• B
    merge from 1.2.0-release (#1347) · a55537f1
    bao liang 提交于
    * update for some bugs
    
    * update some bugs
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
    
    * update
    
    * update
    
    * add multiply settings for application.yml
    
    * add multiply settings for application.yml
    
    * revert
    
    * update configuration settings in task record dao...
    
    * change application_master to application-master
    
    * change application_master to application-master
    
    * update application.yml to application.properties
    
    * revert
    
    * revert
    
    * add properties
    
    * add properties
    
    * revert
    
    * revert
    
    * add api start up..
    add alert send try catch
    
    * update dao info level
    
    * fix bug: task cannot submit when recovery failover
    
    * fix bug: task cannot submit when recovery failover
    
    * merge from dev-db
    
    * revert
    
    * revert
    
    * fix bug: get process definition list failed.
    
    * fix bug: process instance interval is error
    
    * revert
    
    * revert
    
    * update
    
    * support stop submit success tasks
    
    * update kill process
    
    * update for stop process
    
    * update for stop process
    
    * add some logs for stop process
    
    * update for small bug.
    
    * add check strategy before submit task
    
    * revert
    
    * update
    
    * update
    
    * revert
    
    * wait task instance exists if null.
    
    * revert
    
    * update
    
    * change desc to description.
    
    * add check user and definitions function when delete tenant
    
    * update
    
    * change desc to description.
    
    * change desc to description.
    
    * change desc to description.
    
    * remove check resources when delete tenant
    
    * change desc to description.
    
    * change mybatisplus version to 3.2.0
    
    * update
    
    * change the notice to apache.
    
    * update
    
    * update postgre sql
    
    * fix bug: phone can be empty.
    
    * fix bug: postgre test error.
    
    * update create table for postgre quartz
    
    * fix some bugs about postgre.
    
    * update create table for postgre quartz
    
    * add postgre db performance monitor
    
    * add postgre performance monitor
    
    * update performance monitor
    
    * revert
    
    * revert
    
    * fix bug: tasks queue length error
    
    * remove datasource.properties
    
    * change package.xml
    
    * log view service grpc
    
    * log view service grpc
    
    * log view service grpc
    
    * log view service grpc
    
    * log view service grpc
    
    * add src pom
    
    * remove package in alert,api,server
    
    * remove package in alert,api,server
    
    * add binary-front
    
    * add binary-front
    
    * change finalname
    
    * [maven-release-plugin] prepare release 1.2.0
    
    * [maven-release-plugin] prepare for next development iteration
    
    * change finalname
    
    * [maven-release-plugin] prepare release 1.2.0
    
    * [maven-release-plugin] prepare for next development iteration
    
    * change scm
    
    * change scm (#1196)
    
    * package.json update
    
    * package.json update
    
    * [maven-release-plugin] prepare release 1.2.0
    
    * [maven-release-plugin] prepare for next development iteration
    
    * add name
    
    * [maven-release-plugin] prepare release 1.2.0
    
    * update version
    
    * [maven-release-plugin] prepare release 1.2.0
    
    * [maven-release-plugin] prepare for next development iteration
    
    * change chinese sql to english.
    
    * change chinese sql to english.
    
    * [maven-release-plugin] prepare release 1.2.0
    
    * [maven-release-plugin] prepare for next development iteration
    
    * add ui
    
    * [maven-release-plugin] prepare release 1.2.0
    
    * [maven-release-plugin] prepare for next development iteration
    
    * remove unused code.
    
    * add install node-sass
    
    * remove unused code.
    
    * [maven-release-plugin] prepare release 1.2.0-release
    
    * [maven-release-plugin] prepare for next development iteration
    
    * [maven-release-plugin] prepare release 1.2.0-release
    
    * [maven-release-plugin] prepare for next development iteration
    
    * add some notes
    
    * update some notes
    
    * update some notes
    
    * update mbatisplus version
    
    * update lombok version
    
    * update lombok version
    
    * revert
    
    * merge from dev-db (#1225)
    
    * rename from DatasourceUserMapper to DataSourceUserMapper
    
    * add unit test in UserMapper and WorkerGroupMapper
    
    * change cn.escheduler to org.apache.dolphinscheduler
    
    * add unit test in UdfFuncMapperTest
    
    * add unit test in UdfFuncMapperTest
    
    * remove DatabaseConfiguration
    
    * add ConnectionFactoryTest
    
    * cal duration in processInstancesList
    
    * change desc to description
    
    * change table name in mysql ddl
    
    * change table name in mysql ddl
    
    * change escheduler to dolphinscheduler
    
    * change escheduler to dolphinscheduler
    
    * change escheduler to dolphinscheduler
    
    * remove log4j-1.2-api and modify AlertMapperTest
    
    * remove log4j-1.2-api
    
    * Add alertDao to spring management
    
    * Add alertDao to spring management
    
    * get SqlSessionFactory from MybatisSqlSessionFactoryBean
    
    * get processDao by DaoFactory
    
    * read druid properties in ConneciontFactory
    
    * read druid properties in ConneciontFactory
    
    * change get alertDao by spring to DaoFactory
    
    * add log4j to resolve #967
    
    * resole verify udf name error and delete udf error
    
    * Determine if principal is empty
    
    * Determine whether the logon user has the right to delete the project
    
    * Fixed an issue that produced attatch file named such as ATT00002.bin
    
    * fix too many connection in upgrade or create
    
    * fix NEED_FAULT_TOLERANCE and WAITTING_THREAD count fail
    
    * Added a judgment on whether the currently login user is an administrator
    
    * fix update udf database not change and create time is changed
    
    * add enterprise.wechat.enable to decide whether to send enterprise WeChat
    
    * change method check
    
    * Remove the administrator's judgment on query access token list
    
    * only admin can create worker group
    
    * delete alert group need delete the relation of user and alert group
    
    * add timeout in proxy when upload large resource
    
    * add gets scheduled times by expect fire times
    
    * add gets scheduled times by expect fire times
    
    * Increase the judgment of whether it is admin
    
    * Increase the judgment of whether it is admin
    
    * when delete access token add whether login user has perm to delete
    
    * change mysql-connector-java scope to test
    
    * update scm test
    
    * add profile test
    
    * add profile test
    
    * add maven.deploy.skip true
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * add dependency
    
    * add javadoc
    
    * add antrun
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * reset pgsql (#1178)
    
    + 1
    
    * add javadoc
    
    * add javadoc
    
    * [maven-release-plugin] rollback the release of 1.2.0
    
    * add javadoc
    
    * Ans UI upgrade to version 0.1.0 (#1181)
    
    + 1
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * Administrators group prohibit deletion (#1182)
    
    * Ans UI upgrade to version 0.1.0
    
    * Administrators group prohibit deletion
    
    * add javadoc
    
    * add ui pom
    
    * fix master server shutdown error (#1177)
    
    * move updateTaskState into try/catch block in case of exception
    
    * fix NPE
    
    * using conf.getInt instead of getString
    
    * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
    for AlertDao, correct the spelling.
    
    * duplicate
    
    * refactor getTaskWorkerGroupId
    
    * add friendly log
    
    * update hearbeat thread num = 1
    
    * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
    
    * 1. move verifyTaskInstanceIsNull after taskInstance
    2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
    
    * fix the message
    
    * delete before check to avoid KeeperException$NoNodeException
    
    * fix the message
    
    * check processInstance state before delete tenant
    
    * check processInstance state before delete worker group
    
    * refactor
    
    * merge api constants into common constatns
    
    * update the resource perm
    
    * update the dataSource perm
    
    * fix CheckUtils.checkUserParams method
    
    * update AlertGroupService, extends from BaseService, remove duplicate methods
    
    * refactor
    
    * modify method name
    
    * add hasProjectAndPerm method
    
    * using checkProject instead of getResultStatus
    
    * delete checkAuth method, using hasProjectAndPerm instead.
    
    * correct spelling
    
    * add transactional for deleteWorkerGroupById
    
    * add Transactional for deleteProcessInstanceById method
    
    * change sqlSessionTemplate singleton
    
    * change sqlSessionTemplate singleton and reformat code
    
    * fix unsuitable error message
    
    * update shutdownhook methods
    
    * fix worker log bug
    
    * fix api server debug mode bug
    
    * upgrade zk version
    
    * delete this line ,for zkClient.close() will do the whole thing
    
    * fix master server shutdown error
    
    * degrade zk version and add FourLetterWordMain class (#1183)
    
    * move updateTaskState into try/catch block in case of exception
    
    * fix NPE
    
    * using conf.getInt instead of getString
    
    * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
    for AlertDao, correct the spelling.
    
    * duplicate
    
    * refactor getTaskWorkerGroupId
    
    * add friendly log
    
    * update hearbeat thread num = 1
    
    * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
    
    * 1. move verifyTaskInstanceIsNull after taskInstance
    2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
    
    * fix the message
    
    * delete before check to avoid KeeperException$NoNodeException
    
    * fix the message
    
    * check processInstance state before delete tenant
    
    * check processInstance state before delete worker group
    
    * refactor
    
    * merge api constants into common constatns
    
    * update the resource perm
    
    * update the dataSource perm
    
    * fix CheckUtils.checkUserParams method
    
    * update AlertGroupService, extends from BaseService, remove duplicate methods
    
    * refactor
    
    * modify method name
    
    * add hasProjectAndPerm method
    
    * using checkProject instead of getResultStatus
    
    * delete checkAuth method, using hasProjectAndPerm instead.
    
    * correct spelling
    
    * add transactional for deleteWorkerGroupById
    
    * add Transactional for deleteProcessInstanceById method
    
    * change sqlSessionTemplate singleton
    
    * change sqlSessionTemplate singleton and reformat code
    
    * fix unsuitable error message
    
    * update shutdownhook methods
    
    * fix worker log bug
    
    * fix api server debug mode bug
    
    * upgrade zk version
    
    * delete this line ,for zkClient.close() will do the whole thing
    
    * fix master server shutdown error
    
    * degrade zk version and add FourLetterWordMain class
    
    * add ui pom
    
    * add src pom and assembly
    
    * fix ZKWorkerClient not close PathChildrenCache (#1185)
    
    * move updateTaskState into try/catch block in case of exception
    
    * fix NPE
    
    * using conf.getInt instead of getString
    
    * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
    for AlertDao, correct the spelling.
    
    * duplicate
    
    * refactor getTaskWorkerGroupId
    
    * add friendly log
    
    * update hearbeat thread num = 1
    
    * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
    
    * 1. move verifyTaskInstanceIsNull after taskInstance
    2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
    
    * fix the message
    
    * delete before check to avoid KeeperException$NoNodeException
    
    * fix the message
    
    * check processInstance state before delete tenant
    
    * check processInstance state before delete worker group
    
    * refactor
    
    * merge api constants into common constatns
    
    * update the resource perm
    
    * update the dataSource perm
    
    * fix CheckUtils.checkUserParams method
    
    * update AlertGroupService, extends from BaseService, remove duplicate methods
    
    * refactor
    
    * modify method name
    
    * add hasProjectAndPerm method
    
    * using checkProject instead of getResultStatus
    
    * delete checkAuth method, using hasProjectAndPerm instead.
    
    * correct spelling
    
    * add transactional for deleteWorkerGroupById
    
    * add Transactional for deleteProcessInstanceById method
    
    * change sqlSessionTemplate singleton
    
    * change sqlSessionTemplate singleton and reformat code
    
    * fix unsuitable error message
    
    * update shutdownhook methods
    
    * fix worker log bug
    
    * fix api server debug mode bug
    
    * upgrade zk version
    
    * delete this line ,for zkClient.close() will do the whole thing
    
    * fix master server shutdown error
    
    * degrade zk version and add FourLetterWordMain class
    
    * fix PathChildrenCache not close
    
    * add Transactional for createSession method (#1186)
    
    * move updateTaskState into try/catch block in case of exception
    
    * fix NPE
    
    * using conf.getInt instead of getString
    
    * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
    for AlertDao, correct the spelling.
    
    * duplicate
    
    * refactor getTaskWorkerGroupId
    
    * add friendly log
    
    * update hearbeat thread num = 1
    
    * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
    
    * 1. move verifyTaskInstanceIsNull after taskInstance
    2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
    
    * fix the message
    
    * delete before check to avoid KeeperException$NoNodeException
    
    * fix the message
    
    * check processInstance state before delete tenant
    
    * check processInstance state before delete worker group
    
    * refactor
    
    * merge api constants into common constatns
    
    * update the resource perm
    
    * update the dataSource perm
    
    * fix CheckUtils.checkUserParams method
    
    * update AlertGroupService, extends from BaseService, remove duplicate methods
    
    * refactor
    
    * modify method name
    
    * add hasProjectAndPerm method
    
    * using checkProject instead of getResultStatus
    
    * delete checkAuth method, using hasProjectAndPerm instead.
    
    * correct spelling
    
    * add transactional for deleteWorkerGroupById
    
    * add Transactional for deleteProcessInstanceById method
    
    * change sqlSessionTemplate singleton
    
    * change sqlSessionTemplate singleton and reformat code
    
    * fix unsuitable error message
    
    * update shutdownhook methods
    
    * fix worker log bug
    
    * fix api server debug mode bug
    
    * upgrade zk version
    
    * delete this line ,for zkClient.close() will do the whole thing
    
    * fix master server shutdown error
    
    * degrade zk version and add FourLetterWordMain class
    
    * fix PathChildrenCache not close
    
    * add Transactional for createSession method
    
    * add src pom and assembly
    
    * add src pom and assembly
    
    * add src pom and assembly
    
    * add src pom and assembly
    
    * dockerfile dao application.properties ,install.sh modify and application.properties modify (#1187)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * add src pom and assembly
    
    * add src pom and assembly
    
    * dockerfile startup.sh modify (#1189)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs (#1191)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs
    
    * nginx conf modify
    
    * dockerfile application.properties modify
    
    * dockerfile conf modify (#1192)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs
    
    * nginx conf modify
    
    * dockerfile application.properties modify
    
    * dockerfile conf modify (#1193)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs
    
    * nginx conf modify
    
    * dockerfile application.properties modify
    
    * dockerfile email address change (#1194)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs
    
    * nginx conf modify
    
    * dockerfile application.properties modify
    
    * dockerfile email address change
    
    * the alert module is modified in english (#1195)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs
    
    * nginx conf modify
    
    * dockerfile application.properties modify
    
    * dockerfile email address change
    
    * the alert module is modified in English.
    
    * alert server comment and chinese modify
    
    * api server useless code and chinese modify (#1198)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs
    
    * nginx conf modify
    
    * dockerfile application.properties modify
    
    * dockerfile email address change
    
    * the alert module is modified in English.
    
    * alert server comment and chinese modify
    
    * api server useless code and chinese modify
    
    * common,dao,server useless code and chinese modify (#1199)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs
    
    * nginx conf modify
    
    * dockerfile application.properties modify
    
    * dockerfile email address change
    
    * the alert module is modified in English.
    
    * alert server comment and chinese modify
    
    * api server useless code and chinese modify
    
    * common,dao,server useless code and chinese modify
    
    * change chinese sql to english. (#1200)
    
    * update english documents
    
    * refactor zk client
    
    * update documents
    
    * update zkclient
    
    * update zkclient
    
    * update documents
    
    * add architecture-design
    
    * change i18n
    
    * update i18n
    
    * update english documents
    
    * add architecture-design
    
    * update english documents
    
    * update en-US documents
    
    * add architecture-design
    
    * update demo site
    
    * add mybatis plus model
    
    * modify mybatisplus
    
    * modify mybatisplus
    
    * change interface by mybatisplus
    
    * add unit test
    
    * refactor dao interface.
    
    * add unit test for dao...
    
    * add unit test for dao...
    
    * add unit test for dao...
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
    
    * update some dao bugs
    
    * update for some bugs
    
    * update some bugs
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
    
    * update
    
    * update
    
    * add multiply settings for application.yml
    
    * add multiply settings for application.yml
    
    * revert
    
    * update configuration settings in task record dao...
    
    * change application_master to application-master
    
    * change application_master to application-master
    
    * update application.yml to application.properties
    
    * revert
    
    * revert
    
    * add properties
    
    * add properties
    
    * revert
    
    * revert
    
    * add api start up..
    add alert send try catch
    
    * update dao info level
    
    * fix bug: task cannot submit when recovery failover
    
    * fix bug: task cannot submit when recovery failover
    
    * merge from dev-db
    
    * revert
    
    * revert
    
    * fix bug: get process definition list failed.
    
    * fix bug: process instance interval is error
    
    * revert
    
    * revert
    
    * update
    
    * support stop submit success tasks
    
    * update kill process
    
    * update for stop process
    
    * update for stop process
    
    * add some logs for stop process
    
    * update for small bug.
    
    * add check strategy before submit task
    
    * revert
    
    * update
    
    * update
    
    * revert
    
    * wait task instance exists if null.
    
    * revert
    
    * update
    
    * change desc to description.
    
    * add check user and definitions function when delete tenant
    
    * update
    
    * change desc to description.
    
    * change desc to description.
    
    * change desc to description.
    
    * remove check resources when delete tenant
    
    * change desc to description.
    
    * change mybatisplus version to 3.2.0
    
    * update
    
    * change the notice to apache.
    
    * update
    
    * update postgre sql
    
    * fix bug: phone can be empty.
    
    * fix bug: postgre test error.
    
    * update create table for postgre quartz
    
    * fix some bugs about postgre.
    
    * update create table for postgre quartz
    
    * add postgre db performance monitor
    
    * add postgre performance monitor
    
    * update performance monitor
    
    * revert
    
    * revert
    
    * fix bug: tasks queue length error
    
    * remove datasource.properties
    
    * change chinese sql to english.
    
    * change chinese sql to english.
    
    * change chinese to english (#1202)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs
    
    * nginx conf modify
    
    * dockerfile application.properties modify
    
    * dockerfile email address change
    
    * the alert module is modified in English.
    
    * alert server comment and chinese modify
    
    * api server useless code and chinese modify
    
    * common,dao,server useless code and chinese modify
    
    * change chinese to english
    
    * remove unused code (#1204)
    
    * update english documents
    
    * refactor zk client
    
    * update documents
    
    * update zkclient
    
    * update zkclient
    
    * update documents
    
    * add architecture-design
    
    * change i18n
    
    * update i18n
    
    * update english documents
    
    * add architecture-design
    
    * update english documents
    
    * update en-US documents
    
    * add architecture-design
    
    * update demo site
    
    * add mybatis plus model
    
    * modify mybatisplus
    
    * modify mybatisplus
    
    * change interface by mybatisplus
    
    * add unit test
    
    * refactor dao interface.
    
    * add unit test for dao...
    
    * add unit test for dao...
    
    * add unit test for dao...
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
    
    * update some dao bugs
    
    * update for some bugs
    
    * update some bugs
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
    
    * update
    
    * update
    
    * add multiply settings for application.yml
    
    * add multiply settings for application.yml
    
    * revert
    
    * update configuration settings in task record dao...
    
    * change application_master to application-master
    
    * change application_master to application-master
    
    * update application.yml to application.properties
    
    * revert
    
    * revert
    
    * add properties
    
    * add properties
    
    * revert
    
    * revert
    
    * add api start up..
    add alert send try catch
    
    * update dao info level
    
    * fix bug: task cannot submit when recovery failover
    
    * fix bug: task cannot submit when recovery failover
    
    * merge from dev-db
    
    * revert
    
    * revert
    
    * fix bug: get process definition list failed.
    
    * fix bug: process instance interval is error
    
    * revert
    
    * revert
    
    * update
    
    * support stop submit success tasks
    
    * update kill process
    
    * update for stop process
    
    * update for stop process
    
    * add some logs for stop process
    
    * update for small bug.
    
    * add check strategy before submit task
    
    * revert
    
    * update
    
    * update
    
    * revert
    
    * wait task instance exists if null.
    
    * revert
    
    * update
    
    * change desc to description.
    
    * add check user and definitions function when delete tenant
    
    * update
    
    * change desc to description.
    
    * change desc to description.
    
    * change desc to description.
    
    * remove check resources when delete tenant
    
    * change desc to description.
    
    * change mybatisplus version to 3.2.0
    
    * update
    
    * change the notice to apache.
    
    * update
    
    * update postgre sql
    
    * fix bug: phone can be empty.
    
    * fix bug: postgre test error.
    
    * update create table for postgre quartz
    
    * fix some bugs about postgre.
    
    * update create table for postgre quartz
    
    * add postgre db performance monitor
    
    * add postgre performance monitor
    
    * update performance monitor
    
    * revert
    
    * revert
    
    * fix bug: tasks queue length error
    
    * remove datasource.properties
    
    * change chinese sql to english.
    
    * change chinese sql to english.
    
    * remove unused code.
    
    * remove unused code.
    
    * Modify webpack configuration (#1206)
    
    * add more message for java-doc (#1209)
    
    * move updateTaskState into try/catch block in case of exception
    
    * fix NPE
    
    * using conf.getInt instead of getString
    
    * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
    for AlertDao, correct the spelling.
    
    * duplicate
    
    * refactor getTaskWorkerGroupId
    
    * add friendly log
    
    * update hearbeat thread num = 1
    
    * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
    
    * 1. move verifyTaskInstanceIsNull after taskInstance
    2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
    
    * fix the message
    
    * delete before check to avoid KeeperException$NoNodeException
    
    * fix the message
    
    * check processInstance state before delete tenant
    
    * check processInstance state before delete worker group
    
    * refactor
    
    * merge api constants into common constatns
    
    * update the resource perm
    
    * update the dataSource perm
    
    * fix CheckUtils.checkUserParams method
    
    * update AlertGroupService, extends from BaseService, remove duplicate methods
    
    * refactor
    
    * modify method name
    
    * add hasProjectAndPerm method
    
    * using checkProject instead of getResultStatus
    
    * delete checkAuth method, using hasProjectAndPerm instead.
    
    * correct spelling
    
    * add transactional for deleteWorkerGroupById
    
    * add Transactional for deleteProcessInstanceById method
    
    * change sqlSessionTemplate singleton
    
    * change sqlSessionTemplate singleton and reformat code
    
    * fix unsuitable error message
    
    * update shutdownhook methods
    
    * fix worker log bug
    
    * fix api server debug mode bug
    
    * upgrade zk version
    
    * delete this line ,for zkClient.close() will do the whole thing
    
    * fix master server shutdown error
    
    * degrade zk version and add FourLetterWordMain class
    
    * fix PathChildrenCache not close
    
    * add Transactional for createSession method
    
    * add more message for java-doc
    
    * add java doc for common module (#1213)
    
    * dao method comments and useless code modify (#1214)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs
    
    * nginx conf modify
    
    * dockerfile application.properties modify
    
    * dockerfile email address change
    
    * the alert module is modified in English.
    
    * alert server comment and chinese modify
    
    * api server useless code and chinese modify
    
    * common,dao,server useless code and chinese modify
    
    * change chinese to english
    
    * dao method comments and useless code modify
    
    * Change all Chinese names to English (#1207)
    
    * Modify webpack configuration
    
    * Change all Chinese names to English
    
    * add progress-bar-webpack-plugin (#1215)
    
    * Modify webpack configuration
    
    * Change all Chinese names to English
    
    * add progress-bar-webpack-plugin
    
    * Add method and parameters comments (#1220)
    
    * rename from DatasourceUserMapper to DataSourceUserMapper
    
    * add unit test in UserMapper and WorkerGroupMapper
    
    * change cn.escheduler to org.apache.dolphinscheduler
    
    * add unit test in UdfFuncMapperTest
    
    * add unit test in UdfFuncMapperTest
    
    * remove DatabaseConfiguration
    
    * add ConnectionFactoryTest
    
    * cal duration in processInstancesList
    
    * change desc to description
    
    * change table name in mysql ddl
    
    * change table name in mysql ddl
    
    * change escheduler to dolphinscheduler
    
    * change escheduler to dolphinscheduler
    
    * change escheduler to dolphinscheduler
    
    * remove log4j-1.2-api and modify AlertMapperTest
    
    * remove log4j-1.2-api
    
    * Add alertDao to spring management
    
    * Add alertDao to spring management
    
    * get SqlSessionFactory from MybatisSqlSessionFactoryBean
    
    * get processDao by DaoFactory
    
    * read druid properties in ConneciontFactory
    
    * read druid properties in ConneciontFactory
    
    * change get alertDao by spring to DaoFactory
    
    * add log4j to resolve #967
    
    * resole verify udf name error and delete udf error
    
    * Determine if principal is empty
    
    * Determine whether the logon user has the right to delete the project
    
    * Fixed an issue that produced attatch file named such as ATT00002.bin
    
    * fix too many connection in upgrade or create
    
    * fix NEED_FAULT_TOLERANCE and WAITTING_THREAD count fail
    
    * Added a judgment on whether the currently login user is an administrator
    
    * fix update udf database not change and create time is changed
    
    * add enterprise.wechat.enable to decide whether to send enterprise WeChat
    
    * change method check
    
    * Remove the administrator's judgment on query access token list
    
    * only admin can create worker group
    
    * delete alert group need delete the relation of user and alert group
    
    * add timeout in proxy when upload large resource
    
    * add gets scheduled times by expect fire times
    
    * add gets scheduled times by expect fire times
    
    * Increase the judgment of whether it is admin
    
    * Increase the judgment of whether it is admin
    
    * when delete access token add whether login user has perm to delete
    
    * change mysql-connector-java scope to test
    
    * update scm test
    
    * add profile test
    
    * Add method and parameters comments
    
    * roll back
    
    * add some notes (#1221)
    
    * update english documents
    
    * refactor zk client
    
    * update documents
    
    * update zkclient
    
    * update zkclient
    
    * update documents
    
    * add architecture-design
    
    * change i18n
    
    * update i18n
    
    * update english documents
    
    * add architecture-design
    
    * update english documents
    
    * update en-US documents
    
    * add architecture-design
    
    * update demo site
    
    * add mybatis plus model
    
    * modify mybatisplus
    
    * modify mybatisplus
    
    * change interface by mybatisplus
    
    * add unit test
    
    * refactor dao interface.
    
    * add unit test for dao...
    
    * add unit test for dao...
    
    * add unit test for dao...
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
    
    * update some dao bugs
    
    * update for some bugs
    
    * update some bugs
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
    
    * update
    
    * update
    
    * add multiply settings for application.yml
    
    * add multiply settings for application.yml
    
    * revert
    
    * update configuration settings in task record dao...
    
    * change application_master to application-master
    
    * change application_master to application-master
    
    * update application.yml to application.properties
    
    * revert
    
    * revert
    
    * add properties
    
    * add properties
    
    * revert
    
    * revert
    
    * add api start up..
    add alert send try catch
    
    * update dao info level
    
    * fix bug: task cannot submit when recovery failover
    
    * fix bug: task cannot submit when recovery failover
    
    * merge from dev-db
    
    * revert
    
    * revert
    
    * fix bug: get process definition list failed.
    
    * fix bug: process instance interval is error
    
    * revert
    
    * revert
    
    * update
    
    * support stop submit success tasks
    
    * update kill process
    
    * update for stop process
    
    * update for stop process
    
    * add some logs for stop process
    
    * update for small bug.
    
    * add check strategy before submit task
    
    * revert
    
    * update
    
    * update
    
    * revert
    
    * wait task instance exists if null.
    
    * revert
    
    * update
    
    * change desc to description.
    
    * add check user and definitions function when delete tenant
    
    * update
    
    * change desc to description.
    
    * change desc to description.
    
    * change desc to description.
    
    * remove check resources when delete tenant
    
    * change desc to description.
    
    * change mybatisplus version to 3.2.0
    
    * update
    
    * change the notice to apache.
    
    * update
    
    * update postgre sql
    
    * fix bug: phone can be empty.
    
    * fix bug: postgre test error.
    
    * update create table for postgre quartz
    
    * fix some bugs about postgre.
    
    * update create table for postgre quartz
    
    * add postgre db performance monitor
    
    * add postgre performance monitor
    
    * update performance monitor
    
    * revert
    
    * revert
    
    * fix bug: tasks queue length error
    
    * remove datasource.properties
    
    * change chinese sql to english.
    
    * change chinese sql to english.
    
    * remove unused code.
    
    * remove unused code.
    
    * add some notes
    
    * update some notes
    
    * update some notes
    
    * update mbatisplus version
    
    * update lombok version
    
    * update lombok version
    
    * revert
    
    * merge from dev-db
    
    * remove version
    
    * update npm install pom (#1227)
    
    * rename from DatasourceUserMapper to DataSourceUserMapper
    
    * add unit test in UserMapper and WorkerGroupMapper
    
    * change cn.escheduler to org.apache.dolphinscheduler
    
    * add unit test in UdfFuncMapperTest
    
    * add unit test in UdfFuncMapperTest
    
    * remove DatabaseConfiguration
    
    * add ConnectionFactoryTest
    
    * cal duration in processInstancesList
    
    * change desc to description
    
    * change table name in mysql ddl
    
    * change table name in mysql ddl
    
    * change escheduler to dolphinscheduler
    
    * change escheduler to dolphinscheduler
    
    * change escheduler to dolphinscheduler
    
    * remove log4j-1.2-api and modify AlertMapperTest
    
    * remove log4j-1.2-api
    
    * Add alertDao to spring management
    
    * Add alertDao to spring management
    
    * get SqlSessionFactory from MybatisSqlSessionFactoryBean
    
    * get processDao by DaoFactory
    
    * read druid properties in ConneciontFactory
    
    * read druid properties in ConneciontFactory
    
    * change get alertDao by spring to DaoFactory
    
    * add log4j to resolve #967
    
    * resole verify udf name error and delete udf error
    
    * Determine if principal is empty
    
    * Determine whether the logon user has the right to delete the project
    
    * Fixed an issue that produced attatch file named such as ATT00002.bin
    
    * fix too many connection in upgrade or create
    
    * fix NEED_FAULT_TOLERANCE and WAITTING_THREAD count fail
    
    * Added a judgment on whether the currently login user is an administrator
    
    * fix update udf database not change and create time is changed
    
    * add enterprise.wechat.enable to decide whether to send enterprise WeChat
    
    * change method check
    
    * Remove the administrator's judgment on query access token list
    
    * only admin can create worker group
    
    * delete alert group need delete the relation of user and alert group
    
    * add timeout in proxy when upload large resource
    
    * add gets scheduled times by expect fire times
    
    * add gets scheduled times by expect fire times
    
    * Increase the judgment of whether it is admin
    
    * Increase the judgment of whether it is admin
    
    * when delete access token add whether login user has perm to delete
    
    * change mysql-connector-java scope to test
    
    * update scm test
    
    * add profile test
    
    * add profile test
    
    * add maven.deploy.skip true
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * add dependency
    
    * add javadoc
    
    * add antrun
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * reset pgsql (#1178)
    
    + 1
    
    * add javadoc
    
    * add javadoc
    
    * [maven-release-plugin] rollback the release of 1.2.0
    
    * add javadoc
    
    * Ans UI upgrade to version 0.1.0 (#1181)
    
    + 1
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * Administrators group prohibit deletion (#1182)
    
    * Ans UI upgrade to version 0.1.0
    
    * Administrators group prohibit deletion
    
    * add javadoc
    
    * add ui pom
    
    * fix master server shutdown error (#1177)
    
    * move updateTaskState into try/catch block in case of exception
    
    * fix NPE
    
    * using conf.getInt instead of getString
    
    * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
    for AlertDao, correct the spelling.
    
    * duplicate
    
    * refactor getTaskWorkerGroupId
    
    * add friendly log
    
    * update hearbeat thread num = 1
    
    * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
    
    * 1. move verifyTaskInstanceIsNull after taskInstance
    2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
    
    * fix the message
    
    * delete before check to avoid KeeperException$NoNodeException
    
    * fix the message
    
    * check processInstance state before delete tenant
    
    * check processInstance state before delete worker group
    
    * refactor
    
    * merge api constants into common constatns
    
    * update the resource perm
    
    * update the dataSource perm
    
    * fix CheckUtils.checkUserParams method
    
    * update AlertGroupService, extends from BaseService, remove duplicate methods
    
    * refactor
    
    * modify method name
    
    * add hasProjectAndPerm method
    
    * using checkProject instead of getResultStatus
    
    * delete checkAuth method, using hasProjectAndPerm instead.
    
    * correct spelling
    
    * add transactional for deleteWorkerGroupById
    
    * add Transactional for deleteProcessInstanceById method
    
    * change sqlSessionTemplate singleton
    
    * change sqlSessionTemplate singleton and reformat code
    
    * fix unsuitable error message
    
    * update shutdownhook methods
    
    * fix worker log bug
    
    * fix api server debug mode bug
    
    * upgrade zk version
    
    * delete this line ,for zkClient.close() will do the whole thing
    
    * fix master server shutdown error
    
    * degrade zk version and add FourLetterWordMain class (#1183)
    
    * move updateTaskState into try/catch block in case of exception
    
    * fix NPE
    
    * using conf.getInt instead of getString
    
    * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
    for AlertDao, correct the spelling.
    
    * duplicate
    
    * refactor getTaskWorkerGroupId
    
    * add friendly log
    
    * update hearbeat thread num = 1
    
    * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
    
    * 1. move verifyTaskInstanceIsNull after taskInstance
    2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
    
    * fix the message
    
    * delete before check to avoid KeeperException$NoNodeException
    
    * fix the message
    
    * check processInstance state before delete tenant
    
    * check processInstance state before delete worker group
    
    * refactor
    
    * merge api constants into common constatns
    
    * update the resource perm
    
    * update the dataSource perm
    
    * fix CheckUtils.checkUserParams method
    
    * update AlertGroupService, extends from BaseService, remove duplicate methods
    
    * refactor
    
    * modify method name
    
    * add hasProjectAndPerm method
    
    * using checkProject instead of getResultStatus
    
    * delete checkAuth method, using hasProjectAndPerm instead.
    
    * correct spelling
    
    * add transactional for deleteWorkerGroupById
    
    * add Transactional for deleteProcessInstanceById method
    
    * change sqlSessionTemplate singleton
    
    * change sqlSessionTemplate singleton and reformat code
    
    * fix unsuitable error message
    
    * update shutdownhook methods
    
    * fix worker log bug
    
    * fix api server debug mode bug
    
    * upgrade zk version
    
    * delete this line ,for zkClient.close() will do the whole thing
    
    * fix master server shutdown error
    
    * degrade zk version and add FourLetterWordMain class
    
    * add ui pom
    
    * add src pom and assembly
    
    * fix ZKWorkerClient not close PathChildrenCache (#1185)
    
    * move updateTaskState into try/catch block in case of exception
    
    * fix NPE
    
    * using conf.getInt instead of getString
    
    * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
    for AlertDao, correct the spelling.
    
    * duplicate
    
    * refactor getTaskWorkerGroupId
    
    * add friendly log
    
    * update hearbeat thread num = 1
    
    * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
    
    * 1. move verifyTaskInstanceIsNull after taskInstance
    2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
    
    * fix the message
    
    * delete before check to avoid KeeperException$NoNodeException
    
    * fix the message
    
    * check processInstance state before delete tenant
    
    * check processInstance state before delete worker group
    
    * refactor
    
    * merge api constants into common constatns
    
    * update the resource perm
    
    * update the dataSource perm
    
    * fix CheckUtils.checkUserParams method
    
    * update AlertGroupService, extends from BaseService, remove duplicate methods
    
    * refactor
    
    * modify method name
    
    * add hasProjectAndPerm method
    
    * using checkProject instead of getResultStatus
    
    * delete checkAuth method, using hasProjectAndPerm instead.
    
    * correct spelling
    
    * add transactional for deleteWorkerGroupById
    
    * add Transactional for deleteProcessInstanceById method
    
    * change sqlSessionTemplate singleton
    
    * change sqlSessionTemplate singleton and reformat code
    
    * fix unsuitable error message
    
    * update shutdownhook methods
    
    * fix worker log bug
    
    * fix api server debug mode bug
    
    * upgrade zk version
    
    * delete this line ,for zkClient.close() will do the whole thing
    
    * fix master server shutdown error
    
    * degrade zk version and add FourLetterWordMain class
    
    * fix PathChildrenCache not close
    
    * add Transactional for createSession method (#1186)
    
    * move updateTaskState into try/catch block in case of exception
    
    * fix NPE
    
    * using conf.getInt instead of getString
    
    * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
    for AlertDao, correct the spelling.
    
    * duplicate
    
    * refactor getTaskWorkerGroupId
    
    * add friendly log
    
    * update hearbeat thread num = 1
    
    * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
    
    * 1. move verifyTaskInstanceIsNull after taskInstance
    2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
    
    * fix the message
    
    * delete before check to avoid KeeperException$NoNodeException
    
    * fix the message
    
    * check processInstance state before delete tenant
    
    * check processInstance state before delete worker group
    
    * refactor
    
    * merge api constants into common constatns
    
    * update the resource perm
    
    * update the dataSource perm
    
    * fix CheckUtils.checkUserParams method
    
    * update AlertGroupService, extends from BaseService, remove duplicate methods
    
    * refactor
    
    * modify method name
    
    * add hasProjectAndPerm method
    
    * using checkProject instead of getResultStatus
    
    * delete checkAuth method, using hasProjectAndPerm instead.
    
    * correct spelling
    
    * add transactional for deleteWorkerGroupById
    
    * add Transactional for deleteProcessInstanceById method
    
    * change sqlSessionTemplate singleton
    
    * change sqlSessionTemplate singleton and reformat code
    
    * fix unsuitable error message
    
    * update shutdownhook methods
    
    * fix worker log bug
    
    * fix api server debug mode bug
    
    * upgrade zk version
    
    * delete this line ,for zkClient.close() will do the whole thing
    
    * fix master server shutdown error
    
    * degrade zk version and add FourLetterWordMain class
    
    * fix PathChildrenCache not close
    
    * add Transactional for createSession method
    
    * add src pom and assembly
    
    * add src pom and assembly
    
    * add src pom and assembly
    
    * add src pom and assembly
    
    * dockerfile dao application.properties ,install.sh modify and application.properties modify (#1187)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * add src pom and assembly
    
    * add src pom and assembly
    
    * dockerfile startup.sh modify (#1189)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs (#1191)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs
    
    * nginx conf modify
    
    * dockerfile application.properties modify
    
    * dockerfile conf modify (#1192)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs
    
    * nginx conf modify
    
    * dockerfile application.properties modify
    
    * dockerfile conf modify (#1193)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs
    
    * nginx conf modify
    
    * dockerfile application.properties modify
    
    * dockerfile email address change (#1194)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs
    
    * nginx conf modify
    
    * dockerfile application.properties modify
    
    * dockerfile email address change
    
    * the alert module is modified in english (#1195)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs
    
    * nginx conf modify
    
    * dockerfile application.properties modify
    
    * dockerfile email address change
    
    * the alert module is modified in English.
    
    * alert server comment and chinese modify
    
    * api server useless code and chinese modify (#1198)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs
    
    * nginx conf modify
    
    * dockerfile application.properties modify
    
    * dockerfile email address change
    
    * the alert module is modified in English.
    
    * alert server comment and chinese modify
    
    * api server useless code and chinese modify
    
    * common,dao,server useless code and chinese modify (#1199)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs
    
    * nginx conf modify
    
    * dockerfile application.properties modify
    
    * dockerfile email address change
    
    * the alert module is modified in English.
    
    * alert server comment and chinese modify
    
    * api server useless code and chinese modify
    
    * common,dao,server useless code and chinese modify
    
    * change chinese sql to english. (#1200)
    
    * update english documents
    
    * refactor zk client
    
    * update documents
    
    * update zkclient
    
    * update zkclient
    
    * update documents
    
    * add architecture-design
    
    * change i18n
    
    * update i18n
    
    * update english documents
    
    * add architecture-design
    
    * update english documents
    
    * update en-US documents
    
    * add architecture-design
    
    * update demo site
    
    * add mybatis plus model
    
    * modify mybatisplus
    
    * modify mybatisplus
    
    * change interface by mybatisplus
    
    * add unit test
    
    * refactor dao interface.
    
    * add unit test for dao...
    
    * add unit test for dao...
    
    * add unit test for dao...
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
    
    * update some dao bugs
    
    * update for some bugs
    
    * update some bugs
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
    
    * update
    
    * update
    
    * add multiply settings for application.yml
    
    * add multiply settings for application.yml
    
    * revert
    
    * update configuration settings in task record dao...
    
    * change application_master to application-master
    
    * change application_master to application-master
    
    * update application.yml to application.properties
    
    * revert
    
    * revert
    
    * add properties
    
    * add properties
    
    * revert
    
    * revert
    
    * add api start up..
    add alert send try catch
    
    * update dao info level
    
    * fix bug: task cannot submit when recovery failover
    
    * fix bug: task cannot submit when recovery failover
    
    * merge from dev-db
    
    * revert
    
    * revert
    
    * fix bug: get process definition list failed.
    
    * fix bug: process instance interval is error
    
    * revert
    
    * revert
    
    * update
    
    * support stop submit success tasks
    
    * update kill process
    
    * update for stop process
    
    * update for stop process
    
    * add some logs for stop process
    
    * update for small bug.
    
    * add check strategy before submit task
    
    * revert
    
    * update
    
    * update
    
    * revert
    
    * wait task instance exists if null.
    
    * revert
    
    * update
    
    * change desc to description.
    
    * add check user and definitions function when delete tenant
    
    * update
    
    * change desc to description.
    
    * change desc to description.
    
    * change desc to description.
    
    * remove check resources when delete tenant
    
    * change desc to description.
    
    * change mybatisplus version to 3.2.0
    
    * update
    
    * change the notice to apache.
    
    * update
    
    * update postgre sql
    
    * fix bug: phone can be empty.
    
    * fix bug: postgre test error.
    
    * update create table for postgre quartz
    
    * fix some bugs about postgre.
    
    * update create table for postgre quartz
    
    * add postgre db performance monitor
    
    * add postgre performance monitor
    
    * update performance monitor
    
    * revert
    
    * revert
    
    * fix bug: tasks queue length error
    
    * remove datasource.properties
    
    * change chinese sql to english.
    
    * change chinese sql to english.
    
    * change chinese to english (#1202)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs
    
    * nginx conf modify
    
    * dockerfile application.properties modify
    
    * dockerfile email address change
    
    * the alert module is modified in English.
    
    * alert server comment and chinese modify
    
    * api server useless code and chinese modify
    
    * common,dao,server useless code and chinese modify
    
    * change chinese to english
    
    * remove unused code (#1204)
    
    * update english documents
    
    * refactor zk client
    
    * update documents
    
    * update zkclient
    
    * update zkclient
    
    * update documents
    
    * add architecture-design
    
    * change i18n
    
    * update i18n
    
    * update english documents
    
    * add architecture-design
    
    * update english documents
    
    * update en-US documents
    
    * add architecture-design
    
    * update demo site
    
    * add mybatis plus model
    
    * modify mybatisplus
    
    * modify mybatisplus
    
    * change interface by mybatisplus
    
    * add unit test
    
    * refactor dao interface.
    
    * add unit test for dao...
    
    * add unit test for dao...
    
    * add unit test for dao...
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
    
    * update some dao bugs
    
    * update for some bugs
    
    * update some bugs
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
    
    * update
    
    * update
    
    * add multiply settings for application.yml
    
    * add multiply settings for application.yml
    
    * revert
    
    * update configuration settings in task record dao...
    
    * change application_master to application-master
    
    * change application_master to application-master
    
    * update application.yml to application.properties
    
    * revert
    
    * revert
    
    * add properties
    
    * add properties
    
    * revert
    
    * revert
    
    * add api start up..
    add alert send try catch
    
    * update dao info level
    
    * fix bug: task cannot submit when recovery failover
    
    * fix bug: task cannot submit when recovery failover
    
    * merge from dev-db
    
    * revert
    
    * revert
    
    * fix bug: get process definition list failed.
    
    * fix bug: process instance interval is error
    
    * revert
    
    * revert
    
    * update
    
    * support stop submit success tasks
    
    * update kill process
    
    * update for stop process
    
    * update for stop process
    
    * add some logs for stop process
    
    * update for small bug.
    
    * add check strategy before submit task
    
    * revert
    
    * update
    
    * update
    
    * revert
    
    * wait task instance exists if null.
    
    * revert
    
    * update
    
    * change desc to description.
    
    * add check user and definitions function when delete tenant
    
    * update
    
    * change desc to description.
    
    * change desc to description.
    
    * change desc to description.
    
    * remove check resources when delete tenant
    
    * change desc to description.
    
    * change mybatisplus version to 3.2.0
    
    * update
    
    * change the notice to apache.
    
    * update
    
    * update postgre sql
    
    * fix bug: phone can be empty.
    
    * fix bug: postgre test error.
    
    * update create table for postgre quartz
    
    * fix some bugs about postgre.
    
    * update create table for postgre quartz
    
    * add postgre db performance monitor
    
    * add postgre performance monitor
    
    * update performance monitor
    
    * revert
    
    * revert
    
    * fix bug: tasks queue length error
    
    * remove datasource.properties
    
    * change chinese sql to english.
    
    * change chinese sql to english.
    
    * remove unused code.
    
    * remove unused code.
    
    * Modify webpack configuration (#1206)
    
    * add more message for java-doc (#1209)
    
    * move updateTaskState into try/catch block in case of exception
    
    * fix NPE
    
    * using conf.getInt instead of getString
    
    * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
    for AlertDao, correct the spelling.
    
    * duplicate
    
    * refactor getTaskWorkerGroupId
    
    * add friendly log
    
    * update hearbeat thread num = 1
    
    * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
    
    * 1. move verifyTaskInstanceIsNull after taskInstance
    2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
    
    * fix the message
    
    * delete before check to avoid KeeperException$NoNodeException
    
    * fix the message
    
    * check processInstance state before delete tenant
    
    * check processInstance state before delete worker group
    
    * refactor
    
    * merge api constants into common constatns
    
    * update the resource perm
    
    * update the dataSource perm
    
    * fix CheckUtils.checkUserParams method
    
    * update AlertGroupService, extends from BaseService, remove duplicate methods
    
    * refactor
    
    * modify method name
    
    * add hasProjectAndPerm method
    
    * using checkProject instead of getResultStatus
    
    * delete checkAuth method, using hasProjectAndPerm instead.
    
    * correct spelling
    
    * add transactional for deleteWorkerGroupById
    
    * add Transactional for deleteProcessInstanceById method
    
    * change sqlSessionTemplate singleton
    
    * change sqlSessionTemplate singleton and reformat code
    
    * fix unsuitable error message
    
    * update shutdownhook methods
    
    * fix worker log bug
    
    * fix api server debug mode bug
    
    * upgrade zk version
    
    * delete this line ,for zkClient.close() will do the whole thing
    
    * fix master server shutdown error
    
    * degrade zk version and add FourLetterWordMain class
    
    * fix PathChildrenCache not close
    
    * add Transactional for createSession method
    
    * add more message for java-doc
    
    * add java doc for common module (#1213)
    
    * dao method comments and useless code modify (#1214)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs
    
    * nginx conf modify
    
    * dockerfile application.properties modify
    
    * dockerfile email address change
    
    * the alert module is modified in English.
    
    * alert server comment and chinese modify
    
    * api server useless code and chinese modify
    
    * common,dao,server useless code and chinese modify
    
    * change chinese to english
    
    * dao method comments and useless code modify
    
    * Change all Chinese names to English (#1207)
    
    * Modify webpack configuration
    
    * Change all Chinese names to English
    
    * add progress-bar-webpack-plugin (#1215)
    
    * Modify webpack configuration
    
    * Change all Chinese names to English
    
    * add progress-bar-webpack-plugin
    
    * Add method and parameters comments (#1220)
    
    * rename from DatasourceUserMapper to DataSourceUserMapper
    
    * add unit test in UserMapper and WorkerGroupMapper
    
    * change cn.escheduler to org.apache.dolphinscheduler
    
    * add unit test in UdfFuncMapperTest
    
    * add unit test in UdfFuncMapperTest
    
    * remove DatabaseConfiguration
    
    * add ConnectionFactoryTest
    
    * cal duration in processInstancesList
    
    * change desc to description
    
    * change table name in mysql ddl
    
    * change table name in mysql ddl
    
    * change escheduler to dolphinscheduler
    
    * change escheduler to dolphinscheduler
    
    * change escheduler to dolphinscheduler
    
    * remove log4j-1.2-api and modify AlertMapperTest
    
    * remove log4j-1.2-api
    
    * Add alertDao to spring management
    
    * Add alertDao to spring management
    
    * get SqlSessionFactory from MybatisSqlSessionFactoryBean
    
    * get processDao by DaoFactory
    
    * read druid properties in ConneciontFactory
    
    * read druid properties in ConneciontFactory
    
    * change get alertDao by spring to DaoFactory
    
    * add log4j to resolve #967
    
    * resole verify udf name error and delete udf error
    
    * Determine if principal is empty
    
    * Determine whether the logon user has the right to delete the project
    
    * Fixed an issue that produced attatch file named such as ATT00002.bin
    
    * fix too many connection in upgrade or create
    
    * fix NEED_FAULT_TOLERANCE and WAITTING_THREAD count fail
    
    * Added a judgment on whether the currently login user is an administrator
    
    * fix update udf database not change and create time is changed
    
    * add enterprise.wechat.enable to decide whether to send enterprise WeChat
    
    * change method check
    
    * Remove the administrator's judgment on query access token list
    
    * only admin can create worker group
    
    * delete alert group need delete the relation of user and alert group
    
    * add timeout in proxy when upload large resource
    
    * add gets scheduled times by expect fire times
    
    * add gets scheduled times by expect fire times
    
    * Increase the judgment of whether it is admin
    
    * Increase the judgment of whether it is admin
    
    * when delete access token add whether login user has perm to delete
    
    * change mysql-connector-java scope to test
    
    * update scm test
    
    * add profile test
    
    * Add method and parameters comments
    
    * roll back
    
    * add some notes (#1221)
    
    * update english documents
    
    * refactor zk client
    
    * update documents
    
    * update zkclient
    
    * update zkclient
    
    * update documents
    
    * add architecture-design
    
    * change i18n
    
    * update i18n
    
    * update english documents
    
    * add architecture-design
    
    * update english documents
    
    * update en-US documents
    
    * add architecture-design
    
    * update demo site
    
    * add mybatis plus model
    
    * modify mybatisplus
    
    * modify mybatisplus
    
    * change interface by mybatisplus
    
    * add unit test
    
    * refactor dao interface.
    
    * add unit test for dao...
    
    * add unit test for dao...
    
    * add unit test for dao...
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
    
    * update some dao bugs
    
    * update for some bugs
    
    * update some bugs
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
    
    * update
    
    * update
    
    * add multiply settings for application.yml
    
    * add multiply settings for application.yml
    
    * revert
    
    * update configuration settings in task record dao...
    
    * change application_master to application-master
    
    * change application_master to application-master
    
    * update application.yml to application.properties
    
    * revert
    
    * revert
    
    * add properties
    
    * add properties
    
    * revert
    
    * revert
    
    * add api start up..
    add alert send try catch
    
    * update dao info level
    
    * fix bug: task cannot submit when recovery failover
    
    * fix bug: task cannot submit when recovery failover
    
    * merge from dev-db
    
    * revert
    
    * revert
    
    * fix bug: get process definition list failed.
    
    * fix bug: process instance interval is error
    
    * revert
    
    * revert
    
    * update
    
    * support stop submit success tasks
    
    * update kill process
    
    * update for stop process
    
    * update for stop process
    
    * add some logs for stop process
    
    * update for small bug.
    
    * add check strategy before submit task
    
    * revert
    
    * update
    
    * update
    
    * revert
    
    * wait task instance exists if null.
    
    * revert
    
    * update
    
    * change desc to description.
    
    * add check user and definitions function when delete tenant
    
    * update
    
    * change desc to description.
    
    * change desc to description.
    
    * change desc to description.
    
    * remove check resources when delete tenant
    
    * change desc to description.
    
    * change mybatisplus version to 3.2.0
    
    * update
    
    * change the notice to apache.
    
    * update
    
    * update postgre sql
    
    * fix bug: phone can be empty.
    
    * fix bug: postgre test error.
    
    * update create table for postgre quartz
    
    * fix some bugs about postgre.
    
    * update create table for postgre quartz
    
    * add postgre db performance monitor
    
    * add postgre performance monitor
    
    * update performance monitor
    
    * revert
    
    * revert
    
    * fix bug: tasks queue length error
    
    * remove datasource.properties
    
    * change chinese sql to english.
    
    * change chinese sql to english.
    
    * remove unused code.
    
    * remove unused code.
    
    * add some notes
    
    * update some notes
    
    * update some notes
    
    * update mbatisplus version
    
    * update lombok version
    
    * update lombok version
    
    * revert
    
    * merge from dev-db
    
    * remove version
    
    * update npm install pom
    
    * add maven-source-plugin
    
    * [maven-release-plugin] prepare release 1.2.0-release
    
    * [maven-release-plugin] prepare for next development iteration
    
    * ci and maven pom.xml modify (#1234)
    
    * change verison to 1.2.0-release-SNAPSHOT (#1235)
    
    * rename from DatasourceUserMapper to DataSourceUserMapper
    
    * add unit test in UserMapper and WorkerGroupMapper
    
    * change cn.escheduler to org.apache.dolphinscheduler
    
    * add unit test in UdfFuncMapperTest
    
    * add unit test in UdfFuncMapperTest
    
    * remove DatabaseConfiguration
    
    * add ConnectionFactoryTest
    
    * cal duration in processInstancesList
    
    * change desc to description
    
    * change table name in mysql ddl
    
    * change table name in mysql ddl
    
    * change escheduler to dolphinscheduler
    
    * change escheduler to dolphinscheduler
    
    * change escheduler to dolphinscheduler
    
    * remove log4j-1.2-api and modify AlertMapperTest
    
    * remove log4j-1.2-api
    
    * Add alertDao to spring management
    
    * Add alertDao to spring management
    
    * get SqlSessionFactory from MybatisSqlSessionFactoryBean
    
    * get processDao by DaoFactory
    
    * read druid properties in ConneciontFactory
    
    * read druid properties in ConneciontFactory
    
    * change get alertDao by spring to DaoFactory
    
    * add log4j to resolve #967
    
    * resole verify udf name error and delete udf error
    
    * Determine if principal is empty
    
    * Determine whether the logon user has the right to delete the project
    
    * Fixed an issue that produced attatch file named such as ATT00002.bin
    
    * fix too many connection in upgrade or create
    
    * fix NEED_FAULT_TOLERANCE and WAITTING_THREAD count fail
    
    * Added a judgment on whether the currently login user is an administrator
    
    * fix update udf database not change and create time is changed
    
    * add enterprise.wechat.enable to decide whether to send enterprise WeChat
    
    * change method check
    
    * Remove the administrator's judgment on query access token list
    
    * only admin can create worker group
    
    * delete alert group need delete the relation of user and alert group
    
    * add timeout in proxy when upload large resource
    
    * add gets scheduled times by expect fire times
    
    * add gets scheduled times by expect fire times
    
    * Increase the judgment of whether it is admin
    
    * Increase the judgment of whether it is admin
    
    * when delete access token add whether login user has perm to delete
    
    * change mysql-connector-java scope to test
    
    * update scm test
    
    * add profile test
    
    * add profile test
    
    * add maven.deploy.skip true
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * add dependency
    
    * add javadoc
    
    * add antrun
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * reset pgsql (#1178)
    
    + 1
    
    * add javadoc
    
    * add javadoc
    
    * [maven-release-plugin] rollback the release of 1.2.0
    
    * add javadoc
    
    * Ans UI upgrade to version 0.1.0 (#1181)
    
    + 1
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * Administrators group prohibit deletion (#1182)
    
    * Ans UI upgrade to version 0.1.0
    
    * Administrators group prohibit deletion
    
    * add javadoc
    
    * add ui pom
    
    * fix master server shutdown error (#1177)
    
    * move updateTaskState into try/catch block in case of exception
    
    * fix NPE
    
    * using conf.getInt instead of getString
    
    * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
    for AlertDao, correct the spelling.
    
    * duplicate
    
    * refactor getTaskWorkerGroupId
    
    * add friendly log
    
    * update hearbeat thread num = 1
    
    * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
    
    * 1. move verifyTaskInstanceIsNull after taskInstance
    2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
    
    * fix the message
    
    * delete before check to avoid KeeperException$NoNodeException
    
    * fix the message
    
    * check processInstance state before delete tenant
    
    * check processInstance state before delete worker group
    
    * refactor
    
    * merge api constants into common constatns
    
    * update the resource perm
    
    * update the dataSource perm
    
    * fix CheckUtils.checkUserParams method
    
    * update AlertGroupService, extends from BaseService, remove duplicate methods
    
    * refactor
    
    * modify method name
    
    * add hasProjectAndPerm method
    
    * using checkProject instead of getResultStatus
    
    * delete checkAuth method, using hasProjectAndPerm instead.
    
    * correct spelling
    
    * add transactional for deleteWorkerGroupById
    
    * add Transactional for deleteProcessInstanceById method
    
    * change sqlSessionTemplate singleton
    
    * change sqlSessionTemplate singleton and reformat code
    
    * fix unsuitable error message
    
    * update shutdownhook methods
    
    * fix worker log bug
    
    * fix api server debug mode bug
    
    * upgrade zk version
    
    * delete this line ,for zkClient.close() will do the whole thing
    
    * fix master server shutdown error
    
    * degrade zk version and add FourLetterWordMain class (#1183)
    
    * move updateTaskState into try/catch block in case of exception
    
    * fix NPE
    
    * using conf.getInt instead of getString
    
    * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
    for AlertDao, correct the spelling.
    
    * duplicate
    
    * refactor getTaskWorkerGroupId
    
    * add friendly log
    
    * update hearbeat thread num = 1
    
    * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
    
    * 1. move verifyTaskInstanceIsNull after taskInstance
    2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
    
    * fix the message
    
    * delete before check to avoid KeeperException$NoNodeException
    
    * fix the message
    
    * check processInstance state before delete tenant
    
    * check processInstance state before delete worker group
    
    * refactor
    
    * merge api constants into common constatns
    
    * update the resource perm
    
    * update the dataSource perm
    
    * fix CheckUtils.checkUserParams method
    
    * update AlertGroupService, extends from BaseService, remove duplicate methods
    
    * refactor
    
    * modify method name
    
    * add hasProjectAndPerm method
    
    * using checkProject instead of getResultStatus
    
    * delete checkAuth method, using hasProjectAndPerm instead.
    
    * correct spelling
    
    * add transactional for deleteWorkerGroupById
    
    * add Transactional for deleteProcessInstanceById method
    
    * change sqlSessionTemplate singleton
    
    * change sqlSessionTemplate singleton and reformat code
    
    * fix unsuitable error message
    
    * update shutdownhook methods
    
    * fix worker log bug
    
    * fix api server debug mode bug
    
    * upgrade zk version
    
    * delete this line ,for zkClient.close() will do the whole thing
    
    * fix master server shutdown error
    
    * degrade zk version and add FourLetterWordMain class
    
    * add ui pom
    
    * add src pom and assembly
    
    * fix ZKWorkerClient not close PathChildrenCache (#1185)
    
    * move updateTaskState into try/catch block in case of exception
    
    * fix NPE
    
    * using conf.getInt instead of getString
    
    * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
    for AlertDao, correct the spelling.
    
    * duplicate
    
    * refactor getTaskWorkerGroupId
    
    * add friendly log
    
    * update hearbeat thread num = 1
    
    * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
    
    * 1. move verifyTaskInstanceIsNull after taskInstance
    2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
    
    * fix the message
    
    * delete before check to avoid KeeperException$NoNodeException
    
    * fix the message
    
    * check processInstance state before delete tenant
    
    * check processInstance state before delete worker group
    
    * refactor
    
    * merge api constants into common constatns
    
    * update the resource perm
    
    * update the dataSource perm
    
    * fix CheckUtils.checkUserParams method
    
    * update AlertGroupService, extends from BaseService, remove duplicate methods
    
    * refactor
    
    * modify method name
    
    * add hasProjectAndPerm method
    
    * using checkProject instead of getResultStatus
    
    * delete checkAuth method, using hasProjectAndPerm instead.
    
    * correct spelling
    
    * add transactional for deleteWorkerGroupById
    
    * add Transactional for deleteProcessInstanceById method
    
    * change sqlSessionTemplate singleton
    
    * change sqlSessionTemplate singleton and reformat code
    
    * fix unsuitable error message
    
    * update shutdownhook methods
    
    * fix worker log bug
    
    * fix api server debug mode bug
    
    * upgrade zk version
    
    * delete this line ,for zkClient.close() will do the whole thing
    
    * fix master server shutdown error
    
    * degrade zk version and add FourLetterWordMain class
    
    * fix PathChildrenCache not close
    
    * add Transactional for createSession method (#1186)
    
    * move updateTaskState into try/catch block in case of exception
    
    * fix NPE
    
    * using conf.getInt instead of getString
    
    * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
    for AlertDao, correct the spelling.
    
    * duplicate
    
    * refactor getTaskWorkerGroupId
    
    * add friendly log
    
    * update hearbeat thread num = 1
    
    * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
    
    * 1. move verifyTaskInstanceIsNull after taskInstance
    2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
    
    * fix the message
    
    * delete before check to avoid KeeperException$NoNodeException
    
    * fix the message
    
    * check processInstance state before delete tenant
    
    * check processInstance state before delete worker group
    
    * refactor
    
    * merge api constants into common constatns
    
    * update the resource perm
    
    * update the dataSource perm
    
    * fix CheckUtils.checkUserParams method
    
    * update AlertGroupService, extends from BaseService, remove duplicate methods
    
    * refactor
    
    * modify method name
    
    * add hasProjectAndPerm method
    
    * using checkProject instead of getResultStatus
    
    * delete checkAuth method, using hasProjectAndPerm instead.
    
    * correct spelling
    
    * add transactional for deleteWorkerGroupById
    
    * add Transactional for deleteProcessInstanceById method
    
    * change sqlSessionTemplate singleton
    
    * change sqlSessionTemplate singleton and reformat code
    
    * fix unsuitable error message
    
    * update shutdownhook methods
    
    * fix worker log bug
    
    * fix api server debug mode bug
    
    * upgrade zk version
    
    * delete this line ,for zkClient.close() will do the whole thing
    
    * fix master server shutdown error
    
    * degrade zk version and add FourLetterWordMain class
    
    * fix PathChildrenCache not close
    
    * add Transactional for createSession method
    
    * add src pom and assembly
    
    * add src pom and assembly
    
    * add src pom and assembly
    
    * add src pom and assembly
    
    * dockerfile dao application.properties ,install.sh modify and application.properties modify (#1187)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * add src pom and assembly
    
    * add src pom and assembly
    
    * dockerfile startup.sh modify (#1189)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs (#1191)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs
    
    * nginx conf modify
    
    * dockerfile application.properties modify
    
    * dockerfile conf modify (#1192)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs
    
    * nginx conf modify
    
    * dockerfile application.properties modify
    
    * dockerfile conf modify (#1193)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs
    
    * nginx conf modify
    
    * dockerfile application.properties modify
    
    * dockerfile email address change (#1194)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs
    
    * nginx conf modify
    
    * dockerfile application.properties modify
    
    * dockerfile email address change
    
    * the alert module is modified in english (#1195)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs
    
    * nginx conf modify
    
    * dockerfile application.properties modify
    
    * dockerfile email address change
    
    * the alert module is modified in English.
    
    * alert server comment and chinese modify
    
    * api server useless code and chinese modify (#1198)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs
    
    * nginx conf modify
    
    * dockerfile application.properties modify
    
    * dockerfile email address change
    
    * the alert module is modified in English.
    
    * alert server comment and chinese modify
    
    * api server useless code and chinese modify
    
    * common,dao,server useless code and chinese modify (#1199)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs
    
    * nginx conf modify
    
    * dockerfile application.properties modify
    
    * dockerfile email address change
    
    * the alert module is modified in English.
    
    * alert server comment and chinese modify
    
    * api server useless code and chinese modify
    
    * common,dao,server useless code and chinese modify
    
    * change chinese sql to english. (#1200)
    
    * update english documents
    
    * refactor zk client
    
    * update documents
    
    * update zkclient
    
    * update zkclient
    
    * update documents
    
    * add architecture-design
    
    * change i18n
    
    * update i18n
    
    * update english documents
    
    * add architecture-design
    
    * update english documents
    
    * update en-US documents
    
    * add architecture-design
    
    * update demo site
    
    * add mybatis plus model
    
    * modify mybatisplus
    
    * modify mybatisplus
    
    * change interface by mybatisplus
    
    * add unit test
    
    * refactor dao interface.
    
    * add unit test for dao...
    
    * add unit test for dao...
    
    * add unit test for dao...
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
    
    * update some dao bugs
    
    * update for some bugs
    
    * update some bugs
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
    
    * update
    
    * update
    
    * add multiply settings for application.yml
    
    * add multiply settings for application.yml
    
    * revert
    
    * update configuration settings in task record dao...
    
    * change application_master to application-master
    
    * change application_master to application-master
    
    * update application.yml to application.properties
    
    * revert
    
    * revert
    
    * add properties
    
    * add properties
    
    * revert
    
    * revert
    
    * add api start up..
    add alert send try catch
    
    * update dao info level
    
    * fix bug: task cannot submit when recovery failover
    
    * fix bug: task cannot submit when recovery failover
    
    * merge from dev-db
    
    * revert
    
    * revert
    
    * fix bug: get process definition list failed.
    
    * fix bug: process instance interval is error
    
    * revert
    
    * revert
    
    * update
    
    * support stop submit success tasks
    
    * update kill process
    
    * update for stop process
    
    * update for stop process
    
    * add some logs for stop process
    
    * update for small bug.
    
    * add check strategy before submit task
    
    * revert
    
    * update
    
    * update
    
    * revert
    
    * wait task instance exists if null.
    
    * revert
    
    * update
    
    * change desc to description.
    
    * add check user and definitions function when delete tenant
    
    * update
    
    * change desc to description.
    
    * change desc to description.
    
    * change desc to description.
    
    * remove check resources when delete tenant
    
    * change desc to description.
    
    * change mybatisplus version to 3.2.0
    
    * update
    
    * change the notice to apache.
    
    * update
    
    * update postgre sql
    
    * fix bug: phone can be empty.
    
    * fix bug: postgre test error.
    
    * update create table for postgre quartz
    
    * fix some bugs about postgre.
    
    * update create table for postgre quartz
    
    * add postgre db performance monitor
    
    * add postgre performance monitor
    
    * update performance monitor
    
    * revert
    
    * revert
    
    * fix bug: tasks queue length error
    
    * remove datasource.properties
    
    * change chinese sql to english.
    
    * change chinese sql to english.
    
    * change chinese to english (#1202)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs
    
    * nginx conf modify
    
    * dockerfile application.properties modify
    
    * dockerfile email address change
    
    * the alert module is modified in English.
    
    * alert server comment and chinese modify
    
    * api server useless code and chinese modify
    
    * common,dao,server useless code and chinese modify
    
    * change chinese to english
    
    * remove unused code (#1204)
    
    * update english documents
    
    * refactor zk client
    
    * update documents
    
    * update zkclient
    
    * update zkclient
    
    * update documents
    
    * add architecture-design
    
    * change i18n
    
    * update i18n
    
    * update english documents
    
    * add architecture-design
    
    * update english documents
    
    * update en-US documents
    
    * add architecture-design
    
    * update demo site
    
    * add mybatis plus model
    
    * modify mybatisplus
    
    * modify mybatisplus
    
    * change interface by mybatisplus
    
    * add unit test
    
    * refactor dao interface.
    
    * add unit test for dao...
    
    * add unit test for dao...
    
    * add unit test for dao...
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
    
    * update some dao bugs
    
    * update for some bugs
    
    * update some bugs
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
    
    * update
    
    * update
    
    * add multiply settings for application.yml
    
    * add multiply settings for application.yml
    
    * revert
    
    * update configuration settings in task record dao...
    
    * change application_master to application-master
    
    * change application_master to application-master
    
    * update application.yml to application.properties
    
    * revert
    
    * revert
    
    * add properties
    
    * add properties
    
    * revert
    
    * revert
    
    * add api start up..
    add alert send try catch
    
    * update dao info level
    
    * fix bug: task cannot submit when recovery failover
    
    * fix bug: task cannot submit when recovery failover
    
    * merge from dev-db
    
    * revert
    
    * revert
    
    * fix bug: get process definition list failed.
    
    * fix bug: process instance interval is error
    
    * revert
    
    * revert
    
    * update
    
    * support stop submit success tasks
    
    * update kill process
    
    * update for stop process
    
    * update for stop process
    
    * add some logs for stop process
    
    * update for small bug.
    
    * add check strategy before submit task
    
    * revert
    
    * update
    
    * update
    
    * revert
    
    * wait task instance exists if null.
    
    * revert
    
    * update
    
    * change desc to description.
    
    * add check user and definitions function when delete tenant
    
    * update
    
    * change desc to description.
    
    * change desc to description.
    
    * change desc to description.
    
    * remove check resources when delete tenant
    
    * change desc to description.
    
    * change mybatisplus version to 3.2.0
    
    * update
    
    * change the notice to apache.
    
    * update
    
    * update postgre sql
    
    * fix bug: phone can be empty.
    
    * fix bug: postgre test error.
    
    * update create table for postgre quartz
    
    * fix some bugs about postgre.
    
    * update create table for postgre quartz
    
    * add postgre db performance monitor
    
    * add postgre performance monitor
    
    * update performance monitor
    
    * revert
    
    * revert
    
    * fix bug: tasks queue length error
    
    * remove datasource.properties
    
    * change chinese sql to english.
    
    * change chinese sql to english.
    
    * remove unused code.
    
    * remove unused code.
    
    * Modify webpack configuration (#1206)
    
    * add more message for java-doc (#1209)
    
    * move updateTaskState into try/catch block in case of exception
    
    * fix NPE
    
    * using conf.getInt instead of getString
    
    * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
    for AlertDao, correct the spelling.
    
    * duplicate
    
    * refactor getTaskWorkerGroupId
    
    * add friendly log
    
    * update hearbeat thread num = 1
    
    * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
    
    * 1. move verifyTaskInstanceIsNull after taskInstance
    2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
    
    * fix the message
    
    * delete before check to avoid KeeperException$NoNodeException
    
    * fix the message
    
    * check processInstance state before delete tenant
    
    * check processInstance state before delete worker group
    
    * refactor
    
    * merge api constants into common constatns
    
    * update the resource perm
    
    * update the dataSource perm
    
    * fix CheckUtils.checkUserParams method
    
    * update AlertGroupService, extends from BaseService, remove duplicate methods
    
    * refactor
    
    * modify method name
    
    * add hasProjectAndPerm method
    
    * using checkProject instead of getResultStatus
    
    * delete checkAuth method, using hasProjectAndPerm instead.
    
    * correct spelling
    
    * add transactional for deleteWorkerGroupById
    
    * add Transactional for deleteProcessInstanceById method
    
    * change sqlSessionTemplate singleton
    
    * change sqlSessionTemplate singleton and reformat code
    
    * fix unsuitable error message
    
    * update shutdownhook methods
    
    * fix worker log bug
    
    * fix api server debug mode bug
    
    * upgrade zk version
    
    * delete this line ,for zkClient.close() will do the whole thing
    
    * fix master server shutdown error
    
    * degrade zk version and add FourLetterWordMain class
    
    * fix PathChildrenCache not close
    
    * add Transactional for createSession method
    
    * add more message for java-doc
    
    * add java doc for common module (#1213)
    
    * dao method comments and useless code modify (#1214)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs
    
    * nginx conf modify
    
    * dockerfile application.properties modify
    
    * dockerfile email address change
    
    * the alert module is modified in English.
    
    * alert server comment and chinese modify
    
    * api server useless code and chinese modify
    
    * common,dao,server useless code and chinese modify
    
    * change chinese to english
    
    * dao method comments and useless code modify
    
    * Change all Chinese names to English (#1207)
    
    * Modify webpack configuration
    
    * Change all Chinese names to English
    
    * add progress-bar-webpack-plugin (#1215)
    
    * Modify webpack configuration
    
    * Change all Chinese names to English
    
    * add progress-bar-webpack-plugin
    
    * Add method and parameters comments (#1220)
    
    * rename from DatasourceUserMapper to DataSourceUserMapper
    
    * add unit test in UserMapper and WorkerGroupMapper
    
    * change cn.escheduler to org.apache.dolphinscheduler
    
    * add unit test in UdfFuncMapperTest
    
    * add unit test in UdfFuncMapperTest
    
    * remove DatabaseConfiguration
    
    * add ConnectionFactoryTest
    
    * cal duration in processInstancesList
    
    * change desc to description
    
    * change table name in mysql ddl
    
    * change table name in mysql ddl
    
    * change escheduler to dolphinscheduler
    
    * change escheduler to dolphinscheduler
    
    * change escheduler to dolphinscheduler
    
    * remove log4j-1.2-api and modify AlertMapperTest
    
    * remove log4j-1.2-api
    
    * Add alertDao to spring management
    
    * Add alertDao to spring management
    
    * get SqlSessionFactory from MybatisSqlSessionFactoryBean
    
    * get processDao by DaoFactory
    
    * read druid properties in ConneciontFactory
    
    * read druid properties in ConneciontFactory
    
    * change get alertDao by spring to DaoFactory
    
    * add log4j to resolve #967
    
    * resole verify udf name error and delete udf error
    
    * Determine if principal is empty
    
    * Determine whether the logon user has the right to delete the project
    
    * Fixed an issue that produced attatch file named such as ATT00002.bin
    
    * fix too many connection in upgrade or create
    
    * fix NEED_FAULT_TOLERANCE and WAITTING_THREAD count fail
    
    * Added a judgment on whether the currently login user is an administrator
    
    * fix update udf database not change and create time is changed
    
    * add enterprise.wechat.enable to decide whether to send enterprise WeChat
    
    * change method check
    
    * Remove the administrator's judgment on query access token list
    
    * only admin can create worker group
    
    * delete alert group need delete the relation of user and alert group
    
    * add timeout in proxy when upload large resource
    
    * add gets scheduled times by expect fire times
    
    * add gets scheduled times by expect fire times
    
    * Increase the judgment of whether it is admin
    
    * Increase the judgment of whether it is admin
    
    * when delete access token add whether login user has perm to delete
    
    * change mysql-connector-java scope to test
    
    * update scm test
    
    * add profile test
    
    * Add method and parameters comments
    
    * roll back
    
    * add some notes (#1221)
    
    * update english documents
    
    * refactor zk client
    
    * update documents
    
    * update zkclient
    
    * update zkclient
    
    * update documents
    
    * add architecture-design
    
    * change i18n
    
    * update i18n
    
    * update english documents
    
    * add architecture-design
    
    * update english documents
    
    * update en-US documents
    
    * add architecture-design
    
    * update demo site
    
    * add mybatis plus model
    
    * modify mybatisplus
    
    * modify mybatisplus
    
    * change interface by mybatisplus
    
    * add unit test
    
    * refactor dao interface.
    
    * add unit test for dao...
    
    * add unit test for dao...
    
    * add unit test for dao...
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
    
    * update some dao bugs
    
    * update for some bugs
    
    * update some bugs
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
    
    * update
    
    * update
    
    * add multiply settings for application.yml
    
    * add multiply settings for application.yml
    
    * revert
    
    * update configuration settings in task record dao...
    
    * change application_master to application-master
    
    * change application_master to application-master
    
    * update application.yml to application.properties
    
    * revert
    
    * revert
    
    * add properties
    
    * add properties
    
    * revert
    
    * revert
    
    * add api start up..
    add alert send try catch
    
    * update dao info level
    
    * fix bug: task cannot submit when recovery failover
    
    * fix bug: task cannot submit when recovery failover
    
    * merge from dev-db
    
    * revert
    
    * revert
    
    * fix bug: get process definition list failed.
    
    * fix bug: process instance interval is error
    
    * revert
    
    * revert
    
    * update
    
    * support stop submit success tasks
    
    * update kill process
    
    * update for stop process
    
    * update for stop process
    
    * add some logs for stop process
    
    * update for small bug.
    
    * add check strategy before submit task
    
    * revert
    
    * update
    
    * update
    
    * revert
    
    * wait task instance exists if null.
    
    * revert
    
    * update
    
    * change desc to description.
    
    * add check user and definitions function when delete tenant
    
    * update
    
    * change desc to description.
    
    * change desc to description.
    
    * change desc to description.
    
    * remove check resources when delete tenant
    
    * change desc to description.
    
    * change mybatisplus version to 3.2.0
    
    * update
    
    * change the notice to apache.
    
    * update
    
    * update postgre sql
    
    * fix bug: phone can be empty.
    
    * fix bug: postgre test error.
    
    * update create table for postgre quartz
    
    * fix some bugs about postgre.
    
    * update create table for postgre quartz
    
    * add postgre db performance monitor
    
    * add postgre performance monitor
    
    * update performance monitor
    
    * revert
    
    * revert
    
    * fix bug: tasks queue length error
    
    * remove datasource.properties
    
    * change chinese sql to english.
    
    * change chinese sql to english.
    
    * remove unused code.
    
    * remove unused code.
    
    * add some notes
    
    * update some notes
    
    * update some notes
    
    * update mbatisplus version
    
    * update lombok version
    
    * update lombok version
    
    * revert
    
    * merge from dev-db
    
    * remove version
    
    * update npm install pom
    
    * add front assembly
    
    * add front module
    
    * change verison to 1.2.0-release-SNAPSHOT
    
    * [maven-release-plugin] prepare release 1.2.0-release
    
    * [maven-release-plugin] prepare for next development iteration
    
    * [maven-release-plugin] rollback the release of 1.2.0-release
    
    * add name in pom and remove compile (#1236)
    
    * rename from DatasourceUserMapper to DataSourceUserMapper
    
    * add unit test in UserMapper and WorkerGroupMapper
    
    * change cn.escheduler to org.apache.dolphinscheduler
    
    * add unit test in UdfFuncMapperTest
    
    * add unit test in UdfFuncMapperTest
    
    * remove DatabaseConfiguration
    
    * add ConnectionFactoryTest
    
    * cal duration in processInstancesList
    
    * change desc to description
    
    * change table name in mysql ddl
    
    * change table name in mysql ddl
    
    * change escheduler to dolphinscheduler
    
    * change escheduler to dolphinscheduler
    
    * change escheduler to dolphinscheduler
    
    * remove log4j-1.2-api and modify AlertMapperTest
    
    * remove log4j-1.2-api
    
    * Add alertDao to spring management
    
    * Add alertDao to spring management
    
    * get SqlSessionFactory from MybatisSqlSessionFactoryBean
    
    * get processDao by DaoFactory
    
    * read druid properties in ConneciontFactory
    
    * read druid properties in ConneciontFactory
    
    * change get alertDao by spring to DaoFactory
    
    * add log4j to resolve #967
    
    * resole verify udf name error and delete udf error
    
    * Determine if principal is empty
    
    * Determine whether the logon user has the right to delete the project
    
    * Fixed an issue that produced attatch file named such as ATT00002.bin
    
    * fix too many connection in upgrade or create
    
    * fix NEED_FAULT_TOLERANCE and WAITTING_THREAD count fail
    
    * Added a judgment on whether the currently login user is an administrator
    
    * fix update udf database not change and create time is changed
    
    * add enterprise.wechat.enable to decide whether to send enterprise WeChat
    
    * change method check
    
    * Remove the administrator's judgment on query access token list
    
    * only admin can create worker group
    
    * delete alert group need delete the relation of user and alert group
    
    * add timeout in proxy when upload large resource
    
    * add gets scheduled times by expect fire times
    
    * add gets scheduled times by expect fire times
    
    * Increase the judgment of whether it is admin
    
    * Increase the judgment of whether it is admin
    
    * when delete access token add whether login user has perm to delete
    
    * change mysql-connector-java scope to test
    
    * update scm test
    
    * add profile test
    
    * add profile test
    
    * add maven.deploy.skip true
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * add dependency
    
    * add javadoc
    
    * add antrun
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * reset pgsql (#1178)
    
    + 1
    
    * add javadoc
    
    * add javadoc
    
    * [maven-release-plugin] rollback the release of 1.2.0
    
    * add javadoc
    
    * Ans UI upgrade to version 0.1.0 (#1181)
    
    + 1
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * Administrators group prohibit deletion (#1182)
    
    * Ans UI upgrade to version 0.1.0
    
    * Administrators group prohibit deletion
    
    * add javadoc
    
    * add ui pom
    
    * fix master server shutdown error (#1177)
    
    * move updateTaskState into try/catch block in case of exception
    
    * fix NPE
    
    * using conf.getInt instead of getString
    
    * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
    for AlertDao, correct the spelling.
    
    * duplicate
    
    * refactor getTaskWorkerGroupId
    
    * add friendly log
    
    * update hearbeat thread num = 1
    
    * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
    
    * 1. move verifyTaskInstanceIsNull after taskInstance
    2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
    
    * fix the message
    
    * delete before check to avoid KeeperException$NoNodeException
    
    * fix the message
    
    * check processInstance state before delete tenant
    
    * check processInstance state before delete worker group
    
    * refactor
    
    * merge api constants into common constatns
    
    * update the resource perm
    
    * update the dataSource perm
    
    * fix CheckUtils.checkUserParams method
    
    * update AlertGroupService, extends from BaseService, remove duplicate methods
    
    * refactor
    
    * modify method name
    
    * add hasProjectAndPerm method
    
    * using checkProject instead of getResultStatus
    
    * delete checkAuth method, using hasProjectAndPerm instead.
    
    * correct spelling
    
    * add transactional for deleteWorkerGroupById
    
    * add Transactional for deleteProcessInstanceById method
    
    * change sqlSessionTemplate singleton
    
    * change sqlSessionTemplate singleton and reformat code
    
    * fix unsuitable error message
    
    * update shutdownhook methods
    
    * fix worker log bug
    
    * fix api server debug mode bug
    
    * upgrade zk version
    
    * delete this line ,for zkClient.close() will do the whole thing
    
    * fix master server shutdown error
    
    * degrade zk version and add FourLetterWordMain class (#1183)
    
    * move updateTaskState into try/catch block in case of exception
    
    * fix NPE
    
    * using conf.getInt instead of getString
    
    * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
    for AlertDao, correct the spelling.
    
    * duplicate
    
    * refactor getTaskWorkerGroupId
    
    * add friendly log
    
    * update hearbeat thread num = 1
    
    * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
    
    * 1. move verifyTaskInstanceIsNull after taskInstance
    2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
    
    * fix the message
    
    * delete before check to avoid KeeperException$NoNodeException
    
    * fix the message
    
    * check processInstance state before delete tenant
    
    * check processInstance state before delete worker group
    
    * refactor
    
    * merge api constants into common constatns
    
    * update the resource perm
    
    * update the dataSource perm
    
    * fix CheckUtils.checkUserParams method
    
    * update AlertGroupService, extends from BaseService, remove duplicate methods
    
    * refactor
    
    * modify method name
    
    * add hasProjectAndPerm method
    
    * using checkProject instead of getResultStatus
    
    * delete checkAuth method, using hasProjectAndPerm instead.
    
    * correct spelling
    
    * add transactional for deleteWorkerGroupById
    
    * add Transactional for deleteProcessInstanceById method
    
    * change sqlSessionTemplate singleton
    
    * change sqlSessionTemplate singleton and reformat code
    
    * fix unsuitable error message
    
    * update shutdownhook methods
    
    * fix worker log bug
    
    * fix api server debug mode bug
    
    * upgrade zk version
    
    * delete this line ,for zkClient.close() will do the whole thing
    
    * fix master server shutdown error
    
    * degrade zk version and add FourLetterWordMain class
    
    * add ui pom
    
    * add src pom and assembly
    
    * fix ZKWorkerClient not close PathChildrenCache (#1185)
    
    * move updateTaskState into try/catch block in case of exception
    
    * fix NPE
    
    * using conf.getInt instead of getString
    
    * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
    for AlertDao, correct the spelling.
    
    * duplicate
    
    * refactor getTaskWorkerGroupId
    
    * add friendly log
    
    * update hearbeat thread num = 1
    
    * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
    
    * 1. move verifyTaskInstanceIsNull after taskInstance
    2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
    
    * fix the message
    
    * delete before check to avoid KeeperException$NoNodeException
    
    * fix the message
    
    * check processInstance state before delete tenant
    
    * check processInstance state before delete worker group
    
    * refactor
    
    * merge api constants into common constatns
    
    * update the resource perm
    
    * update the dataSource perm
    
    * fix CheckUtils.checkUserParams method
    
    * update AlertGroupService, extends from BaseService, remove duplicate methods
    
    * refactor
    
    * modify method name
    
    * add hasProjectAndPerm method
    
    * using checkProject instead of getResultStatus
    
    * delete checkAuth method, using hasProjectAndPerm instead.
    
    * correct spelling
    
    * add transactional for deleteWorkerGroupById
    
    * add Transactional for deleteProcessInstanceById method
    
    * change sqlSessionTemplate singleton
    
    * change sqlSessionTemplate singleton and reformat code
    
    * fix unsuitable error message
    
    * update shutdownhook methods
    
    * fix worker log bug
    
    * fix api server debug mode bug
    
    * upgrade zk version
    
    * delete this line ,for zkClient.close() will do the whole thing
    
    * fix master server shutdown error
    
    * degrade zk version and add FourLetterWordMain class
    
    * fix PathChildrenCache not close
    
    * add Transactional for createSession method (#1186)
    
    * move updateTaskState into try/catch block in case of exception
    
    * fix NPE
    
    * using conf.getInt instead of getString
    
    * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
    for AlertDao, correct the spelling.
    
    * duplicate
    
    * refactor getTaskWorkerGroupId
    
    * add friendly log
    
    * update hearbeat thread num = 1
    
    * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
    
    * 1. move verifyTaskInstanceIsNull after taskInstance
    2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
    
    * fix the message
    
    * delete before check to avoid KeeperException$NoNodeException
    
    * fix the message
    
    * check processInstance state before delete tenant
    
    * check processInstance state before delete worker group
    
    * refactor
    
    * merge api constants into common constatns
    
    * update the resource perm
    
    * update the dataSource perm
    
    * fix CheckUtils.checkUserParams method
    
    * update AlertGroupService, extends from BaseService, remove duplicate methods
    
    * refactor
    
    * modify method name
    
    * add hasProjectAndPerm method
    
    * using checkProject instead of getResultStatus
    
    * delete checkAuth method, using hasProjectAndPerm instead.
    
    * correct spelling
    
    * add transactional for deleteWorkerGroupById
    
    * add Transactional for deleteProcessInstanceById method
    
    * change sqlSessionTemplate singleton
    
    * change sqlSessionTemplate singleton and reformat code
    
    * fix unsuitable error message
    
    * update shutdownhook methods
    
    * fix worker log bug
    
    * fix api server debug mode bug
    
    * upgrade zk version
    
    * delete this line ,for zkClient.close() will do the whole thing
    
    * fix master server shutdown error
    
    * degrade zk version and add FourLetterWordMain class
    
    * fix PathChildrenCache not close
    
    * add Transactional for createSession method
    
    * add src pom and assembly
    
    * add src pom and assembly
    
    * add src pom and assembly
    
    * add src pom and assembly
    
    * dockerfile dao application.properties ,install.sh modify and application.properties modify (#1187)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * add src pom and assembly
    
    * add src pom and assembly
    
    * dockerfile startup.sh modify (#1189)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs (#1191)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs
    
    * nginx conf modify
    
    * dockerfile application.properties modify
    
    * dockerfile conf modify (#1192)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs
    
    * nginx conf modify
    
    * dockerfile application.properties modify
    
    * dockerfile conf modify (#1193)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs
    
    * nginx conf modify
    
    * dockerfile application.properties modify
    
    * dockerfile email address change (#1194)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs
    
    * nginx conf modify
    
    * dockerfile application.properties modify
    
    * dockerfile email address change
    
    * the alert module is modified in english (#1195)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs
    
    * nginx conf modify
    
    * dockerfile application.properties modify
    
    * dockerfile email address change
    
    * the alert module is modified in English.
    
    * alert server comment and chinese modify
    
    * api server useless code and chinese modify (#1198)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs
    
    * nginx conf modify
    
    * dockerfile application.properties modify
    
    * dockerfile email address change
    
    * the alert module is modified in English.
    
    * alert server comment and chinese modify
    
    * api server useless code and chinese modify
    
    * common,dao,server useless code and chinese modify (#1199)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs
    
    * nginx conf modify
    
    * dockerfile application.properties modify
    
    * dockerfile email address change
    
    * the alert module is modified in English.
    
    * alert server comment and chinese modify
    
    * api server useless code and chinese modify
    
    * common,dao,server useless code and chinese modify
    
    * change chinese sql to english. (#1200)
    
    * update english documents
    
    * refactor zk client
    
    * update documents
    
    * update zkclient
    
    * update zkclient
    
    * update documents
    
    * add architecture-design
    
    * change i18n
    
    * update i18n
    
    * update english documents
    
    * add architecture-design
    
    * update english documents
    
    * update en-US documents
    
    * add architecture-design
    
    * update demo site
    
    * add mybatis plus model
    
    * modify mybatisplus
    
    * modify mybatisplus
    
    * change interface by mybatisplus
    
    * add unit test
    
    * refactor dao interface.
    
    * add unit test for dao...
    
    * add unit test for dao...
    
    * add unit test for dao...
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
    
    * update some dao bugs
    
    * update for some bugs
    
    * update some bugs
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
    
    * update
    
    * update
    
    * add multiply settings for application.yml
    
    * add multiply settings for application.yml
    
    * revert
    
    * update configuration settings in task record dao...
    
    * change application_master to application-master
    
    * change application_master to application-master
    
    * update application.yml to application.properties
    
    * revert
    
    * revert
    
    * add properties
    
    * add properties
    
    * revert
    
    * revert
    
    * add api start up..
    add alert send try catch
    
    * update dao info level
    
    * fix bug: task cannot submit when recovery failover
    
    * fix bug: task cannot submit when recovery failover
    
    * merge from dev-db
    
    * revert
    
    * revert
    
    * fix bug: get process definition list failed.
    
    * fix bug: process instance interval is error
    
    * revert
    
    * revert
    
    * update
    
    * support stop submit success tasks
    
    * update kill process
    
    * update for stop process
    
    * update for stop process
    
    * add some logs for stop process
    
    * update for small bug.
    
    * add check strategy before submit task
    
    * revert
    
    * update
    
    * update
    
    * revert
    
    * wait task instance exists if null.
    
    * revert
    
    * update
    
    * change desc to description.
    
    * add check user and definitions function when delete tenant
    
    * update
    
    * change desc to description.
    
    * change desc to description.
    
    * change desc to description.
    
    * remove check resources when delete tenant
    
    * change desc to description.
    
    * change mybatisplus version to 3.2.0
    
    * update
    
    * change the notice to apache.
    
    * update
    
    * update postgre sql
    
    * fix bug: phone can be empty.
    
    * fix bug: postgre test error.
    
    * update create table for postgre quartz
    
    * fix some bugs about postgre.
    
    * update create table for postgre quartz
    
    * add postgre db performance monitor
    
    * add postgre performance monitor
    
    * update performance monitor
    
    * revert
    
    * revert
    
    * fix bug: tasks queue length error
    
    * remove datasource.properties
    
    * change chinese sql to english.
    
    * change chinese sql to english.
    
    * change chinese to english (#1202)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs
    
    * nginx conf modify
    
    * dockerfile application.properties modify
    
    * dockerfile email address change
    
    * the alert module is modified in English.
    
    * alert server comment and chinese modify
    
    * api server useless code and chinese modify
    
    * common,dao,server useless code and chinese modify
    
    * change chinese to english
    
    * remove unused code (#1204)
    
    * update english documents
    
    * refactor zk client
    
    * update documents
    
    * update zkclient
    
    * update zkclient
    
    * update documents
    
    * add architecture-design
    
    * change i18n
    
    * update i18n
    
    * update english documents
    
    * add architecture-design
    
    * update english documents
    
    * update en-US documents
    
    * add architecture-design
    
    * update demo site
    
    * add mybatis plus model
    
    * modify mybatisplus
    
    * modify mybatisplus
    
    * change interface by mybatisplus
    
    * add unit test
    
    * refactor dao interface.
    
    * add unit test for dao...
    
    * add unit test for dao...
    
    * add unit test for dao...
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
    
    * update some dao bugs
    
    * update for some bugs
    
    * update some bugs
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
    
    * update
    
    * update
    
    * add multiply settings for application.yml
    
    * add multiply settings for application.yml
    
    * revert
    
    * update configuration settings in task record dao...
    
    * change application_master to application-master
    
    * change application_master to application-master
    
    * update application.yml to application.properties
    
    * revert
    
    * revert
    
    * add properties
    
    * add properties
    
    * revert
    
    * revert
    
    * add api start up..
    add alert send try catch
    
    * update dao info level
    
    * fix bug: task cannot submit when recovery failover
    
    * fix bug: task cannot submit when recovery failover
    
    * merge from dev-db
    
    * revert
    
    * revert
    
    * fix bug: get process definition list failed.
    
    * fix bug: process instance interval is error
    
    * revert
    
    * revert
    
    * update
    
    * support stop submit success tasks
    
    * update kill process
    
    * update for stop process
    
    * update for stop process
    
    * add some logs for stop process
    
    * update for small bug.
    
    * add check strategy before submit task
    
    * revert
    
    * update
    
    * update
    
    * revert
    
    * wait task instance exists if null.
    
    * revert
    
    * update
    
    * change desc to description.
    
    * add check user and definitions function when delete tenant
    
    * update
    
    * change desc to description.
    
    * change desc to description.
    
    * change desc to description.
    
    * remove check resources when delete tenant
    
    * change desc to description.
    
    * change mybatisplus version to 3.2.0
    
    * update
    
    * change the notice to apache.
    
    * update
    
    * update postgre sql
    
    * fix bug: phone can be empty.
    
    * fix bug: postgre test error.
    
    * update create table for postgre quartz
    
    * fix some bugs about postgre.
    
    * update create table for postgre quartz
    
    * add postgre db performance monitor
    
    * add postgre performance monitor
    
    * update performance monitor
    
    * revert
    
    * revert
    
    * fix bug: tasks queue length error
    
    * remove datasource.properties
    
    * change chinese sql to english.
    
    * change chinese sql to english.
    
    * remove unused code.
    
    * remove unused code.
    
    * Modify webpack configuration (#1206)
    
    * add more message for java-doc (#1209)
    
    * move updateTaskState into try/catch block in case of exception
    
    * fix NPE
    
    * using conf.getInt instead of getString
    
    * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
    for AlertDao, correct the spelling.
    
    * duplicate
    
    * refactor getTaskWorkerGroupId
    
    * add friendly log
    
    * update hearbeat thread num = 1
    
    * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
    
    * 1. move verifyTaskInstanceIsNull after taskInstance
    2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
    
    * fix the message
    
    * delete before check to avoid KeeperException$NoNodeException
    
    * fix the message
    
    * check processInstance state before delete tenant
    
    * check processInstance state before delete worker group
    
    * refactor
    
    * merge api constants into common constatns
    
    * update the resource perm
    
    * update the dataSource perm
    
    * fix CheckUtils.checkUserParams method
    
    * update AlertGroupService, extends from BaseService, remove duplicate methods
    
    * refactor
    
    * modify method name
    
    * add hasProjectAndPerm method
    
    * using checkProject instead of getResultStatus
    
    * delete checkAuth method, using hasProjectAndPerm instead.
    
    * correct spelling
    
    * add transactional for deleteWorkerGroupById
    
    * add Transactional for deleteProcessInstanceById method
    
    * change sqlSessionTemplate singleton
    
    * change sqlSessionTemplate singleton and reformat code
    
    * fix unsuitable error message
    
    * update shutdownhook methods
    
    * fix worker log bug
    
    * fix api server debug mode bug
    
    * upgrade zk version
    
    * delete this line ,for zkClient.close() will do the whole thing
    
    * fix master server shutdown error
    
    * degrade zk version and add FourLetterWordMain class
    
    * fix PathChildrenCache not close
    
    * add Transactional for createSession method
    
    * add more message for java-doc
    
    * add java doc for common module (#1213)
    
    * dao method comments and useless code modify (#1214)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs
    
    * nginx conf modify
    
    * dockerfile application.properties modify
    
    * dockerfile email address change
    
    * the alert module is modified in English.
    
    * alert server comment and chinese modify
    
    * api server useless code and chinese modify
    
    * common,dao,server useless code and chinese modify
    
    * change chinese to english
    
    * dao method comments and useless code modify
    
    * Change all Chinese names to English (#1207)
    
    * Modify webpack configuration
    
    * Change all Chinese names to English
    
    * add progress-bar-webpack-plugin (#1215)
    
    * Modify webpack configuration
    
    * Change all Chinese names to English
    
    * add progress-bar-webpack-plugin
    
    * Add method and parameters comments (#1220)
    
    * rename from DatasourceUserMapper to DataSourceUserMapper
    
    * add unit test in UserMapper and WorkerGroupMapper
    
    * change cn.escheduler to org.apache.dolphinscheduler
    
    * add unit test in UdfFuncMapperTest
    
    * add unit test in UdfFuncMapperTest
    
    * remove DatabaseConfiguration
    
    * add ConnectionFactoryTest
    
    * cal duration in processInstancesList
    
    * change desc to description
    
    * change table name in mysql ddl
    
    * change table name in mysql ddl
    
    * change escheduler to dolphinscheduler
    
    * change escheduler to dolphinscheduler
    
    * change escheduler to dolphinscheduler
    
    * remove log4j-1.2-api and modify AlertMapperTest
    
    * remove log4j-1.2-api
    
    * Add alertDao to spring management
    
    * Add alertDao to spring management
    
    * get SqlSessionFactory from MybatisSqlSessionFactoryBean
    
    * get processDao by DaoFactory
    
    * read druid properties in ConneciontFactory
    
    * read druid properties in ConneciontFactory
    
    * change get alertDao by spring to DaoFactory
    
    * add log4j to resolve #967
    
    * resole verify udf name error and delete udf error
    
    * Determine if principal is empty
    
    * Determine whether the logon user has the right to delete the project
    
    * Fixed an issue that produced attatch file named such as ATT00002.bin
    
    * fix too many connection in upgrade or create
    
    * fix NEED_FAULT_TOLERANCE and WAITTING_THREAD count fail
    
    * Added a judgment on whether the currently login user is an administrator
    
    * fix update udf database not change and create time is changed
    
    * add enterprise.wechat.enable to decide whether to send enterprise WeChat
    
    * change method check
    
    * Remove the administrator's judgment on query access token list
    
    * only admin can create worker group
    
    * delete alert group need delete the relation of user and alert group
    
    * add timeout in proxy when upload large resource
    
    * add gets scheduled times by expect fire times
    
    * add gets scheduled times by expect fire times
    
    * Increase the judgment of whether it is admin
    
    * Increase the judgment of whether it is admin
    
    * when delete access token add whether login user has perm to delete
    
    * change mysql-connector-java scope to test
    
    * update scm test
    
    * add profile test
    
    * Add method and parameters comments
    
    * roll back
    
    * add some notes (#1221)
    
    * update english documents
    
    * refactor zk client
    
    * update documents
    
    * update zkclient
    
    * update zkclient
    
    * update documents
    
    * add architecture-design
    
    * change i18n
    
    * update i18n
    
    * update english documents
    
    * add architecture-design
    
    * update english documents
    
    * update en-US documents
    
    * add architecture-design
    
    * update demo site
    
    * add mybatis plus model
    
    * modify mybatisplus
    
    * modify mybatisplus
    
    * change interface by mybatisplus
    
    * add unit test
    
    * refactor dao interface.
    
    * add unit test for dao...
    
    * add unit test for dao...
    
    * add unit test for dao...
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
    
    * update some dao bugs
    
    * update for some bugs
    
    * update some bugs
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
    
    * update
    
    * update
    
    * add multiply settings for application.yml
    
    * add multiply settings for application.yml
    
    * revert
    
    * update configuration settings in task record dao...
    
    * change application_master to application-master
    
    * change application_master to application-master
    
    * update application.yml to application.properties
    
    * revert
    
    * revert
    
    * add properties
    
    * add properties
    
    * revert
    
    * revert
    
    * add api start up..
    add alert send try catch
    
    * update dao info level
    
    * fix bug: task cannot submit when recovery failover
    
    * fix bug: task cannot submit when recovery failover
    
    * merge from dev-db
    
    * revert
    
    * revert
    
    * fix bug: get process definition list failed.
    
    * fix bug: process instance interval is error
    
    * revert
    
    * revert
    
    * update
    
    * support stop submit success tasks
    
    * update kill process
    
    * update for stop process
    
    * update for stop process
    
    * add some logs for stop process
    
    * update for small bug.
    
    * add check strategy before submit task
    
    * revert
    
    * update
    
    * update
    
    * revert
    
    * wait task instance exists if null.
    
    * revert
    
    * update
    
    * change desc to description.
    
    * add check user and definitions function when delete tenant
    
    * update
    
    * change desc to description.
    
    * change desc to description.
    
    * change desc to description.
    
    * remove check resources when delete tenant
    
    * change desc to description.
    
    * change mybatisplus version to 3.2.0
    
    * update
    
    * change the notice to apache.
    
    * update
    
    * update postgre sql
    
    * fix bug: phone can be empty.
    
    * fix bug: postgre test error.
    
    * update create table for postgre quartz
    
    * fix some bugs about postgre.
    
    * update create table for postgre quartz
    
    * add postgre db performance monitor
    
    * add postgre performance monitor
    
    * update performance monitor
    
    * revert
    
    * revert
    
    * fix bug: tasks queue length error
    
    * remove datasource.properties
    
    * change chinese sql to english.
    
    * change chinese sql to english.
    
    * remove unused code.
    
    * remove unused code.
    
    * add some notes
    
    * update some notes
    
    * update some notes
    
    * update mbatisplus version
    
    * update lombok version
    
    * update lombok version
    
    * revert
    
    * merge from dev-db
    
    * remove version
    
    * update npm install pom
    
    * add front assembly
    
    * add front module
    
    * change verison to 1.2.0-release-SNAPSHOT
    
    * add name in pom and remove compile
    
    * add name in pom (#1237)
    
    * rename from DatasourceUserMapper to DataSourceUserMapper
    
    * add unit test in UserMapper and WorkerGroupMapper
    
    * change cn.escheduler to org.apache.dolphinscheduler
    
    * add unit test in UdfFuncMapperTest
    
    * add unit test in UdfFuncMapperTest
    
    * remove DatabaseConfiguration
    
    * add ConnectionFactoryTest
    
    * cal duration in processInstancesList
    
    * change desc to description
    
    * change table name in mysql ddl
    
    * change table name in mysql ddl
    
    * change escheduler to dolphinscheduler
    
    * change escheduler to dolphinscheduler
    
    * change escheduler to dolphinscheduler
    
    * remove log4j-1.2-api and modify AlertMapperTest
    
    * remove log4j-1.2-api
    
    * Add alertDao to spring management
    
    * Add alertDao to spring management
    
    * get SqlSessionFactory from MybatisSqlSessionFactoryBean
    
    * get processDao by DaoFactory
    
    * read druid properties in ConneciontFactory
    
    * read druid properties in ConneciontFactory
    
    * change get alertDao by spring to DaoFactory
    
    * add log4j to resolve #967
    
    * resole verify udf name error and delete udf error
    
    * Determine if principal is empty
    
    * Determine whether the logon user has the right to delete the project
    
    * Fixed an issue that produced attatch file named such as ATT00002.bin
    
    * fix too many connection in upgrade or create
    
    * fix NEED_FAULT_TOLERANCE and WAITTING_THREAD count fail
    
    * Added a judgment on whether the currently login user is an administrator
    
    * fix update udf database not change and create time is changed
    
    * add enterprise.wechat.enable to decide whether to send enterprise WeChat
    
    * change method check
    
    * Remove the administrator's judgment on query access token list
    
    * only admin can create worker group
    
    * delete alert group need delete the relation of user and alert group
    
    * add timeout in proxy when upload large resource
    
    * add gets scheduled times by expect fire times
    
    * add gets scheduled times by expect fire times
    
    * Increase the judgment of whether it is admin
    
    * Increase the judgment of whether it is admin
    
    * when delete access token add whether login user has perm to delete
    
    * change mysql-connector-java scope to test
    
    * update scm test
    
    * add profile test
    
    * add profile test
    
    * add maven.deploy.skip true
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * add dependency
    
    * add javadoc
    
    * add antrun
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * reset pgsql (#1178)
    
    + 1
    
    * add javadoc
    
    * add javadoc
    
    * [maven-release-plugin] rollback the release of 1.2.0
    
    * add javadoc
    
    * Ans UI upgrade to version 0.1.0 (#1181)
    
    + 1
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * Administrators group prohibit deletion (#1182)
    
    * Ans UI upgrade to version 0.1.0
    
    * Administrators group prohibit deletion
    
    * add javadoc
    
    * add ui pom
    
    * fix master server shutdown error (#1177)
    
    * move updateTaskState into try/catch block in case of exception
    
    * fix NPE
    
    * using conf.getInt instead of getString
    
    * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
    for AlertDao, correct the spelling.
    
    * duplicate
    
    * refactor getTaskWorkerGroupId
    
    * add friendly log
    
    * update hearbeat thread num = 1
    
    * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
    
    * 1. move verifyTaskInstanceIsNull after taskInstance
    2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
    
    * fix the message
    
    * delete before check to avoid KeeperException$NoNodeException
    
    * fix the message
    
    * check processInstance state before delete tenant
    
    * check processInstance state before delete worker group
    
    * refactor
    
    * merge api constants into common constatns
    
    * update the resource perm
    
    * update the dataSource perm
    
    * fix CheckUtils.checkUserParams method
    
    * update AlertGroupService, extends from BaseService, remove duplicate methods
    
    * refactor
    
    * modify method name
    
    * add hasProjectAndPerm method
    
    * using checkProject instead of getResultStatus
    
    * delete checkAuth method, using hasProjectAndPerm instead.
    
    * correct spelling
    
    * add transactional for deleteWorkerGroupById
    
    * add Transactional for deleteProcessInstanceById method
    
    * change sqlSessionTemplate singleton
    
    * change sqlSessionTemplate singleton and reformat code
    
    * fix unsuitable error message
    
    * update shutdownhook methods
    
    * fix worker log bug
    
    * fix api server debug mode bug
    
    * upgrade zk version
    
    * delete this line ,for zkClient.close() will do the whole thing
    
    * fix master server shutdown error
    
    * degrade zk version and add FourLetterWordMain class (#1183)
    
    * move updateTaskState into try/catch block in case of exception
    
    * fix NPE
    
    * using conf.getInt instead of getString
    
    * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
    for AlertDao, correct the spelling.
    
    * duplicate
    
    * refactor getTaskWorkerGroupId
    
    * add friendly log
    
    * update hearbeat thread num = 1
    
    * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
    
    * 1. move verifyTaskInstanceIsNull after taskInstance
    2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
    
    * fix the message
    
    * delete before check to avoid KeeperException$NoNodeException
    
    * fix the message
    
    * check processInstance state before delete tenant
    
    * check processInstance state before delete worker group
    
    * refactor
    
    * merge api constants into common constatns
    
    * update the resource perm
    
    * update the dataSource perm
    
    * fix CheckUtils.checkUserParams method
    
    * update AlertGroupService, extends from BaseService, remove duplicate methods
    
    * refactor
    
    * modify method name
    
    * add hasProjectAndPerm method
    
    * using checkProject instead of getResultStatus
    
    * delete checkAuth method, using hasProjectAndPerm instead.
    
    * correct spelling
    
    * add transactional for deleteWorkerGroupById
    
    * add Transactional for deleteProcessInstanceById method
    
    * change sqlSessionTemplate singleton
    
    * change sqlSessionTemplate singleton and reformat code
    
    * fix unsuitable error message
    
    * update shutdownhook methods
    
    * fix worker log bug
    
    * fix api server debug mode bug
    
    * upgrade zk version
    
    * delete this line ,for zkClient.close() will do the whole thing
    
    * fix master server shutdown error
    
    * degrade zk version and add FourLetterWordMain class
    
    * add ui pom
    
    * add src pom and assembly
    
    * fix ZKWorkerClient not close PathChildrenCache (#1185)
    
    * move updateTaskState into try/catch block in case of exception
    
    * fix NPE
    
    * using conf.getInt instead of getString
    
    * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
    for AlertDao, correct the spelling.
    
    * duplicate
    
    * refactor getTaskWorkerGroupId
    
    * add friendly log
    
    * update hearbeat thread num = 1
    
    * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
    
    * 1. move verifyTaskInstanceIsNull after taskInstance
    2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
    
    * fix the message
    
    * delete before check to avoid KeeperException$NoNodeException
    
    * fix the message
    
    * check processInstance state before delete tenant
    
    * check processInstance state before delete worker group
    
    * refactor
    
    * merge api constants into common constatns
    
    * update the resource perm
    
    * update the dataSource perm
    
    * fix CheckUtils.checkUserParams method
    
    * update AlertGroupService, extends from BaseService, remove duplicate methods
    
    * refactor
    
    * modify method name
    
    * add hasProjectAndPerm method
    
    * using checkProject instead of getResultStatus
    
    * delete checkAuth method, using hasProjectAndPerm instead.
    
    * correct spelling
    
    * add transactional for deleteWorkerGroupById
    
    * add Transactional for deleteProcessInstanceById method
    
    * change sqlSessionTemplate singleton
    
    * change sqlSessionTemplate singleton and reformat code
    
    * fix unsuitable error message
    
    * update shutdownhook methods
    
    * fix worker log bug
    
    * fix api server debug mode bug
    
    * upgrade zk version
    
    * delete this line ,for zkClient.close() will do the whole thing
    
    * fix master server shutdown error
    
    * degrade zk version and add FourLetterWordMain class
    
    * fix PathChildrenCache not close
    
    * add Transactional for createSession method (#1186)
    
    * move updateTaskState into try/catch block in case of exception
    
    * fix NPE
    
    * using conf.getInt instead of getString
    
    * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
    for AlertDao, correct the spelling.
    
    * duplicate
    
    * refactor getTaskWorkerGroupId
    
    * add friendly log
    
    * update hearbeat thread num = 1
    
    * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
    
    * 1. move verifyTaskInstanceIsNull after taskInstance
    2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
    
    * fix the message
    
    * delete before check to avoid KeeperException$NoNodeException
    
    * fix the message
    
    * check processInstance state before delete tenant
    
    * check processInstance state before delete worker group
    
    * refactor
    
    * merge api constants into common constatns
    
    * update the resource perm
    
    * update the dataSource perm
    
    * fix CheckUtils.checkUserParams method
    
    * update AlertGroupService, extends from BaseService, remove duplicate methods
    
    * refactor
    
    * modify method name
    
    * add hasProjectAndPerm method
    
    * using checkProject instead of getResultStatus
    
    * delete checkAuth method, using hasProjectAndPerm instead.
    
    * correct spelling
    
    * add transactional for deleteWorkerGroupById
    
    * add Transactional for deleteProcessInstanceById method
    
    * change sqlSessionTemplate singleton
    
    * change sqlSessionTemplate singleton and reformat code
    
    * fix unsuitable error message
    
    * update shutdownhook methods
    
    * fix worker log bug
    
    * fix api server debug mode bug
    
    * upgrade zk version
    
    * delete this line ,for zkClient.close() will do the whole thing
    
    * fix master server shutdown error
    
    * degrade zk version and add FourLetterWordMain class
    
    * fix PathChildrenCache not close
    
    * add Transactional for createSession method
    
    * add src pom and assembly
    
    * add src pom and assembly
    
    * add src pom and assembly
    
    * add src pom and assembly
    
    * dockerfile dao application.properties ,install.sh modify and application.properties modify (#1187)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * add src pom and assembly
    
    * add src pom and assembly
    
    * dockerfile startup.sh modify (#1189)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs (#1191)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs
    
    * nginx conf modify
    
    * dockerfile application.properties modify
    
    * dockerfile conf modify (#1192)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs
    
    * nginx conf modify
    
    * dockerfile application.properties modify
    
    * dockerfile conf modify (#1193)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs
    
    * nginx conf modify
    
    * dockerfile application.properties modify
    
    * dockerfile email address change (#1194)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs
    
    * nginx conf modify
    
    * dockerfile application.properties modify
    
    * dockerfile email address change
    
    * the alert module is modified in english (#1195)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs
    
    * nginx conf modify
    
    * dockerfile application.properties modify
    
    * dockerfile email address change
    
    * the alert module is modified in English.
    
    * alert server comment and chinese modify
    
    * api server useless code and chinese modify (#1198)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs
    
    * nginx conf modify
    
    * dockerfile application.properties modify
    
    * dockerfile email address change
    
    * the alert module is modified in English.
    
    * alert server comment and chinese modify
    
    * api server useless code and chinese modify
    
    * common,dao,server useless code and chinese modify (#1199)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs
    
    * nginx conf modify
    
    * dockerfile application.properties modify
    
    * dockerfile email address change
    
    * the alert module is modified in English.
    
    * alert server comment and chinese modify
    
    * api server useless code and chinese modify
    
    * common,dao,server useless code and chinese modify
    
    * change chinese sql to english. (#1200)
    
    * update english documents
    
    * refactor zk client
    
    * update documents
    
    * update zkclient
    
    * update zkclient
    
    * update documents
    
    * add architecture-design
    
    * change i18n
    
    * update i18n
    
    * update english documents
    
    * add architecture-design
    
    * update english documents
    
    * update en-US documents
    
    * add architecture-design
    
    * update demo site
    
    * add mybatis plus model
    
    * modify mybatisplus
    
    * modify mybatisplus
    
    * change interface by mybatisplus
    
    * add unit test
    
    * refactor dao interface.
    
    * add unit test for dao...
    
    * add unit test for dao...
    
    * add unit test for dao...
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
    
    * update some dao bugs
    
    * update for some bugs
    
    * update some bugs
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
    
    * update
    
    * update
    
    * add multiply settings for application.yml
    
    * add multiply settings for application.yml
    
    * revert
    
    * update configuration settings in task record dao...
    
    * change application_master to application-master
    
    * change application_master to application-master
    
    * update application.yml to application.properties
    
    * revert
    
    * revert
    
    * add properties
    
    * add properties
    
    * revert
    
    * revert
    
    * add api start up..
    add alert send try catch
    
    * update dao info level
    
    * fix bug: task cannot submit when recovery failover
    
    * fix bug: task cannot submit when recovery failover
    
    * merge from dev-db
    
    * revert
    
    * revert
    
    * fix bug: get process definition list failed.
    
    * fix bug: process instance interval is error
    
    * revert
    
    * revert
    
    * update
    
    * support stop submit success tasks
    
    * update kill process
    
    * update for stop process
    
    * update for stop process
    
    * add some logs for stop process
    
    * update for small bug.
    
    * add check strategy before submit task
    
    * revert
    
    * update
    
    * update
    
    * revert
    
    * wait task instance exists if null.
    
    * revert
    
    * update
    
    * change desc to description.
    
    * add check user and definitions function when delete tenant
    
    * update
    
    * change desc to description.
    
    * change desc to description.
    
    * change desc to description.
    
    * remove check resources when delete tenant
    
    * change desc to description.
    
    * change mybatisplus version to 3.2.0
    
    * update
    
    * change the notice to apache.
    
    * update
    
    * update postgre sql
    
    * fix bug: phone can be empty.
    
    * fix bug: postgre test error.
    
    * update create table for postgre quartz
    
    * fix some bugs about postgre.
    
    * update create table for postgre quartz
    
    * add postgre db performance monitor
    
    * add postgre performance monitor
    
    * update performance monitor
    
    * revert
    
    * revert
    
    * fix bug: tasks queue length error
    
    * remove datasource.properties
    
    * change chinese sql to english.
    
    * change chinese sql to english.
    
    * change chinese to english (#1202)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs
    
    * nginx conf modify
    
    * dockerfile application.properties modify
    
    * dockerfile email address change
    
    * the alert module is modified in English.
    
    * alert server comment and chinese modify
    
    * api server useless code and chinese modify
    
    * common,dao,server useless code and chinese modify
    
    * change chinese to english
    
    * remove unused code (#1204)
    
    * update english documents
    
    * refactor zk client
    
    * update documents
    
    * update zkclient
    
    * update zkclient
    
    * update documents
    
    * add architecture-design
    
    * change i18n
    
    * update i18n
    
    * update english documents
    
    * add architecture-design
    
    * update english documents
    
    * update en-US documents
    
    * add architecture-design
    
    * update demo site
    
    * add mybatis plus model
    
    * modify mybatisplus
    
    * modify mybatisplus
    
    * change interface by mybatisplus
    
    * add unit test
    
    * refactor dao interface.
    
    * add unit test for dao...
    
    * add unit test for dao...
    
    * add unit test for dao...
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
    
    * update some dao bugs
    
    * update for some bugs
    
    * update some bugs
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
    
    * update
    
    * update
    
    * add multiply settings for application.yml
    
    * add multiply settings for application.yml
    
    * revert
    
    * update configuration settings in task record dao...
    
    * change application_master to application-master
    
    * change application_master to application-master
    
    * update application.yml to application.properties
    
    * revert
    
    * revert
    
    * add properties
    
    * add properties
    
    * revert
    
    * revert
    
    * add api start up..
    add alert send try catch
    
    * update dao info level
    
    * fix bug: task cannot submit when recovery failover
    
    * fix bug: task cannot submit when recovery failover
    
    * merge from dev-db
    
    * revert
    
    * revert
    
    * fix bug: get process definition list failed.
    
    * fix bug: process instance interval is error
    
    * revert
    
    * revert
    
    * update
    
    * support stop submit success tasks
    
    * update kill process
    
    * update for stop process
    
    * update for stop process
    
    * add some logs for stop process
    
    * update for small bug.
    
    * add check strategy before submit task
    
    * revert
    
    * update
    
    * update
    
    * revert
    
    * wait task instance exists if null.
    
    * revert
    
    * update
    
    * change desc to description.
    
    * add check user and definitions function when delete tenant
    
    * update
    
    * change desc to description.
    
    * change desc to description.
    
    * change desc to description.
    
    * remove check resources when delete tenant
    
    * change desc to description.
    
    * change mybatisplus version to 3.2.0
    
    * update
    
    * change the notice to apache.
    
    * update
    
    * update postgre sql
    
    * fix bug: phone can be empty.
    
    * fix bug: postgre test error.
    
    * update create table for postgre quartz
    
    * fix some bugs about postgre.
    
    * update create table for postgre quartz
    
    * add postgre db performance monitor
    
    * add postgre performance monitor
    
    * update performance monitor
    
    * revert
    
    * revert
    
    * fix bug: tasks queue length error
    
    * remove datasource.properties
    
    * change chinese sql to english.
    
    * change chinese sql to english.
    
    * remove unused code.
    
    * remove unused code.
    
    * Modify webpack configuration (#1206)
    
    * add more message for java-doc (#1209)
    
    * move updateTaskState into try/catch block in case of exception
    
    * fix NPE
    
    * using conf.getInt instead of getString
    
    * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
    for AlertDao, correct the spelling.
    
    * duplicate
    
    * refactor getTaskWorkerGroupId
    
    * add friendly log
    
    * update hearbeat thread num = 1
    
    * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
    
    * 1. move verifyTaskInstanceIsNull after taskInstance
    2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
    
    * fix the message
    
    * delete before check to avoid KeeperException$NoNodeException
    
    * fix the message
    
    * check processInstance state before delete tenant
    
    * check processInstance state before delete worker group
    
    * refactor
    
    * merge api constants into common constatns
    
    * update the resource perm
    
    * update the dataSource perm
    
    * fix CheckUtils.checkUserParams method
    
    * update AlertGroupService, extends from BaseService, remove duplicate methods
    
    * refactor
    
    * modify method name
    
    * add hasProjectAndPerm method
    
    * using checkProject instead of getResultStatus
    
    * delete checkAuth method, using hasProjectAndPerm instead.
    
    * correct spelling
    
    * add transactional for deleteWorkerGroupById
    
    * add Transactional for deleteProcessInstanceById method
    
    * change sqlSessionTemplate singleton
    
    * change sqlSessionTemplate singleton and reformat code
    
    * fix unsuitable error message
    
    * update shutdownhook methods
    
    * fix worker log bug
    
    * fix api server debug mode bug
    
    * upgrade zk version
    
    * delete this line ,for zkClient.close() will do the whole thing
    
    * fix master server shutdown error
    
    * degrade zk version and add FourLetterWordMain class
    
    * fix PathChildrenCache not close
    
    * add Transactional for createSession method
    
    * add more message for java-doc
    
    * add java doc for common module (#1213)
    
    * dao method comments and useless code modify (#1214)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs
    
    * nginx conf modify
    
    * dockerfile application.properties modify
    
    * dockerfile email address change
    
    * the alert module is modified in English.
    
    * alert server comment and chinese modify
    
    * api server useless code and chinese modify
    
    * common,dao,server useless code and chinese modify
    
    * change chinese to english
    
    * dao method comments and useless code modify
    
    * Change all Chinese names to English (#1207)
    
    * Modify webpack configuration
    
    * Change all Chinese names to English
    
    * add progress-bar-webpack-plugin (#1215)
    
    * Modify webpack configuration
    
    * Change all Chinese names to English
    
    * add progress-bar-webpack-plugin
    
    * Add method and parameters comments (#1220)
    
    * rename from DatasourceUserMapper to DataSourceUserMapper
    
    * add unit test in UserMapper and WorkerGroupMapper
    
    * change cn.escheduler to org.apache.dolphinscheduler
    
    * add unit test in UdfFuncMapperTest
    
    * add unit test in UdfFuncMapperTest
    
    * remove DatabaseConfiguration
    
    * add ConnectionFactoryTest
    
    * cal duration in processInstancesList
    
    * change desc to description
    
    * change table name in mysql ddl
    
    * change table name in mysql ddl
    
    * change escheduler to dolphinscheduler
    
    * change escheduler to dolphinscheduler
    
    * change escheduler to dolphinscheduler
    
    * remove log4j-1.2-api and modify AlertMapperTest
    
    * remove log4j-1.2-api
    
    * Add alertDao to spring management
    
    * Add alertDao to spring management
    
    * get SqlSessionFactory from MybatisSqlSessionFactoryBean
    
    * get processDao by DaoFactory
    
    * read druid properties in ConneciontFactory
    
    * read druid properties in ConneciontFactory
    
    * change get alertDao by spring to DaoFactory
    
    * add log4j to resolve #967
    
    * resole verify udf name error and delete udf error
    
    * Determine if principal is empty
    
    * Determine whether the logon user has the right to delete the project
    
    * Fixed an issue that produced attatch file named such as ATT00002.bin
    
    * fix too many connection in upgrade or create
    
    * fix NEED_FAULT_TOLERANCE and WAITTING_THREAD count fail
    
    * Added a judgment on whether the currently login user is an administrator
    
    * fix update udf database not change and create time is changed
    
    * add enterprise.wechat.enable to decide whether to send enterprise WeChat
    
    * change method check
    
    * Remove the administrator's judgment on query access token list
    
    * only admin can create worker group
    
    * delete alert group need delete the relation of user and alert group
    
    * add timeout in proxy when upload large resource
    
    * add gets scheduled times by expect fire times
    
    * add gets scheduled times by expect fire times
    
    * Increase the judgment of whether it is admin
    
    * Increase the judgment of whether it is admin
    
    * when delete access token add whether login user has perm to delete
    
    * change mysql-connector-java scope to test
    
    * update scm test
    
    * add profile test
    
    * Add method and parameters comments
    
    * roll back
    
    * add some notes (#1221)
    
    * update english documents
    
    * refactor zk client
    
    * update documents
    
    * update zkclient
    
    * update zkclient
    
    * update documents
    
    * add architecture-design
    
    * change i18n
    
    * update i18n
    
    * update english documents
    
    * add architecture-design
    
    * update english documents
    
    * update en-US documents
    
    * add architecture-design
    
    * update demo site
    
    * add mybatis plus model
    
    * modify mybatisplus
    
    * modify mybatisplus
    
    * change interface by mybatisplus
    
    * add unit test
    
    * refactor dao interface.
    
    * add unit test for dao...
    
    * add unit test for dao...
    
    * add unit test for dao...
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
    
    * update some dao bugs
    
    * update for some bugs
    
    * update some bugs
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
    
    * update
    
    * update
    
    * add multiply settings for application.yml
    
    * add multiply settings for application.yml
    
    * revert
    
    * update configuration settings in task record dao...
    
    * change application_master to application-master
    
    * change application_master to application-master
    
    * update application.yml to application.properties
    
    * revert
    
    * revert
    
    * add properties
    
    * add properties
    
    * revert
    
    * revert
    
    * add api start up..
    add alert send try catch
    
    * update dao info level
    
    * fix bug: task cannot submit when recovery failover
    
    * fix bug: task cannot submit when recovery failover
    
    * merge from dev-db
    
    * revert
    
    * revert
    
    * fix bug: get process definition list failed.
    
    * fix bug: process instance interval is error
    
    * revert
    
    * revert
    
    * update
    
    * support stop submit success tasks
    
    * update kill process
    
    * update for stop process
    
    * update for stop process
    
    * add some logs for stop process
    
    * update for small bug.
    
    * add check strategy before submit task
    
    * revert
    
    * update
    
    * update
    
    * revert
    
    * wait task instance exists if null.
    
    * revert
    
    * update
    
    * change desc to description.
    
    * add check user and definitions function when delete tenant
    
    * update
    
    * change desc to description.
    
    * change desc to description.
    
    * change desc to description.
    
    * remove check resources when delete tenant
    
    * change desc to description.
    
    * change mybatisplus version to 3.2.0
    
    * update
    
    * change the notice to apache.
    
    * update
    
    * update postgre sql
    
    * fix bug: phone can be empty.
    
    * fix bug: postgre test error.
    
    * update create table for postgre quartz
    
    * fix some bugs about postgre.
    
    * update create table for postgre quartz
    
    * add postgre db performance monitor
    
    * add postgre performance monitor
    
    * update performance monitor
    
    * revert
    
    * revert
    
    * fix bug: tasks queue length error
    
    * remove datasource.properties
    
    * change chinese sql to english.
    
    * change chinese sql to english.
    
    * remove unused code.
    
    * remove unused code.
    
    * add some notes
    
    * update some notes
    
    * update some notes
    
    * update mbatisplus version
    
    * update lombok version
    
    * update lombok version
    
    * revert
    
    * merge from dev-db
    
    * remove version
    
    * update npm install pom
    
    * add front assembly
    
    * add front module
    
    * change verison to 1.2.0-release-SNAPSHOT
    
    * add name in pom and remove compile
    
    * add name in pom
    
    * [maven-release-plugin] prepare release 1.2.0-release
    
    * [maven-release-plugin] prepare for next development iteration
    
    * [maven-release-plugin] prepare release 1.2.0-release
    
    * [maven-release-plugin] prepare for next development iteration
    
    * update pom
    
    * [maven-release-plugin] prepare release 1.2.0-release
    
    * [maven-release-plugin] prepare for next development iteration
    
    * add release-docs (#1241)
    
    license and notice statistics
    
    * [maven-release-plugin] prepare release 1.2.0-release
    
    * [maven-release-plugin] prepare for next development iteration
    
    * merge from dev-db (#1248)
    
    * reset pgsql (#1178)
    
    + 1
    
    * Ans UI upgrade to version 0.1.0 (#1181)
    
    + 1
    
    * Administrators group prohibit deletion (#1182)
    
    * Ans UI upgrade to version 0.1.0
    
    * Administrators group prohibit deletion
    
    * fix master server shutdown error (#1177)
    
    * move updateTaskState into try/catch block in case of exception
    
    * fix NPE
    
    * using conf.getInt instead of getString
    
    * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
    for AlertDao, correct the spelling.
    
    * duplicate
    
    * refactor getTaskWorkerGroupId
    
    * add friendly log
    
    * update hearbeat thread num = 1
    
    * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
    
    * 1. move verifyTaskInstanceIsNull after taskInstance
    2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
    
    * fix the message
    
    * delete before check to avoid KeeperException$NoNodeException
    
    * fix the message
    
    * check processInstance state before delete tenant
    
    * check processInstance state before delete worker group
    
    * refactor
    
    * merge api constants into common constatns
    
    * update the resource perm
    
    * update the dataSource perm
    
    * fix CheckUtils.checkUserParams method
    
    * update AlertGroupService, extends from BaseService, remove duplicate methods
    
    * refactor
    
    * modify method name
    
    * add hasProjectAndPerm method
    
    * using checkProject instead of getResultStatus
    
    * delete checkAuth method, using hasProjectAndPerm instead.
    
    * correct spelling
    
    * add transactional for deleteWorkerGroupById
    
    * add Transactional for deleteProcessInstanceById method
    
    * change sqlSessionTemplate singleton
    
    * change sqlSessionTemplate singleton and reformat code
    
    * fix unsuitable error message
    
    * update shutdownhook methods
    
    * fix worker log bug
    
    * fix api server debug mode bug
    
    * upgrade zk version
    
    * delete this line ,for zkClient.close() will do the whole thing
    
    * fix master server shutdown error
    
    * degrade zk version and add FourLetterWordMain class (#1183)
    
    * move updateTaskState into try/catch block in case of exception
    
    * fix NPE
    
    * using conf.getInt instead of getString
    
    * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
    for AlertDao, correct the spelling.
    
    * duplicate
    
    * refactor getTaskWorkerGroupId
    
    * add friendly log
    
    * update hearbeat thread num = 1
    
    * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
    
    * 1. move verifyTaskInstanceIsNull after taskInstance
    2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
    
    * fix the message
    
    * delete before check to avoid KeeperException$NoNodeException
    
    * fix the message
    
    * check processInstance state before delete tenant
    
    * check processInstance state before delete worker group
    
    * refactor
    
    * merge api constants into common constatns
    
    * update the resource perm
    
    * update the dataSource perm
    
    * fix CheckUtils.checkUserParams method
    
    * update AlertGroupService, extends from BaseService, remove duplicate methods
    
    * refactor
    
    * modify method name
    
    * add hasProjectAndPerm method
    
    * using checkProject instead of getResultStatus
    
    * delete checkAuth method, using hasProjectAndPerm instead.
    
    * correct spelling
    
    * add transactional for deleteWorkerGroupById
    
    * add Transactional for deleteProcessInstanceById method
    
    * change sqlSessionTemplate singleton
    
    * change sqlSessionTemplate singleton and reformat code
    
    * fix unsuitable error message
    
    * update shutdownhook methods
    
    * fix worker log bug
    
    * fix api server debug mode bug
    
    * upgrade zk version
    
    * delete this line ,for zkClient.close() will do the whole thing
    
    * fix master server shutdown error
    
    * degrade zk version and add FourLetterWordMain class
    
    * fix ZKWorkerClient not close PathChildrenCache (#1185)
    
    * move updateTaskState into try/catch block in case of exception
    
    * fix NPE
    
    * using conf.getInt instead of getString
    
    * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
    for AlertDao, correct the spelling.
    
    * duplicate
    
    * refactor getTaskWorkerGroupId
    
    * add friendly log
    
    * update hearbeat thread num = 1
    
    * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
    
    * 1. move verifyTaskInstanceIsNull after taskInstance
    2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
    
    * fix the message
    
    * delete before check to avoid KeeperException$NoNodeException
    
    * fix the message
    
    * check processInstance state before delete tenant
    
    * check processInstance state before delete worker group
    
    * refactor
    
    * merge api constants into common constatns
    
    * update the resource perm
    
    * update the dataSource perm
    
    * fix CheckUtils.checkUserParams method
    
    * update AlertGroupService, extends from BaseService, remove duplicate methods
    
    * refactor
    
    * modify method name
    
    * add hasProjectAndPerm method
    
    * using checkProject instead of getResultStatus
    
    * delete checkAuth method, using hasProjectAndPerm instead.
    
    * correct spelling
    
    * add transactional for deleteWorkerGroupById
    
    * add Transactional for deleteProcessInstanceById method
    
    * change sqlSessionTemplate singleton
    
    * change sqlSessionTemplate singleton and reformat code
    
    * fix unsuitable error message
    
    * update shutdownhook methods
    
    * fix worker log bug
    
    * fix api server debug mode bug
    
    * upgrade zk version
    
    * delete this line ,for zkClient.close() will do the whole thing
    
    * fix master server shutdown error
    
    * degrade zk version and add FourLetterWordMain class
    
    * fix PathChildrenCache not close
    
    * add Transactional for createSession method (#1186)
    
    * move updateTaskState into try/catch block in case of exception
    
    * fix NPE
    
    * using conf.getInt instead of getString
    
    * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
    for AlertDao, correct the spelling.
    
    * duplicate
    
    * refactor getTaskWorkerGroupId
    
    * add friendly log
    
    * update hearbeat thread num = 1
    
    * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
    
    * 1. move verifyTaskInstanceIsNull after taskInstance
    2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
    
    * fix the message
    
    * delete before check to avoid KeeperException$NoNodeException
    
    * fix the message
    
    * check processInstance state before delete tenant
    
    * check processInstance state before delete worker group
    
    * refactor
    
    * merge api constants into common constatns
    
    * update the resource perm
    
    * update the dataSource perm
    
    * fix CheckUtils.checkUserParams method
    
    * update AlertGroupService, extends from BaseService, remove duplicate methods
    
    * refactor
    
    * modify method name
    
    * add hasProjectAndPerm method
    
    * using checkProject instead of getResultStatus
    
    * delete checkAuth method, using hasProjectAndPerm instead.
    
    * correct spelling
    
    * add transactional for deleteWorkerGroupById
    
    * add Transactional for deleteProcessInstanceById method
    
    * change sqlSessionTemplate singleton
    
    * change sqlSessionTemplate singleton and reformat code
    
    * fix unsuitable error message
    
    * update shutdownhook methods
    
    * fix worker log bug
    
    * fix api server debug mode bug
    
    * upgrade zk version
    
    * delete this line ,for zkClient.close() will do the whole thing
    
    * fix master server shutdown error
    
    * degrade zk version and add FourLetterWordMain class
    
    * fix PathChildrenCache not close
    
    * add Transactional for createSession method
    
    * dockerfile dao application.properties ,install.sh modify and application.properties modify (#1187)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify (#1189)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs (#1191)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs
    
    * nginx conf modify
    
    * dockerfile application.properties modify
    
    * dockerfile conf modify (#1192)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs
    
    * nginx conf modify
    
    * dockerfile application.properties modify
    
    * dockerfile conf modify (#1193)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs
    
    * nginx conf modify
    
    * dockerfile application.properties modify
    
    * dockerfile email address change (#1194)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs
    
    * nginx conf modify
    
    * dockerfile application.properties modify
    
    * dockerfile email address change
    
    * the alert module is modified in english (#1195)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs
    
    * nginx conf modify
    
    * dockerfile application.properties modify
    
    * dockerfile email address change
    
    * the alert module is modified in English.
    
    * alert server comment and chinese modify
    
    * api server useless code and chinese modify (#1198)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs
    
    * nginx conf modify
    
    * dockerfile application.properties modify
    
    * dockerfile email address change
    
    * the alert module is modified in English.
    
    * alert server comment and chinese modify
    
    * api server useless code and chinese modify
    
    * common,dao,server useless code and chinese modify (#1199)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs
    
    * nginx conf modify
    
    * dockerfile application.properties modify
    
    * dockerfile email address change
    
    * the alert module is modified in English.
    
    * alert server comment and chinese modify
    
    * api server useless code and chinese modify
    
    * common,dao,server useless code and chinese modify
    
    * change chinese sql to english. (#1200)
    
    * update english documents
    
    * refactor zk client
    
    * update documents
    
    * update zkclient
    
    * update zkclient
    
    * update documents
    
    * add architecture-design
    
    * change i18n
    
    * update i18n
    
    * update english documents
    
    * add architecture-design
    
    * update english documents
    
    * update en-US documents
    
    * add architecture-design
    
    * update demo site
    
    * add mybatis plus model
    
    * modify mybatisplus
    
    * modify mybatisplus
    
    * change interface by mybatisplus
    
    * add unit test
    
    * refactor dao interface.
    
    * add unit test for dao...
    
    * add unit test for dao...
    
    * add unit test for dao...
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
    
    * update some dao bugs
    
    * update for some bugs
    
    * update some bugs
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
    
    * update
    
    * update
    
    * add multiply settings for application.yml
    
    * add multiply settings for application.yml
    
    * revert
    
    * update configuration settings in task record dao...
    
    * change application_master to application-master
    
    * change application_master to application-master
    
    * update application.yml to application.properties
    
    * revert
    
    * revert
    
    * add properties
    
    * add properties
    
    * revert
    
    * revert
    
    * add api start up..
    add alert send try catch
    
    * update dao info level
    
    * fix bug: task cannot submit when recovery failover
    
    * fix bug: task cannot submit when recovery failover
    
    * merge from dev-db
    
    * revert
    
    * revert
    
    * fix bug: get process definition list failed.
    
    * fix bug: process instance interval is error
    
    * revert
    
    * revert
    
    * update
    
    * support stop submit success tasks
    
    * update kill process
    
    * update for stop process
    
    * update for stop process
    
    * add some logs for stop process
    
    * update for small bug.
    
    * add check strategy before submit task
    
    * revert
    
    * update
    
    * update
    
    * revert
    
    * wait task instance exists if null.
    
    * revert
    
    * update
    
    * change desc to description.
    
    * add check user and definitions function when delete tenant
    
    * update
    
    * change desc to description.
    
    * change desc to description.
    
    * change desc to description.
    
    * remove check resources when delete tenant
    
    * change desc to description.
    
    * change mybatisplus version to 3.2.0
    
    * update
    
    * change the notice to apache.
    
    * update
    
    * update postgre sql
    
    * fix bug: phone can be empty.
    
    * fix bug: postgre test error.
    
    * update create table for postgre quartz
    
    * fix some bugs about postgre.
    
    * update create table for postgre quartz
    
    * add postgre db performance monitor
    
    * add postgre performance monitor
    
    * update performance monitor
    
    * revert
    
    * revert
    
    * fix bug: tasks queue length error
    
    * remove datasource.properties
    
    * change chinese sql to english.
    
    * change chinese sql to english.
    
    * change chinese to english (#1202)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs
    
    * nginx conf modify
    
    * dockerfile application.properties modify
    
    * dockerfile email address change
    
    * the alert module is modified in English.
    
    * alert server comment and chinese modify
    
    * api server useless code and chinese modify
    
    * common,dao,server useless code and chinese modify
    
    * change chinese to english
    
    * remove unused code (#1204)
    
    * update english documents
    
    * refactor zk client
    
    * update documents
    
    * update zkclient
    
    * update zkclient
    
    * update documents
    
    * add architecture-design
    
    * change i18n
    
    * update i18n
    
    * update english documents
    
    * add architecture-design
    
    * update english documents
    
    * update en-US documents
    
    * add architecture-design
    
    * update demo site
    
    * add mybatis plus model
    
    * modify mybatisplus
    
    * modify mybatisplus
    
    * change interface by mybatisplus
    
    * add unit test
    
    * refactor dao interface.
    
    * add unit test for dao...
    
    * add unit test for dao...
    
    * add unit test for dao...
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
    
    * update some dao bugs
    
    * update for some bugs
    
    * update some bugs
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
    
    * update
    
    * update
    
    * add multiply settings for application.yml
    
    * add multiply settings for application.yml
    
    * revert
    
    * update configuration settings in task record dao...
    
    * change application_master to application-master
    
    * change application_master to application-master
    
    * update application.yml to application.properties
    
    * revert
    
    * revert
    
    * add properties
    
    * add properties
    
    * revert
    
    * revert
    
    * add api start up..
    add alert send try catch
    
    * update dao info level
    
    * fix bug: task cannot submit when recovery failover
    
    * fix bug: task cannot submit when recovery failover
    
    * merge from dev-db
    
    * revert
    
    * revert
    
    * fix bug: get process definition list failed.
    
    * fix bug: process instance interval is error
    
    * revert
    
    * revert
    
    * update
    
    * support stop submit success tasks
    
    * update kill process
    
    * update for stop process
    
    * update for stop process
    
    * add some logs for stop process
    
    * update for small bug.
    
    * add check strategy before submit task
    
    * revert
    
    * update
    
    * update
    
    * revert
    
    * wait task instance exists if null.
    
    * revert
    
    * update
    
    * change desc to description.
    
    * add check user and definitions function when delete tenant
    
    * update
    
    * change desc to description.
    
    * change desc to description.
    
    * change desc to description.
    
    * remove check resources when delete tenant
    
    * change desc to description.
    
    * change mybatisplus version to 3.2.0
    
    * update
    
    * change the notice to apache.
    
    * update
    
    * update postgre sql
    
    * fix bug: phone can be empty.
    
    * fix bug: postgre test error.
    
    * update create table for postgre quartz
    
    * fix some bugs about postgre.
    
    * update create table for postgre quartz
    
    * add postgre db performance monitor
    
    * add postgre performance monitor
    
    * update performance monitor
    
    * revert
    
    * revert
    
    * fix bug: tasks queue length error
    
    * remove datasource.properties
    
    * change chinese sql to english.
    
    * change chinese sql to english.
    
    * remove unused code.
    
    * remove unused code.
    
    * Modify webpack configuration (#1206)
    
    * add more message for java-doc (#1209)
    
    * move updateTaskState into try/catch block in case of exception
    
    * fix NPE
    
    * using conf.getInt instead of getString
    
    * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
    for AlertDao, correct the spelling.
    
    * duplicate
    
    * refactor getTaskWorkerGroupId
    
    * add friendly log
    
    * update hearbeat thread num = 1
    
    * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
    
    * 1. move verifyTaskInstanceIsNull after taskInstance
    2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
    
    * fix the message
    
    * delete before check to avoid KeeperException$NoNodeException
    
    * fix the message
    
    * check processInstance state before delete tenant
    
    * check processInstance state before delete worker group
    
    * refactor
    
    * merge api constants into common constatns
    
    * update the resource perm
    
    * update the dataSource perm
    
    * fix CheckUtils.checkUserParams method
    
    * update AlertGroupService, extends from BaseService, remove duplicate methods
    
    * refactor
    
    * modify method name
    
    * add hasProjectAndPerm method
    
    * using checkProject instead of getResultStatus
    
    * delete checkAuth method, using hasProjectAndPerm instead.
    
    * correct spelling
    
    * add transactional for deleteWorkerGroupById
    
    * add Transactional for deleteProcessInstanceById method
    
    * change sqlSessionTemplate singleton
    
    * change sqlSessionTemplate singleton and reformat code
    
    * fix unsuitable error message
    
    * update shutdownhook methods
    
    * fix worker log bug
    
    * fix api server debug mode bug
    
    * upgrade zk version
    
    * delete this line ,for zkClient.close() will do the whole thing
    
    * fix master server shutdown error
    
    * degrade zk version and add FourLetterWordMain class
    
    * fix PathChildrenCache not close
    
    * add Transactional for createSession method
    
    * add more message for java-doc
    
    * add java doc for common module (#1213)
    
    * dao method comments and useless code modify (#1214)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs
    
    * nginx conf modify
    
    * dockerfile application.properties modify
    
    * dockerfile email address change
    
    * the alert module is modified in English.
    
    * alert server comment and chinese modify
    
    * api server useless code and chinese modify
    
    * common,dao,server useless code and chinese modify
    
    * change chinese to english
    
    * dao method comments and useless code modify
    
    * Change all Chinese names to English (#1207)
    
    * Modify webpack configuration
    
    * Change all Chinese names to English
    
    * add progress-bar-webpack-plugin (#1215)
    
    * Modify webpack configuration
    
    * Change all Chinese names to English
    
    * add progress-bar-webpack-plugin
    
    * Add method and parameters comments (#1220)
    
    * rename from DatasourceUserMapper to DataSourceUserMapper
    
    * add unit test in UserMapper and WorkerGroupMapper
    
    * change cn.escheduler to org.apache.dolphinscheduler
    
    * add unit test in UdfFuncMapperTest
    
    * add unit test in UdfFuncMapperTest
    
    * remove DatabaseConfiguration
    
    * add ConnectionFactoryTest
    
    * cal duration in processInstancesList
    
    * change desc to description
    
    * change table name in mysql ddl
    
    * change table name in mysql ddl
    
    * change escheduler to dolphinscheduler
    
    * change escheduler to dolphinscheduler
    
    * change escheduler to dolphinscheduler
    
    * remove log4j-1.2-api and modify AlertMapperTest
    
    * remove log4j-1.2-api
    
    * Add alertDao to spring management
    
    * Add alertDao to spring management
    
    * get SqlSessionFactory from MybatisSqlSessionFactoryBean
    
    * get processDao by DaoFactory
    
    * read druid properties in ConneciontFactory
    
    * read druid properties in ConneciontFactory
    
    * change get alertDao by spring to DaoFactory
    
    * add log4j to resolve #967
    
    * resole verify udf name error and delete udf error
    
    * Determine if principal is empty
    
    * Determine whether the logon user has the right to delete the project
    
    * Fixed an issue that produced attatch file named such as ATT00002.bin
    
    * fix too many connection in upgrade or create
    
    * fix NEED_FAULT_TOLERANCE and WAITTING_THREAD count fail
    
    * Added a judgment on whether the currently login user is an administrator
    
    * fix update udf database not change and create time is changed
    
    * add enterprise.wechat.enable to decide whether to send enterprise WeChat
    
    * change method check
    
    * Remove the administrator's judgment on query access token list
    
    * only admin can create worker group
    
    * delete alert group need delete the relation of user and alert group
    
    * add timeout in proxy when upload large resource
    
    * add gets scheduled times by expect fire times
    
    * add gets scheduled times by expect fire times
    
    * Increase the judgment of whether it is admin
    
    * Increase the judgment of whether it is admin
    
    * when delete access token add whether login user has perm to delete
    
    * change mysql-connector-java scope to test
    
    * update scm test
    
    * add profile test
    
    * Add method and parameters comments
    
    * roll back
    
    * add some notes (#1221)
    
    * update english documents
    
    * refactor zk client
    
    * update documents
    
    * update zkclient
    
    * update zkclient
    
    * update documents
    
    * add architecture-design
    
    * change i18n
    
    * update i18n
    
    * update english documents
    
    * add architecture-design
    
    * update english documents
    
    * update en-US documents
    
    * add architecture-design
    
    * update demo site
    
    * add mybatis plus model
    
    * modify mybatisplus
    
    * modify mybatisplus
    
    * change interface by mybatisplus
    
    * add unit test
    
    * refactor dao interface.
    
    * add unit test for dao...
    
    * add unit test for dao...
    
    * add unit test for dao...
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
    
    * update some dao bugs
    
    * update for some bugs
    
    * update some bugs
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
    
    * update
    
    * update
    
    * add multiply settings for application.yml
    
    * add multiply settings for application.yml
    
    * revert
    
    * update configuration settings in task record dao...
    
    * change application_master to application-master
    
    * change application_master to application-master
    
    * update application.yml to application.properties
    
    * revert
    
    * revert
    
    * add properties
    
    * add properties
    
    * revert
    
    * revert
    
    * add api start up..
    add alert send try catch
    
    * update dao info level
    
    * fix bug: task cannot submit when recovery failover
    
    * fix bug: task cannot submit when recovery failover
    
    * merge from dev-db
    
    * revert
    
    * revert
    
    * fix bug: get process definition list failed.
    
    * fix bug: process instance interval is error
    
    * revert
    
    * revert
    
    * update
    
    * support stop submit success tasks
    
    * update kill process
    
    * update for stop process
    
    * update for stop process
    
    * add some logs for stop process
    
    * update for small bug.
    
    * add check strategy before submit task
    
    * revert
    
    * update
    
    * update
    
    * revert
    
    * wait task instance exists if null.
    
    * revert
    
    * update
    
    * change desc to description.
    
    * add check user and definitions function when delete tenant
    
    * update
    
    * change desc to description.
    
    * change desc to description.
    
    * change desc to description.
    
    * remove check resources when delete tenant
    
    * change desc to description.
    
    * change mybatisplus version to 3.2.0
    
    * update
    
    * change the notice to apache.
    
    * update
    
    * update postgre sql
    
    * fix bug: phone can be empty.
    
    * fix bug: postgre test error.
    
    * update create table for postgre quartz
    
    * fix some bugs about postgre.
    
    * update create table for postgre quartz
    
    * add postgre db performance monitor
    
    * add postgre performance monitor
    
    * update performance monitor
    
    * revert
    
    * revert
    
    * fix bug: tasks queue length error
    
    * remove datasource.properties
    
    * change chinese sql to english.
    
    * change chinese sql to english.
    
    * remove unused code.
    
    * remove unused code.
    
    * add some notes
    
    * update some notes
    
    * update some notes
    
    * update mbatisplus version
    
    * update lombok version
    
    * update lombok version
    
    * revert
    
    * master startup error bug fix (#1229)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs
    
    * nginx conf modify
    
    * dockerfile application.properties modify
    
    * dockerfile email address change
    
    * the alert module is modified in English.
    
    * alert server comment and chinese modify
    
    * api server useless code and chinese modify
    
    * common,dao,server useless code and chinese modify
    
    * change chinese to english
    
    * dao method comments and useless code modify
    
    * master startup error bug fix
    
    * delete class App, let spring manage connectionFactory (#1233)
    
    * move updateTaskState into try/catch block in case of exception
    
    * fix NPE
    
    * using conf.getInt instead of getString
    
    * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
    for AlertDao, correct the spelling.
    
    * duplicate
    
    * refactor getTaskWorkerGroupId
    
    * add friendly log
    
    * update hearbeat thread num = 1
    
    * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
    
    * 1. move verifyTaskInstanceIsNull after taskInstance
    2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
    
    * fix the message
    
    * delete before check to avoid KeeperException$NoNodeException
    
    * fix the message
    
    * check processInstance state before delete tenant
    
    * check processInstance state before delete worker group
    
    * refactor
    
    * merge api constants into common constatns
    
    * update the resource perm
    
    * update the dataSource perm
    
    * fix CheckUtils.checkUserParams method
    
    * update AlertGroupService, extends from BaseService, remove duplicate methods
    
    * refactor
    
    * modify method name
    
    * add hasProjectAndPerm method
    
    * using checkProject instead of getResultStatus
    
    * delete checkAuth method, using hasProjectAndPerm instead.
    
    * correct spelling
    
    * add transactional for deleteWorkerGroupById
    
    * add Transactional for deleteProcessInstanceById method
    
    * change sqlSessionTemplate singleton
    
    * change sqlSessionTemplate singleton and reformat code
    
    * fix unsuitable error message
    
    * update shutdownhook methods
    
    * fix worker log bug
    
    * fix api server debug mode bug
    
    * upgrade zk version
    
    * delete this line ,for zkClient.close() will do the whole thing
    
    * fix master server shutdown error
    
    * degrade zk version and add FourLetterWordMain class
    
    * fix PathChildrenCache not close
    
    * add Transactional for createSession method
    
    * add more message for java-doc
    
    * delete App, let spring manage connectionFactory
    
    * add license
    
    * add class Application for test support
    
    * update pom.xml
    
    * [maven-release-plugin] prepare release 1.2.1-release
    
    * [maven-release-plugin] prepare for next development iteration
    
    * [maven-release-plugin] prepare release 1.2.2-release
    
    * [maven-release-plugin] prepare for next development iteration
    
    * update license (#1249)
    
    * add licenses in assemble (#1253)
    
    * rename from DatasourceUserMapper to DataSourceUserMapper
    
    * add unit test in UserMapper and WorkerGroupMapper
    
    * change cn.escheduler to org.apache.dolphinscheduler
    
    * add unit test in UdfFuncMapperTest
    
    * add unit test in UdfFuncMapperTest
    
    * remove DatabaseConfiguration
    
    * add ConnectionFactoryTest
    
    * cal duration in processInstancesList
    
    * change desc to description
    
    * change table name in mysql ddl
    
    * change table name in mysql ddl
    
    * change escheduler to dolphinscheduler
    
    * change escheduler to dolphinscheduler
    
    * change escheduler to dolphinscheduler
    
    * remove log4j-1.2-api and modify AlertMapperTest
    
    * remove log4j-1.2-api
    
    * Add alertDao to spring management
    
    * Add alertDao to spring management
    
    * get SqlSessionFactory from MybatisSqlSessionFactoryBean
    
    * get processDao by DaoFactory
    
    * read druid properties in ConneciontFactory
    
    * read druid properties in ConneciontFactory
    
    * change get alertDao by spring to DaoFactory
    
    * add log4j to resolve #967
    
    * resole verify udf name error and delete udf error
    
    * Determine if principal is empty
    
    * Determine whether the logon user has the right to delete the project
    
    * Fixed an issue that produced attatch file named such as ATT00002.bin
    
    * fix too many connection in upgrade or create
    
    * fix NEED_FAULT_TOLERANCE and WAITTING_THREAD count fail
    
    * Added a judgment on whether the currently login user is an administrator
    
    * fix update udf database not change and create time is changed
    
    * add enterprise.wechat.enable to decide whether to send enterprise WeChat
    
    * change method check
    
    * Remove the administrator's judgment on query access token list
    
    * only admin can create worker group
    
    * delete alert group need delete the relation of user and alert group
    
    * add timeout in proxy when upload large resource
    
    * add gets scheduled times by expect fire times
    
    * add gets scheduled times by expect fire times
    
    * Increase the judgment of whether it is admin
    
    * Increase the judgment of whether it is admin
    
    * when delete access token add whether login user has perm to delete
    
    * change mysql-connector-java scope to test
    
    * update scm test
    
    * add profile test
    
    * add profile test
    
    * add maven.deploy.skip true
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * add dependency
    
    * add javadoc
    
    * add antrun
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * reset pgsql (#1178)
    
    + 1
    
    * add javadoc
    
    * add javadoc
    
    * [maven-release-plugin] rollback the release of 1.2.0
    
    * add javadoc
    
    * Ans UI upgrade to version 0.1.0 (#1181)
    
    + 1
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * Administrators group prohibit deletion (#1182)
    
    * Ans UI upgrade to version 0.1.0
    
    * Administrators group prohibit deletion
    
    * add javadoc
    
    * add ui pom
    
    * fix master server shutdown error (#1177)
    
    * move updateTaskState into try/catch block in case of exception
    
    * fix NPE
    
    * using conf.getInt instead of getString
    
    * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
    for AlertDao, correct the spelling.
    
    * duplicate
    
    * refactor getTaskWorkerGroupId
    
    * add friendly log
    
    * update hearbeat thread num = 1
    
    * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
    
    * 1. move verifyTaskInstanceIsNull after taskInstance
    2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
    
    * fix the message
    
    * delete before check to avoid KeeperException$NoNodeException
    
    * fix the message
    
    * check processInstance state before delete tenant
    
    * check processInstance state before delete worker group
    
    * refactor
    
    * merge api constants into common constatns
    
    * update the resource perm
    
    * update the dataSource perm
    
    * fix CheckUtils.checkUserParams method
    
    * update AlertGroupService, extends from BaseService, remove duplicate methods
    
    * refactor
    
    * modify method name
    
    * add hasProjectAndPerm method
    
    * using checkProject instead of getResultStatus
    
    * delete checkAuth method, using hasProjectAndPerm instead.
    
    * correct spelling
    
    * add transactional for deleteWorkerGroupById
    
    * add Transactional for deleteProcessInstanceById method
    
    * change sqlSessionTemplate singleton
    
    * change sqlSessionTemplate singleton and reformat code
    
    * fix unsuitable error message
    
    * update shutdownhook methods
    
    * fix worker log bug
    
    * fix api server debug mode bug
    
    * upgrade zk version
    
    * delete this line ,for zkClient.close() will do the whole thing
    
    * fix master server shutdown error
    
    * degrade zk version and add FourLetterWordMain class (#1183)
    
    * move updateTaskState into try/catch block in case of exception
    
    * fix NPE
    
    * using conf.getInt instead of getString
    
    * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
    for AlertDao, correct the spelling.
    
    * duplicate
    
    * refactor getTaskWorkerGroupId
    
    * add friendly log
    
    * update hearbeat thread num = 1
    
    * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
    
    * 1. move verifyTaskInstanceIsNull after taskInstance
    2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
    
    * fix the message
    
    * delete before check to avoid KeeperException$NoNodeException
    
    * fix the message
    
    * check processInstance state before delete tenant
    
    * check processInstance state before delete worker group
    
    * refactor
    
    * merge api constants into common constatns
    
    * update the resource perm
    
    * update the dataSource perm
    
    * fix CheckUtils.checkUserParams method
    
    * update AlertGroupService, extends from BaseService, remove duplicate methods
    
    * refactor
    
    * modify method name
    
    * add hasProjectAndPerm method
    
    * using checkProject instead of getResultStatus
    
    * delete checkAuth method, using hasProjectAndPerm instead.
    
    * correct spelling
    
    * add transactional for deleteWorkerGroupById
    
    * add Transactional for deleteProcessInstanceById method
    
    * change sqlSessionTemplate singleton
    
    * change sqlSessionTemplate singleton and reformat code
    
    * fix unsuitable error message
    
    * update shutdownhook methods
    
    * fix worker log bug
    
    * fix api server debug mode bug
    
    * upgrade zk version
    
    * delete this line ,for zkClient.close() will do the whole thing
    
    * fix master server shutdown error
    
    * degrade zk version and add FourLetterWordMain class
    
    * add ui pom
    
    * add src pom and assembly
    
    * fix ZKWorkerClient not close PathChildrenCache (#1185)
    
    * move updateTaskState into try/catch block in case of exception
    
    * fix NPE
    
    * using conf.getInt instead of getString
    
    * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
    for AlertDao, correct the spelling.
    
    * duplicate
    
    * refactor getTaskWorkerGroupId
    
    * add friendly log
    
    * update hearbeat thread num = 1
    
    * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
    
    * 1. move verifyTaskInstanceIsNull after taskInstance
    2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
    
    * fix the message
    
    * delete before check to avoid KeeperException$NoNodeException
    
    * fix the message
    
    * check processInstance state before delete tenant
    
    * check processInstance state before delete worker group
    
    * refactor
    
    * merge api constants into common constatns
    
    * update the resource perm
    
    * update the dataSource perm
    
    * fix CheckUtils.checkUserParams method
    
    * update AlertGroupService, extends from BaseService, remove duplicate methods
    
    * refactor
    
    * modify method name
    
    * add hasProjectAndPerm method
    
    * using checkProject instead of getResultStatus
    
    * delete checkAuth method, using hasProjectAndPerm instead.
    
    * correct spelling
    
    * add transactional for deleteWorkerGroupById
    
    * add Transactional for deleteProcessInstanceById method
    
    * change sqlSessionTemplate singleton
    
    * change sqlSessionTemplate singleton and reformat code
    
    * fix unsuitable error message
    
    * update shutdownhook methods
    
    * fix worker log bug
    
    * fix api server debug mode bug
    
    * upgrade zk version
    
    * delete this line ,for zkClient.close() will do the whole thing
    
    * fix master server shutdown error
    
    * degrade zk version and add FourLetterWordMain class
    
    * fix PathChildrenCache not close
    
    * add Transactional for createSession method (#1186)
    
    * move updateTaskState into try/catch block in case of exception
    
    * fix NPE
    
    * using conf.getInt instead of getString
    
    * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
    for AlertDao, correct the spelling.
    
    * duplicate
    
    * refactor getTaskWorkerGroupId
    
    * add friendly log
    
    * update hearbeat thread num = 1
    
    * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
    
    * 1. move verifyTaskInstanceIsNull after taskInstance
    2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
    
    * fix the message
    
    * delete before check to avoid KeeperException$NoNodeException
    
    * fix the message
    
    * check processInstance state before delete tenant
    
    * check processInstance state before delete worker group
    
    * refactor
    
    * merge api constants into common constatns
    
    * update the resource perm
    
    * update the dataSource perm
    
    * fix CheckUtils.checkUserParams method
    
    * update AlertGroupService, extends from BaseService, remove duplicate methods
    
    * refactor
    
    * modify method name
    
    * add hasProjectAndPerm method
    
    * using checkProject instead of getResultStatus
    
    * delete checkAuth method, using hasProjectAndPerm instead.
    
    * correct spelling
    
    * add transactional for deleteWorkerGroupById
    
    * add Transactional for deleteProcessInstanceById method
    
    * change sqlSessionTemplate singleton
    
    * change sqlSessionTemplate singleton and reformat code
    
    * fix unsuitable error message
    
    * update shutdownhook methods
    
    * fix worker log bug
    
    * fix api server debug mode bug
    
    * upgrade zk version
    
    * delete this line ,for zkClient.close() will do the whole thing
    
    * fix master server shutdown error
    
    * degrade zk version and add FourLetterWordMain class
    
    * fix PathChildrenCache not close
    
    * add Transactional for createSession method
    
    * add src pom and assembly
    
    * add src pom and assembly
    
    * add src pom and assembly
    
    * add src pom and assembly
    
    * dockerfile dao application.properties ,install.sh modify and application.properties modify (#1187)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * add src pom and assembly
    
    * add src pom and assembly
    
    * dockerfile startup.sh modify (#1189)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs (#1191)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs
    
    * nginx conf modify
    
    * dockerfile application.properties modify
    
    * dockerfile conf modify (#1192)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs
    
    * nginx conf modify
    
    * dockerfile application.properties modify
    
    * dockerfile conf modify (#1193)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs
    
    * nginx conf modify
    
    * dockerfile application.properties modify
    
    * dockerfile email address change (#1194)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs
    
    * nginx conf modify
    
    * dockerfile application.properties modify
    
    * dockerfile email address change
    
    * the alert module is modified in english (#1195)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs
    
    * nginx conf modify
    
    * dockerfile application.properties modify
    
    * dockerfile email address change
    
    * the alert module is modified in English.
    
    * alert server comment and chinese modify
    
    * api server useless code and chinese modify (#1198)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs
    
    * nginx conf modify
    
    * dockerfile application.properties modify
    
    * dockerfile email address change
    
    * the alert module is modified in English.
    
    * alert server comment and chinese modify
    
    * api server useless code and chinese modify
    
    * common,dao,server useless code and chinese modify (#1199)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs
    
    * nginx conf modify
    
    * dockerfile application.properties modify
    
    * dockerfile email address change
    
    * the alert module is modified in English.
    
    * alert server comment and chinese modify
    
    * api server useless code and chinese modify
    
    * common,dao,server useless code and chinese modify
    
    * change chinese sql to english. (#1200)
    
    * update english documents
    
    * refactor zk client
    
    * update documents
    
    * update zkclient
    
    * update zkclient
    
    * update documents
    
    * add architecture-design
    
    * change i18n
    
    * update i18n
    
    * update english documents
    
    * add architecture-design
    
    * update english documents
    
    * update en-US documents
    
    * add architecture-design
    
    * update demo site
    
    * add mybatis plus model
    
    * modify mybatisplus
    
    * modify mybatisplus
    
    * change interface by mybatisplus
    
    * add unit test
    
    * refactor dao interface.
    
    * add unit test for dao...
    
    * add unit test for dao...
    
    * add unit test for dao...
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
    
    * update some dao bugs
    
    * update for some bugs
    
    * update some bugs
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
    
    * update
    
    * update
    
    * add multiply settings for application.yml
    
    * add multiply settings for application.yml
    
    * revert
    
    * update configuration settings in task record dao...
    
    * change application_master to application-master
    
    * change application_master to application-master
    
    * update application.yml to application.properties
    
    * revert
    
    * revert
    
    * add properties
    
    * add properties
    
    * revert
    
    * revert
    
    * add api start up..
    add alert send try catch
    
    * update dao info level
    
    * fix bug: task cannot submit when recovery failover
    
    * fix bug: task cannot submit when recovery failover
    
    * merge from dev-db
    
    * revert
    
    * revert
    
    * fix bug: get process definition list failed.
    
    * fix bug: process instance interval is error
    
    * revert
    
    * revert
    
    * update
    
    * support stop submit success tasks
    
    * update kill process
    
    * update for stop process
    
    * update for stop process
    
    * add some logs for stop process
    
    * update for small bug.
    
    * add check strategy before submit task
    
    * revert
    
    * update
    
    * update
    
    * revert
    
    * wait task instance exists if null.
    
    * revert
    
    * update
    
    * change desc to description.
    
    * add check user and definitions function when delete tenant
    
    * update
    
    * change desc to description.
    
    * change desc to description.
    
    * change desc to description.
    
    * remove check resources when delete tenant
    
    * change desc to description.
    
    * change mybatisplus version to 3.2.0
    
    * update
    
    * change the notice to apache.
    
    * update
    
    * update postgre sql
    
    * fix bug: phone can be empty.
    
    * fix bug: postgre test error.
    
    * update create table for postgre quartz
    
    * fix some bugs about postgre.
    
    * update create table for postgre quartz
    
    * add postgre db performance monitor
    
    * add postgre performance monitor
    
    * update performance monitor
    
    * revert
    
    * revert
    
    * fix bug: tasks queue length error
    
    * remove datasource.properties
    
    * change chinese sql to english.
    
    * change chinese sql to english.
    
    * change chinese to english (#1202)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs
    
    * nginx conf modify
    
    * dockerfile application.properties modify
    
    * dockerfile email address change
    
    * the alert module is modified in English.
    
    * alert server comment and chinese modify
    
    * api server useless code and chinese modify
    
    * common,dao,server useless code and chinese modify
    
    * change chinese to english
    
    * remove unused code (#1204)
    
    * update english documents
    
    * refactor zk client
    
    * update documents
    
    * update zkclient
    
    * update zkclient
    
    * update documents
    
    * add architecture-design
    
    * change i18n
    
    * update i18n
    
    * update english documents
    
    * add architecture-design
    
    * update english documents
    
    * update en-US documents
    
    * add architecture-design
    
    * update demo site
    
    * add mybatis plus model
    
    * modify mybatisplus
    
    * modify mybatisplus
    
    * change interface by mybatisplus
    
    * add unit test
    
    * refactor dao interface.
    
    * add unit test for dao...
    
    * add unit test for dao...
    
    * add unit test for dao...
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
    
    * update some dao bugs
    
    * update for some bugs
    
    * update some bugs
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
    
    * update
    
    * update
    
    * add multiply settings for application.yml
    
    * add multiply settings for application.yml
    
    * revert
    
    * update configuration settings in task record dao...
    
    * change application_master to application-master
    
    * change application_master to application-master
    
    * update application.yml to application.properties
    
    * revert
    
    * revert
    
    * add properties
    
    * add properties
    
    * revert
    
    * revert
    
    * add api start up..
    add alert send try catch
    
    * update dao info level
    
    * fix bug: task cannot submit when recovery failover
    
    * fix bug: task cannot submit when recovery failover
    
    * merge from dev-db
    
    * revert
    
    * revert
    
    * fix bug: get process definition list failed.
    
    * fix bug: process instance interval is error
    
    * revert
    
    * revert
    
    * update
    
    * support stop submit success tasks
    
    * update kill process
    
    * update for stop process
    
    * update for stop process
    
    * add some logs for stop process
    
    * update for small bug.
    
    * add check strategy before submit task
    
    * revert
    
    * update
    
    * update
    
    * revert
    
    * wait task instance exists if null.
    
    * revert
    
    * update
    
    * change desc to description.
    
    * add check user and definitions function when delete tenant
    
    * update
    
    * change desc to description.
    
    * change desc to description.
    
    * change desc to description.
    
    * remove check resources when delete tenant
    
    * change desc to description.
    
    * change mybatisplus version to 3.2.0
    
    * update
    
    * change the notice to apache.
    
    * update
    
    * update postgre sql
    
    * fix bug: phone can be empty.
    
    * fix bug: postgre test error.
    
    * update create table for postgre quartz
    
    * fix some bugs about postgre.
    
    * update create table for postgre quartz
    
    * add postgre db performance monitor
    
    * add postgre performance monitor
    
    * update performance monitor
    
    * revert
    
    * revert
    
    * fix bug: tasks queue length error
    
    * remove datasource.properties
    
    * change chinese sql to english.
    
    * change chinese sql to english.
    
    * remove unused code.
    
    * remove unused code.
    
    * Modify webpack configuration (#1206)
    
    * add more message for java-doc (#1209)
    
    * move updateTaskState into try/catch block in case of exception
    
    * fix NPE
    
    * using conf.getInt instead of getString
    
    * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
    for AlertDao, correct the spelling.
    
    * duplicate
    
    * refactor getTaskWorkerGroupId
    
    * add friendly log
    
    * update hearbeat thread num = 1
    
    * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
    
    * 1. move verifyTaskInstanceIsNull after taskInstance
    2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
    
    * fix the message
    
    * delete before check to avoid KeeperException$NoNodeException
    
    * fix the message
    
    * check processInstance state before delete tenant
    
    * check processInstance state before delete worker group
    
    * refactor
    
    * merge api constants into common constatns
    
    * update the resource perm
    
    * update the dataSource perm
    
    * fix CheckUtils.checkUserParams method
    
    * update AlertGroupService, extends from BaseService, remove duplicate methods
    
    * refactor
    
    * modify method name
    
    * add hasProjectAndPerm method
    
    * using checkProject instead of getResultStatus
    
    * delete checkAuth method, using hasProjectAndPerm instead.
    
    * correct spelling
    
    * add transactional for deleteWorkerGroupById
    
    * add Transactional for deleteProcessInstanceById method
    
    * change sqlSessionTemplate singleton
    
    * change sqlSessionTemplate singleton and reformat code
    
    * fix unsuitable error message
    
    * update shutdownhook methods
    
    * fix worker log bug
    
    * fix api server debug mode bug
    
    * upgrade zk version
    
    * delete this line ,for zkClient.close() will do the whole thing
    
    * fix master server shutdown error
    
    * degrade zk version and add FourLetterWordMain class
    
    * fix PathChildrenCache not close
    
    * add Transactional for createSession method
    
    * add more message for java-doc
    
    * add java doc for common module (#1213)
    
    * dao method comments and useless code modify (#1214)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs
    
    * nginx conf modify
    
    * dockerfile application.properties modify
    
    * dockerfile email address change
    
    * the alert module is modified in English.
    
    * alert server comment and chinese modify
    
    * api server useless code and chinese modify
    
    * common,dao,server useless code and chinese modify
    
    * change chinese to english
    
    * dao method comments and useless code modify
    
    * Change all Chinese names to English (#1207)
    
    * Modify webpack configuration
    
    * Change all Chinese names to English
    
    * add progress-bar-webpack-plugin (#1215)
    
    * Modify webpack configuration
    
    * Change all Chinese names to English
    
    * add progress-bar-webpack-plugin
    
    * Add method and parameters comments (#1220)
    
    * rename from DatasourceUserMapper to DataSourceUserMapper
    
    * add unit test in UserMapper and WorkerGroupMapper
    
    * change cn.escheduler to org.apache.dolphinscheduler
    
    * add unit test in UdfFuncMapperTest
    
    * add unit test in UdfFuncMapperTest
    
    * remove DatabaseConfiguration
    
    * add ConnectionFactoryTest
    
    * cal duration in processInstancesList
    
    * change desc to description
    
    * change table name in mysql ddl
    
    * change table name in mysql ddl
    
    * change escheduler to dolphinscheduler
    
    * change escheduler to dolphinscheduler
    
    * change escheduler to dolphinscheduler
    
    * remove log4j-1.2-api and modify AlertMapperTest
    
    * remove log4j-1.2-api
    
    * Add alertDao to spring management
    
    * Add alertDao to spring management
    
    * get SqlSessionFactory from MybatisSqlSessionFactoryBean
    
    * get processDao by DaoFactory
    
    * read druid properties in ConneciontFactory
    
    * read druid properties in ConneciontFactory
    
    * change get alertDao by spring to DaoFactory
    
    * add log4j to resolve #967
    
    * resole verify udf name error and delete udf error
    
    * Determine if principal is empty
    
    * Determine whether the logon user has the right to delete the project
    
    * Fixed an issue that produced attatch file named such as ATT00002.bin
    
    * fix too many connection in upgrade or create
    
    * fix NEED_FAULT_TOLERANCE and WAITTING_THREAD count fail
    
    * Added a judgment on whether the currently login user is an administrator
    
    * fix update udf database not change and create time is changed
    
    * add enterprise.wechat.enable to decide whether to send enterprise WeChat
    
    * change method check
    
    * Remove the administrator's judgment on query access token list
    
    * only admin can create worker group
    
    * delete alert group need delete the relation of user and alert group
    
    * add timeout in proxy when upload large resource
    
    * add gets scheduled times by expect fire times
    
    * add gets scheduled times by expect fire times
    
    * Increase the judgment of whether it is admin
    
    * Increase the judgment of whether it is admin
    
    * when delete access token add whether login user has perm to delete
    
    * change mysql-connector-java scope to test
    
    * update scm test
    
    * add profile test
    
    * Add method and parameters comments
    
    * roll back
    
    * add some notes (#1221)
    
    * update english documents
    
    * refactor zk client
    
    * update documents
    
    * update zkclient
    
    * update zkclient
    
    * update documents
    
    * add architecture-design
    
    * change i18n
    
    * update i18n
    
    * update english documents
    
    * add architecture-design
    
    * update english documents
    
    * update en-US documents
    
    * add architecture-design
    
    * update demo site
    
    * add mybatis plus model
    
    * modify mybatisplus
    
    * modify mybatisplus
    
    * change interface by mybatisplus
    
    * add unit test
    
    * refactor dao interface.
    
    * add unit test for dao...
    
    * add unit test for dao...
    
    * add unit test for dao...
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
    
    * update some dao bugs
    
    * update for some bugs
    
    * update some bugs
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
    
    * update
    
    * update
    
    * add multiply settings for application.yml
    
    * add multiply settings for application.yml
    
    * revert
    
    * update configuration settings in task record dao...
    
    * change application_master to application-master
    
    * change application_master to application-master
    
    * update application.yml to application.properties
    
    * revert
    
    * revert
    
    * add properties
    
    * add properties
    
    * revert
    
    * revert
    
    * add api start up..
    add alert send try catch
    
    * update dao info level
    
    * fix bug: task cannot submit when recovery failover
    
    * fix bug: task cannot submit when recovery failover
    
    * merge from dev-db
    
    * revert
    
    * revert
    
    * fix bug: get process definition list failed.
    
    * fix bug: process instance interval is error
    
    * revert
    
    * revert
    
    * update
    
    * support stop submit success tasks
    
    * update kill process
    
    * update for stop process
    
    * update for stop process
    
    * add some logs for stop process
    
    * update for small bug.
    
    * add check strategy before submit task
    
    * revert
    
    * update
    
    * update
    
    * revert
    
    * wait task instance exists if null.
    
    * revert
    
    * update
    
    * change desc to description.
    
    * add check user and definitions function when delete tenant
    
    * update
    
    * change desc to description.
    
    * change desc to description.
    
    * change desc to description.
    
    * remove check resources when delete tenant
    
    * change desc to description.
    
    * change mybatisplus version to 3.2.0
    
    * update
    
    * change the notice to apache.
    
    * update
    
    * update postgre sql
    
    * fix bug: phone can be empty.
    
    * fix bug: postgre test error.
    
    * update create table for postgre quartz
    
    * fix some bugs about postgre.
    
    * update create table for postgre quartz
    
    * add postgre db performance monitor
    
    * add postgre performance monitor
    
    * update performance monitor
    
    * revert
    
    * revert
    
    * fix bug: tasks queue length error
    
    * remove datasource.properties
    
    * change chinese sql to english.
    
    * change chinese sql to english.
    
    * remove unused code.
    
    * remove unused code.
    
    * add some notes
    
    * update some notes
    
    * update some notes
    
    * update mbatisplus version
    
    * update lombok version
    
    * update lombok version
    
    * revert
    
    * merge from dev-db
    
    * remove version
    
    * update npm install pom
    
    * add front assembly
    
    * add front module
    
    * change verison to 1.2.0-release-SNAPSHOT
    
    * add name in pom and remove compile
    
    * add name in pom
    
    * add licenses in assemble
    
    * change version to 1.2.0-RC1-SNAPSHOT (#1255)
    
    * rename from DatasourceUserMapper to DataSourceUserMapper
    
    * add unit test in UserMapper and WorkerGroupMapper
    
    * change cn.escheduler to org.apache.dolphinscheduler
    
    * add unit test in UdfFuncMapperTest
    
    * add unit test in UdfFuncMapperTest
    
    * remove DatabaseConfiguration
    
    * add ConnectionFactoryTest
    
    * cal duration in processInstancesList
    
    * change desc to description
    
    * change table name in mysql ddl
    
    * change table name in mysql ddl
    
    * change escheduler to dolphinscheduler
    
    * change escheduler to dolphinscheduler
    
    * change escheduler to dolphinscheduler
    
    * remove log4j-1.2-api and modify AlertMapperTest
    
    * remove log4j-1.2-api
    
    * Add alertDao to spring management
    
    * Add alertDao to spring management
    
    * get SqlSessionFactory from MybatisSqlSessionFactoryBean
    
    * get processDao by DaoFactory
    
    * read druid properties in ConneciontFactory
    
    * read druid properties in ConneciontFactory
    
    * change get alertDao by spring to DaoFactory
    
    * add log4j to resolve #967
    
    * resole verify udf name error and delete udf error
    
    * Determine if principal is empty
    
    * Determine whether the logon user has the right to delete the project
    
    * Fixed an issue that produced attatch file named such as ATT00002.bin
    
    * fix too many connection in upgrade or create
    
    * fix NEED_FAULT_TOLERANCE and WAITTING_THREAD count fail
    
    * Added a judgment on whether the currently login user is an administrator
    
    * fix update udf database not change and create time is changed
    
    * add enterprise.wechat.enable to decide whether to send enterprise WeChat
    
    * change method check
    
    * Remove the administrator's judgment on query access token list
    
    * only admin can create worker group
    
    * delete alert group need delete the relation of user and alert group
    
    * add timeout in proxy when upload large resource
    
    * add gets scheduled times by expect fire times
    
    * add gets scheduled times by expect fire times
    
    * Increase the judgment of whether it is admin
    
    * Increase the judgment of whether it is admin
    
    * when delete access token add whether login user has perm to delete
    
    * change mysql-connector-java scope to test
    
    * update scm test
    
    * add profile test
    
    * add profile test
    
    * add maven.deploy.skip true
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * add dependency
    
    * add javadoc
    
    * add antrun
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * reset pgsql (#1178)
    
    + 1
    
    * add javadoc
    
    * add javadoc
    
    * [maven-release-plugin] rollback the release of 1.2.0
    
    * add javadoc
    
    * Ans UI upgrade to version 0.1.0 (#1181)
    
    + 1
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * Administrators group prohibit deletion (#1182)
    
    * Ans UI upgrade to version 0.1.0
    
    * Administrators group prohibit deletion
    
    * add javadoc
    
    * add ui pom
    
    * fix master server shutdown error (#1177)
    
    * move updateTaskState into try/catch block in case of exception
    
    * fix NPE
    
    * using conf.getInt instead of getString
    
    * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
    for AlertDao, correct the spelling.
    
    * duplicate
    
    * refactor getTaskWorkerGroupId
    
    * add friendly log
    
    * update hearbeat thread num = 1
    
    * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
    
    * 1. move verifyTaskInstanceIsNull after taskInstance
    2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
    
    * fix the message
    
    * delete before check to avoid KeeperException$NoNodeException
    
    * fix the message
    
    * check processInstance state before delete tenant
    
    * check processInstance state before delete worker group
    
    * refactor
    
    * merge api constants into common constatns
    
    * update the resource perm
    
    * update the dataSource perm
    
    * fix CheckUtils.checkUserParams method
    
    * update AlertGroupService, extends from BaseService, remove duplicate methods
    
    * refactor
    
    * modify method name
    
    * add hasProjectAndPerm method
    
    * using checkProject instead of getResultStatus
    
    * delete checkAuth method, using hasProjectAndPerm instead.
    
    * correct spelling
    
    * add transactional for deleteWorkerGroupById
    
    * add Transactional for deleteProcessInstanceById method
    
    * change sqlSessionTemplate singleton
    
    * change sqlSessionTemplate singleton and reformat code
    
    * fix unsuitable error message
    
    * update shutdownhook methods
    
    * fix worker log bug
    
    * fix api server debug mode bug
    
    * upgrade zk version
    
    * delete this line ,for zkClient.close() will do the whole thing
    
    * fix master server shutdown error
    
    * degrade zk version and add FourLetterWordMain class (#1183)
    
    * move updateTaskState into try/catch block in case of exception
    
    * fix NPE
    
    * using conf.getInt instead of getString
    
    * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
    for AlertDao, correct the spelling.
    
    * duplicate
    
    * refactor getTaskWorkerGroupId
    
    * add friendly log
    
    * update hearbeat thread num = 1
    
    * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
    
    * 1. move verifyTaskInstanceIsNull after taskInstance
    2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
    
    * fix the message
    
    * delete before check to avoid KeeperException$NoNodeException
    
    * fix the message
    
    * check processInstance state before delete tenant
    
    * check processInstance state before delete worker group
    
    * refactor
    
    * merge api constants into common constatns
    
    * update the resource perm
    
    * update the dataSource perm
    
    * fix CheckUtils.checkUserParams method
    
    * update AlertGroupService, extends from BaseService, remove duplicate methods
    
    * refactor
    
    * modify method name
    
    * add hasProjectAndPerm method
    
    * using checkProject instead of getResultStatus
    
    * delete checkAuth method, using hasProjectAndPerm instead.
    
    * correct spelling
    
    * add transactional for deleteWorkerGroupById
    
    * add Transactional for deleteProcessInstanceById method
    
    * change sqlSessionTemplate singleton
    
    * change sqlSessionTemplate singleton and reformat code
    
    * fix unsuitable error message
    
    * update shutdownhook methods
    
    * fix worker log bug
    
    * fix api server debug mode bug
    
    * upgrade zk version
    
    * delete this line ,for zkClient.close() will do the whole thing
    
    * fix master server shutdown error
    
    * degrade zk version and add FourLetterWordMain class
    
    * add ui pom
    
    * add src pom and assembly
    
    * fix ZKWorkerClient not close PathChildrenCache (#1185)
    
    * move updateTaskState into try/catch block in case of exception
    
    * fix NPE
    
    * using conf.getInt instead of getString
    
    * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
    for AlertDao, correct the spelling.
    
    * duplicate
    
    * refactor getTaskWorkerGroupId
    
    * add friendly log
    
    * update hearbeat thread num = 1
    
    * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
    
    * 1. move verifyTaskInstanceIsNull after taskInstance
    2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
    
    * fix the message
    
    * delete before check to avoid KeeperException$NoNodeException
    
    * fix the message
    
    * check processInstance state before delete tenant
    
    * check processInstance state before delete worker group
    
    * refactor
    
    * merge api constants into common constatns
    
    * update the resource perm
    
    * update the dataSource perm
    
    * fix CheckUtils.checkUserParams method
    
    * update AlertGroupService, extends from BaseService, remove duplicate methods
    
    * refactor
    
    * modify method name
    
    * add hasProjectAndPerm method
    
    * using checkProject instead of getResultStatus
    
    * delete checkAuth method, using hasProjectAndPerm instead.
    
    * correct spelling
    
    * add transactional for deleteWorkerGroupById
    
    * add Transactional for deleteProcessInstanceById method
    
    * change sqlSessionTemplate singleton
    
    * change sqlSessionTemplate singleton and reformat code
    
    * fix unsuitable error message
    
    * update shutdownhook methods
    
    * fix worker log bug
    
    * fix api server debug mode bug
    
    * upgrade zk version
    
    * delete this line ,for zkClient.close() will do the whole thing
    
    * fix master server shutdown error
    
    * degrade zk version and add FourLetterWordMain class
    
    * fix PathChildrenCache not close
    
    * add Transactional for createSession method (#1186)
    
    * move updateTaskState into try/catch block in case of exception
    
    * fix NPE
    
    * using conf.getInt instead of getString
    
    * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
    for AlertDao, correct the spelling.
    
    * duplicate
    
    * refactor getTaskWorkerGroupId
    
    * add friendly log
    
    * update hearbeat thread num = 1
    
    * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
    
    * 1. move verifyTaskInstanceIsNull after taskInstance
    2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
    
    * fix the message
    
    * delete before check to avoid KeeperException$NoNodeException
    
    * fix the message
    
    * check processInstance state before delete tenant
    
    * check processInstance state before delete worker group
    
    * refactor
    
    * merge api constants into common constatns
    
    * update the resource perm
    
    * update the dataSource perm
    
    * fix CheckUtils.checkUserParams method
    
    * update AlertGroupService, extends from BaseService, remove duplicate methods
    
    * refactor
    
    * modify method name
    
    * add hasProjectAndPerm method
    
    * using checkProject instead of getResultStatus
    
    * delete checkAuth method, using hasProjectAndPerm instead.
    
    * correct spelling
    
    * add transactional for deleteWorkerGroupById
    
    * add Transactional for deleteProcessInstanceById method
    
    * change sqlSessionTemplate singleton
    
    * change sqlSessionTemplate singleton and reformat code
    
    * fix unsuitable error message
    
    * update shutdownhook methods
    
    * fix worker log bug
    
    * fix api server debug mode bug
    
    * upgrade zk version
    
    * delete this line ,for zkClient.close() will do the whole thing
    
    * fix master server shutdown error
    
    * degrade zk version and add FourLetterWordMain class
    
    * fix PathChildrenCache not close
    
    * add Transactional for createSession method
    
    * add src pom and assembly
    
    * add src pom and assembly
    
    * add src pom and assembly
    
    * add src pom and assembly
    
    * dockerfile dao application.properties ,install.sh modify and application.properties modify (#1187)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * add src pom and assembly
    
    * add src pom and assembly
    
    * dockerfile startup.sh modify (#1189)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs (#1191)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs
    
    * nginx conf modify
    
    * dockerfile application.properties modify
    
    * dockerfile conf modify (#1192)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs
    
    * nginx conf modify
    
    * dockerfile application.properties modify
    
    * dockerfile conf modify (#1193)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs
    
    * nginx conf modify
    
    * dockerfile application.properties modify
    
    * dockerfile email address change (#1194)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs
    
    * nginx conf modify
    
    * dockerfile application.properties modify
    
    * dockerfile email address change
    
    * the alert module is modified in english (#1195)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs
    
    * nginx conf modify
    
    * dockerfile application.properties modify
    
    * dockerfile email address change
    
    * the alert module is modified in English.
    
    * alert server comment and chinese modify
    
    * api server useless code and chinese modify (#1198)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs
    
    * nginx conf modify
    
    * dockerfile application.properties modify
    
    * dockerfile email address change
    
    * the alert module is modified in English.
    
    * alert server comment and chinese modify
    
    * api server useless code and chinese modify
    
    * common,dao,server useless code and chinese modify (#1199)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs
    
    * nginx conf modify
    
    * dockerfile application.properties modify
    
    * dockerfile email address change
    
    * the alert module is modified in English.
    
    * alert server comment and chinese modify
    
    * api server useless code and chinese modify
    
    * common,dao,server useless code and chinese modify
    
    * change chinese sql to english. (#1200)
    
    * update english documents
    
    * refactor zk client
    
    * update documents
    
    * update zkclient
    
    * update zkclient
    
    * update documents
    
    * add architecture-design
    
    * change i18n
    
    * update i18n
    
    * update english documents
    
    * add architecture-design
    
    * update english documents
    
    * update en-US documents
    
    * add architecture-design
    
    * update demo site
    
    * add mybatis plus model
    
    * modify mybatisplus
    
    * modify mybatisplus
    
    * change interface by mybatisplus
    
    * add unit test
    
    * refactor dao interface.
    
    * add unit test for dao...
    
    * add unit test for dao...
    
    * add unit test for dao...
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
    
    * update some dao bugs
    
    * update for some bugs
    
    * update some bugs
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
    
    * update
    
    * update
    
    * add multiply settings for application.yml
    
    * add multiply settings for application.yml
    
    * revert
    
    * update configuration settings in task record dao...
    
    * change application_master to application-master
    
    * change application_master to application-master
    
    * update application.yml to application.properties
    
    * revert
    
    * revert
    
    * add properties
    
    * add properties
    
    * revert
    
    * revert
    
    * add api start up..
    add alert send try catch
    
    * update dao info level
    
    * fix bug: task cannot submit when recovery failover
    
    * fix bug: task cannot submit when recovery failover
    
    * merge from dev-db
    
    * revert
    
    * revert
    
    * fix bug: get process definition list failed.
    
    * fix bug: process instance interval is error
    
    * revert
    
    * revert
    
    * update
    
    * support stop submit success tasks
    
    * update kill process
    
    * update for stop process
    
    * update for stop process
    
    * add some logs for stop process
    
    * update for small bug.
    
    * add check strategy before submit task
    
    * revert
    
    * update
    
    * update
    
    * revert
    
    * wait task instance exists if null.
    
    * revert
    
    * update
    
    * change desc to description.
    
    * add check user and definitions function when delete tenant
    
    * update
    
    * change desc to description.
    
    * change desc to description.
    
    * change desc to description.
    
    * remove check resources when delete tenant
    
    * change desc to description.
    
    * change mybatisplus version to 3.2.0
    
    * update
    
    * change the notice to apache.
    
    * update
    
    * update postgre sql
    
    * fix bug: phone can be empty.
    
    * fix bug: postgre test error.
    
    * update create table for postgre quartz
    
    * fix some bugs about postgre.
    
    * update create table for postgre quartz
    
    * add postgre db performance monitor
    
    * add postgre performance monitor
    
    * update performance monitor
    
    * revert
    
    * revert
    
    * fix bug: tasks queue length error
    
    * remove datasource.properties
    
    * change chinese sql to english.
    
    * change chinese sql to english.
    
    * change chinese to english (#1202)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs
    
    * nginx conf modify
    
    * dockerfile application.properties modify
    
    * dockerfile email address change
    
    * the alert module is modified in English.
    
    * alert server comment and chinese modify
    
    * api server useless code and chinese modify
    
    * common,dao,server useless code and chinese modify
    
    * change chinese to english
    
    * remove unused code (#1204)
    
    * update english documents
    
    * refactor zk client
    
    * update documents
    
    * update zkclient
    
    * update zkclient
    
    * update documents
    
    * add architecture-design
    
    * change i18n
    
    * update i18n
    
    * update english documents
    
    * add architecture-design
    
    * update english documents
    
    * update en-US documents
    
    * add architecture-design
    
    * update demo site
    
    * add mybatis plus model
    
    * modify mybatisplus
    
    * modify mybatisplus
    
    * change interface by mybatisplus
    
    * add unit test
    
    * refactor dao interface.
    
    * add unit test for dao...
    
    * add unit test for dao...
    
    * add unit test for dao...
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
    
    * update some dao bugs
    
    * update for some bugs
    
    * update some bugs
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
    
    * update
    
    * update
    
    * add multiply settings for application.yml
    
    * add multiply settings for application.yml
    
    * revert
    
    * update configuration settings in task record dao...
    
    * change application_master to application-master
    
    * change application_master to application-master
    
    * update application.yml to application.properties
    
    * revert
    
    * revert
    
    * add properties
    
    * add properties
    
    * revert
    
    * revert
    
    * add api start up..
    add alert send try catch
    
    * update dao info level
    
    * fix bug: task cannot submit when recovery failover
    
    * fix bug: task cannot submit when recovery failover
    
    * merge from dev-db
    
    * revert
    
    * revert
    
    * fix bug: get process definition list failed.
    
    * fix bug: process instance interval is error
    
    * revert
    
    * revert
    
    * update
    
    * support stop submit success tasks
    
    * update kill process
    
    * update for stop process
    
    * update for stop process
    
    * add some logs for stop process
    
    * update for small bug.
    
    * add check strategy before submit task
    
    * revert
    
    * update
    
    * update
    
    * revert
    
    * wait task instance exists if null.
    
    * revert
    
    * update
    
    * change desc to description.
    
    * add check user and definitions function when delete tenant
    
    * update
    
    * change desc to description.
    
    * change desc to description.
    
    * change desc to description.
    
    * remove check resources when delete tenant
    
    * change desc to description.
    
    * change mybatisplus version to 3.2.0
    
    * update
    
    * change the notice to apache.
    
    * update
    
    * update postgre sql
    
    * fix bug: phone can be empty.
    
    * fix bug: postgre test error.
    
    * update create table for postgre quartz
    
    * fix some bugs about postgre.
    
    * update create table for postgre quartz
    
    * add postgre db performance monitor
    
    * add postgre performance monitor
    
    * update performance monitor
    
    * revert
    
    * revert
    
    * fix bug: tasks queue length error
    
    * remove datasource.properties
    
    * change chinese sql to english.
    
    * change chinese sql to english.
    
    * remove unused code.
    
    * remove unused code.
    
    * Modify webpack configuration (#1206)
    
    * add more message for java-doc (#1209)
    
    * move updateTaskState into try/catch block in case of exception
    
    * fix NPE
    
    * using conf.getInt instead of getString
    
    * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
    for AlertDao, correct the spelling.
    
    * duplicate
    
    * refactor getTaskWorkerGroupId
    
    * add friendly log
    
    * update hearbeat thread num = 1
    
    * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
    
    * 1. move verifyTaskInstanceIsNull after taskInstance
    2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
    
    * fix the message
    
    * delete before check to avoid KeeperException$NoNodeException
    
    * fix the message
    
    * check processInstance state before delete tenant
    
    * check processInstance state before delete worker group
    
    * refactor
    
    * merge api constants into common constatns
    
    * update the resource perm
    
    * update the dataSource perm
    
    * fix CheckUtils.checkUserParams method
    
    * update AlertGroupService, extends from BaseService, remove duplicate methods
    
    * refactor
    
    * modify method name
    
    * add hasProjectAndPerm method
    
    * using checkProject instead of getResultStatus
    
    * delete checkAuth method, using hasProjectAndPerm instead.
    
    * correct spelling
    
    * add transactional for deleteWorkerGroupById
    
    * add Transactional for deleteProcessInstanceById method
    
    * change sqlSessionTemplate singleton
    
    * change sqlSessionTemplate singleton and reformat code
    
    * fix unsuitable error message
    
    * update shutdownhook methods
    
    * fix worker log bug
    
    * fix api server debug mode bug
    
    * upgrade zk version
    
    * delete this line ,for zkClient.close() will do the whole thing
    
    * fix master server shutdown error
    
    * degrade zk version and add FourLetterWordMain class
    
    * fix PathChildrenCache not close
    
    * add Transactional for createSession method
    
    * add more message for java-doc
    
    * add java doc for common module (#1213)
    
    * dao method comments and useless code modify (#1214)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs
    
    * nginx conf modify
    
    * dockerfile application.properties modify
    
    * dockerfile email address change
    
    * the alert module is modified in English.
    
    * alert server comment and chinese modify
    
    * api server useless code and chinese modify
    
    * common,dao,server useless code and chinese modify
    
    * change chinese to english
    
    * dao method comments and useless code modify
    
    * Change all Chinese names to English (#1207)
    
    * Modify webpack configuration
    
    * Change all Chinese names to English
    
    * add progress-bar-webpack-plugin (#1215)
    
    * Modify webpack configuration
    
    * Change all Chinese names to English
    
    * add progress-bar-webpack-plugin
    
    * Add method and parameters comments (#1220)
    
    * rename from DatasourceUserMapper to DataSourceUserMapper
    
    * add unit test in UserMapper and WorkerGroupMapper
    
    * change cn.escheduler to org.apache.dolphinscheduler
    
    * add unit test in UdfFuncMapperTest
    
    * add unit test in UdfFuncMapperTest
    
    * remove DatabaseConfiguration
    
    * add ConnectionFactoryTest
    
    * cal duration in processInstancesList
    
    * change desc to description
    
    * change table name in mysql ddl
    
    * change table name in mysql ddl
    
    * change escheduler to dolphinscheduler
    
    * change escheduler to dolphinscheduler
    
    * change escheduler to dolphinscheduler
    
    * remove log4j-1.2-api and modify AlertMapperTest
    
    * remove log4j-1.2-api
    
    * Add alertDao to spring management
    
    * Add alertDao to spring management
    
    * get SqlSessionFactory from MybatisSqlSessionFactoryBean
    
    * get processDao by DaoFactory
    
    * read druid properties in ConneciontFactory
    
    * read druid properties in ConneciontFactory
    
    * change get alertDao by spring to DaoFactory
    
    * add log4j to resolve #967
    
    * resole verify udf name error and delete udf error
    
    * Determine if principal is empty
    
    * Determine whether the logon user has the right to delete the project
    
    * Fixed an issue that produced attatch file named such as ATT00002.bin
    
    * fix too many connection in upgrade or create
    
    * fix NEED_FAULT_TOLERANCE and WAITTING_THREAD count fail
    
    * Added a judgment on whether the currently login user is an administrator
    
    * fix update udf database not change and create time is changed
    
    * add enterprise.wechat.enable to decide whether to send enterprise WeChat
    
    * change method check
    
    * Remove the administrator's judgment on query access token list
    
    * only admin can create worker group
    
    * delete alert group need delete the relation of user and alert group
    
    * add timeout in proxy when upload large resource
    
    * add gets scheduled times by expect fire times
    
    * add gets scheduled times by expect fire times
    
    * Increase the judgment of whether it is admin
    
    * Increase the judgment of whether it is admin
    
    * when delete access token add whether login user has perm to delete
    
    * change mysql-connector-java scope to test
    
    * update scm test
    
    * add profile test
    
    * Add method and parameters comments
    
    * roll back
    
    * add some notes (#1221)
    
    * update english documents
    
    * refactor zk client
    
    * update documents
    
    * update zkclient
    
    * update zkclient
    
    * update documents
    
    * add architecture-design
    
    * change i18n
    
    * update i18n
    
    * update english documents
    
    * add architecture-design
    
    * update english documents
    
    * update en-US documents
    
    * add architecture-design
    
    * update demo site
    
    * add mybatis plus model
    
    * modify mybatisplus
    
    * modify mybatisplus
    
    * change interface by mybatisplus
    
    * add unit test
    
    * refactor dao interface.
    
    * add unit test for dao...
    
    * add unit test for dao...
    
    * add unit test for dao...
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
    
    * update some dao bugs
    
    * update for some bugs
    
    * update some bugs
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
    
    * update
    
    * update
    
    * add multiply settings for application.yml
    
    * add multiply settings for application.yml
    
    * revert
    
    * update configuration settings in task record dao...
    
    * change application_master to application-master
    
    * change application_master to application-master
    
    * update application.yml to application.properties
    
    * revert
    
    * revert
    
    * add properties
    
    * add properties
    
    * revert
    
    * revert
    
    * add api start up..
    add alert send try catch
    
    * update dao info level
    
    * fix bug: task cannot submit when recovery failover
    
    * fix bug: task cannot submit when recovery failover
    
    * merge from dev-db
    
    * revert
    
    * revert
    
    * fix bug: get process definition list failed.
    
    * fix bug: process instance interval is error
    
    * revert
    
    * revert
    
    * update
    
    * support stop submit success tasks
    
    * update kill process
    
    * update for stop process
    
    * update for stop process
    
    * add some logs for stop process
    
    * update for small bug.
    
    * add check strategy before submit task
    
    * revert
    
    * update
    
    * update
    
    * revert
    
    * wait task instance exists if null.
    
    * revert
    
    * update
    
    * change desc to description.
    
    * add check user and definitions function when delete tenant
    
    * update
    
    * change desc to description.
    
    * change desc to description.
    
    * change desc to description.
    
    * remove check resources when delete tenant
    
    * change desc to description.
    
    * change mybatisplus version to 3.2.0
    
    * update
    
    * change the notice to apache.
    
    * update
    
    * update postgre sql
    
    * fix bug: phone can be empty.
    
    * fix bug: postgre test error.
    
    * update create table for postgre quartz
    
    * fix some bugs about postgre.
    
    * update create table for postgre quartz
    
    * add postgre db performance monitor
    
    * add postgre performance monitor
    
    * update performance monitor
    
    * revert
    
    * revert
    
    * fix bug: tasks queue length error
    
    * remove datasource.properties
    
    * change chinese sql to english.
    
    * change chinese sql to english.
    
    * remove unused code.
    
    * remove unused code.
    
    * add some notes
    
    * update some notes
    
    * update some notes
    
    * update mbatisplus version
    
    * update lombok version
    
    * update lombok version
    
    * revert
    
    * merge from dev-db
    
    * remove version
    
    * update npm install pom
    
    * add front assembly
    
    * add front module
    
    * change verison to 1.2.0-release-SNAPSHOT
    
    * add name in pom and remove compile
    
    * add name in pom
    
    * add licenses in assemble
    
    * change version to 1.2.0-RC1-SNAPSHOT
    
    * [maven-release-plugin] prepare release 1.2.0-RC1
    
    * [maven-release-plugin] prepare for next development iteration
    
    * change assembly id (#1261)
    
    * rename from DatasourceUserMapper to DataSourceUserMapper
    
    * add unit test in UserMapper and WorkerGroupMapper
    
    * change cn.escheduler to org.apache.dolphinscheduler
    
    * add unit test in UdfFuncMapperTest
    
    * add unit test in UdfFuncMapperTest
    
    * remove DatabaseConfiguration
    
    * add ConnectionFactoryTest
    
    * cal duration in processInstancesList
    
    * change desc to description
    
    * change table name in mysql ddl
    
    * change table name in mysql ddl
    
    * change escheduler to dolphinscheduler
    
    * change escheduler to dolphinscheduler
    
    * change escheduler to dolphinscheduler
    
    * remove log4j-1.2-api and modify AlertMapperTest
    
    * remove log4j-1.2-api
    
    * Add alertDao to spring management
    
    * Add alertDao to spring management
    
    * get SqlSessionFactory from MybatisSqlSessionFactoryBean
    
    * get processDao by DaoFactory
    
    * read druid properties in ConneciontFactory
    
    * read druid properties in ConneciontFactory
    
    * change get alertDao by spring to DaoFactory
    
    * add log4j to resolve #967
    
    * resole verify udf name error and delete udf error
    
    * Determine if principal is empty
    
    * Determine whether the logon user has the right to delete the project
    
    * Fixed an issue that produced attatch file named such as ATT00002.bin
    
    * fix too many connection in upgrade or create
    
    * fix NEED_FAULT_TOLERANCE and WAITTING_THREAD count fail
    
    * Added a judgment on whether the currently login user is an administrator
    
    * fix update udf database not change and create time is changed
    
    * add enterprise.wechat.enable to decide whether to send enterprise WeChat
    
    * change method check
    
    * Remove the administrator's judgment on query access token list
    
    * only admin can create worker group
    
    * delete alert group need delete the relation of user and alert group
    
    * add timeout in proxy when upload large resource
    
    * add gets scheduled times by expect fire times
    
    * add gets scheduled times by expect fire times
    
    * Increase the judgment of whether it is admin
    
    * Increase the judgment of whether it is admin
    
    * when delete access token add whether login user has perm to delete
    
    * change mysql-connector-java scope to test
    
    * update scm test
    
    * add profile test
    
    * add profile test
    
    * add maven.deploy.skip true
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * add dependency
    
    * add javadoc
    
    * add antrun
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * reset pgsql (#1178)
    
    + 1
    
    * add javadoc
    
    * add javadoc
    
    * [maven-release-plugin] rollback the release of 1.2.0
    
    * add javadoc
    
    * Ans UI upgrade to version 0.1.0 (#1181)
    
    + 1
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * Administrators group prohibit deletion (#1182)
    
    * Ans UI upgrade to version 0.1.0
    
    * Administrators group prohibit deletion
    
    * add javadoc
    
    * add ui pom
    
    * fix master server shutdown error (#1177)
    
    * move updateTaskState into try/catch block in case of exception
    
    * fix NPE
    
    * using conf.getInt instead of getString
    
    * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
    for AlertDao, correct the spelling.
    
    * duplicate
    
    * refactor getTaskWorkerGroupId
    
    * add friendly log
    
    * update hearbeat thread num = 1
    
    * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
    
    * 1. move verifyTaskInstanceIsNull after taskInstance
    2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
    
    * fix the message
    
    * delete before check to avoid KeeperException$NoNodeException
    
    * fix the message
    
    * check processInstance state before delete tenant
    
    * check processInstance state before delete worker group
    
    * refactor
    
    * merge api constants into common constatns
    
    * update the resource perm
    
    * update the dataSource perm
    
    * fix CheckUtils.checkUserParams method
    
    * update AlertGroupService, extends from BaseService, remove duplicate methods
    
    * refactor
    
    * modify method name
    
    * add hasProjectAndPerm method
    
    * using checkProject instead of getResultStatus
    
    * delete checkAuth method, using hasProjectAndPerm instead.
    
    * correct spelling
    
    * add transactional for deleteWorkerGroupById
    
    * add Transactional for deleteProcessInstanceById method
    
    * change sqlSessionTemplate singleton
    
    * change sqlSessionTemplate singleton and reformat code
    
    * fix unsuitable error message
    
    * update shutdownhook methods
    
    * fix worker log bug
    
    * fix api server debug mode bug
    
    * upgrade zk version
    
    * delete this line ,for zkClient.close() will do the whole thing
    
    * fix master server shutdown error
    
    * degrade zk version and add FourLetterWordMain class (#1183)
    
    * move updateTaskState into try/catch block in case of exception
    
    * fix NPE
    
    * using conf.getInt instead of getString
    
    * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
    for AlertDao, correct the spelling.
    
    * duplicate
    
    * refactor getTaskWorkerGroupId
    
    * add friendly log
    
    * update hearbeat thread num = 1
    
    * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
    
    * 1. move verifyTaskInstanceIsNull after taskInstance
    2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
    
    * fix the message
    
    * delete before check to avoid KeeperException$NoNodeException
    
    * fix the message
    
    * check processInstance state before delete tenant
    
    * check processInstance state before delete worker group
    
    * refactor
    
    * merge api constants into common constatns
    
    * update the resource perm
    
    * update the dataSource perm
    
    * fix CheckUtils.checkUserParams method
    
    * update AlertGroupService, extends from BaseService, remove duplicate methods
    
    * refactor
    
    * modify method name
    
    * add hasProjectAndPerm method
    
    * using checkProject instead of getResultStatus
    
    * delete checkAuth method, using hasProjectAndPerm instead.
    
    * correct spelling
    
    * add transactional for deleteWorkerGroupById
    
    * add Transactional for deleteProcessInstanceById method
    
    * change sqlSessionTemplate singleton
    
    * change sqlSessionTemplate singleton and reformat code
    
    * fix unsuitable error message
    
    * update shutdownhook methods
    
    * fix worker log bug
    
    * fix api server debug mode bug
    
    * upgrade zk version
    
    * delete this line ,for zkClient.close() will do the whole thing
    
    * fix master server shutdown error
    
    * degrade zk version and add FourLetterWordMain class
    
    * add ui pom
    
    * add src pom and assembly
    
    * fix ZKWorkerClient not close PathChildrenCache (#1185)
    
    * move updateTaskState into try/catch block in case of exception
    
    * fix NPE
    
    * using conf.getInt instead of getString
    
    * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
    for AlertDao, correct the spelling.
    
    * duplicate
    
    * refactor getTaskWorkerGroupId
    
    * add friendly log
    
    * update hearbeat thread num = 1
    
    * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
    
    * 1. move verifyTaskInstanceIsNull after taskInstance
    2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
    
    * fix the message
    
    * delete before check to avoid KeeperException$NoNodeException
    
    * fix the message
    
    * check processInstance state before delete tenant
    
    * check processInstance state before delete worker group
    
    * refactor
    
    * merge api constants into common constatns
    
    * update the resource perm
    
    * update the dataSource perm
    
    * fix CheckUtils.checkUserParams method
    
    * update AlertGroupService, extends from BaseService, remove duplicate methods
    
    * refactor
    
    * modify method name
    
    * add hasProjectAndPerm method
    
    * using checkProject instead of getResultStatus
    
    * delete checkAuth method, using hasProjectAndPerm instead.
    
    * correct spelling
    
    * add transactional for deleteWorkerGroupById
    
    * add Transactional for deleteProcessInstanceById method
    
    * change sqlSessionTemplate singleton
    
    * change sqlSessionTemplate singleton and reformat code
    
    * fix unsuitable error message
    
    * update shutdownhook methods
    
    * fix worker log bug
    
    * fix api server debug mode bug
    
    * upgrade zk version
    
    * delete this line ,for zkClient.close() will do the whole thing
    
    * fix master server shutdown error
    
    * degrade zk version and add FourLetterWordMain class
    
    * fix PathChildrenCache not close
    
    * add Transactional for createSession method (#1186)
    
    * move updateTaskState into try/catch block in case of exception
    
    * fix NPE
    
    * using conf.getInt instead of getString
    
    * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
    for AlertDao, correct the spelling.
    
    * duplicate
    
    * refactor getTaskWorkerGroupId
    
    * add friendly log
    
    * update hearbeat thread num = 1
    
    * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
    
    * 1. move verifyTaskInstanceIsNull after taskInstance
    2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
    
    * fix the message
    
    * delete before check to avoid KeeperException$NoNodeException
    
    * fix the message
    
    * check processInstance state before delete tenant
    
    * check processInstance state before delete worker group
    
    * refactor
    
    * merge api constants into common constatns
    
    * update the resource perm
    
    * update the dataSource perm
    
    * fix CheckUtils.checkUserParams method
    
    * update AlertGroupService, extends from BaseService, remove duplicate methods
    
    * refactor
    
    * modify method name
    
    * add hasProjectAndPerm method
    
    * using checkProject instead of getResultStatus
    
    * delete checkAuth method, using hasProjectAndPerm instead.
    
    * correct spelling
    
    * add transactional for deleteWorkerGroupById
    
    * add Transactional for deleteProcessInstanceById method
    
    * change sqlSessionTemplate singleton
    
    * change sqlSessionTemplate singleton and reformat code
    
    * fix unsuitable error message
    
    * update shutdownhook methods
    
    * fix worker log bug
    
    * fix api server debug mode bug
    
    * upgrade zk version
    
    * delete this line ,for zkClient.close() will do the whole thing
    
    * fix master server shutdown error
    
    * degrade zk version and add FourLetterWordMain class
    
    * fix PathChildrenCache not close
    
    * add Transactional for createSession method
    
    * add src pom and assembly
    
    * add src pom and assembly
    
    * add src pom and assembly
    
    * add src pom and assembly
    
    * dockerfile dao application.properties ,install.sh modify and application.properties modify (#1187)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * add src pom and assembly
    
    * add src pom and assembly
    
    * dockerfile startup.sh modify (#1189)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs (#1191)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs
    
    * nginx conf modify
    
    * dockerfile application.properties modify
    
    * dockerfile conf modify (#1192)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs
    
    * nginx conf modify
    
    * dockerfile application.properties modify
    
    * dockerfile conf modify (#1193)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs
    
    * nginx conf modify
    
    * dockerfile application.properties modify
    
    * dockerfile email address change (#1194)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs
    
    * nginx conf modify
    
    * dockerfile application.properties modify
    
    * dockerfile email address change
    
    * the alert module is modified in english (#1195)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs
    
    * nginx conf modify
    
    * dockerfile application.properties modify
    
    * dockerfile email address change
    
    * the alert module is modified in English.
    
    * alert server comment and chinese modify
    
    * api server useless code and chinese modify (#1198)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs
    
    * nginx conf modify
    
    * dockerfile application.properties modify
    
    * dockerfile email address change
    
    * the alert module is modified in English.
    
    * alert server comment and chinese modify
    
    * api server useless code and chinese modify
    
    * common,dao,server useless code and chinese modify (#1199)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs
    
    * nginx conf modify
    
    * dockerfile application.properties modify
    
    * dockerfile email address change
    
    * the alert module is modified in English.
    
    * alert server comment and chinese modify
    
    * api server useless code and chinese modify
    
    * common,dao,server useless code and chinese modify
    
    * change chinese sql to english. (#1200)
    
    * update english documents
    
    * refactor zk client
    
    * update documents
    
    * update zkclient
    
    * update zkclient
    
    * update documents
    
    * add architecture-design
    
    * change i18n
    
    * update i18n
    
    * update english documents
    
    * add architecture-design
    
    * update english documents
    
    * update en-US documents
    
    * add architecture-design
    
    * update demo site
    
    * add mybatis plus model
    
    * modify mybatisplus
    
    * modify mybatisplus
    
    * change interface by mybatisplus
    
    * add unit test
    
    * refactor dao interface.
    
    * add unit test for dao...
    
    * add unit test for dao...
    
    * add unit test for dao...
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
    
    * update some dao bugs
    
    * update for some bugs
    
    * update some bugs
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
    
    * update
    
    * update
    
    * add multiply settings for application.yml
    
    * add multiply settings for application.yml
    
    * revert
    
    * update configuration settings in task record dao...
    
    * change application_master to application-master
    
    * change application_master to application-master
    
    * update application.yml to application.properties
    
    * revert
    
    * revert
    
    * add properties
    
    * add properties
    
    * revert
    
    * revert
    
    * add api start up..
    add alert send try catch
    
    * update dao info level
    
    * fix bug: task cannot submit when recovery failover
    
    * fix bug: task cannot submit when recovery failover
    
    * merge from dev-db
    
    * revert
    
    * revert
    
    * fix bug: get process definition list failed.
    
    * fix bug: process instance interval is error
    
    * revert
    
    * revert
    
    * update
    
    * support stop submit success tasks
    
    * update kill process
    
    * update for stop process
    
    * update for stop process
    
    * add some logs for stop process
    
    * update for small bug.
    
    * add check strategy before submit task
    
    * revert
    
    * update
    
    * update
    
    * revert
    
    * wait task instance exists if null.
    
    * revert
    
    * update
    
    * change desc to description.
    
    * add check user and definitions function when delete tenant
    
    * update
    
    * change desc to description.
    
    * change desc to description.
    
    * change desc to description.
    
    * remove check resources when delete tenant
    
    * change desc to description.
    
    * change mybatisplus version to 3.2.0
    
    * update
    
    * change the notice to apache.
    
    * update
    
    * update postgre sql
    
    * fix bug: phone can be empty.
    
    * fix bug: postgre test error.
    
    * update create table for postgre quartz
    
    * fix some bugs about postgre.
    
    * update create table for postgre quartz
    
    * add postgre db performance monitor
    
    * add postgre performance monitor
    
    * update performance monitor
    
    * revert
    
    * revert
    
    * fix bug: tasks queue length error
    
    * remove datasource.properties
    
    * change chinese sql to english.
    
    * change chinese sql to english.
    
    * change chinese to english (#1202)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs
    
    * nginx conf modify
    
    * dockerfile application.properties modify
    
    * dockerfile email address change
    
    * the alert module is modified in English.
    
    * alert server comment and chinese modify
    
    * api server useless code and chinese modify
    
    * common,dao,server useless code and chinese modify
    
    * change chinese to english
    
    * remove unused code (#1204)
    
    * update english documents
    
    * refactor zk client
    
    * update documents
    
    * update zkclient
    
    * update zkclient
    
    * update documents
    
    * add architecture-design
    
    * change i18n
    
    * update i18n
    
    * update english documents
    
    * add architecture-design
    
    * update english documents
    
    * update en-US documents
    
    * add architecture-design
    
    * update demo site
    
    * add mybatis plus model
    
    * modify mybatisplus
    
    * modify mybatisplus
    
    * change interface by mybatisplus
    
    * add unit test
    
    * refactor dao interface.
    
    * add unit test for dao...
    
    * add unit test for dao...
    
    * add unit test for dao...
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
    
    * update some dao bugs
    
    * update for some bugs
    
    * update some bugs
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
    
    * update
    
    * update
    
    * add multiply settings for application.yml
    
    * add multiply settings for application.yml
    
    * revert
    
    * update configuration settings in task record dao...
    
    * change application_master to application-master
    
    * change application_master to application-master
    
    * update application.yml to application.properties
    
    * revert
    
    * revert
    
    * add properties
    
    * add properties
    
    * revert
    
    * revert
    
    * add api start up..
    add alert send try catch
    
    * update dao info level
    
    * fix bug: task cannot submit when recovery failover
    
    * fix bug: task cannot submit when recovery failover
    
    * merge from dev-db
    
    * revert
    
    * revert
    
    * fix bug: get process definition list failed.
    
    * fix bug: process instance interval is error
    
    * revert
    
    * revert
    
    * update
    
    * support stop submit success tasks
    
    * update kill process
    
    * update for stop process
    
    * update for stop process
    
    * add some logs for stop process
    
    * update for small bug.
    
    * add check strategy before submit task
    
    * revert
    
    * update
    
    * update
    
    * revert
    
    * wait task instance exists if null.
    
    * revert
    
    * update
    
    * change desc to description.
    
    * add check user and definitions function when delete tenant
    
    * update
    
    * change desc to description.
    
    * change desc to description.
    
    * change desc to description.
    
    * remove check resources when delete tenant
    
    * change desc to description.
    
    * change mybatisplus version to 3.2.0
    
    * update
    
    * change the notice to apache.
    
    * update
    
    * update postgre sql
    
    * fix bug: phone can be empty.
    
    * fix bug: postgre test error.
    
    * update create table for postgre quartz
    
    * fix some bugs about postgre.
    
    * update create table for postgre quartz
    
    * add postgre db performance monitor
    
    * add postgre performance monitor
    
    * update performance monitor
    
    * revert
    
    * revert
    
    * fix bug: tasks queue length error
    
    * remove datasource.properties
    
    * change chinese sql to english.
    
    * change chinese sql to english.
    
    * remove unused code.
    
    * remove unused code.
    
    * Modify webpack configuration (#1206)
    
    * add more message for java-doc (#1209)
    
    * move updateTaskState into try/catch block in case of exception
    
    * fix NPE
    
    * using conf.getInt instead of getString
    
    * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
    for AlertDao, correct the spelling.
    
    * duplicate
    
    * refactor getTaskWorkerGroupId
    
    * add friendly log
    
    * update hearbeat thread num = 1
    
    * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
    
    * 1. move verifyTaskInstanceIsNull after taskInstance
    2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
    
    * fix the message
    
    * delete before check to avoid KeeperException$NoNodeException
    
    * fix the message
    
    * check processInstance state before delete tenant
    
    * check processInstance state before delete worker group
    
    * refactor
    
    * merge api constants into common constatns
    
    * update the resource perm
    
    * update the dataSource perm
    
    * fix CheckUtils.checkUserParams method
    
    * update AlertGroupService, extends from BaseService, remove duplicate methods
    
    * refactor
    
    * modify method name
    
    * add hasProjectAndPerm method
    
    * using checkProject instead of getResultStatus
    
    * delete checkAuth method, using hasProjectAndPerm instead.
    
    * correct spelling
    
    * add transactional for deleteWorkerGroupById
    
    * add Transactional for deleteProcessInstanceById method
    
    * change sqlSessionTemplate singleton
    
    * change sqlSessionTemplate singleton and reformat code
    
    * fix unsuitable error message
    
    * update shutdownhook methods
    
    * fix worker log bug
    
    * fix api server debug mode bug
    
    * upgrade zk version
    
    * delete this line ,for zkClient.close() will do the whole thing
    
    * fix master server shutdown error
    
    * degrade zk version and add FourLetterWordMain class
    
    * fix PathChildrenCache not close
    
    * add Transactional for createSession method
    
    * add more message for java-doc
    
    * add java doc for common module (#1213)
    
    * dao method comments and useless code modify (#1214)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs
    
    * nginx conf modify
    
    * dockerfile application.properties modify
    
    * dockerfile email address change
    
    * the alert module is modified in English.
    
    * alert server comment and chinese modify
    
    * api server useless code and chinese modify
    
    * common,dao,server useless code and chinese modify
    
    * change chinese to english
    
    * dao method comments and useless code modify
    
    * Change all Chinese names to English (#1207)
    
    * Modify webpack configuration
    
    * Change all Chinese names to English
    
    * add progress-bar-webpack-plugin (#1215)
    
    * Modify webpack configuration
    
    * Change all Chinese names to English
    
    * add progress-bar-webpack-plugin
    
    * Add method and parameters comments (#1220)
    
    * rename from DatasourceUserMapper to DataSourceUserMapper
    
    * add unit test in UserMapper and WorkerGroupMapper
    
    * change cn.escheduler to org.apache.dolphinscheduler
    
    * add unit test in UdfFuncMapperTest
    
    * add unit test in UdfFuncMapperTest
    
    * remove DatabaseConfiguration
    
    * add ConnectionFactoryTest
    
    * cal duration in processInstancesList
    
    * change desc to description
    
    * change table name in mysql ddl
    
    * change table name in mysql ddl
    
    * change escheduler to dolphinscheduler
    
    * change escheduler to dolphinscheduler
    
    * change escheduler to dolphinscheduler
    
    * remove log4j-1.2-api and modify AlertMapperTest
    
    * remove log4j-1.2-api
    
    * Add alertDao to spring management
    
    * Add alertDao to spring management
    
    * get SqlSessionFactory from MybatisSqlSessionFactoryBean
    
    * get processDao by DaoFactory
    
    * read druid properties in ConneciontFactory
    
    * read druid properties in ConneciontFactory
    
    * change get alertDao by spring to DaoFactory
    
    * add log4j to resolve #967
    
    * resole verify udf name error and delete udf error
    
    * Determine if principal is empty
    
    * Determine whether the logon user has the right to delete the project
    
    * Fixed an issue that produced attatch file named such as ATT00002.bin
    
    * fix too many connection in upgrade or create
    
    * fix NEED_FAULT_TOLERANCE and WAITTING_THREAD count fail
    
    * Added a judgment on whether the currently login user is an administrator
    
    * fix update udf database not change and create time is changed
    
    * add enterprise.wechat.enable to decide whether to send enterprise WeChat
    
    * change method check
    
    * Remove the administrator's judgment on query access token list
    
    * only admin can create worker group
    
    * delete alert group need delete the relation of user and alert group
    
    * add timeout in proxy when upload large resource
    
    * add gets scheduled times by expect fire times
    
    * add gets scheduled times by expect fire times
    
    * Increase the judgment of whether it is admin
    
    * Increase the judgment of whether it is admin
    
    * when delete access token add whether login user has perm to delete
    
    * change mysql-connector-java scope to test
    
    * update scm test
    
    * add profile test
    
    * Add method and parameters comments
    
    * roll back
    
    * add some notes (#1221)
    
    * update english documents
    
    * refactor zk client
    
    * update documents
    
    * update zkclient
    
    * update zkclient
    
    * update documents
    
    * add architecture-design
    
    * change i18n
    
    * update i18n
    
    * update english documents
    
    * add architecture-design
    
    * update english documents
    
    * update en-US documents
    
    * add architecture-design
    
    * update demo site
    
    * add mybatis plus model
    
    * modify mybatisplus
    
    * modify mybatisplus
    
    * change interface by mybatisplus
    
    * add unit test
    
    * refactor dao interface.
    
    * add unit test for dao...
    
    * add unit test for dao...
    
    * add unit test for dao...
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
    
    * update some dao bugs
    
    * update for some bugs
    
    * update some bugs
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
    
    * update
    
    * update
    
    * add multiply settings for application.yml
    
    * add multiply settings for application.yml
    
    * revert
    
    * update configuration settings in task record dao...
    
    * change application_master to application-master
    
    * change application_master to application-master
    
    * update application.yml to application.properties
    
    * revert
    
    * revert
    
    * add properties
    
    * add properties
    
    * revert
    
    * revert
    
    * add api start up..
    add alert send try catch
    
    * update dao info level
    
    * fix bug: task cannot submit when recovery failover
    
    * fix bug: task cannot submit when recovery failover
    
    * merge from dev-db
    
    * revert
    
    * revert
    
    * fix bug: get process definition list failed.
    
    * fix bug: process instance interval is error
    
    * revert
    
    * revert
    
    * update
    
    * support stop submit success tasks
    
    * update kill process
    
    * update for stop process
    
    * update for stop process
    
    * add some logs for stop process
    
    * update for small bug.
    
    * add check strategy before submit task
    
    * revert
    
    * update
    
    * update
    
    * revert
    
    * wait task instance exists if null.
    
    * revert
    
    * update
    
    * change desc to description.
    
    * add check user and definitions function when delete tenant
    
    * update
    
    * change desc to description.
    
    * change desc to description.
    
    * change desc to description.
    
    * remove check resources when delete tenant
    
    * change desc to description.
    
    * change mybatisplus version to 3.2.0
    
    * update
    
    * change the notice to apache.
    
    * update
    
    * update postgre sql
    
    * fix bug: phone can be empty.
    
    * fix bug: postgre test error.
    
    * update create table for postgre quartz
    
    * fix some bugs about postgre.
    
    * update create table for postgre quartz
    
    * add postgre db performance monitor
    
    * add postgre performance monitor
    
    * update performance monitor
    
    * revert
    
    * revert
    
    * fix bug: tasks queue length error
    
    * remove datasource.properties
    
    * change chinese sql to english.
    
    * change chinese sql to english.
    
    * remove unused code.
    
    * remove unused code.
    
    * add some notes
    
    * update some notes
    
    * update some notes
    
    * update mbatisplus version
    
    * update lombok version
    
    * update lombok version
    
    * revert
    
    * merge from dev-db
    
    * remove version
    
    * update npm install pom
    
    * add front assembly
    
    * add front module
    
    * change verison to 1.2.0-release-SNAPSHOT
    
    * add name in pom and remove compile
    
    * add name in pom
    
    * add licenses in assemble
    
    * change version to 1.2.0-RC1-SNAPSHOT
    
    * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
    
    # Conflicts:
    #	dolphinscheduler-alert/pom.xml
    #	dolphinscheduler-api/pom.xml
    #	dolphinscheduler-common/pom.xml
    #	dolphinscheduler-dao/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
    #	dolphinscheduler-dist/pom.xml
    #	dolphinscheduler-rpc/pom.xml
    #	dolphinscheduler-server/pom.xml
    #	dolphinscheduler-ui/pom.xml
    #	pom.xml
    change assembly id
    
    * add DISCLAIMER (#1262)
    
    * rename from DatasourceUserMapper to DataSourceUserMapper
    
    * add unit test in UserMapper and WorkerGroupMapper
    
    * change cn.escheduler to org.apache.dolphinscheduler
    
    * add unit test in UdfFuncMapperTest
    
    * add unit test in UdfFuncMapperTest
    
    * remove DatabaseConfiguration
    
    * add ConnectionFactoryTest
    
    * cal duration in processInstancesList
    
    * change desc to description
    
    * change table name in mysql ddl
    
    * change table name in mysql ddl
    
    * change escheduler to dolphinscheduler
    
    * change escheduler to dolphinscheduler
    
    * change escheduler to dolphinscheduler
    
    * remove log4j-1.2-api and modify AlertMapperTest
    
    * remove log4j-1.2-api
    
    * Add alertDao to spring management
    
    * Add alertDao to spring management
    
    * get SqlSessionFactory from MybatisSqlSessionFactoryBean
    
    * get processDao by DaoFactory
    
    * read druid properties in ConneciontFactory
    
    * read druid properties in ConneciontFactory
    
    * change get alertDao by spring to DaoFactory
    
    * add log4j to resolve #967
    
    * resole verify udf name error and delete udf error
    
    * Determine if principal is empty
    
    * Determine whether the logon user has the right to delete the project
    
    * Fixed an issue that produced attatch file named such as ATT00002.bin
    
    * fix too many connection in upgrade or create
    
    * fix NEED_FAULT_TOLERANCE and WAITTING_THREAD count fail
    
    * Added a judgment on whether the currently login user is an administrator
    
    * fix update udf database not change and create time is changed
    
    * add enterprise.wechat.enable to decide whether to send enterprise WeChat
    
    * change method check
    
    * Remove the administrator's judgment on query access token list
    
    * only admin can create worker group
    
    * delete alert group need delete the relation of user and alert group
    
    * add timeout in proxy when upload large resource
    
    * add gets scheduled times by expect fire times
    
    * add gets scheduled times by expect fire times
    
    * Increase the judgment of whether it is admin
    
    * Increase the judgment of whether it is admin
    
    * when delete access token add whether login user has perm to delete
    
    * change mysql-connector-java scope to test
    
    * update scm test
    
    * add profile test
    
    * add profile test
    
    * add maven.deploy.skip true
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * add dependency
    
    * add javadoc
    
    * add antrun
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * reset pgsql (#1178)
    
    + 1
    
    * add javadoc
    
    * add javadoc
    
    * [maven-release-plugin] rollback the release of 1.2.0
    
    * add javadoc
    
    * Ans UI upgrade to version 0.1.0 (#1181)
    
    + 1
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * Administrators group prohibit deletion (#1182)
    
    * Ans UI upgrade to version 0.1.0
    
    * Administrators group prohibit deletion
    
    * add javadoc
    
    * add ui pom
    
    * fix master server shutdown error (#1177)
    
    * move updateTaskState into try/catch block in case of exception
    
    * fix NPE
    
    * using conf.getInt instead of getString
    
    * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
    for AlertDao, correct the spelling.
    
    * duplicate
    
    * refactor getTaskWorkerGroupId
    
    * add friendly log
    
    * update hearbeat thread num = 1
    
    * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
    
    * 1. move verifyTaskInstanceIsNull after taskInstance
    2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
    
    * fix the message
    
    * delete before check to avoid KeeperException$NoNodeException
    
    * fix the message
    
    * check processInstance state before delete tenant
    
    * check processInstance state before delete worker group
    
    * refactor
    
    * merge api constants into common constatns
    
    * update the resource perm
    
    * update the dataSource perm
    
    * fix CheckUtils.checkUserParams method
    
    * update AlertGroupService, extends from BaseService, remove duplicate methods
    
    * refactor
    
    * modify method name
    
    * add hasProjectAndPerm method
    
    * using checkProject instead of getResultStatus
    
    * delete checkAuth method, using hasProjectAndPerm instead.
    
    * correct spelling
    
    * add transactional for deleteWorkerGroupById
    
    * add Transactional for deleteProcessInstanceById method
    
    * change sqlSessionTemplate singleton
    
    * change sqlSessionTemplate singleton and reformat code
    
    * fix unsuitable error message
    
    * update shutdownhook methods
    
    * fix worker log bug
    
    * fix api server debug mode bug
    
    * upgrade zk version
    
    * delete this line ,for zkClient.close() will do the whole thing
    
    * fix master server shutdown error
    
    * degrade zk version and add FourLetterWordMain class (#1183)
    
    * move updateTaskState into try/catch block in case of exception
    
    * fix NPE
    
    * using conf.getInt instead of getString
    
    * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
    for AlertDao, correct the spelling.
    
    * duplicate
    
    * refactor getTaskWorkerGroupId
    
    * add friendly log
    
    * update hearbeat thread num = 1
    
    * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
    
    * 1. move verifyTaskInstanceIsNull after taskInstance
    2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
    
    * fix the message
    
    * delete before check to avoid KeeperException$NoNodeException
    
    * fix the message
    
    * check processInstance state before delete tenant
    
    * check processInstance state before delete worker group
    
    * refactor
    
    * merge api constants into common constatns
    
    * update the resource perm
    
    * update the dataSource perm
    
    * fix CheckUtils.checkUserParams method
    
    * update AlertGroupService, extends from BaseService, remove duplicate methods
    
    * refactor
    
    * modify method name
    
    * add hasProjectAndPerm method
    
    * using checkProject instead of getResultStatus
    
    * delete checkAuth method, using hasProjectAndPerm instead.
    
    * correct spelling
    
    * add transactional for deleteWorkerGroupById
    
    * add Transactional for deleteProcessInstanceById method
    
    * change sqlSessionTemplate singleton
    
    * change sqlSessionTemplate singleton and reformat code
    
    * fix unsuitable error message
    
    * update shutdownhook methods
    
    * fix worker log bug
    
    * fix api server debug mode bug
    
    * upgrade zk version
    
    * delete this line ,for zkClient.close() will do the whole thing
    
    * fix master server shutdown error
    
    * degrade zk version and add FourLetterWordMain class
    
    * add ui pom
    
    * add src pom and assembly
    
    * fix ZKWorkerClient not close PathChildrenCache (#1185)
    
    * move updateTaskState into try/catch block in case of exception
    
    * fix NPE
    
    * using conf.getInt instead of getString
    
    * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
    for AlertDao, correct the spelling.
    
    * duplicate
    
    * refactor getTaskWorkerGroupId
    
    * add friendly log
    
    * update hearbeat thread num = 1
    
    * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
    
    * 1. move verifyTaskInstanceIsNull after taskInstance
    2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
    
    * fix the message
    
    * delete before check to avoid KeeperException$NoNodeException
    
    * fix the message
    
    * check processInstance state before delete tenant
    
    * check processInstance state before delete worker group
    
    * refactor
    
    * merge api constants into common constatns
    
    * update the resource perm
    
    * update the dataSource perm
    
    * fix CheckUtils.checkUserParams method
    
    * update AlertGroupService, extends from BaseService, remove duplicate methods
    
    * refactor
    
    * modify method name
    
    * add hasProjectAndPerm method
    
    * using checkProject instead of getResultStatus
    
    * delete checkAuth method, using hasProjectAndPerm instead.
    
    * correct spelling
    
    * add transactional for deleteWorkerGroupById
    
    * add Transactional for deleteProcessInstanceById method
    
    * change sqlSessionTemplate singleton
    
    * change sqlSessionTemplate singleton and reformat code
    
    * fix unsuitable error message
    
    * update shutdownhook methods
    
    * fix worker log bug
    
    * fix api server debug mode bug
    
    * upgrade zk version
    
    * delete this line ,for zkClient.close() will do the whole thing
    
    * fix master server shutdown error
    
    * degrade zk version and add FourLetterWordMain class
    
    * fix PathChildrenCache not close
    
    * add Transactional for createSession method (#1186)
    
    * move updateTaskState into try/catch block in case of exception
    
    * fix NPE
    
    * using conf.getInt instead of getString
    
    * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
    for AlertDao, correct the spelling.
    
    * duplicate
    
    * refactor getTaskWorkerGroupId
    
    * add friendly log
    
    * update hearbeat thread num = 1
    
    * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
    
    * 1. move verifyTaskInstanceIsNull after taskInstance
    2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
    
    * fix the message
    
    * delete before check to avoid KeeperException$NoNodeException
    
    * fix the message
    
    * check processInstance state before delete tenant
    
    * check processInstance state before delete worker group
    
    * refactor
    
    * merge api constants into common constatns
    
    * update the resource perm
    
    * update the dataSource perm
    
    * fix CheckUtils.checkUserParams method
    
    * update AlertGroupService, extends from BaseService, remove duplicate methods
    
    * refactor
    
    * modify method name
    
    * add hasProjectAndPerm method
    
    * using checkProject instead of getResultStatus
    
    * delete checkAuth method, using hasProjectAndPerm instead.
    
    * correct spelling
    
    * add transactional for deleteWorkerGroupById
    
    * add Transactional for deleteProcessInstanceById method
    
    * change sqlSessionTemplate singleton
    
    * change sqlSessionTemplate singleton and reformat code
    
    * fix unsuitable error message
    
    * update shutdownhook methods
    
    * fix worker log bug
    
    * fix api server debug mode bug
    
    * upgrade zk version
    
    * delete this line ,for zkClient.close() will do the whole thing
    
    * fix master server shutdown error
    
    * degrade zk version and add FourLetterWordMain class
    
    * fix PathChildrenCache not close
    
    * add Transactional for createSession method
    
    * add src pom and assembly
    
    * add src pom and assembly
    
    * add src pom and assembly
    
    * add src pom and assembly
    
    * dockerfile dao application.properties ,install.sh modify and application.properties modify (#1187)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * add src pom and assembly
    
    * add src pom and assembly
    
    * dockerfile startup.sh modify (#1189)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs (#1191)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs
    
    * nginx conf modify
    
    * dockerfile application.properties modify
    
    * dockerfile conf modify (#1192)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs
    
    * nginx conf modify
    
    * dockerfile application.properties modify
    
    * dockerfile conf modify (#1193)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs
    
    * nginx conf modify
    
    * dockerfile application.properties modify
    
    * dockerfile email address change (#1194)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs
    
    * nginx conf modify
    
    * dockerfile application.properties modify
    
    * dockerfile email address change
    
    * the alert module is modified in english (#1195)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs
    
    * nginx conf modify
    
    * dockerfile application.properties modify
    
    * dockerfile email address change
    
    * the alert module is modified in English.
    
    * alert server comment and chinese modify
    
    * api server useless code and chinese modify (#1198)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs
    
    * nginx conf modify
    
    * dockerfile application.properties modify
    
    * dockerfile email address change
    
    * the alert module is modified in English.
    
    * alert server comment and chinese modify
    
    * api server useless code and chinese modify
    
    * common,dao,server useless code and chinese modify (#1199)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs
    
    * nginx conf modify
    
    * dockerfile application.properties modify
    
    * dockerfile email address change
    
    * the alert module is modified in English.
    
    * alert server comment and chinese modify
    
    * api server useless code and chinese modify
    
    * common,dao,server useless code and chinese modify
    
    * change chinese sql to english. (#1200)
    
    * update english documents
    
    * refactor zk client
    
    * update documents
    
    * update zkclient
    
    * update zkclient
    
    * update documents
    
    * add architecture-design
    
    * change i18n
    
    * update i18n
    
    * update english documents
    
    * add architecture-design
    
    * update english documents
    
    * update en-US documents
    
    * add architecture-design
    
    * update demo site
    
    * add mybatis plus model
    
    * modify mybatisplus
    
    * modify mybatisplus
    
    * change interface by mybatisplus
    
    * add unit test
    
    * refactor dao interface.
    
    * add unit test for dao...
    
    * add unit test for dao...
    
    * add unit test for dao...
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
    
    * update some dao bugs
    
    * update for some bugs
    
    * update some bugs
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
    
    * update
    
    * update
    
    * add multiply settings for application.yml
    
    * add multiply settings for application.yml
    
    * revert
    
    * update configuration settings in task record dao...
    
    * change application_master to application-master
    
    * change application_master to application-master
    
    * update application.yml to application.properties
    
    * revert
    
    * revert
    
    * add properties
    
    * add properties
    
    * revert
    
    * revert
    
    * add api start up..
    add alert send try catch
    
    * update dao info level
    
    * fix bug: task cannot submit when recovery failover
    
    * fix bug: task cannot submit when recovery failover
    
    * merge from dev-db
    
    * revert
    
    * revert
    
    * fix bug: get process definition list failed.
    
    * fix bug: process instance interval is error
    
    * revert
    
    * revert
    
    * update
    
    * support stop submit success tasks
    
    * update kill process
    
    * update for stop process
    
    * update for stop process
    
    * add some logs for stop process
    
    * update for small bug.
    
    * add check strategy before submit task
    
    * revert
    
    * update
    
    * update
    
    * revert
    
    * wait task instance exists if null.
    
    * revert
    
    * update
    
    * change desc to description.
    
    * add check user and definitions function when delete tenant
    
    * update
    
    * change desc to description.
    
    * change desc to description.
    
    * change desc to description.
    
    * remove check resources when delete tenant
    
    * change desc to description.
    
    * change mybatisplus version to 3.2.0
    
    * update
    
    * change the notice to apache.
    
    * update
    
    * update postgre sql
    
    * fix bug: phone can be empty.
    
    * fix bug: postgre test error.
    
    * update create table for postgre quartz
    
    * fix some bugs about postgre.
    
    * update create table for postgre quartz
    
    * add postgre db performance monitor
    
    * add postgre performance monitor
    
    * update performance monitor
    
    * revert
    
    * revert
    
    * fix bug: tasks queue length error
    
    * remove datasource.properties
    
    * change chinese sql to english.
    
    * change chinese sql to english.
    
    * change chinese to english (#1202)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs
    
    * nginx conf modify
    
    * dockerfile application.properties modify
    
    * dockerfile email address change
    
    * the alert module is modified in English.
    
    * alert server comment and chinese modify
    
    * api server useless code and chinese modify
    
    * common,dao,server useless code and chinese modify
    
    * change chinese to english
    
    * remove unused code (#1204)
    
    * update english documents
    
    * refactor zk client
    
    * update documents
    
    * update zkclient
    
    * update zkclient
    
    * update documents
    
    * add architecture-design
    
    * change i18n
    
    * update i18n
    
    * update english documents
    
    * add architecture-design
    
    * update english documents
    
    * update en-US documents
    
    * add architecture-design
    
    * update demo site
    
    * add mybatis plus model
    
    * modify mybatisplus
    
    * modify mybatisplus
    
    * change interface by mybatisplus
    
    * add unit test
    
    * refactor dao interface.
    
    * add unit test for dao...
    
    * add unit test for dao...
    
    * add unit test for dao...
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
    
    * update some dao bugs
    
    * update for some bugs
    
    * update some bugs
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
    
    * update
    
    * update
    
    * add multiply settings for application.yml
    
    * add multiply settings for application.yml
    
    * revert
    
    * update configuration settings in task record dao...
    
    * change application_master to application-master
    
    * change application_master to application-master
    
    * update application.yml to application.properties
    
    * revert
    
    * revert
    
    * add properties
    
    * add properties
    
    * revert
    
    * revert
    
    * add api start up..
    add alert send try catch
    
    * update dao info level
    
    * fix bug: task cannot submit when recovery failover
    
    * fix bug: task cannot submit when recovery failover
    
    * merge from dev-db
    
    * revert
    
    * revert
    
    * fix bug: get process definition list failed.
    
    * fix bug: process instance interval is error
    
    * revert
    
    * revert
    
    * update
    
    * support stop submit success tasks
    
    * update kill process
    
    * update for stop process
    
    * update for stop process
    
    * add some logs for stop process
    
    * update for small bug.
    
    * add check strategy before submit task
    
    * revert
    
    * update
    
    * update
    
    * revert
    
    * wait task instance exists if null.
    
    * revert
    
    * update
    
    * change desc to description.
    
    * add check user and definitions function when delete tenant
    
    * update
    
    * change desc to description.
    
    * change desc to description.
    
    * change desc to description.
    
    * remove check resources when delete tenant
    
    * change desc to description.
    
    * change mybatisplus version to 3.2.0
    
    * update
    
    * change the notice to apache.
    
    * update
    
    * update postgre sql
    
    * fix bug: phone can be empty.
    
    * fix bug: postgre test error.
    
    * update create table for postgre quartz
    
    * fix some bugs about postgre.
    
    * update create table for postgre quartz
    
    * add postgre db performance monitor
    
    * add postgre performance monitor
    
    * update performance monitor
    
    * revert
    
    * revert
    
    * fix bug: tasks queue length error
    
    * remove datasource.properties
    
    * change chinese sql to english.
    
    * change chinese sql to english.
    
    * remove unused code.
    
    * remove unused code.
    
    * Modify webpack configuration (#1206)
    
    * add more message for java-doc (#1209)
    
    * move updateTaskState into try/catch block in case of exception
    
    * fix NPE
    
    * using conf.getInt instead of getString
    
    * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
    for AlertDao, correct the spelling.
    
    * duplicate
    
    * refactor getTaskWorkerGroupId
    
    * add friendly log
    
    * update hearbeat thread num = 1
    
    * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
    
    * 1. move verifyTaskInstanceIsNull after taskInstance
    2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
    
    * fix the message
    
    * delete before check to avoid KeeperException$NoNodeException
    
    * fix the message
    
    * check processInstance state before delete tenant
    
    * check processInstance state before delete worker group
    
    * refactor
    
    * merge api constants into common constatns
    
    * update the resource perm
    
    * update the dataSource perm
    
    * fix CheckUtils.checkUserParams method
    
    * update AlertGroupService, extends from BaseService, remove duplicate methods
    
    * refactor
    
    * modify method name
    
    * add hasProjectAndPerm method
    
    * using checkProject instead of getResultStatus
    
    * delete checkAuth method, using hasProjectAndPerm instead.
    
    * correct spelling
    
    * add transactional for deleteWorkerGroupById
    
    * add Transactional for deleteProcessInstanceById method
    
    * change sqlSessionTemplate singleton
    
    * change sqlSessionTemplate singleton and reformat code
    
    * fix unsuitable error message
    
    * update shutdownhook methods
    
    * fix worker log bug
    
    * fix api server debug mode bug
    
    * upgrade zk version
    
    * delete this line ,for zkClient.close() will do the whole thing
    
    * fix master server shutdown error
    
    * degrade zk version and add FourLetterWordMain class
    
    * fix PathChildrenCache not close
    
    * add Transactional for createSession method
    
    * add more message for java-doc
    
    * add java doc for common module (#1213)
    
    * dao method comments and useless code modify (#1214)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs
    
    * nginx conf modify
    
    * dockerfile application.properties modify
    
    * dockerfile email address change
    
    * the alert module is modified in English.
    
    * alert server comment and chinese modify
    
    * api server useless code and chinese modify
    
    * common,dao,server useless code and chinese modify
    
    * change chinese to english
    
    * dao method comments and useless code modify
    
    * Change all Chinese names to English (#1207)
    
    * Modify webpack configuration
    
    * Change all Chinese names to English
    
    * add progress-bar-webpack-plugin (#1215)
    
    * Modify webpack configuration
    
    * Change all Chinese names to English
    
    * add progress-bar-webpack-plugin
    
    * Add method and parameters comments (#1220)
    
    * rename from DatasourceUserMapper to DataSourceUserMapper
    
    * add unit test in UserMapper and WorkerGroupMapper
    
    * change cn.escheduler to org.apache.dolphinscheduler
    
    * add unit test in UdfFuncMapperTest
    
    * add unit test in UdfFuncMapperTest
    
    * remove DatabaseConfiguration
    
    * add ConnectionFactoryTest
    
    * cal duration in processInstancesList
    
    * change desc to description
    
    * change table name in mysql ddl
    
    * change table name in mysql ddl
    
    * change escheduler to dolphinscheduler
    
    * change escheduler to dolphinscheduler
    
    * change escheduler to dolphinscheduler
    
    * remove log4j-1.2-api and modify AlertMapperTest
    
    * remove log4j-1.2-api
    
    * Add alertDao to spring management
    
    * Add alertDao to spring management
    
    * get SqlSessionFactory from MybatisSqlSessionFactoryBean
    
    * get processDao by DaoFactory
    
    * read druid properties in ConneciontFactory
    
    * read druid properties in ConneciontFactory
    
    * change get alertDao by spring to DaoFactory
    
    * add log4j to resolve #967
    
    * resole verify udf name error and delete udf error
    
    * Determine if principal is empty
    
    * Determine whether the logon user has the right to delete the project
    
    * Fixed an issue that produced attatch file named such as ATT00002.bin
    
    * fix too many connection in upgrade or create
    
    * fix NEED_FAULT_TOLERANCE and WAITTING_THREAD count fail
    
    * Added a judgment on whether the currently login user is an administrator
    
    * fix update udf database not change and create time is changed
    
    * add enterprise.wechat.enable to decide whether to send enterprise WeChat
    
    * change method check
    
    * Remove the administrator's judgment on query access token list
    
    * only admin can create worker group
    
    * delete alert group need delete the relation of user and alert group
    
    * add timeout in proxy when upload large resource
    
    * add gets scheduled times by expect fire times
    
    * add gets scheduled times by expect fire times
    
    * Increase the judgment of whether it is admin
    
    * Increase the judgment of whether it is admin
    
    * when delete access token add whether login user has perm to delete
    
    * change mysql-connector-java scope to test
    
    * update scm test
    
    * add profile test
    
    * Add method and parameters comments
    
    * roll back
    
    * add some notes (#1221)
    
    * update english documents
    
    * refactor zk client
    
    * update documents
    
    * update zkclient
    
    * update zkclient
    
    * update documents
    
    * add architecture-design
    
    * change i18n
    
    * update i18n
    
    * update english documents
    
    * add architecture-design
    
    * update english documents
    
    * update en-US documents
    
    * add architecture-design
    
    * update demo site
    
    * add mybatis plus model
    
    * modify mybatisplus
    
    * modify mybatisplus
    
    * change interface by mybatisplus
    
    * add unit test
    
    * refactor dao interface.
    
    * add unit test for dao...
    
    * add unit test for dao...
    
    * add unit test for dao...
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
    
    * update some dao bugs
    
    * update for some bugs
    
    * update some bugs
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
    
    * update
    
    * update
    
    * add multiply settings for application.yml
    
    * add multiply settings for application.yml
    
    * revert
    
    * update configuration settings in task record dao...
    
    * change application_master to application-master
    
    * change application_master to application-master
    
    * update application.yml to application.properties
    
    * revert
    
    * revert
    
    * add properties
    
    * add properties
    
    * revert
    
    * revert
    
    * add api start up..
    add alert send try catch
    
    * update dao info level
    
    * fix bug: task cannot submit when recovery failover
    
    * fix bug: task cannot submit when recovery failover
    
    * merge from dev-db
    
    * revert
    
    * revert
    
    * fix bug: get process definition list failed.
    
    * fix bug: process instance interval is error
    
    * revert
    
    * revert
    
    * update
    
    * support stop submit success tasks
    
    * update kill process
    
    * update for stop process
    
    * update for stop process
    
    * add some logs for stop process
    
    * update for small bug.
    
    * add check strategy before submit task
    
    * revert
    
    * update
    
    * update
    
    * revert
    
    * wait task instance exists if null.
    
    * revert
    
    * update
    
    * change desc to description.
    
    * add check user and definitions function when delete tenant
    
    * update
    
    * change desc to description.
    
    * change desc to description.
    
    * change desc to description.
    
    * remove check resources when delete tenant
    
    * change desc to description.
    
    * change mybatisplus version to 3.2.0
    
    * update
    
    * change the notice to apache.
    
    * update
    
    * update postgre sql
    
    * fix bug: phone can be empty.
    
    * fix bug: postgre test error.
    
    * update create table for postgre quartz
    
    * fix some bugs about postgre.
    
    * update create table for postgre quartz
    
    * add postgre db performance monitor
    
    * add postgre performance monitor
    
    * update performance monitor
    
    * revert
    
    * revert
    
    * fix bug: tasks queue length error
    
    * remove datasource.properties
    
    * change chinese sql to english.
    
    * change chinese sql to english.
    
    * remove unused code.
    
    * remove unused code.
    
    * add some notes
    
    * update some notes
    
    * update some notes
    
    * update mbatisplus version
    
    * update lombok version
    
    * update lombok version
    
    * revert
    
    * merge from dev-db
    
    * remove version
    
    * update npm install pom
    
    * add front assembly
    
    * add front module
    
    * change verison to 1.2.0-release-SNAPSHOT
    
    * add name in pom and remove compile
    
    * add name in pom
    
    * add licenses in assemble
    
    * change version to 1.2.0-RC1-SNAPSHOT
    
    * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
    
    # Conflicts:
    #	dolphinscheduler-alert/pom.xml
    #	dolphinscheduler-api/pom.xml
    #	dolphinscheduler-common/pom.xml
    #	dolphinscheduler-dao/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
    #	dolphinscheduler-dist/pom.xml
    #	dolphinscheduler-rpc/pom.xml
    #	dolphinscheduler-server/pom.xml
    #	dolphinscheduler-ui/pom.xml
    #	pom.xml
    change assembly id
    
    * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
    
    # Conflicts:
    #	dolphinscheduler-alert/pom.xml
    #	dolphinscheduler-api/pom.xml
    #	dolphinscheduler-common/pom.xml
    #	dolphinscheduler-dao/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
    #	dolphinscheduler-dist/pom.xml
    #	dolphinscheduler-rpc/pom.xml
    #	dolphinscheduler-server/pom.xml
    #	dolphinscheduler-ui/pom.xml
    #	pom.xml
    add DISCLAIMER
    
    * add license in xml and properties (#1265)
    
    * rename from DatasourceUserMapper to DataSourceUserMapper
    
    * add unit test in UserMapper and WorkerGroupMapper
    
    * change cn.escheduler to org.apache.dolphinscheduler
    
    * add unit test in UdfFuncMapperTest
    
    * add unit test in UdfFuncMapperTest
    
    * remove DatabaseConfiguration
    
    * add ConnectionFactoryTest
    
    * cal duration in processInstancesList
    
    * change desc to description
    
    * change table name in mysql ddl
    
    * change table name in mysql ddl
    
    * change escheduler to dolphinscheduler
    
    * change escheduler to dolphinscheduler
    
    * change escheduler to dolphinscheduler
    
    * remove log4j-1.2-api and modify AlertMapperTest
    
    * remove log4j-1.2-api
    
    * Add alertDao to spring management
    
    * Add alertDao to spring management
    
    * get SqlSessionFactory from MybatisSqlSessionFactoryBean
    
    * get processDao by DaoFactory
    
    * read druid properties in ConneciontFactory
    
    * read druid properties in ConneciontFactory
    
    * change get alertDao by spring to DaoFactory
    
    * add log4j to resolve #967
    
    * resole verify udf name error and delete udf error
    
    * Determine if principal is empty
    
    * Determine whether the logon user has the right to delete the project
    
    * Fixed an issue that produced attatch file named such as ATT00002.bin
    
    * fix too many connection in upgrade or create
    
    * fix NEED_FAULT_TOLERANCE and WAITTING_THREAD count fail
    
    * Added a judgment on whether the currently login user is an administrator
    
    * fix update udf database not change and create time is changed
    
    * add enterprise.wechat.enable to decide whether to send enterprise WeChat
    
    * change method check
    
    * Remove the administrator's judgment on query access token list
    
    * only admin can create worker group
    
    * delete alert group need delete the relation of user and alert group
    
    * add timeout in proxy when upload large resource
    
    * add gets scheduled times by expect fire times
    
    * add gets scheduled times by expect fire times
    
    * Increase the judgment of whether it is admin
    
    * Increase the judgment of whether it is admin
    
    * when delete access token add whether login user has perm to delete
    
    * change mysql-connector-java scope to test
    
    * update scm test
    
    * add profile test
    
    * add profile test
    
    * add maven.deploy.skip true
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * add dependency
    
    * add javadoc
    
    * add antrun
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * reset pgsql (#1178)
    
    + 1
    
    * add javadoc
    
    * add javadoc
    
    * [maven-release-plugin] rollback the release of 1.2.0
    
    * add javadoc
    
    * Ans UI upgrade to version 0.1.0 (#1181)
    
    + 1
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * Administrators group prohibit deletion (#1182)
    
    * Ans UI upgrade to version 0.1.0
    
    * Administrators group prohibit deletion
    
    * add javadoc
    
    * add ui pom
    
    * fix master server shutdown error (#1177)
    
    * move updateTaskState into try/catch block in case of exception
    
    * fix NPE
    
    * using conf.getInt instead of getString
    
    * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
    for AlertDao, correct the spelling.
    
    * duplicate
    
    * refactor getTaskWorkerGroupId
    
    * add friendly log
    
    * update hearbeat thread num = 1
    
    * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
    
    * 1. move verifyTaskInstanceIsNull after taskInstance
    2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
    
    * fix the message
    
    * delete before check to avoid KeeperException$NoNodeException
    
    * fix the message
    
    * check processInstance state before delete tenant
    
    * check processInstance state before delete worker group
    
    * refactor
    
    * merge api constants into common constatns
    
    * update the resource perm
    
    * update the dataSource perm
    
    * fix CheckUtils.checkUserParams method
    
    * update AlertGroupService, extends from BaseService, remove duplicate methods
    
    * refactor
    
    * modify method name
    
    * add hasProjectAndPerm method
    
    * using checkProject instead of getResultStatus
    
    * delete checkAuth method, using hasProjectAndPerm instead.
    
    * correct spelling
    
    * add transactional for deleteWorkerGroupById
    
    * add Transactional for deleteProcessInstanceById method
    
    * change sqlSessionTemplate singleton
    
    * change sqlSessionTemplate singleton and reformat code
    
    * fix unsuitable error message
    
    * update shutdownhook methods
    
    * fix worker log bug
    
    * fix api server debug mode bug
    
    * upgrade zk version
    
    * delete this line ,for zkClient.close() will do the whole thing
    
    * fix master server shutdown error
    
    * degrade zk version and add FourLetterWordMain class (#1183)
    
    * move updateTaskState into try/catch block in case of exception
    
    * fix NPE
    
    * using conf.getInt instead of getString
    
    * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
    for AlertDao, correct the spelling.
    
    * duplicate
    
    * refactor getTaskWorkerGroupId
    
    * add friendly log
    
    * update hearbeat thread num = 1
    
    * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
    
    * 1. move verifyTaskInstanceIsNull after taskInstance
    2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
    
    * fix the message
    
    * delete before check to avoid KeeperException$NoNodeException
    
    * fix the message
    
    * check processInstance state before delete tenant
    
    * check processInstance state before delete worker group
    
    * refactor
    
    * merge api constants into common constatns
    
    * update the resource perm
    
    * update the dataSource perm
    
    * fix CheckUtils.checkUserParams method
    
    * update AlertGroupService, extends from BaseService, remove duplicate methods
    
    * refactor
    
    * modify method name
    
    * add hasProjectAndPerm method
    
    * using checkProject instead of getResultStatus
    
    * delete checkAuth method, using hasProjectAndPerm instead.
    
    * correct spelling
    
    * add transactional for deleteWorkerGroupById
    
    * add Transactional for deleteProcessInstanceById method
    
    * change sqlSessionTemplate singleton
    
    * change sqlSessionTemplate singleton and reformat code
    
    * fix unsuitable error message
    
    * update shutdownhook methods
    
    * fix worker log bug
    
    * fix api server debug mode bug
    
    * upgrade zk version
    
    * delete this line ,for zkClient.close() will do the whole thing
    
    * fix master server shutdown error
    
    * degrade zk version and add FourLetterWordMain class
    
    * add ui pom
    
    * add src pom and assembly
    
    * fix ZKWorkerClient not close PathChildrenCache (#1185)
    
    * move updateTaskState into try/catch block in case of exception
    
    * fix NPE
    
    * using conf.getInt instead of getString
    
    * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
    for AlertDao, correct the spelling.
    
    * duplicate
    
    * refactor getTaskWorkerGroupId
    
    * add friendly log
    
    * update hearbeat thread num = 1
    
    * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
    
    * 1. move verifyTaskInstanceIsNull after taskInstance
    2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
    
    * fix the message
    
    * delete before check to avoid KeeperException$NoNodeException
    
    * fix the message
    
    * check processInstance state before delete tenant
    
    * check processInstance state before delete worker group
    
    * refactor
    
    * merge api constants into common constatns
    
    * update the resource perm
    
    * update the dataSource perm
    
    * fix CheckUtils.checkUserParams method
    
    * update AlertGroupService, extends from BaseService, remove duplicate methods
    
    * refactor
    
    * modify method name
    
    * add hasProjectAndPerm method
    
    * using checkProject instead of getResultStatus
    
    * delete checkAuth method, using hasProjectAndPerm instead.
    
    * correct spelling
    
    * add transactional for deleteWorkerGroupById
    
    * add Transactional for deleteProcessInstanceById method
    
    * change sqlSessionTemplate singleton
    
    * change sqlSessionTemplate singleton and reformat code
    
    * fix unsuitable error message
    
    * update shutdownhook methods
    
    * fix worker log bug
    
    * fix api server debug mode bug
    
    * upgrade zk version
    
    * delete this line ,for zkClient.close() will do the whole thing
    
    * fix master server shutdown error
    
    * degrade zk version and add FourLetterWordMain class
    
    * fix PathChildrenCache not close
    
    * add Transactional for createSession method (#1186)
    
    * move updateTaskState into try/catch block in case of exception
    
    * fix NPE
    
    * using conf.getInt instead of getString
    
    * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
    for AlertDao, correct the spelling.
    
    * duplicate
    
    * refactor getTaskWorkerGroupId
    
    * add friendly log
    
    * update hearbeat thread num = 1
    
    * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
    
    * 1. move verifyTaskInstanceIsNull after taskInstance
    2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
    
    * fix the message
    
    * delete before check to avoid KeeperException$NoNodeException
    
    * fix the message
    
    * check processInstance state before delete tenant
    
    * check processInstance state before delete worker group
    
    * refactor
    
    * merge api constants into common constatns
    
    * update the resource perm
    
    * update the dataSource perm
    
    * fix CheckUtils.checkUserParams method
    
    * update AlertGroupService, extends from BaseService, remove duplicate methods
    
    * refactor
    
    * modify method name
    
    * add hasProjectAndPerm method
    
    * using checkProject instead of getResultStatus
    
    * delete checkAuth method, using hasProjectAndPerm instead.
    
    * correct spelling
    
    * add transactional for deleteWorkerGroupById
    
    * add Transactional for deleteProcessInstanceById method
    
    * change sqlSessionTemplate singleton
    
    * change sqlSessionTemplate singleton and reformat code
    
    * fix unsuitable error message
    
    * update shutdownhook methods
    
    * fix worker log bug
    
    * fix api server debug mode bug
    
    * upgrade zk version
    
    * delete this line ,for zkClient.close() will do the whole thing
    
    * fix master server shutdown error
    
    * degrade zk version and add FourLetterWordMain class
    
    * fix PathChildrenCache not close
    
    * add Transactional for createSession method
    
    * add src pom and assembly
    
    * add src pom and assembly
    
    * add src pom and assembly
    
    * add src pom and assembly
    
    * dockerfile dao application.properties ,install.sh modify and application.properties modify (#1187)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * add src pom and assembly
    
    * add src pom and assembly
    
    * dockerfile startup.sh modify (#1189)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs (#1191)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs
    
    * nginx conf modify
    
    * dockerfile application.properties modify
    
    * dockerfile conf modify (#1192)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs
    
    * nginx conf modify
    
    * dockerfile application.properties modify
    
    * dockerfile conf modify (#1193)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs
    
    * nginx conf modify
    
    * dockerfile application.properties modify
    
    * dockerfile email address change (#1194)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs
    
    * nginx conf modify
    
    * dockerfile application.properties modify
    
    * dockerfile email address change
    
    * the alert module is modified in english (#1195)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs
    
    * nginx conf modify
    
    * dockerfile application.properties modify
    
    * dockerfile email address change
    
    * the alert module is modified in English.
    
    * alert server comment and chinese modify
    
    * api server useless code and chinese modify (#1198)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs
    
    * nginx conf modify
    
    * dockerfile application.properties modify
    
    * dockerfile email address change
    
    * the alert module is modified in English.
    
    * alert server comment and chinese modify
    
    * api server useless code and chinese modify
    
    * common,dao,server useless code and chinese modify (#1199)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs
    
    * nginx conf modify
    
    * dockerfile application.properties modify
    
    * dockerfile email address change
    
    * the alert module is modified in English.
    
    * alert server comment and chinese modify
    
    * api server useless code and chinese modify
    
    * common,dao,server useless code and chinese modify
    
    * change chinese sql to english. (#1200)
    
    * update english documents
    
    * refactor zk client
    
    * update documents
    
    * update zkclient
    
    * update zkclient
    
    * update documents
    
    * add architecture-design
    
    * change i18n
    
    * update i18n
    
    * update english documents
    
    * add architecture-design
    
    * update english documents
    
    * update en-US documents
    
    * add architecture-design
    
    * update demo site
    
    * add mybatis plus model
    
    * modify mybatisplus
    
    * modify mybatisplus
    
    * change interface by mybatisplus
    
    * add unit test
    
    * refactor dao interface.
    
    * add unit test for dao...
    
    * add unit test for dao...
    
    * add unit test for dao...
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
    
    * update some dao bugs
    
    * update for some bugs
    
    * update some bugs
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
    
    * update
    
    * update
    
    * add multiply settings for application.yml
    
    * add multiply settings for application.yml
    
    * revert
    
    * update configuration settings in task record dao...
    
    * change application_master to application-master
    
    * change application_master to application-master
    
    * update application.yml to application.properties
    
    * revert
    
    * revert
    
    * add properties
    
    * add properties
    
    * revert
    
    * revert
    
    * add api start up..
    add alert send try catch
    
    * update dao info level
    
    * fix bug: task cannot submit when recovery failover
    
    * fix bug: task cannot submit when recovery failover
    
    * merge from dev-db
    
    * revert
    
    * revert
    
    * fix bug: get process definition list failed.
    
    * fix bug: process instance interval is error
    
    * revert
    
    * revert
    
    * update
    
    * support stop submit success tasks
    
    * update kill process
    
    * update for stop process
    
    * update for stop process
    
    * add some logs for stop process
    
    * update for small bug.
    
    * add check strategy before submit task
    
    * revert
    
    * update
    
    * update
    
    * revert
    
    * wait task instance exists if null.
    
    * revert
    
    * update
    
    * change desc to description.
    
    * add check user and definitions function when delete tenant
    
    * update
    
    * change desc to description.
    
    * change desc to description.
    
    * change desc to description.
    
    * remove check resources when delete tenant
    
    * change desc to description.
    
    * change mybatisplus version to 3.2.0
    
    * update
    
    * change the notice to apache.
    
    * update
    
    * update postgre sql
    
    * fix bug: phone can be empty.
    
    * fix bug: postgre test error.
    
    * update create table for postgre quartz
    
    * fix some bugs about postgre.
    
    * update create table for postgre quartz
    
    * add postgre db performance monitor
    
    * add postgre performance monitor
    
    * update performance monitor
    
    * revert
    
    * revert
    
    * fix bug: tasks queue length error
    
    * remove datasource.properties
    
    * change chinese sql to english.
    
    * change chinese sql to english.
    
    * change chinese to english (#1202)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs
    
    * nginx conf modify
    
    * dockerfile application.properties modify
    
    * dockerfile email address change
    
    * the alert module is modified in English.
    
    * alert server comment and chinese modify
    
    * api server useless code and chinese modify
    
    * common,dao,server useless code and chinese modify
    
    * change chinese to english
    
    * remove unused code (#1204)
    
    * update english documents
    
    * refactor zk client
    
    * update documents
    
    * update zkclient
    
    * update zkclient
    
    * update documents
    
    * add architecture-design
    
    * change i18n
    
    * update i18n
    
    * update english documents
    
    * add architecture-design
    
    * update english documents
    
    * update en-US documents
    
    * add architecture-design
    
    * update demo site
    
    * add mybatis plus model
    
    * modify mybatisplus
    
    * modify mybatisplus
    
    * change interface by mybatisplus
    
    * add unit test
    
    * refactor dao interface.
    
    * add unit test for dao...
    
    * add unit test for dao...
    
    * add unit test for dao...
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
    
    * update some dao bugs
    
    * update for some bugs
    
    * update some bugs
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
    
    * update
    
    * update
    
    * add multiply settings for application.yml
    
    * add multiply settings for application.yml
    
    * revert
    
    * update configuration settings in task record dao...
    
    * change application_master to application-master
    
    * change application_master to application-master
    
    * update application.yml to application.properties
    
    * revert
    
    * revert
    
    * add properties
    
    * add properties
    
    * revert
    
    * revert
    
    * add api start up..
    add alert send try catch
    
    * update dao info level
    
    * fix bug: task cannot submit when recovery failover
    
    * fix bug: task cannot submit when recovery failover
    
    * merge from dev-db
    
    * revert
    
    * revert
    
    * fix bug: get process definition list failed.
    
    * fix bug: process instance interval is error
    
    * revert
    
    * revert
    
    * update
    
    * support stop submit success tasks
    
    * update kill process
    
    * update for stop process
    
    * update for stop process
    
    * add some logs for stop process
    
    * update for small bug.
    
    * add check strategy before submit task
    
    * revert
    
    * update
    
    * update
    
    * revert
    
    * wait task instance exists if null.
    
    * revert
    
    * update
    
    * change desc to description.
    
    * add check user and definitions function when delete tenant
    
    * update
    
    * change desc to description.
    
    * change desc to description.
    
    * change desc to description.
    
    * remove check resources when delete tenant
    
    * change desc to description.
    
    * change mybatisplus version to 3.2.0
    
    * update
    
    * change the notice to apache.
    
    * update
    
    * update postgre sql
    
    * fix bug: phone can be empty.
    
    * fix bug: postgre test error.
    
    * update create table for postgre quartz
    
    * fix some bugs about postgre.
    
    * update create table for postgre quartz
    
    * add postgre db performance monitor
    
    * add postgre performance monitor
    
    * update performance monitor
    
    * revert
    
    * revert
    
    * fix bug: tasks queue length error
    
    * remove datasource.properties
    
    * change chinese sql to english.
    
    * change chinese sql to english.
    
    * remove unused code.
    
    * remove unused code.
    
    * Modify webpack configuration (#1206)
    
    * add more message for java-doc (#1209)
    
    * move updateTaskState into try/catch block in case of exception
    
    * fix NPE
    
    * using conf.getInt instead of getString
    
    * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
    for AlertDao, correct the spelling.
    
    * duplicate
    
    * refactor getTaskWorkerGroupId
    
    * add friendly log
    
    * update hearbeat thread num = 1
    
    * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
    
    * 1. move verifyTaskInstanceIsNull after taskInstance
    2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
    
    * fix the message
    
    * delete before check to avoid KeeperException$NoNodeException
    
    * fix the message
    
    * check processInstance state before delete tenant
    
    * check processInstance state before delete worker group
    
    * refactor
    
    * merge api constants into common constatns
    
    * update the resource perm
    
    * update the dataSource perm
    
    * fix CheckUtils.checkUserParams method
    
    * update AlertGroupService, extends from BaseService, remove duplicate methods
    
    * refactor
    
    * modify method name
    
    * add hasProjectAndPerm method
    
    * using checkProject instead of getResultStatus
    
    * delete checkAuth method, using hasProjectAndPerm instead.
    
    * correct spelling
    
    * add transactional for deleteWorkerGroupById
    
    * add Transactional for deleteProcessInstanceById method
    
    * change sqlSessionTemplate singleton
    
    * change sqlSessionTemplate singleton and reformat code
    
    * fix unsuitable error message
    
    * update shutdownhook methods
    
    * fix worker log bug
    
    * fix api server debug mode bug
    
    * upgrade zk version
    
    * delete this line ,for zkClient.close() will do the whole thing
    
    * fix master server shutdown error
    
    * degrade zk version and add FourLetterWordMain class
    
    * fix PathChildrenCache not close
    
    * add Transactional for createSession method
    
    * add more message for java-doc
    
    * add java doc for common module (#1213)
    
    * dao method comments and useless code modify (#1214)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs
    
    * nginx conf modify
    
    * dockerfile application.properties modify
    
    * dockerfile email address change
    
    * the alert module is modified in English.
    
    * alert server comment and chinese modify
    
    * api server useless code and chinese modify
    
    * common,dao,server useless code and chinese modify
    
    * change chinese to english
    
    * dao method comments and useless code modify
    
    * Change all Chinese names to English (#1207)
    
    * Modify webpack configuration
    
    * Change all Chinese names to English
    
    * add progress-bar-webpack-plugin (#1215)
    
    * Modify webpack configuration
    
    * Change all Chinese names to English
    
    * add progress-bar-webpack-plugin
    
    * Add method and parameters comments (#1220)
    
    * rename from DatasourceUserMapper to DataSourceUserMapper
    
    * add unit test in UserMapper and WorkerGroupMapper
    
    * change cn.escheduler to org.apache.dolphinscheduler
    
    * add unit test in UdfFuncMapperTest
    
    * add unit test in UdfFuncMapperTest
    
    * remove DatabaseConfiguration
    
    * add ConnectionFactoryTest
    
    * cal duration in processInstancesList
    
    * change desc to description
    
    * change table name in mysql ddl
    
    * change table name in mysql ddl
    
    * change escheduler to dolphinscheduler
    
    * change escheduler to dolphinscheduler
    
    * change escheduler to dolphinscheduler
    
    * remove log4j-1.2-api and modify AlertMapperTest
    
    * remove log4j-1.2-api
    
    * Add alertDao to spring management
    
    * Add alertDao to spring management
    
    * get SqlSessionFactory from MybatisSqlSessionFactoryBean
    
    * get processDao by DaoFactory
    
    * read druid properties in ConneciontFactory
    
    * read druid properties in ConneciontFactory
    
    * change get alertDao by spring to DaoFactory
    
    * add log4j to resolve #967
    
    * resole verify udf name error and delete udf error
    
    * Determine if principal is empty
    
    * Determine whether the logon user has the right to delete the project
    
    * Fixed an issue that produced attatch file named such as ATT00002.bin
    
    * fix too many connection in upgrade or create
    
    * fix NEED_FAULT_TOLERANCE and WAITTING_THREAD count fail
    
    * Added a judgment on whether the currently login user is an administrator
    
    * fix update udf database not change and create time is changed
    
    * add enterprise.wechat.enable to decide whether to send enterprise WeChat
    
    * change method check
    
    * Remove the administrator's judgment on query access token list
    
    * only admin can create worker group
    
    * delete alert group need delete the relation of user and alert group
    
    * add timeout in proxy when upload large resource
    
    * add gets scheduled times by expect fire times
    
    * add gets scheduled times by expect fire times
    
    * Increase the judgment of whether it is admin
    
    * Increase the judgment of whether it is admin
    
    * when delete access token add whether login user has perm to delete
    
    * change mysql-connector-java scope to test
    
    * update scm test
    
    * add profile test
    
    * Add method and parameters comments
    
    * roll back
    
    * add some notes (#1221)
    
    * update english documents
    
    * refactor zk client
    
    * update documents
    
    * update zkclient
    
    * update zkclient
    
    * update documents
    
    * add architecture-design
    
    * change i18n
    
    * update i18n
    
    * update english documents
    
    * add architecture-design
    
    * update english documents
    
    * update en-US documents
    
    * add architecture-design
    
    * update demo site
    
    * add mybatis plus model
    
    * modify mybatisplus
    
    * modify mybatisplus
    
    * change interface by mybatisplus
    
    * add unit test
    
    * refactor dao interface.
    
    * add unit test for dao...
    
    * add unit test for dao...
    
    * add unit test for dao...
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
    
    * update some dao bugs
    
    * update for some bugs
    
    * update some bugs
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
    
    * update
    
    * update
    
    * add multiply settings for application.yml
    
    * add multiply settings for application.yml
    
    * revert
    
    * update configuration settings in task record dao...
    
    * change application_master to application-master
    
    * change application_master to application-master
    
    * update application.yml to application.properties
    
    * revert
    
    * revert
    
    * add properties
    
    * add properties
    
    * revert
    
    * revert
    
    * add api start up..
    add alert send try catch
    
    * update dao info level
    
    * fix bug: task cannot submit when recovery failover
    
    * fix bug: task cannot submit when recovery failover
    
    * merge from dev-db
    
    * revert
    
    * revert
    
    * fix bug: get process definition list failed.
    
    * fix bug: process instance interval is error
    
    * revert
    
    * revert
    
    * update
    
    * support stop submit success tasks
    
    * update kill process
    
    * update for stop process
    
    * update for stop process
    
    * add some logs for stop process
    
    * update for small bug.
    
    * add check strategy before submit task
    
    * revert
    
    * update
    
    * update
    
    * revert
    
    * wait task instance exists if null.
    
    * revert
    
    * update
    
    * change desc to description.
    
    * add check user and definitions function when delete tenant
    
    * update
    
    * change desc to description.
    
    * change desc to description.
    
    * change desc to description.
    
    * remove check resources when delete tenant
    
    * change desc to description.
    
    * change mybatisplus version to 3.2.0
    
    * update
    
    * change the notice to apache.
    
    * update
    
    * update postgre sql
    
    * fix bug: phone can be empty.
    
    * fix bug: postgre test error.
    
    * update create table for postgre quartz
    
    * fix some bugs about postgre.
    
    * update create table for postgre quartz
    
    * add postgre db performance monitor
    
    * add postgre performance monitor
    
    * update performance monitor
    
    * revert
    
    * revert
    
    * fix bug: tasks queue length error
    
    * remove datasource.properties
    
    * change chinese sql to english.
    
    * change chinese sql to english.
    
    * remove unused code.
    
    * remove unused code.
    
    * add some notes
    
    * update some notes
    
    * update some notes
    
    * update mbatisplus version
    
    * update lombok version
    
    * update lombok version
    
    * revert
    
    * merge from dev-db
    
    * remove version
    
    * update npm install pom
    
    * add front assembly
    
    * add front module
    
    * change verison to 1.2.0-release-SNAPSHOT
    
    * add name in pom and remove compile
    
    * add name in pom
    
    * add licenses in assemble
    
    * change version to 1.2.0-RC1-SNAPSHOT
    
    * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
    
    # Conflicts:
    #	dolphinscheduler-alert/pom.xml
    #	dolphinscheduler-api/pom.xml
    #	dolphinscheduler-common/pom.xml
    #	dolphinscheduler-dao/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
    #	dolphinscheduler-dist/pom.xml
    #	dolphinscheduler-rpc/pom.xml
    #	dolphinscheduler-server/pom.xml
    #	dolphinscheduler-ui/pom.xml
    #	pom.xml
    change assembly id
    
    * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
    
    # Conflicts:
    #	dolphinscheduler-alert/pom.xml
    #	dolphinscheduler-api/pom.xml
    #	dolphinscheduler-common/pom.xml
    #	dolphinscheduler-dao/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
    #	dolphinscheduler-dist/pom.xml
    #	dolphinscheduler-rpc/pom.xml
    #	dolphinscheduler-server/pom.xml
    #	dolphinscheduler-ui/pom.xml
    #	pom.xml
    add DISCLAIMER
    
    * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
    
    # Conflicts:
    #	dolphinscheduler-alert/pom.xml
    #	dolphinscheduler-api/pom.xml
    #	dolphinscheduler-common/pom.xml
    #	dolphinscheduler-dao/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
    #	dolphinscheduler-dist/pom.xml
    #	dolphinscheduler-rpc/pom.xml
    #	dolphinscheduler-server/pom.xml
    #	dolphinscheduler-ui/pom.xml
    #	pom.xml
    add license in xml and properties
    
    * add license in dockerfile (#1269)
    
    * rename from DatasourceUserMapper to DataSourceUserMapper
    
    * add unit test in UserMapper and WorkerGroupMapper
    
    * change cn.escheduler to org.apache.dolphinscheduler
    
    * add unit test in UdfFuncMapperTest
    
    * add unit test in UdfFuncMapperTest
    
    * remove DatabaseConfiguration
    
    * add ConnectionFactoryTest
    
    * cal duration in processInstancesList
    
    * change desc to description
    
    * change table name in mysql ddl
    
    * change table name in mysql ddl
    
    * change escheduler to dolphinscheduler
    
    * change escheduler to dolphinscheduler
    
    * change escheduler to dolphinscheduler
    
    * remove log4j-1.2-api and modify AlertMapperTest
    
    * remove log4j-1.2-api
    
    * Add alertDao to spring management
    
    * Add alertDao to spring management
    
    * get SqlSessionFactory from MybatisSqlSessionFactoryBean
    
    * get processDao by DaoFactory
    
    * read druid properties in ConneciontFactory
    
    * read druid properties in ConneciontFactory
    
    * change get alertDao by spring to DaoFactory
    
    * add log4j to resolve #967
    
    * resole verify udf name error and delete udf error
    
    * Determine if principal is empty
    
    * Determine whether the logon user has the right to delete the project
    
    * Fixed an issue that produced attatch file named such as ATT00002.bin
    
    * fix too many connection in upgrade or create
    
    * fix NEED_FAULT_TOLERANCE and WAITTING_THREAD count fail
    
    * Added a judgment on whether the currently login user is an administrator
    
    * fix update udf database not change and create time is changed
    
    * add enterprise.wechat.enable to decide whether to send enterprise WeChat
    
    * change method check
    
    * Remove the administrator's judgment on query access token list
    
    * only admin can create worker group
    
    * delete alert group need delete the relation of user and alert group
    
    * add timeout in proxy when upload large resource
    
    * add gets scheduled times by expect fire times
    
    * add gets scheduled times by expect fire times
    
    * Increase the judgment of whether it is admin
    
    * Increase the judgment of whether it is admin
    
    * when delete access token add whether login user has perm to delete
    
    * change mysql-connector-java scope to test
    
    * update scm test
    
    * add profile test
    
    * add profile test
    
    * add maven.deploy.skip true
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * add dependency
    
    * add javadoc
    
    * add antrun
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * reset pgsql (#1178)
    
    + 1
    
    * add javadoc
    
    * add javadoc
    
    * [maven-release-plugin] rollback the release of 1.2.0
    
    * add javadoc
    
    * Ans UI upgrade to version 0.1.0 (#1181)
    
    + 1
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * Administrators group prohibit deletion (#1182)
    
    * Ans UI upgrade to version 0.1.0
    
    * Administrators group prohibit deletion
    
    * add javadoc
    
    * add ui pom
    
    * fix master server shutdown error (#1177)
    
    * move updateTaskState into try/catch block in case of exception
    
    * fix NPE
    
    * using conf.getInt instead of getString
    
    * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
    for AlertDao, correct the spelling.
    
    * duplicate
    
    * refactor getTaskWorkerGroupId
    
    * add friendly log
    
    * update hearbeat thread num = 1
    
    * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
    
    * 1. move verifyTaskInstanceIsNull after taskInstance
    2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
    
    * fix the message
    
    * delete before check to avoid KeeperException$NoNodeException
    
    * fix the message
    
    * check processInstance state before delete tenant
    
    * check processInstance state before delete worker group
    
    * refactor
    
    * merge api constants into common constatns
    
    * update the resource perm
    
    * update the dataSource perm
    
    * fix CheckUtils.checkUserParams method
    
    * update AlertGroupService, extends from BaseService, remove duplicate methods
    
    * refactor
    
    * modify method name
    
    * add hasProjectAndPerm method
    
    * using checkProject instead of getResultStatus
    
    * delete checkAuth method, using hasProjectAndPerm instead.
    
    * correct spelling
    
    * add transactional for deleteWorkerGroupById
    
    * add Transactional for deleteProcessInstanceById method
    
    * change sqlSessionTemplate singleton
    
    * change sqlSessionTemplate singleton and reformat code
    
    * fix unsuitable error message
    
    * update shutdownhook methods
    
    * fix worker log bug
    
    * fix api server debug mode bug
    
    * upgrade zk version
    
    * delete this line ,for zkClient.close() will do the whole thing
    
    * fix master server shutdown error
    
    * degrade zk version and add FourLetterWordMain class (#1183)
    
    * move updateTaskState into try/catch block in case of exception
    
    * fix NPE
    
    * using conf.getInt instead of getString
    
    * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
    for AlertDao, correct the spelling.
    
    * duplicate
    
    * refactor getTaskWorkerGroupId
    
    * add friendly log
    
    * update hearbeat thread num = 1
    
    * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
    
    * 1. move verifyTaskInstanceIsNull after taskInstance
    2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
    
    * fix the message
    
    * delete before check to avoid KeeperException$NoNodeException
    
    * fix the message
    
    * check processInstance state before delete tenant
    
    * check processInstance state before delete worker group
    
    * refactor
    
    * merge api constants into common constatns
    
    * update the resource perm
    
    * update the dataSource perm
    
    * fix CheckUtils.checkUserParams method
    
    * update AlertGroupService, extends from BaseService, remove duplicate methods
    
    * refactor
    
    * modify method name
    
    * add hasProjectAndPerm method
    
    * using checkProject instead of getResultStatus
    
    * delete checkAuth method, using hasProjectAndPerm instead.
    
    * correct spelling
    
    * add transactional for deleteWorkerGroupById
    
    * add Transactional for deleteProcessInstanceById method
    
    * change sqlSessionTemplate singleton
    
    * change sqlSessionTemplate singleton and reformat code
    
    * fix unsuitable error message
    
    * update shutdownhook methods
    
    * fix worker log bug
    
    * fix api server debug mode bug
    
    * upgrade zk version
    
    * delete this line ,for zkClient.close() will do the whole thing
    
    * fix master server shutdown error
    
    * degrade zk version and add FourLetterWordMain class
    
    * add ui pom
    
    * add src pom and assembly
    
    * fix ZKWorkerClient not close PathChildrenCache (#1185)
    
    * move updateTaskState into try/catch block in case of exception
    
    * fix NPE
    
    * using conf.getInt instead of getString
    
    * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
    for AlertDao, correct the spelling.
    
    * duplicate
    
    * refactor getTaskWorkerGroupId
    
    * add friendly log
    
    * update hearbeat thread num = 1
    
    * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
    
    * 1. move verifyTaskInstanceIsNull after taskInstance
    2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
    
    * fix the message
    
    * delete before check to avoid KeeperException$NoNodeException
    
    * fix the message
    
    * check processInstance state before delete tenant
    
    * check processInstance state before delete worker group
    
    * refactor
    
    * merge api constants into common constatns
    
    * update the resource perm
    
    * update the dataSource perm
    
    * fix CheckUtils.checkUserParams method
    
    * update AlertGroupService, extends from BaseService, remove duplicate methods
    
    * refactor
    
    * modify method name
    
    * add hasProjectAndPerm method
    
    * using checkProject instead of getResultStatus
    
    * delete checkAuth method, using hasProjectAndPerm instead.
    
    * correct spelling
    
    * add transactional for deleteWorkerGroupById
    
    * add Transactional for deleteProcessInstanceById method
    
    * change sqlSessionTemplate singleton
    
    * change sqlSessionTemplate singleton and reformat code
    
    * fix unsuitable error message
    
    * update shutdownhook methods
    
    * fix worker log bug
    
    * fix api server debug mode bug
    
    * upgrade zk version
    
    * delete this line ,for zkClient.close() will do the whole thing
    
    * fix master server shutdown error
    
    * degrade zk version and add FourLetterWordMain class
    
    * fix PathChildrenCache not close
    
    * add Transactional for createSession method (#1186)
    
    * move updateTaskState into try/catch block in case of exception
    
    * fix NPE
    
    * using conf.getInt instead of getString
    
    * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
    for AlertDao, correct the spelling.
    
    * duplicate
    
    * refactor getTaskWorkerGroupId
    
    * add friendly log
    
    * update hearbeat thread num = 1
    
    * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
    
    * 1. move verifyTaskInstanceIsNull after taskInstance
    2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
    
    * fix the message
    
    * delete before check to avoid KeeperException$NoNodeException
    
    * fix the message
    
    * check processInstance state before delete tenant
    
    * check processInstance state before delete worker group
    
    * refactor
    
    * merge api constants into common constatns
    
    * update the resource perm
    
    * update the dataSource perm
    
    * fix CheckUtils.checkUserParams method
    
    * update AlertGroupService, extends from BaseService, remove duplicate methods
    
    * refactor
    
    * modify method name
    
    * add hasProjectAndPerm method
    
    * using checkProject instead of getResultStatus
    
    * delete checkAuth method, using hasProjectAndPerm instead.
    
    * correct spelling
    
    * add transactional for deleteWorkerGroupById
    
    * add Transactional for deleteProcessInstanceById method
    
    * change sqlSessionTemplate singleton
    
    * change sqlSessionTemplate singleton and reformat code
    
    * fix unsuitable error message
    
    * update shutdownhook methods
    
    * fix worker log bug
    
    * fix api server debug mode bug
    
    * upgrade zk version
    
    * delete this line ,for zkClient.close() will do the whole thing
    
    * fix master server shutdown error
    
    * degrade zk version and add FourLetterWordMain class
    
    * fix PathChildrenCache not close
    
    * add Transactional for createSession method
    
    * add src pom and assembly
    
    * add src pom and assembly
    
    * add src pom and assembly
    
    * add src pom and assembly
    
    * dockerfile dao application.properties ,install.sh modify and application.properties modify (#1187)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * add src pom and assembly
    
    * add src pom and assembly
    
    * dockerfile startup.sh modify (#1189)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs (#1191)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs
    
    * nginx conf modify
    
    * dockerfile application.properties modify
    
    * dockerfile conf modify (#1192)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs
    
    * nginx conf modify
    
    * dockerfile application.properties modify
    
    * dockerfile conf modify (#1193)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs
    
    * nginx conf modify
    
    * dockerfile application.properties modify
    
    * dockerfile email address change (#1194)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs
    
    * nginx conf modify
    
    * dockerfile application.properties modify
    
    * dockerfile email address change
    
    * the alert module is modified in english (#1195)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs
    
    * nginx conf modify
    
    * dockerfile application.properties modify
    
    * dockerfile email address change
    
    * the alert module is modified in English.
    
    * alert server comment and chinese modify
    
    * api server useless code and chinese modify (#1198)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs
    
    * nginx conf modify
    
    * dockerfile application.properties modify
    
    * dockerfile email address change
    
    * the alert module is modified in English.
    
    * alert server comment and chinese modify
    
    * api server useless code and chinese modify
    
    * common,dao,server useless code and chinese modify (#1199)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs
    
    * nginx conf modify
    
    * dockerfile application.properties modify
    
    * dockerfile email address change
    
    * the alert module is modified in English.
    
    * alert server comment and chinese modify
    
    * api server useless code and chinese modify
    
    * common,dao,server useless code and chinese modify
    
    * change chinese sql to english. (#1200)
    
    * update english documents
    
    * refactor zk client
    
    * update documents
    
    * update zkclient
    
    * update zkclient
    
    * update documents
    
    * add architecture-design
    
    * change i18n
    
    * update i18n
    
    * update english documents
    
    * add architecture-design
    
    * update english documents
    
    * update en-US documents
    
    * add architecture-design
    
    * update demo site
    
    * add mybatis plus model
    
    * modify mybatisplus
    
    * modify mybatisplus
    
    * change interface by mybatisplus
    
    * add unit test
    
    * refactor dao interface.
    
    * add unit test for dao...
    
    * add unit test for dao...
    
    * add unit test for dao...
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
    
    * update some dao bugs
    
    * update for some bugs
    
    * update some bugs
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
    
    * update
    
    * update
    
    * add multiply settings for application.yml
    
    * add multiply settings for application.yml
    
    * revert
    
    * update configuration settings in task record dao...
    
    * change application_master to application-master
    
    * change application_master to application-master
    
    * update application.yml to application.properties
    
    * revert
    
    * revert
    
    * add properties
    
    * add properties
    
    * revert
    
    * revert
    
    * add api start up..
    add alert send try catch
    
    * update dao info level
    
    * fix bug: task cannot submit when recovery failover
    
    * fix bug: task cannot submit when recovery failover
    
    * merge from dev-db
    
    * revert
    
    * revert
    
    * fix bug: get process definition list failed.
    
    * fix bug: process instance interval is error
    
    * revert
    
    * revert
    
    * update
    
    * support stop submit success tasks
    
    * update kill process
    
    * update for stop process
    
    * update for stop process
    
    * add some logs for stop process
    
    * update for small bug.
    
    * add check strategy before submit task
    
    * revert
    
    * update
    
    * update
    
    * revert
    
    * wait task instance exists if null.
    
    * revert
    
    * update
    
    * change desc to description.
    
    * add check user and definitions function when delete tenant
    
    * update
    
    * change desc to description.
    
    * change desc to description.
    
    * change desc to description.
    
    * remove check resources when delete tenant
    
    * change desc to description.
    
    * change mybatisplus version to 3.2.0
    
    * update
    
    * change the notice to apache.
    
    * update
    
    * update postgre sql
    
    * fix bug: phone can be empty.
    
    * fix bug: postgre test error.
    
    * update create table for postgre quartz
    
    * fix some bugs about postgre.
    
    * update create table for postgre quartz
    
    * add postgre db performance monitor
    
    * add postgre performance monitor
    
    * update performance monitor
    
    * revert
    
    * revert
    
    * fix bug: tasks queue length error
    
    * remove datasource.properties
    
    * change chinese sql to english.
    
    * change chinese sql to english.
    
    * change chinese to english (#1202)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs
    
    * nginx conf modify
    
    * dockerfile application.properties modify
    
    * dockerfile email address change
    
    * the alert module is modified in English.
    
    * alert server comment and chinese modify
    
    * api server useless code and chinese modify
    
    * common,dao,server useless code and chinese modify
    
    * change chinese to english
    
    * remove unused code (#1204)
    
    * update english documents
    
    * refactor zk client
    
    * update documents
    
    * update zkclient
    
    * update zkclient
    
    * update documents
    
    * add architecture-design
    
    * change i18n
    
    * update i18n
    
    * update english documents
    
    * add architecture-design
    
    * update english documents
    
    * update en-US documents
    
    * add architecture-design
    
    * update demo site
    
    * add mybatis plus model
    
    * modify mybatisplus
    
    * modify mybatisplus
    
    * change interface by mybatisplus
    
    * add unit test
    
    * refactor dao interface.
    
    * add unit test for dao...
    
    * add unit test for dao...
    
    * add unit test for dao...
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
    
    * update some dao bugs
    
    * update for some bugs
    
    * update some bugs
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
    
    * update
    
    * update
    
    * add multiply settings for application.yml
    
    * add multiply settings for application.yml
    
    * revert
    
    * update configuration settings in task record dao...
    
    * change application_master to application-master
    
    * change application_master to application-master
    
    * update application.yml to application.properties
    
    * revert
    
    * revert
    
    * add properties
    
    * add properties
    
    * revert
    
    * revert
    
    * add api start up..
    add alert send try catch
    
    * update dao info level
    
    * fix bug: task cannot submit when recovery failover
    
    * fix bug: task cannot submit when recovery failover
    
    * merge from dev-db
    
    * revert
    
    * revert
    
    * fix bug: get process definition list failed.
    
    * fix bug: process instance interval is error
    
    * revert
    
    * revert
    
    * update
    
    * support stop submit success tasks
    
    * update kill process
    
    * update for stop process
    
    * update for stop process
    
    * add some logs for stop process
    
    * update for small bug.
    
    * add check strategy before submit task
    
    * revert
    
    * update
    
    * update
    
    * revert
    
    * wait task instance exists if null.
    
    * revert
    
    * update
    
    * change desc to description.
    
    * add check user and definitions function when delete tenant
    
    * update
    
    * change desc to description.
    
    * change desc to description.
    
    * change desc to description.
    
    * remove check resources when delete tenant
    
    * change desc to description.
    
    * change mybatisplus version to 3.2.0
    
    * update
    
    * change the notice to apache.
    
    * update
    
    * update postgre sql
    
    * fix bug: phone can be empty.
    
    * fix bug: postgre test error.
    
    * update create table for postgre quartz
    
    * fix some bugs about postgre.
    
    * update create table for postgre quartz
    
    * add postgre db performance monitor
    
    * add postgre performance monitor
    
    * update performance monitor
    
    * revert
    
    * revert
    
    * fix bug: tasks queue length error
    
    * remove datasource.properties
    
    * change chinese sql to english.
    
    * change chinese sql to english.
    
    * remove unused code.
    
    * remove unused code.
    
    * Modify webpack configuration (#1206)
    
    * add more message for java-doc (#1209)
    
    * move updateTaskState into try/catch block in case of exception
    
    * fix NPE
    
    * using conf.getInt instead of getString
    
    * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
    for AlertDao, correct the spelling.
    
    * duplicate
    
    * refactor getTaskWorkerGroupId
    
    * add friendly log
    
    * update hearbeat thread num = 1
    
    * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
    
    * 1. move verifyTaskInstanceIsNull after taskInstance
    2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
    
    * fix the message
    
    * delete before check to avoid KeeperException$NoNodeException
    
    * fix the message
    
    * check processInstance state before delete tenant
    
    * check processInstance state before delete worker group
    
    * refactor
    
    * merge api constants into common constatns
    
    * update the resource perm
    
    * update the dataSource perm
    
    * fix CheckUtils.checkUserParams method
    
    * update AlertGroupService, extends from BaseService, remove duplicate methods
    
    * refactor
    
    * modify method name
    
    * add hasProjectAndPerm method
    
    * using checkProject instead of getResultStatus
    
    * delete checkAuth method, using hasProjectAndPerm instead.
    
    * correct spelling
    
    * add transactional for deleteWorkerGroupById
    
    * add Transactional for deleteProcessInstanceById method
    
    * change sqlSessionTemplate singleton
    
    * change sqlSessionTemplate singleton and reformat code
    
    * fix unsuitable error message
    
    * update shutdownhook methods
    
    * fix worker log bug
    
    * fix api server debug mode bug
    
    * upgrade zk version
    
    * delete this line ,for zkClient.close() will do the whole thing
    
    * fix master server shutdown error
    
    * degrade zk version and add FourLetterWordMain class
    
    * fix PathChildrenCache not close
    
    * add Transactional for createSession method
    
    * add more message for java-doc
    
    * add java doc for common module (#1213)
    
    * dao method comments and useless code modify (#1214)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs
    
    * nginx conf modify
    
    * dockerfile application.properties modify
    
    * dockerfile email address change
    
    * the alert module is modified in English.
    
    * alert server comment and chinese modify
    
    * api server useless code and chinese modify
    
    * common,dao,server useless code and chinese modify
    
    * change chinese to english
    
    * dao method comments and useless code modify
    
    * Change all Chinese names to English (#1207)
    
    * Modify webpack configuration
    
    * Change all Chinese names to English
    
    * add progress-bar-webpack-plugin (#1215)
    
    * Modify webpack configuration
    
    * Change all Chinese names to English
    
    * add progress-bar-webpack-plugin
    
    * Add method and parameters comments (#1220)
    
    * rename from DatasourceUserMapper to DataSourceUserMapper
    
    * add unit test in UserMapper and WorkerGroupMapper
    
    * change cn.escheduler to org.apache.dolphinscheduler
    
    * add unit test in UdfFuncMapperTest
    
    * add unit test in UdfFuncMapperTest
    
    * remove DatabaseConfiguration
    
    * add ConnectionFactoryTest
    
    * cal duration in processInstancesList
    
    * change desc to description
    
    * change table name in mysql ddl
    
    * change table name in mysql ddl
    
    * change escheduler to dolphinscheduler
    
    * change escheduler to dolphinscheduler
    
    * change escheduler to dolphinscheduler
    
    * remove log4j-1.2-api and modify AlertMapperTest
    
    * remove log4j-1.2-api
    
    * Add alertDao to spring management
    
    * Add alertDao to spring management
    
    * get SqlSessionFactory from MybatisSqlSessionFactoryBean
    
    * get processDao by DaoFactory
    
    * read druid properties in ConneciontFactory
    
    * read druid properties in ConneciontFactory
    
    * change get alertDao by spring to DaoFactory
    
    * add log4j to resolve #967
    
    * resole verify udf name error and delete udf error
    
    * Determine if principal is empty
    
    * Determine whether the logon user has the right to delete the project
    
    * Fixed an issue that produced attatch file named such as ATT00002.bin
    
    * fix too many connection in upgrade or create
    
    * fix NEED_FAULT_TOLERANCE and WAITTING_THREAD count fail
    
    * Added a judgment on whether the currently login user is an administrator
    
    * fix update udf database not change and create time is changed
    
    * add enterprise.wechat.enable to decide whether to send enterprise WeChat
    
    * change method check
    
    * Remove the administrator's judgment on query access token list
    
    * only admin can create worker group
    
    * delete alert group need delete the relation of user and alert group
    
    * add timeout in proxy when upload large resource
    
    * add gets scheduled times by expect fire times
    
    * add gets scheduled times by expect fire times
    
    * Increase the judgment of whether it is admin
    
    * Increase the judgment of whether it is admin
    
    * when delete access token add whether login user has perm to delete
    
    * change mysql-connector-java scope to test
    
    * update scm test
    
    * add profile test
    
    * Add method and parameters comments
    
    * roll back
    
    * add some notes (#1221)
    
    * update english documents
    
    * refactor zk client
    
    * update documents
    
    * update zkclient
    
    * update zkclient
    
    * update documents
    
    * add architecture-design
    
    * change i18n
    
    * update i18n
    
    * update english documents
    
    * add architecture-design
    
    * update english documents
    
    * update en-US documents
    
    * add architecture-design
    
    * update demo site
    
    * add mybatis plus model
    
    * modify mybatisplus
    
    * modify mybatisplus
    
    * change interface by mybatisplus
    
    * add unit test
    
    * refactor dao interface.
    
    * add unit test for dao...
    
    * add unit test for dao...
    
    * add unit test for dao...
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
    
    * update some dao bugs
    
    * update for some bugs
    
    * update some bugs
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
    
    * update
    
    * update
    
    * add multiply settings for application.yml
    
    * add multiply settings for application.yml
    
    * revert
    
    * update configuration settings in task record dao...
    
    * change application_master to application-master
    
    * change application_master to application-master
    
    * update application.yml to application.properties
    
    * revert
    
    * revert
    
    * add properties
    
    * add properties
    
    * revert
    
    * revert
    
    * add api start up..
    add alert send try catch
    
    * update dao info level
    
    * fix bug: task cannot submit when recovery failover
    
    * fix bug: task cannot submit when recovery failover
    
    * merge from dev-db
    
    * revert
    
    * revert
    
    * fix bug: get process definition list failed.
    
    * fix bug: process instance interval is error
    
    * revert
    
    * revert
    
    * update
    
    * support stop submit success tasks
    
    * update kill process
    
    * update for stop process
    
    * update for stop process
    
    * add some logs for stop process
    
    * update for small bug.
    
    * add check strategy before submit task
    
    * revert
    
    * update
    
    * update
    
    * revert
    
    * wait task instance exists if null.
    
    * revert
    
    * update
    
    * change desc to description.
    
    * add check user and definitions function when delete tenant
    
    * update
    
    * change desc to description.
    
    * change desc to description.
    
    * change desc to description.
    
    * remove check resources when delete tenant
    
    * change desc to description.
    
    * change mybatisplus version to 3.2.0
    
    * update
    
    * change the notice to apache.
    
    * update
    
    * update postgre sql
    
    * fix bug: phone can be empty.
    
    * fix bug: postgre test error.
    
    * update create table for postgre quartz
    
    * fix some bugs about postgre.
    
    * update create table for postgre quartz
    
    * add postgre db performance monitor
    
    * add postgre performance monitor
    
    * update performance monitor
    
    * revert
    
    * revert
    
    * fix bug: tasks queue length error
    
    * remove datasource.properties
    
    * change chinese sql to english.
    
    * change chinese sql to english.
    
    * remove unused code.
    
    * remove unused code.
    
    * add some notes
    
    * update some notes
    
    * update some notes
    
    * update mbatisplus version
    
    * update lombok version
    
    * update lombok version
    
    * revert
    
    * merge from dev-db
    
    * remove version
    
    * update npm install pom
    
    * add front assembly
    
    * add front module
    
    * change verison to 1.2.0-release-SNAPSHOT
    
    * add name in pom and remove compile
    
    * add name in pom
    
    * add licenses in assemble
    
    * change version to 1.2.0-RC1-SNAPSHOT
    
    * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
    
    # Conflicts:
    #	dolphinscheduler-alert/pom.xml
    #	dolphinscheduler-api/pom.xml
    #	dolphinscheduler-common/pom.xml
    #	dolphinscheduler-dao/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
    #	dolphinscheduler-dist/pom.xml
    #	dolphinscheduler-rpc/pom.xml
    #	dolphinscheduler-server/pom.xml
    #	dolphinscheduler-ui/pom.xml
    #	pom.xml
    change assembly id
    
    * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
    
    # Conflicts:
    #	dolphinscheduler-alert/pom.xml
    #	dolphinscheduler-api/pom.xml
    #	dolphinscheduler-common/pom.xml
    #	dolphinscheduler-dao/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
    #	dolphinscheduler-dist/pom.xml
    #	dolphinscheduler-rpc/pom.xml
    #	dolphinscheduler-server/pom.xml
    #	dolphinscheduler-ui/pom.xml
    #	pom.xml
    add DISCLAIMER
    
    * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
    
    # Conflicts:
    #	dolphinscheduler-alert/pom.xml
    #	dolphinscheduler-api/pom.xml
    #	dolphinscheduler-common/pom.xml
    #	dolphinscheduler-dao/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
    #	dolphinscheduler-dist/pom.xml
    #	dolphinscheduler-rpc/pom.xml
    #	dolphinscheduler-server/pom.xml
    #	dolphinscheduler-ui/pom.xml
    #	pom.xml
    add license in xml and properties
    
    * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
    
    # Conflicts:
    #	dolphinscheduler-alert/pom.xml
    #	dolphinscheduler-api/pom.xml
    #	dolphinscheduler-common/pom.xml
    #	dolphinscheduler-dao/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
    #	dolphinscheduler-dist/pom.xml
    #	dolphinscheduler-rpc/pom.xml
    #	dolphinscheduler-server/pom.xml
    #	dolphinscheduler-ui/pom.xml
    #	pom.xml
    add license in dockerfile
    
    * merge dev-db to 1.2.0-release (#1270)
    
    * reset pgsql (#1178)
    
    + 1
    
    * Ans UI upgrade to version 0.1.0 (#1181)
    
    + 1
    
    * Administrators group prohibit deletion (#1182)
    
    * Ans UI upgrade to version 0.1.0
    
    * Administrators group prohibit deletion
    
    * fix master server shutdown error (#1177)
    
    * move updateTaskState into try/catch block in case of exception
    
    * fix NPE
    
    * using conf.getInt instead of getString
    
    * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
    for AlertDao, correct the spelling.
    
    * duplicate
    
    * refactor getTaskWorkerGroupId
    
    * add friendly log
    
    * update hearbeat thread num = 1
    
    * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
    
    * 1. move verifyTaskInstanceIsNull after taskInstance
    2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
    
    * fix the message
    
    * delete before check to avoid KeeperException$NoNodeException
    
    * fix the message
    
    * check processInstance state before delete tenant
    
    * check processInstance state before delete worker group
    
    * refactor
    
    * merge api constants into common constatns
    
    * update the resource perm
    
    * update the dataSource perm
    
    * fix CheckUtils.checkUserParams method
    
    * update AlertGroupService, extends from BaseService, remove duplicate methods
    
    * refactor
    
    * modify method name
    
    * add hasProjectAndPerm method
    
    * using checkProject instead of getResultStatus
    
    * delete checkAuth method, using hasProjectAndPerm instead.
    
    * correct spelling
    
    * add transactional for deleteWorkerGroupById
    
    * add Transactional for deleteProcessInstanceById method
    
    * change sqlSessionTemplate singleton
    
    * change sqlSessionTemplate singleton and reformat code
    
    * fix unsuitable error message
    
    * update shutdownhook methods
    
    * fix worker log bug
    
    * fix api server debug mode bug
    
    * upgrade zk version
    
    * delete this line ,for zkClient.close() will do the whole thing
    
    * fix master server shutdown error
    
    * degrade zk version and add FourLetterWordMain class (#1183)
    
    * move updateTaskState into try/catch block in case of exception
    
    * fix NPE
    
    * using conf.getInt instead of getString
    
    * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
    for AlertDao, correct the spelling.
    
    * duplicate
    
    * refactor getTaskWorkerGroupId
    
    * add friendly log
    
    * update hearbeat thread num = 1
    
    * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
    
    * 1. move verifyTaskInstanceIsNull after taskInstance
    2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
    
    * fix the message
    
    * delete before check to avoid KeeperException$NoNodeException
    
    * fix the message
    
    * check processInstance state before delete tenant
    
    * check processInstance state before delete worker group
    
    * refactor
    
    * merge api constants into common constatns
    
    * update the resource perm
    
    * update the dataSource perm
    
    * fix CheckUtils.checkUserParams method
    
    * update AlertGroupService, extends from BaseService, remove duplicate methods
    
    * refactor
    
    * modify method name
    
    * add hasProjectAndPerm method
    
    * using checkProject instead of getResultStatus
    
    * delete checkAuth method, using hasProjectAndPerm instead.
    
    * correct spelling
    
    * add transactional for deleteWorkerGroupById
    
    * add Transactional for deleteProcessInstanceById method
    
    * change sqlSessionTemplate singleton
    
    * change sqlSessionTemplate singleton and reformat code
    
    * fix unsuitable error message
    
    * update shutdownhook methods
    
    * fix worker log bug
    
    * fix api server debug mode bug
    
    * upgrade zk version
    
    * delete this line ,for zkClient.close() will do the whole thing
    
    * fix master server shutdown error
    
    * degrade zk version and add FourLetterWordMain class
    
    * fix ZKWorkerClient not close PathChildrenCache (#1185)
    
    * move updateTaskState into try/catch block in case of exception
    
    * fix NPE
    
    * using conf.getInt instead of getString
    
    * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
    for AlertDao, correct the spelling.
    
    * duplicate
    
    * refactor getTaskWorkerGroupId
    
    * add friendly log
    
    * update hearbeat thread num = 1
    
    * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
    
    * 1. move verifyTaskInstanceIsNull after taskInstance
    2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
    
    * fix the message
    
    * delete before check to avoid KeeperException$NoNodeException
    
    * fix the message
    
    * check processInstance state before delete tenant
    
    * check processInstance state before delete worker group
    
    * refactor
    
    * merge api constants into common constatns
    
    * update the resource perm
    
    * update the dataSource perm
    
    * fix CheckUtils.checkUserParams method
    
    * update AlertGroupService, extends from BaseService, remove duplicate methods
    
    * refactor
    
    * modify method name
    
    * add hasProjectAndPerm method
    
    * using checkProject instead of getResultStatus
    
    * delete checkAuth method, using hasProjectAndPerm instead.
    
    * correct spelling
    
    * add transactional for deleteWorkerGroupById
    
    * add Transactional for deleteProcessInstanceById method
    
    * change sqlSessionTemplate singleton
    
    * change sqlSessionTemplate singleton and reformat code
    
    * fix unsuitable error message
    
    * update shutdownhook methods
    
    * fix worker log bug
    
    * fix api server debug mode bug
    
    * upgrade zk version
    
    * delete this line ,for zkClient.close() will do the whole thing
    
    * fix master server shutdown error
    
    * degrade zk version and add FourLetterWordMain class
    
    * fix PathChildrenCache not close
    
    * add Transactional for createSession method (#1186)
    
    * move updateTaskState into try/catch block in case of exception
    
    * fix NPE
    
    * using conf.getInt instead of getString
    
    * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
    for AlertDao, correct the spelling.
    
    * duplicate
    
    * refactor getTaskWorkerGroupId
    
    * add friendly log
    
    * update hearbeat thread num = 1
    
    * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
    
    * 1. move verifyTaskInstanceIsNull after taskInstance
    2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
    
    * fix the message
    
    * delete before check to avoid KeeperException$NoNodeException
    
    * fix the message
    
    * check processInstance state before delete tenant
    
    * check processInstance state before delete worker group
    
    * refactor
    
    * merge api constants into common constatns
    
    * update the resource perm
    
    * update the dataSource perm
    
    * fix CheckUtils.checkUserParams method
    
    * update AlertGroupService, extends from BaseService, remove duplicate methods
    
    * refactor
    
    * modify method name
    
    * add hasProjectAndPerm method
    
    * using checkProject instead of getResultStatus
    
    * delete checkAuth method, using hasProjectAndPerm instead.
    
    * correct spelling
    
    * add transactional for deleteWorkerGroupById
    
    * add Transactional for deleteProcessInstanceById method
    
    * change sqlSessionTemplate singleton
    
    * change sqlSessionTemplate singleton and reformat code
    
    * fix unsuitable error message
    
    * update shutdownhook methods
    
    * fix worker log bug
    
    * fix api server debug mode bug
    
    * upgrade zk version
    
    * delete this line ,for zkClient.close() will do the whole thing
    
    * fix master server shutdown error
    
    * degrade zk version and add FourLetterWordMain class
    
    * fix PathChildrenCache not close
    
    * add Transactional for createSession method
    
    * dockerfile dao application.properties ,install.sh modify and application.properties modify (#1187)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify (#1189)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs (#1191)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs
    
    * nginx conf modify
    
    * dockerfile application.properties modify
    
    * dockerfile conf modify (#1192)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs
    
    * nginx conf modify
    
    * dockerfile application.properties modify
    
    * dockerfile conf modify (#1193)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs
    
    * nginx conf modify
    
    * dockerfile application.properties modify
    
    * dockerfile email address change (#1194)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs
    
    * nginx conf modify
    
    * dockerfile application.properties modify
    
    * dockerfile email address change
    
    * the alert module is modified in english (#1195)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs
    
    * nginx conf modify
    
    * dockerfile application.properties modify
    
    * dockerfile email address change
    
    * the alert module is modified in English.
    
    * alert server comment and chinese modify
    
    * api server useless code and chinese modify (#1198)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs
    
    * nginx conf modify
    
    * dockerfile application.properties modify
    
    * dockerfile email address change
    
    * the alert module is modified in English.
    
    * alert server comment and chinese modify
    
    * api server useless code and chinese modify
    
    * common,dao,server useless code and chinese modify (#1199)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs
    
    * nginx conf modify
    
    * dockerfile application.properties modify
    
    * dockerfile email address change
    
    * the alert module is modified in English.
    
    * alert server comment and chinese modify
    
    * api server useless code and chinese modify
    
    * common,dao,server useless code and chinese modify
    
    * change chinese sql to english. (#1200)
    
    * update english documents
    
    * refactor zk client
    
    * update documents
    
    * update zkclient
    
    * update zkclient
    
    * update documents
    
    * add architecture-design
    
    * change i18n
    
    * update i18n
    
    * update english documents
    
    * add architecture-design
    
    * update english documents
    
    * update en-US documents
    
    * add architecture-design
    
    * update demo site
    
    * add mybatis plus model
    
    * modify mybatisplus
    
    * modify mybatisplus
    
    * change interface by mybatisplus
    
    * add unit test
    
    * refactor dao interface.
    
    * add unit test for dao...
    
    * add unit test for dao...
    
    * add unit test for dao...
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
    
    * update some dao bugs
    
    * update for some bugs
    
    * update some bugs
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
    
    * update
    
    * update
    
    * add multiply settings for application.yml
    
    * add multiply settings for application.yml
    
    * revert
    
    * update configuration settings in task record dao...
    
    * change application_master to application-master
    
    * change application_master to application-master
    
    * update application.yml to application.properties
    
    * revert
    
    * revert
    
    * add properties
    
    * add properties
    
    * revert
    
    * revert
    
    * add api start up..
    add alert send try catch
    
    * update dao info level
    
    * fix bug: task cannot submit when recovery failover
    
    * fix bug: task cannot submit when recovery failover
    
    * merge from dev-db
    
    * revert
    
    * revert
    
    * fix bug: get process definition list failed.
    
    * fix bug: process instance interval is error
    
    * revert
    
    * revert
    
    * update
    
    * support stop submit success tasks
    
    * update kill process
    
    * update for stop process
    
    * update for stop process
    
    * add some logs for stop process
    
    * update for small bug.
    
    * add check strategy before submit task
    
    * revert
    
    * update
    
    * update
    
    * revert
    
    * wait task instance exists if null.
    
    * revert
    
    * update
    
    * change desc to description.
    
    * add check user and definitions function when delete tenant
    
    * update
    
    * change desc to description.
    
    * change desc to description.
    
    * change desc to description.
    
    * remove check resources when delete tenant
    
    * change desc to description.
    
    * change mybatisplus version to 3.2.0
    
    * update
    
    * change the notice to apache.
    
    * update
    
    * update postgre sql
    
    * fix bug: phone can be empty.
    
    * fix bug: postgre test error.
    
    * update create table for postgre quartz
    
    * fix some bugs about postgre.
    
    * update create table for postgre quartz
    
    * add postgre db performance monitor
    
    * add postgre performance monitor
    
    * update performance monitor
    
    * revert
    
    * revert
    
    * fix bug: tasks queue length error
    
    * remove datasource.properties
    
    * change chinese sql to english.
    
    * change chinese sql to english.
    
    * change chinese to english (#1202)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs
    
    * nginx conf modify
    
    * dockerfile application.properties modify
    
    * dockerfile email address change
    
    * the alert module is modified in English.
    
    * alert server comment and chinese modify
    
    * api server useless code and chinese modify
    
    * common,dao,server useless code and chinese modify
    
    * change chinese to english
    
    * remove unused code (#1204)
    
    * update english documents
    
    * refactor zk client
    
    * update documents
    
    * update zkclient
    
    * update zkclient
    
    * update documents
    
    * add architecture-design
    
    * change i18n
    
    * update i18n
    
    * update english documents
    
    * add architecture-design
    
    * update english documents
    
    * update en-US documents
    
    * add architecture-design
    
    * update demo site
    
    * add mybatis plus model
    
    * modify mybatisplus
    
    * modify mybatisplus
    
    * change interface by mybatisplus
    
    * add unit test
    
    * refactor dao interface.
    
    * add unit test for dao...
    
    * add unit test for dao...
    
    * add unit test for dao...
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
    
    * update some dao bugs
    
    * update for some bugs
    
    * update some bugs
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
    
    * update
    
    * update
    
    * add multiply settings for application.yml
    
    * add multiply settings for application.yml
    
    * revert
    
    * update configuration settings in task record dao...
    
    * change application_master to application-master
    
    * change application_master to application-master
    
    * update application.yml to application.properties
    
    * revert
    
    * revert
    
    * add properties
    
    * add properties
    
    * revert
    
    * revert
    
    * add api start up..
    add alert send try catch
    
    * update dao info level
    
    * fix bug: task cannot submit when recovery failover
    
    * fix bug: task cannot submit when recovery failover
    
    * merge from dev-db
    
    * revert
    
    * revert
    
    * fix bug: get process definition list failed.
    
    * fix bug: process instance interval is error
    
    * revert
    
    * revert
    
    * update
    
    * support stop submit success tasks
    
    * update kill process
    
    * update for stop process
    
    * update for stop process
    
    * add some logs for stop process
    
    * update for small bug.
    
    * add check strategy before submit task
    
    * revert
    
    * update
    
    * update
    
    * revert
    
    * wait task instance exists if null.
    
    * revert
    
    * update
    
    * change desc to description.
    
    * add check user and definitions function when delete tenant
    
    * update
    
    * change desc to description.
    
    * change desc to description.
    
    * change desc to description.
    
    * remove check resources when delete tenant
    
    * change desc to description.
    
    * change mybatisplus version to 3.2.0
    
    * update
    
    * change the notice to apache.
    
    * update
    
    * update postgre sql
    
    * fix bug: phone can be empty.
    
    * fix bug: postgre test error.
    
    * update create table for postgre quartz
    
    * fix some bugs about postgre.
    
    * update create table for postgre quartz
    
    * add postgre db performance monitor
    
    * add postgre performance monitor
    
    * update performance monitor
    
    * revert
    
    * revert
    
    * fix bug: tasks queue length error
    
    * remove datasource.properties
    
    * change chinese sql to english.
    
    * change chinese sql to english.
    
    * remove unused code.
    
    * remove unused code.
    
    * Modify webpack configuration (#1206)
    
    * add more message for java-doc (#1209)
    
    * move updateTaskState into try/catch block in case of exception
    
    * fix NPE
    
    * using conf.getInt instead of getString
    
    * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
    for AlertDao, correct the spelling.
    
    * duplicate
    
    * refactor getTaskWorkerGroupId
    
    * add friendly log
    
    * update hearbeat thread num = 1
    
    * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
    
    * 1. move verifyTaskInstanceIsNull after taskInstance
    2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
    
    * fix the message
    
    * delete before check to avoid KeeperException$NoNodeException
    
    * fix the message
    
    * check processInstance state before delete tenant
    
    * check processInstance state before delete worker group
    
    * refactor
    
    * merge api constants into common constatns
    
    * update the resource perm
    
    * update the dataSource perm
    
    * fix CheckUtils.checkUserParams method
    
    * update AlertGroupService, extends from BaseService, remove duplicate methods
    
    * refactor
    
    * modify method name
    
    * add hasProjectAndPerm method
    
    * using checkProject instead of getResultStatus
    
    * delete checkAuth method, using hasProjectAndPerm instead.
    
    * correct spelling
    
    * add transactional for deleteWorkerGroupById
    
    * add Transactional for deleteProcessInstanceById method
    
    * change sqlSessionTemplate singleton
    
    * change sqlSessionTemplate singleton and reformat code
    
    * fix unsuitable error message
    
    * update shutdownhook methods
    
    * fix worker log bug
    
    * fix api server debug mode bug
    
    * upgrade zk version
    
    * delete this line ,for zkClient.close() will do the whole thing
    
    * fix master server shutdown error
    
    * degrade zk version and add FourLetterWordMain class
    
    * fix PathChildrenCache not close
    
    * add Transactional for createSession method
    
    * add more message for java-doc
    
    * add java doc for common module (#1213)
    
    * dao method comments and useless code modify (#1214)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs
    
    * nginx conf modify
    
    * dockerfile application.properties modify
    
    * dockerfile email address change
    
    * the alert module is modified in English.
    
    * alert server comment and chinese modify
    
    * api server useless code and chinese modify
    
    * common,dao,server useless code and chinese modify
    
    * change chinese to english
    
    * dao method comments and useless code modify
    
    * Change all Chinese names to English (#1207)
    
    * Modify webpack configuration
    
    * Change all Chinese names to English
    
    * add progress-bar-webpack-plugin (#1215)
    
    * Modify webpack configuration
    
    * Change all Chinese names to English
    
    * add progress-bar-webpack-plugin
    
    * Add method and parameters comments (#1220)
    
    * rename from DatasourceUserMapper to DataSourceUserMapper
    
    * add unit test in UserMapper and WorkerGroupMapper
    
    * change cn.escheduler to org.apache.dolphinscheduler
    
    * add unit test in UdfFuncMapperTest
    
    * add unit test in UdfFuncMapperTest
    
    * remove DatabaseConfiguration
    
    * add ConnectionFactoryTest
    
    * cal duration in processInstancesList
    
    * change desc to description
    
    * change table name in mysql ddl
    
    * change table name in mysql ddl
    
    * change escheduler to dolphinscheduler
    
    * change escheduler to dolphinscheduler
    
    * change escheduler to dolphinscheduler
    
    * remove log4j-1.2-api and modify AlertMapperTest
    
    * remove log4j-1.2-api
    
    * Add alertDao to spring management
    
    * Add alertDao to spring management
    
    * get SqlSessionFactory from MybatisSqlSessionFactoryBean
    
    * get processDao by DaoFactory
    
    * read druid properties in ConneciontFactory
    
    * read druid properties in ConneciontFactory
    
    * change get alertDao by spring to DaoFactory
    
    * add log4j to resolve #967
    
    * resole verify udf name error and delete udf error
    
    * Determine if principal is empty
    
    * Determine whether the logon user has the right to delete the project
    
    * Fixed an issue that produced attatch file named such as ATT00002.bin
    
    * fix too many connection in upgrade or create
    
    * fix NEED_FAULT_TOLERANCE and WAITTING_THREAD count fail
    
    * Added a judgment on whether the currently login user is an administrator
    
    * fix update udf database not change and create time is changed
    
    * add enterprise.wechat.enable to decide whether to send enterprise WeChat
    
    * change method check
    
    * Remove the administrator's judgment on query access token list
    
    * only admin can create worker group
    
    * delete alert group need delete the relation of user and alert group
    
    * add timeout in proxy when upload large resource
    
    * add gets scheduled times by expect fire times
    
    * add gets scheduled times by expect fire times
    
    * Increase the judgment of whether it is admin
    
    * Increase the judgment of whether it is admin
    
    * when delete access token add whether login user has perm to delete
    
    * change mysql-connector-java scope to test
    
    * update scm test
    
    * add profile test
    
    * Add method and parameters comments
    
    * roll back
    
    * add some notes (#1221)
    
    * update english documents
    
    * refactor zk client
    
    * update documents
    
    * update zkclient
    
    * update zkclient
    
    * update documents
    
    * add architecture-design
    
    * change i18n
    
    * update i18n
    
    * update english documents
    
    * add architecture-design
    
    * update english documents
    
    * update en-US documents
    
    * add architecture-design
    
    * update demo site
    
    * add mybatis plus model
    
    * modify mybatisplus
    
    * modify mybatisplus
    
    * change interface by mybatisplus
    
    * add unit test
    
    * refactor dao interface.
    
    * add unit test for dao...
    
    * add unit test for dao...
    
    * add unit test for dao...
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
    
    * update some dao bugs
    
    * update for some bugs
    
    * update some bugs
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
    
    * update
    
    * update
    
    * add multiply settings for application.yml
    
    * add multiply settings for application.yml
    
    * revert
    
    * update configuration settings in task record dao...
    
    * change application_master to application-master
    
    * change application_master to application-master
    
    * update application.yml to application.properties
    
    * revert
    
    * revert
    
    * add properties
    
    * add properties
    
    * revert
    
    * revert
    
    * add api start up..
    add alert send try catch
    
    * update dao info level
    
    * fix bug: task cannot submit when recovery failover
    
    * fix bug: task cannot submit when recovery failover
    
    * merge from dev-db
    
    * revert
    
    * revert
    
    * fix bug: get process definition list failed.
    
    * fix bug: process instance interval is error
    
    * revert
    
    * revert
    
    * update
    
    * support stop submit success tasks
    
    * update kill process
    
    * update for stop process
    
    * update for stop process
    
    * add some logs for stop process
    
    * update for small bug.
    
    * add check strategy before submit task
    
    * revert
    
    * update
    
    * update
    
    * revert
    
    * wait task instance exists if null.
    
    * revert
    
    * update
    
    * change desc to description.
    
    * add check user and definitions function when delete tenant
    
    * update
    
    * change desc to description.
    
    * change desc to description.
    
    * change desc to description.
    
    * remove check resources when delete tenant
    
    * change desc to description.
    
    * change mybatisplus version to 3.2.0
    
    * update
    
    * change the notice to apache.
    
    * update
    
    * update postgre sql
    
    * fix bug: phone can be empty.
    
    * fix bug: postgre test error.
    
    * update create table for postgre quartz
    
    * fix some bugs about postgre.
    
    * update create table for postgre quartz
    
    * add postgre db performance monitor
    
    * add postgre performance monitor
    
    * update performance monitor
    
    * revert
    
    * revert
    
    * fix bug: tasks queue length error
    
    * remove datasource.properties
    
    * change chinese sql to english.
    
    * change chinese sql to english.
    
    * remove unused code.
    
    * remove unused code.
    
    * add some notes
    
    * update some notes
    
    * update some notes
    
    * update mbatisplus version
    
    * update lombok version
    
    * update lombok version
    
    * revert
    
    * master startup error bug fix (#1229)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs
    
    * nginx conf modify
    
    * dockerfile application.properties modify
    
    * dockerfile email address change
    
    * the alert module is modified in English.
    
    * alert server comment and chinese modify
    
    * api server useless code and chinese modify
    
    * common,dao,server useless code and chinese modify
    
    * change chinese to english
    
    * dao method comments and useless code modify
    
    * master startup error bug fix
    
    * delete class App, let spring manage connectionFactory (#1233)
    
    * move updateTaskState into try/catch block in case of exception
    
    * fix NPE
    
    * using conf.getInt instead of getString
    
    * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
    for AlertDao, correct the spelling.
    
    * duplicate
    
    * refactor getTaskWorkerGroupId
    
    * add friendly log
    
    * update hearbeat thread num = 1
    
    * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
    
    * 1. move verifyTaskInstanceIsNull after taskInstance
    2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
    
    * fix the message
    
    * delete before check to avoid KeeperException$NoNodeException
    
    * fix the message
    
    * check processInstance state before delete tenant
    
    * check processInstance state before delete worker group
    
    * refactor
    
    * merge api constants into common constatns
    
    * update the resource perm
    
    * update the dataSource perm
    
    * fix CheckUtils.checkUserParams method
    
    * update AlertGroupService, extends from BaseService, remove duplicate methods
    
    * refactor
    
    * modify method name
    
    * add hasProjectAndPerm method
    
    * using checkProject instead of getResultStatus
    
    * delete checkAuth method, using hasProjectAndPerm instead.
    
    * correct spelling
    
    * add transactional for deleteWorkerGroupById
    
    * add Transactional for deleteProcessInstanceById method
    
    * change sqlSessionTemplate singleton
    
    * change sqlSessionTemplate singleton and reformat code
    
    * fix unsuitable error message
    
    * update shutdownhook methods
    
    * fix worker log bug
    
    * fix api server debug mode bug
    
    * upgrade zk version
    
    * delete this line ,for zkClient.close() will do the whole thing
    
    * fix master server shutdown error
    
    * degrade zk version and add FourLetterWordMain class
    
    * fix PathChildrenCache not close
    
    * add Transactional for createSession method
    
    * add more message for java-doc
    
    * delete App, let spring manage connectionFactory
    
    * add license
    
    * add class Application for test support
    
    * refactor masterServer and workerServer (#1244)
    
    * move updateTaskState into try/catch block in case of exception
    
    * fix NPE
    
    * using conf.getInt instead of getString
    
    * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
    for AlertDao, correct the spelling.
    
    * duplicate
    
    * refactor getTaskWorkerGroupId
    
    * add friendly log
    
    * update hearbeat thread num = 1
    
    * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
    
    * 1. move verifyTaskInstanceIsNull after taskInstance
    2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
    
    * fix the message
    
    * delete before check to avoid KeeperException$NoNodeException
    
    * fix the message
    
    * check processInstance state before delete tenant
    
    * check processInstance state before delete worker group
    
    * refactor
    
    * merge api constants into common constatns
    
    * update the resource perm
    
    * update the dataSource perm
    
    * fix CheckUtils.checkUserParams method
    
    * update AlertGroupService, extends from BaseService, remove duplicate methods
    
    * refactor
    
    * modify method name
    
    * add hasProjectAndPerm method
    
    * using checkProject instead of getResultStatus
    
    * delete checkAuth method, using hasProjectAndPerm instead.
    
    * correct spelling
    
    * add transactional for deleteWorkerGroupById
    
    * add Transactional for deleteProcessInstanceById method
    
    * change sqlSessionTemplate singleton
    
    * change sqlSessionTemplate singleton and reformat code
    
    * fix unsuitable error message
    
    * update shutdownhook methods
    
    * fix worker log bug
    
    * fix api server debug mode bug
    
    * upgrade zk version
    
    * delete this line ,for zkClient.close() will do the whole thing
    
    * fix master server shutdown error
    
    * degrade zk version and add FourLetterWordMain class
    
    * fix PathChildrenCache not close
    
    * add Transactional for createSession method
    
    * add more message for java-doc
    
    * delete App, let spring manage connectionFactory
    
    * add license
    
    * add class Application for test support
    
    * refactor masterServer and workerServer
    
    * add args
    
    * ConnectionFactory add paging intercepter
    
    * ConnectionFactory add paging intercepter (#1250)
    
    * remove spotbugs-annotations.jar LGPL protocol
    
    * remove spotbugs-annotations.jar LGPL protocol (#1251)
    
    * ConnectionFactory add paging intercepter
    
    * remove spotbugs-annotations.jar LGPL protocol
    
    * fix #1245, make scanCommand transactional (#1246)
    
    * fix the spring transaction not worker bug  (#1252)
    
    * move updateTaskState into try/catch block in case of exception
    
    * fix NPE
    
    * using conf.getInt instead of getString
    
    * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
    for AlertDao, correct the spelling.
    
    * duplicate
    
    * refactor getTaskWorkerGroupId
    
    * add friendly log
    
    * update hearbeat thread num = 1
    
    * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
    
    * 1. move verifyTaskInstanceIsNull after taskInstance
    2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
    
    * fix the message
    
    * delete before check to avoid KeeperException$NoNodeException
    
    * fix the message
    
    * check processInstance state before delete tenant
    
    * check processInstance state before delete worker group
    
    * refactor
    
    * merge api constants into common constatns
    
    * update the resource perm
    
    * update the dataSource perm
    
    * fix CheckUtils.checkUserParams method
    
    * update AlertGroupService, extends from BaseService, remove duplicate methods
    
    * refactor
    
    * modify method name
    
    * add hasProjectAndPerm method
    
    * using checkProject instead of getResultStatus
    
    * delete checkAuth method, using hasProjectAndPerm instead.
    
    * correct spelling
    
    * add transactional for deleteWorkerGroupById
    
    * add Transactional for deleteProcessInstanceById method
    
    * change sqlSessionTemplate singleton
    
    * change sqlSessionTemplate singleton and reformat code
    
    * fix unsuitable error message
    
    * update shutdownhook methods
    
    * fix worker log bug
    
    * fix api server debug mode bug
    
    * upgrade zk version
    
    * delete this line ,for zkClient.close() will do the whole thing
    
    * fix master server shutdown error
    
    * degrade zk version and add FourLetterWordMain class
    
    * fix PathChildrenCache not close
    
    * add Transactional for createSession method
    
    * add more message for java-doc
    
    * delete App, let spring manage connectionFactory
    
    * add license
    
    * add class Application for test support
    
    * refactor masterServer and workerServer
    
    * add args
    
    * fix the spring transaction not work bug
    
    * remove author
    
    * delete @Bean annotation
    
    * rename application.properties to application-dao.properties
    
    * delete class MybatisPlusConfig (#1254)
    
    * move updateTaskState into try/catch block in case of exception
    
    * fix NPE
    
    * using conf.getInt instead of getString
    
    * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
    for AlertDao, correct the spelling.
    
    * duplicate
    
    * refactor getTaskWorkerGroupId
    
    * add friendly log
    
    * update hearbeat thread num = 1
    
    * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
    
    * 1. move verifyTaskInstanceIsNull after taskInstance
    2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
    
    * fix the message
    
    * delete before check to avoid KeeperException$NoNodeException
    
    * fix the message
    
    * check processInstance state before delete tenant
    
    * check processInstance state before delete worker group
    
    * refactor
    
    * merge api constants into common constatns
    
    * update the resource perm
    
    * update the dataSource perm
    
    * fix CheckUtils.checkUserParams method
    
    * update AlertGroupService, extends from BaseService, remove duplicate methods
    
    * refactor
    
    * modify method name
    
    * add hasProjectAndPerm method
    
    * using checkProject instead of getResultStatus
    
    * delete checkAuth method, using hasProjectAndPerm instead.
    
    * correct spelling
    
    * add transactional for deleteWorkerGroupById
    
    * add Transactional for deleteProcessInstanceById method
    
    * change sqlSessionTemplate singleton
    
    * change sqlSessionTemplate singleton and reformat code
    
    * fix unsuitable error message
    
    * update shutdownhook methods
    
    * fix worker log bug
    
    * fix api server debug mode bug
    
    * upgra…
    
    * add license in script and sql (#1271)
    
    * rename from DatasourceUserMapper to DataSourceUserMapper
    
    * add unit test in UserMapper and WorkerGroupMapper
    
    * change cn.escheduler to org.apache.dolphinscheduler
    
    * add unit test in UdfFuncMapperTest
    
    * add unit test in UdfFuncMapperTest
    
    * remove DatabaseConfiguration
    
    * add ConnectionFactoryTest
    
    * cal duration in processInstancesList
    
    * change desc to description
    
    * change table name in mysql ddl
    
    * change table name in mysql ddl
    
    * change escheduler to dolphinscheduler
    
    * change escheduler to dolphinscheduler
    
    * change escheduler to dolphinscheduler
    
    * remove log4j-1.2-api and modify AlertMapperTest
    
    * remove log4j-1.2-api
    
    * Add alertDao to spring management
    
    * Add alertDao to spring management
    
    * get SqlSessionFactory from MybatisSqlSessionFactoryBean
    
    * get processDao by DaoFactory
    
    * read druid properties in ConneciontFactory
    
    * read druid properties in ConneciontFactory
    
    * change get alertDao by spring to DaoFactory
    
    * add log4j to resolve #967
    
    * resole verify udf name error and delete udf error
    
    * Determine if principal is empty
    
    * Determine whether the logon user has the right to delete the project
    
    * Fixed an issue that produced attatch file named such as ATT00002.bin
    
    * fix too many connection in upgrade or create
    
    * fix NEED_FAULT_TOLERANCE and WAITTING_THREAD count fail
    
    * Added a judgment on whether the currently login user is an administrator
    
    * fix update udf database not change and create time is changed
    
    * add enterprise.wechat.enable to decide whether to send enterprise WeChat
    
    * change method check
    
    * Remove the administrator's judgment on query access token list
    
    * only admin can create worker group
    
    * delete alert group need delete the relation of user and alert group
    
    * add timeout in proxy when upload large resource
    
    * add gets scheduled times by expect fire times
    
    * add gets scheduled times by expect fire times
    
    * Increase the judgment of whether it is admin
    
    * Increase the judgment of whether it is admin
    
    * when delete access token add whether login user has perm to delete
    
    * change mysql-connector-java scope to test
    
    * update scm test
    
    * add profile test
    
    * add profile test
    
    * add maven.deploy.skip true
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * add dependency
    
    * add javadoc
    
    * add antrun
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * reset pgsql (#1178)
    
    + 1
    
    * add javadoc
    
    * add javadoc
    
    * [maven-release-plugin] rollback the release of 1.2.0
    
    * add javadoc
    
    * Ans UI upgrade to version 0.1.0 (#1181)
    
    + 1
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * Administrators group prohibit deletion (#1182)
    
    * Ans UI upgrade to version 0.1.0
    
    * Administrators group prohibit deletion
    
    * add javadoc
    
    * add ui pom
    
    * fix master server shutdown error (#1177)
    
    * move updateTaskState into try/catch block in case of exception
    
    * fix NPE
    
    * using conf.getInt instead of getString
    
    * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
    for AlertDao, correct the spelling.
    
    * duplicate
    
    * refactor getTaskWorkerGroupId
    
    * add friendly log
    
    * update hearbeat thread num = 1
    
    * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
    
    * 1. move verifyTaskInstanceIsNull after taskInstance
    2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
    
    * fix the message
    
    * delete before check to avoid KeeperException$NoNodeException
    
    * fix the message
    
    * check processInstance state before delete tenant
    
    * check processInstance state before delete worker group
    
    * refactor
    
    * merge api constants into common constatns
    
    * update the resource perm
    
    * update the dataSource perm
    
    * fix CheckUtils.checkUserParams method
    
    * update AlertGroupService, extends from BaseService, remove duplicate methods
    
    * refactor
    
    * modify method name
    
    * add hasProjectAndPerm method
    
    * using checkProject instead of getResultStatus
    
    * delete checkAuth method, using hasProjectAndPerm instead.
    
    * correct spelling
    
    * add transactional for deleteWorkerGroupById
    
    * add Transactional for deleteProcessInstanceById method
    
    * change sqlSessionTemplate singleton
    
    * change sqlSessionTemplate singleton and reformat code
    
    * fix unsuitable error message
    
    * update shutdownhook methods
    
    * fix worker log bug
    
    * fix api server debug mode bug
    
    * upgrade zk version
    
    * delete this line ,for zkClient.close() will do the whole thing
    
    * fix master server shutdown error
    
    * degrade zk version and add FourLetterWordMain class (#1183)
    
    * move updateTaskState into try/catch block in case of exception
    
    * fix NPE
    
    * using conf.getInt instead of getString
    
    * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
    for AlertDao, correct the spelling.
    
    * duplicate
    
    * refactor getTaskWorkerGroupId
    
    * add friendly log
    
    * update hearbeat thread num = 1
    
    * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
    
    * 1. move verifyTaskInstanceIsNull after taskInstance
    2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
    
    * fix the message
    
    * delete before check to avoid KeeperException$NoNodeException
    
    * fix the message
    
    * check processInstance state before delete tenant
    
    * check processInstance state before delete worker group
    
    * refactor
    
    * merge api constants into common constatns
    
    * update the resource perm
    
    * update the dataSource perm
    
    * fix CheckUtils.checkUserParams method
    
    * update AlertGroupService, extends from BaseService, remove duplicate methods
    
    * refactor
    
    * modify method name
    
    * add hasProjectAndPerm method
    
    * using checkProject instead of getResultStatus
    
    * delete checkAuth method, using hasProjectAndPerm instead.
    
    * correct spelling
    
    * add transactional for deleteWorkerGroupById
    
    * add Transactional for deleteProcessInstanceById method
    
    * change sqlSessionTemplate singleton
    
    * change sqlSessionTemplate singleton and reformat code
    
    * fix unsuitable error message
    
    * update shutdownhook methods
    
    * fix worker log bug
    
    * fix api server debug mode bug
    
    * upgrade zk version
    
    * delete this line ,for zkClient.close() will do the whole thing
    
    * fix master server shutdown error
    
    * degrade zk version and add FourLetterWordMain class
    
    * add ui pom
    
    * add src pom and assembly
    
    * fix ZKWorkerClient not close PathChildrenCache (#1185)
    
    * move updateTaskState into try/catch block in case of exception
    
    * fix NPE
    
    * using conf.getInt instead of getString
    
    * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
    for AlertDao, correct the spelling.
    
    * duplicate
    
    * refactor getTaskWorkerGroupId
    
    * add friendly log
    
    * update hearbeat thread num = 1
    
    * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
    
    * 1. move verifyTaskInstanceIsNull after taskInstance
    2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
    
    * fix the message
    
    * delete before check to avoid KeeperException$NoNodeException
    
    * fix the message
    
    * check processInstance state before delete tenant
    
    * check processInstance state before delete worker group
    
    * refactor
    
    * merge api constants into common constatns
    
    * update the resource perm
    
    * update the dataSource perm
    
    * fix CheckUtils.checkUserParams method
    
    * update AlertGroupService, extends from BaseService, remove duplicate methods
    
    * refactor
    
    * modify method name
    
    * add hasProjectAndPerm method
    
    * using checkProject instead of getResultStatus
    
    * delete checkAuth method, using hasProjectAndPerm instead.
    
    * correct spelling
    
    * add transactional for deleteWorkerGroupById
    
    * add Transactional for deleteProcessInstanceById method
    
    * change sqlSessionTemplate singleton
    
    * change sqlSessionTemplate singleton and reformat code
    
    * fix unsuitable error message
    
    * update shutdownhook methods
    
    * fix worker log bug
    
    * fix api server debug mode bug
    
    * upgrade zk version
    
    * delete this line ,for zkClient.close() will do the whole thing
    
    * fix master server shutdown error
    
    * degrade zk version and add FourLetterWordMain class
    
    * fix PathChildrenCache not close
    
    * add Transactional for createSession method (#1186)
    
    * move updateTaskState into try/catch block in case of exception
    
    * fix NPE
    
    * using conf.getInt instead of getString
    
    * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
    for AlertDao, correct the spelling.
    
    * duplicate
    
    * refactor getTaskWorkerGroupId
    
    * add friendly log
    
    * update hearbeat thread num = 1
    
    * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
    
    * 1. move verifyTaskInstanceIsNull after taskInstance
    2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
    
    * fix the message
    
    * delete before check to avoid KeeperException$NoNodeException
    
    * fix the message
    
    * check processInstance state before delete tenant
    
    * check processInstance state before delete worker group
    
    * refactor
    
    * merge api constants into common constatns
    
    * update the resource perm
    
    * update the dataSource perm
    
    * fix CheckUtils.checkUserParams method
    
    * update AlertGroupService, extends from BaseService, remove duplicate methods
    
    * refactor
    
    * modify method name
    
    * add hasProjectAndPerm method
    
    * using checkProject instead of getResultStatus
    
    * delete checkAuth method, using hasProjectAndPerm instead.
    
    * correct spelling
    
    * add transactional for deleteWorkerGroupById
    
    * add Transactional for deleteProcessInstanceById method
    
    * change sqlSessionTemplate singleton
    
    * change sqlSessionTemplate singleton and reformat code
    
    * fix unsuitable error message
    
    * update shutdownhook methods
    
    * fix worker log bug
    
    * fix api server debug mode bug
    
    * upgrade zk version
    
    * delete this line ,for zkClient.close() will do the whole thing
    
    * fix master server shutdown error
    
    * degrade zk version and add FourLetterWordMain class
    
    * fix PathChildrenCache not close
    
    * add Transactional for createSession method
    
    * add src pom and assembly
    
    * add src pom and assembly
    
    * add src pom and assembly
    
    * add src pom and assembly
    
    * dockerfile dao application.properties ,install.sh modify and application.properties modify (#1187)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * add src pom and assembly
    
    * add src pom and assembly
    
    * dockerfile startup.sh modify (#1189)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs (#1191)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs
    
    * nginx conf modify
    
    * dockerfile application.properties modify
    
    * dockerfile conf modify (#1192)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs
    
    * nginx conf modify
    
    * dockerfile application.properties modify
    
    * dockerfile conf modify (#1193)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs
    
    * nginx conf modify
    
    * dockerfile application.properties modify
    
    * dockerfile email address change (#1194)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs
    
    * nginx conf modify
    
    * dockerfile application.properties modify
    
    * dockerfile email address change
    
    * the alert module is modified in english (#1195)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs
    
    * nginx conf modify
    
    * dockerfile application.properties modify
    
    * dockerfile email address change
    
    * the alert module is modified in English.
    
    * alert server comment and chinese modify
    
    * api server useless code and chinese modify (#1198)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs
    
    * nginx conf modify
    
    * dockerfile application.properties modify
    
    * dockerfile email address change
    
    * the alert module is modified in English.
    
    * alert server comment and chinese modify
    
    * api server useless code and chinese modify
    
    * common,dao,server useless code and chinese modify (#1199)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs
    
    * nginx conf modify
    
    * dockerfile application.properties modify
    
    * dockerfile email address change
    
    * the alert module is modified in English.
    
    * alert server comment and chinese modify
    
    * api server useless code and chinese modify
    
    * common,dao,server useless code and chinese modify
    
    * change chinese sql to english. (#1200)
    
    * update english documents
    
    * refactor zk client
    
    * update documents
    
    * update zkclient
    
    * update zkclient
    
    * update documents
    
    * add architecture-design
    
    * change i18n
    
    * update i18n
    
    * update english documents
    
    * add architecture-design
    
    * update english documents
    
    * update en-US documents
    
    * add architecture-design
    
    * update demo site
    
    * add mybatis plus model
    
    * modify mybatisplus
    
    * modify mybatisplus
    
    * change interface by mybatisplus
    
    * add unit test
    
    * refactor dao interface.
    
    * add unit test for dao...
    
    * add unit test for dao...
    
    * add unit test for dao...
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
    
    * update some dao bugs
    
    * update for some bugs
    
    * update some bugs
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
    
    * update
    
    * update
    
    * add multiply settings for application.yml
    
    * add multiply settings for application.yml
    
    * revert
    
    * update configuration settings in task record dao...
    
    * change application_master to application-master
    
    * change application_master to application-master
    
    * update application.yml to application.properties
    
    * revert
    
    * revert
    
    * add properties
    
    * add properties
    
    * revert
    
    * revert
    
    * add api start up..
    add alert send try catch
    
    * update dao info level
    
    * fix bug: task cannot submit when recovery failover
    
    * fix bug: task cannot submit when recovery failover
    
    * merge from dev-db
    
    * revert
    
    * revert
    
    * fix bug: get process definition list failed.
    
    * fix bug: process instance interval is error
    
    * revert
    
    * revert
    
    * update
    
    * support stop submit success tasks
    
    * update kill process
    
    * update for stop process
    
    * update for stop process
    
    * add some logs for stop process
    
    * update for small bug.
    
    * add check strategy before submit task
    
    * revert
    
    * update
    
    * update
    
    * revert
    
    * wait task instance exists if null.
    
    * revert
    
    * update
    
    * change desc to description.
    
    * add check user and definitions function when delete tenant
    
    * update
    
    * change desc to description.
    
    * change desc to description.
    
    * change desc to description.
    
    * remove check resources when delete tenant
    
    * change desc to description.
    
    * change mybatisplus version to 3.2.0
    
    * update
    
    * change the notice to apache.
    
    * update
    
    * update postgre sql
    
    * fix bug: phone can be empty.
    
    * fix bug: postgre test error.
    
    * update create table for postgre quartz
    
    * fix some bugs about postgre.
    
    * update create table for postgre quartz
    
    * add postgre db performance monitor
    
    * add postgre performance monitor
    
    * update performance monitor
    
    * revert
    
    * revert
    
    * fix bug: tasks queue length error
    
    * remove datasource.properties
    
    * change chinese sql to english.
    
    * change chinese sql to english.
    
    * change chinese to english (#1202)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs
    
    * nginx conf modify
    
    * dockerfile application.properties modify
    
    * dockerfile email address change
    
    * the alert module is modified in English.
    
    * alert server comment and chinese modify
    
    * api server useless code and chinese modify
    
    * common,dao,server useless code and chinese modify
    
    * change chinese to english
    
    * remove unused code (#1204)
    
    * update english documents
    
    * refactor zk client
    
    * update documents
    
    * update zkclient
    
    * update zkclient
    
    * update documents
    
    * add architecture-design
    
    * change i18n
    
    * update i18n
    
    * update english documents
    
    * add architecture-design
    
    * update english documents
    
    * update en-US documents
    
    * add architecture-design
    
    * update demo site
    
    * add mybatis plus model
    
    * modify mybatisplus
    
    * modify mybatisplus
    
    * change interface by mybatisplus
    
    * add unit test
    
    * refactor dao interface.
    
    * add unit test for dao...
    
    * add unit test for dao...
    
    * add unit test for dao...
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
    
    * update some dao bugs
    
    * update for some bugs
    
    * update some bugs
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
    
    * update
    
    * update
    
    * add multiply settings for application.yml
    
    * add multiply settings for application.yml
    
    * revert
    
    * update configuration settings in task record dao...
    
    * change application_master to application-master
    
    * change application_master to application-master
    
    * update application.yml to application.properties
    
    * revert
    
    * revert
    
    * add properties
    
    * add properties
    
    * revert
    
    * revert
    
    * add api start up..
    add alert send try catch
    
    * update dao info level
    
    * fix bug: task cannot submit when recovery failover
    
    * fix bug: task cannot submit when recovery failover
    
    * merge from dev-db
    
    * revert
    
    * revert
    
    * fix bug: get process definition list failed.
    
    * fix bug: process instance interval is error
    
    * revert
    
    * revert
    
    * update
    
    * support stop submit success tasks
    
    * update kill process
    
    * update for stop process
    
    * update for stop process
    
    * add some logs for stop process
    
    * update for small bug.
    
    * add check strategy before submit task
    
    * revert
    
    * update
    
    * update
    
    * revert
    
    * wait task instance exists if null.
    
    * revert
    
    * update
    
    * change desc to description.
    
    * add check user and definitions function when delete tenant
    
    * update
    
    * change desc to description.
    
    * change desc to description.
    
    * change desc to description.
    
    * remove check resources when delete tenant
    
    * change desc to description.
    
    * change mybatisplus version to 3.2.0
    
    * update
    
    * change the notice to apache.
    
    * update
    
    * update postgre sql
    
    * fix bug: phone can be empty.
    
    * fix bug: postgre test error.
    
    * update create table for postgre quartz
    
    * fix some bugs about postgre.
    
    * update create table for postgre quartz
    
    * add postgre db performance monitor
    
    * add postgre performance monitor
    
    * update performance monitor
    
    * revert
    
    * revert
    
    * fix bug: tasks queue length error
    
    * remove datasource.properties
    
    * change chinese sql to english.
    
    * change chinese sql to english.
    
    * remove unused code.
    
    * remove unused code.
    
    * Modify webpack configuration (#1206)
    
    * add more message for java-doc (#1209)
    
    * move updateTaskState into try/catch block in case of exception
    
    * fix NPE
    
    * using conf.getInt instead of getString
    
    * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
    for AlertDao, correct the spelling.
    
    * duplicate
    
    * refactor getTaskWorkerGroupId
    
    * add friendly log
    
    * update hearbeat thread num = 1
    
    * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
    
    * 1. move verifyTaskInstanceIsNull after taskInstance
    2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
    
    * fix the message
    
    * delete before check to avoid KeeperException$NoNodeException
    
    * fix the message
    
    * check processInstance state before delete tenant
    
    * check processInstance state before delete worker group
    
    * refactor
    
    * merge api constants into common constatns
    
    * update the resource perm
    
    * update the dataSource perm
    
    * fix CheckUtils.checkUserParams method
    
    * update AlertGroupService, extends from BaseService, remove duplicate methods
    
    * refactor
    
    * modify method name
    
    * add hasProjectAndPerm method
    
    * using checkProject instead of getResultStatus
    
    * delete checkAuth method, using hasProjectAndPerm instead.
    
    * correct spelling
    
    * add transactional for deleteWorkerGroupById
    
    * add Transactional for deleteProcessInstanceById method
    
    * change sqlSessionTemplate singleton
    
    * change sqlSessionTemplate singleton and reformat code
    
    * fix unsuitable error message
    
    * update shutdownhook methods
    
    * fix worker log bug
    
    * fix api server debug mode bug
    
    * upgrade zk version
    
    * delete this line ,for zkClient.close() will do the whole thing
    
    * fix master server shutdown error
    
    * degrade zk version and add FourLetterWordMain class
    
    * fix PathChildrenCache not close
    
    * add Transactional for createSession method
    
    * add more message for java-doc
    
    * add java doc for common module (#1213)
    
    * dao method comments and useless code modify (#1214)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs
    
    * nginx conf modify
    
    * dockerfile application.properties modify
    
    * dockerfile email address change
    
    * the alert module is modified in English.
    
    * alert server comment and chinese modify
    
    * api server useless code and chinese modify
    
    * common,dao,server useless code and chinese modify
    
    * change chinese to english
    
    * dao method comments and useless code modify
    
    * Change all Chinese names to English (#1207)
    
    * Modify webpack configuration
    
    * Change all Chinese names to English
    
    * add progress-bar-webpack-plugin (#1215)
    
    * Modify webpack configuration
    
    * Change all Chinese names to English
    
    * add progress-bar-webpack-plugin
    
    * Add method and parameters comments (#1220)
    
    * rename from DatasourceUserMapper to DataSourceUserMapper
    
    * add unit test in UserMapper and WorkerGroupMapper
    
    * change cn.escheduler to org.apache.dolphinscheduler
    
    * add unit test in UdfFuncMapperTest
    
    * add unit test in UdfFuncMapperTest
    
    * remove DatabaseConfiguration
    
    * add ConnectionFactoryTest
    
    * cal duration in processInstancesList
    
    * change desc to description
    
    * change table name in mysql ddl
    
    * change table name in mysql ddl
    
    * change escheduler to dolphinscheduler
    
    * change escheduler to dolphinscheduler
    
    * change escheduler to dolphinscheduler
    
    * remove log4j-1.2-api and modify AlertMapperTest
    
    * remove log4j-1.2-api
    
    * Add alertDao to spring management
    
    * Add alertDao to spring management
    
    * get SqlSessionFactory from MybatisSqlSessionFactoryBean
    
    * get processDao by DaoFactory
    
    * read druid properties in ConneciontFactory
    
    * read druid properties in ConneciontFactory
    
    * change get alertDao by spring to DaoFactory
    
    * add log4j to resolve #967
    
    * resole verify udf name error and delete udf error
    
    * Determine if principal is empty
    
    * Determine whether the logon user has the right to delete the project
    
    * Fixed an issue that produced attatch file named such as ATT00002.bin
    
    * fix too many connection in upgrade or create
    
    * fix NEED_FAULT_TOLERANCE and WAITTING_THREAD count fail
    
    * Added a judgment on whether the currently login user is an administrator
    
    * fix update udf database not change and create time is changed
    
    * add enterprise.wechat.enable to decide whether to send enterprise WeChat
    
    * change method check
    
    * Remove the administrator's judgment on query access token list
    
    * only admin can create worker group
    
    * delete alert group need delete the relation of user and alert group
    
    * add timeout in proxy when upload large resource
    
    * add gets scheduled times by expect fire times
    
    * add gets scheduled times by expect fire times
    
    * Increase the judgment of whether it is admin
    
    * Increase the judgment of whether it is admin
    
    * when delete access token add whether login user has perm to delete
    
    * change mysql-connector-java scope to test
    
    * update scm test
    
    * add profile test
    
    * Add method and parameters comments
    
    * roll back
    
    * add some notes (#1221)
    
    * update english documents
    
    * refactor zk client
    
    * update documents
    
    * update zkclient
    
    * update zkclient
    
    * update documents
    
    * add architecture-design
    
    * change i18n
    
    * update i18n
    
    * update english documents
    
    * add architecture-design
    
    * update english documents
    
    * update en-US documents
    
    * add architecture-design
    
    * update demo site
    
    * add mybatis plus model
    
    * modify mybatisplus
    
    * modify mybatisplus
    
    * change interface by mybatisplus
    
    * add unit test
    
    * refactor dao interface.
    
    * add unit test for dao...
    
    * add unit test for dao...
    
    * add unit test for dao...
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
    
    * update some dao bugs
    
    * update for some bugs
    
    * update some bugs
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
    
    * update
    
    * update
    
    * add multiply settings for application.yml
    
    * add multiply settings for application.yml
    
    * revert
    
    * update configuration settings in task record dao...
    
    * change application_master to application-master
    
    * change application_master to application-master
    
    * update application.yml to application.properties
    
    * revert
    
    * revert
    
    * add properties
    
    * add properties
    
    * revert
    
    * revert
    
    * add api start up..
    add alert send try catch
    
    * update dao info level
    
    * fix bug: task cannot submit when recovery failover
    
    * fix bug: task cannot submit when recovery failover
    
    * merge from dev-db
    
    * revert
    
    * revert
    
    * fix bug: get process definition list failed.
    
    * fix bug: process instance interval is error
    
    * revert
    
    * revert
    
    * update
    
    * support stop submit success tasks
    
    * update kill process
    
    * update for stop process
    
    * update for stop process
    
    * add some logs for stop process
    
    * update for small bug.
    
    * add check strategy before submit task
    
    * revert
    
    * update
    
    * update
    
    * revert
    
    * wait task instance exists if null.
    
    * revert
    
    * update
    
    * change desc to description.
    
    * add check user and definitions function when delete tenant
    
    * update
    
    * change desc to description.
    
    * change desc to description.
    
    * change desc to description.
    
    * remove check resources when delete tenant
    
    * change desc to description.
    
    * change mybatisplus version to 3.2.0
    
    * update
    
    * change the notice to apache.
    
    * update
    
    * update postgre sql
    
    * fix bug: phone can be empty.
    
    * fix bug: postgre test error.
    
    * update create table for postgre quartz
    
    * fix some bugs about postgre.
    
    * update create table for postgre quartz
    
    * add postgre db performance monitor
    
    * add postgre performance monitor
    
    * update performance monitor
    
    * revert
    
    * revert
    
    * fix bug: tasks queue length error
    
    * remove datasource.properties
    
    * change chinese sql to english.
    
    * change chinese sql to english.
    
    * remove unused code.
    
    * remove unused code.
    
    * add some notes
    
    * update some notes
    
    * update some notes
    
    * update mbatisplus version
    
    * update lombok version
    
    * update lombok version
    
    * revert
    
    * merge from dev-db
    
    * remove version
    
    * update npm install pom
    
    * add front assembly
    
    * add front module
    
    * change verison to 1.2.0-release-SNAPSHOT
    
    * add name in pom and remove compile
    
    * add name in pom
    
    * add licenses in assemble
    
    * change version to 1.2.0-RC1-SNAPSHOT
    
    * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
    
    # Conflicts:
    #	dolphinscheduler-alert/pom.xml
    #	dolphinscheduler-api/pom.xml
    #	dolphinscheduler-common/pom.xml
    #	dolphinscheduler-dao/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
    #	dolphinscheduler-dist/pom.xml
    #	dolphinscheduler-rpc/pom.xml
    #	dolphinscheduler-server/pom.xml
    #	dolphinscheduler-ui/pom.xml
    #	pom.xml
    change assembly id
    
    * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
    
    # Conflicts:
    #	dolphinscheduler-alert/pom.xml
    #	dolphinscheduler-api/pom.xml
    #	dolphinscheduler-common/pom.xml
    #	dolphinscheduler-dao/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
    #	dolphinscheduler-dist/pom.xml
    #	dolphinscheduler-rpc/pom.xml
    #	dolphinscheduler-server/pom.xml
    #	dolphinscheduler-ui/pom.xml
    #	pom.xml
    add DISCLAIMER
    
    * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
    
    # Conflicts:
    #	dolphinscheduler-alert/pom.xml
    #	dolphinscheduler-api/pom.xml
    #	dolphinscheduler-common/pom.xml
    #	dolphinscheduler-dao/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
    #	dolphinscheduler-dist/pom.xml
    #	dolphinscheduler-rpc/pom.xml
    #	dolphinscheduler-server/pom.xml
    #	dolphinscheduler-ui/pom.xml
    #	pom.xml
    add license in xml and properties
    
    * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
    
    # Conflicts:
    #	dolphinscheduler-alert/pom.xml
    #	dolphinscheduler-api/pom.xml
    #	dolphinscheduler-common/pom.xml
    #	dolphinscheduler-dao/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
    #	dolphinscheduler-dist/pom.xml
    #	dolphinscheduler-rpc/pom.xml
    #	dolphinscheduler-server/pom.xml
    #	dolphinscheduler-ui/pom.xml
    #	pom.xml
    add license in dockerfile
    
    * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
    
    # Conflicts:
    #	dolphinscheduler-alert/pom.xml
    #	dolphinscheduler-api/pom.xml
    #	dolphinscheduler-common/pom.xml
    #	dolphinscheduler-dao/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
    #	dolphinscheduler-dist/pom.xml
    #	dolphinscheduler-rpc/pom.xml
    #	dolphinscheduler-server/pom.xml
    #	dolphinscheduler-ui/pom.xml
    #	pom.xml
    add license in script and sql
    
    * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
    
    # Conflicts:
    #	dolphinscheduler-alert/pom.xml
    #	dolphinscheduler-api/pom.xml
    #	dolphinscheduler-common/pom.xml
    #	dolphinscheduler-dao/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
    #	dolphinscheduler-dist/pom.xml
    #	dolphinscheduler-rpc/pom.xml
    #	dolphinscheduler-server/pom.xml
    #	dolphinscheduler-ui/pom.xml
    #	pom.xml
    add license in script and sql
    
    * merge dev-db to 1.2.0-release (#1272)
    
    * reset pgsql (#1178)
    
    + 1
    
    * Ans UI upgrade to version 0.1.0 (#1181)
    
    + 1
    
    * Administrators group prohibit deletion (#1182)
    
    * Ans UI upgrade to version 0.1.0
    
    * Administrators group prohibit deletion
    
    * fix master server shutdown error (#1177)
    
    * move updateTaskState into try/catch block in case of exception
    
    * fix NPE
    
    * using conf.getInt instead of getString
    
    * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
    for AlertDao, correct the spelling.
    
    * duplicate
    
    * refactor getTaskWorkerGroupId
    
    * add friendly log
    
    * update hearbeat thread num = 1
    
    * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
    
    * 1. move verifyTaskInstanceIsNull after taskInstance
    2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
    
    * fix the message
    
    * delete before check to avoid KeeperException$NoNodeException
    
    * fix the message
    
    * check processInstance state before delete tenant
    
    * check processInstance state before delete worker group
    
    * refactor
    
    * merge api constants into common constatns
    
    * update the resource perm
    
    * update the dataSource perm
    
    * fix CheckUtils.checkUserParams method
    
    * update AlertGroupService, extends from BaseService, remove duplicate methods
    
    * refactor
    
    * modify method name
    
    * add hasProjectAndPerm method
    
    * using checkProject instead of getResultStatus
    
    * delete checkAuth method, using hasProjectAndPerm instead.
    
    * correct spelling
    
    * add transactional for deleteWorkerGroupById
    
    * add Transactional for deleteProcessInstanceById method
    
    * change sqlSessionTemplate singleton
    
    * change sqlSessionTemplate singleton and reformat code
    
    * fix unsuitable error message
    
    * update shutdownhook methods
    
    * fix worker log bug
    
    * fix api server debug mode bug
    
    * upgrade zk version
    
    * delete this line ,for zkClient.close() will do the whole thing
    
    * fix master server shutdown error
    
    * degrade zk version and add FourLetterWordMain class (#1183)
    
    * move updateTaskState into try/catch block in case of exception
    
    * fix NPE
    
    * using conf.getInt instead of getString
    
    * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
    for AlertDao, correct the spelling.
    
    * duplicate
    
    * refactor getTaskWorkerGroupId
    
    * add friendly log
    
    * update hearbeat thread num = 1
    
    * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
    
    * 1. move verifyTaskInstanceIsNull after taskInstance
    2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
    
    * fix the message
    
    * delete before check to avoid KeeperException$NoNodeException
    
    * fix the message
    
    * check processInstance state before delete tenant
    
    * check processInstance state before delete worker group
    
    * refactor
    
    * merge api constants into common constatns
    
    * update the resource perm
    
    * update the dataSource perm
    
    * fix CheckUtils.checkUserParams method
    
    * update AlertGroupService, extends from BaseService, remove duplicate methods
    
    * refactor
    
    * modify method name
    
    * add hasProjectAndPerm method
    
    * using checkProject instead of getResultStatus
    
    * delete checkAuth method, using hasProjectAndPerm instead.
    
    * correct spelling
    
    * add transactional for deleteWorkerGroupById
    
    * add Transactional for deleteProcessInstanceById method
    
    * change sqlSessionTemplate singleton
    
    * change sqlSessionTemplate singleton and reformat code
    
    * fix unsuitable error message
    
    * update shutdownhook methods
    
    * fix worker log bug
    
    * fix api server debug mode bug
    
    * upgrade zk version
    
    * delete this line ,for zkClient.close() will do the whole thing
    
    * fix master server shutdown error
    
    * degrade zk version and add FourLetterWordMain class
    
    * fix ZKWorkerClient not close PathChildrenCache (#1185)
    
    * move updateTaskState into try/catch block in case of exception
    
    * fix NPE
    
    * using conf.getInt instead of getString
    
    * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
    for AlertDao, correct the spelling.
    
    * duplicate
    
    * refactor getTaskWorkerGroupId
    
    * add friendly log
    
    * update hearbeat thread num = 1
    
    * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
    
    * 1. move verifyTaskInstanceIsNull after taskInstance
    2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
    
    * fix the message
    
    * delete before check to avoid KeeperException$NoNodeException
    
    * fix the message
    
    * check processInstance state before delete tenant
    
    * check processInstance state before delete worker group
    
    * refactor
    
    * merge api constants into common constatns
    
    * update the resource perm
    
    * update the dataSource perm
    
    * fix CheckUtils.checkUserParams method
    
    * update AlertGroupService, extends from BaseService, remove duplicate methods
    
    * refactor
    
    * modify method name
    
    * add hasProjectAndPerm method
    
    * using checkProject instead of getResultStatus
    
    * delete checkAuth method, using hasProjectAndPerm instead.
    
    * correct spelling
    
    * add transactional for deleteWorkerGroupById
    
    * add Transactional for deleteProcessInstanceById method
    
    * change sqlSessionTemplate singleton
    
    * change sqlSessionTemplate singleton and reformat code
    
    * fix unsuitable error message
    
    * update shutdownhook methods
    
    * fix worker log bug
    
    * fix api server debug mode bug
    
    * upgrade zk version
    
    * delete this line ,for zkClient.close() will do the whole thing
    
    * fix master server shutdown error
    
    * degrade zk version and add FourLetterWordMain class
    
    * fix PathChildrenCache not close
    
    * add Transactional for createSession method (#1186)
    
    * move updateTaskState into try/catch block in case of exception
    
    * fix NPE
    
    * using conf.getInt instead of getString
    
    * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
    for AlertDao, correct the spelling.
    
    * duplicate
    
    * refactor getTaskWorkerGroupId
    
    * add friendly log
    
    * update hearbeat thread num = 1
    
    * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
    
    * 1. move verifyTaskInstanceIsNull after taskInstance
    2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
    
    * fix the message
    
    * delete before check to avoid KeeperException$NoNodeException
    
    * fix the message
    
    * check processInstance state before delete tenant
    
    * check processInstance state before delete worker group
    
    * refactor
    
    * merge api constants into common constatns
    
    * update the resource perm
    
    * update the dataSource perm
    
    * fix CheckUtils.checkUserParams method
    
    * update AlertGroupService, extends from BaseService, remove duplicate methods
    
    * refactor
    
    * modify method name
    
    * add hasProjectAndPerm method
    
    * using checkProject instead of getResultStatus
    
    * delete checkAuth method, using hasProjectAndPerm instead.
    
    * correct spelling
    
    * add transactional for deleteWorkerGroupById
    
    * add Transactional for deleteProcessInstanceById method
    
    * change sqlSessionTemplate singleton
    
    * change sqlSessionTemplate singleton and reformat code
    
    * fix unsuitable error message
    
    * update shutdownhook methods
    
    * fix worker log bug
    
    * fix api server debug mode bug
    
    * upgrade zk version
    
    * delete this line ,for zkClient.close() will do the whole thing
    
    * fix master server shutdown error
    
    * degrade zk version and add FourLetterWordMain class
    
    * fix PathChildrenCache not close
    
    * add Transactional for createSession method
    
    * dockerfile dao application.properties ,install.sh modify and application.properties modify (#1187)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify (#1189)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs (#1191)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs
    
    * nginx conf modify
    
    * dockerfile application.properties modify
    
    * dockerfile conf modify (#1192)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs
    
    * nginx conf modify
    
    * dockerfile application.properties modify
    
    * dockerfile conf modify (#1193)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs
    
    * nginx conf modify
    
    * dockerfile application.properties modify
    
    * dockerfile email address change (#1194)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs
    
    * nginx conf modify
    
    * dockerfile application.properties modify
    
    * dockerfile email address change
    
    * the alert module is modified in english (#1195)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs
    
    * nginx conf modify
    
    * dockerfile application.properties modify
    
    * dockerfile email address change
    
    * the alert module is modified in English.
    
    * alert server comment and chinese modify
    
    * api server useless code and chinese modify (#1198)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs
    
    * nginx conf modify
    
    * dockerfile application.properties modify
    
    * dockerfile email address change
    
    * the alert module is modified in English.
    
    * alert server comment and chinese modify
    
    * api server useless code and chinese modify
    
    * common,dao,server useless code and chinese modify (#1199)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs
    
    * nginx conf modify
    
    * dockerfile application.properties modify
    
    * dockerfile email address change
    
    * the alert module is modified in English.
    
    * alert server comment and chinese modify
    
    * api server useless code and chinese modify
    
    * common,dao,server useless code and chinese modify
    
    * change chinese sql to english. (#1200)
    
    * update english documents
    
    * refactor zk client
    
    * update documents
    
    * update zkclient
    
    * update zkclient
    
    * update documents
    
    * add architecture-design
    
    * change i18n
    
    * update i18n
    
    * update english documents
    
    * add architecture-design
    
    * update english documents
    
    * update en-US documents
    
    * add architecture-design
    
    * update demo site
    
    * add mybatis plus model
    
    * modify mybatisplus
    
    * modify mybatisplus
    
    * change interface by mybatisplus
    
    * add unit test
    
    * refactor dao interface.
    
    * add unit test for dao...
    
    * add unit test for dao...
    
    * add unit test for dao...
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
    
    * update some dao bugs
    
    * update for some bugs
    
    * update some bugs
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
    
    * update
    
    * update
    
    * add multiply settings for application.yml
    
    * add multiply settings for application.yml
    
    * revert
    
    * update configuration settings in task record dao...
    
    * change application_master to application-master
    
    * change application_master to application-master
    
    * update application.yml to application.properties
    
    * revert
    
    * revert
    
    * add properties
    
    * add properties
    
    * revert
    
    * revert
    
    * add api start up..
    add alert send try catch
    
    * update dao info level
    
    * fix bug: task cannot submit when recovery failover
    
    * fix bug: task cannot submit when recovery failover
    
    * merge from dev-db
    
    * revert
    
    * revert
    
    * fix bug: get process definition list failed.
    
    * fix bug: process instance interval is error
    
    * revert
    
    * revert
    
    * update
    
    * support stop submit success tasks
    
    * update kill process
    
    * update for stop process
    
    * update for stop process
    
    * add some logs for stop process
    
    * update for small bug.
    
    * add check strategy before submit task
    
    * revert
    
    * update
    
    * update
    
    * revert
    
    * wait task instance exists if null.
    
    * revert
    
    * update
    
    * change desc to description.
    
    * add check user and definitions function when delete tenant
    
    * update
    
    * change desc to description.
    
    * change desc to description.
    
    * change desc to description.
    
    * remove check resources when delete tenant
    
    * change desc to description.
    
    * change mybatisplus version to 3.2.0
    
    * update
    
    * change the notice to apache.
    
    * update
    
    * update postgre sql
    
    * fix bug: phone can be empty.
    
    * fix bug: postgre test error.
    
    * update create table for postgre quartz
    
    * fix some bugs about postgre.
    
    * update create table for postgre quartz
    
    * add postgre db performance monitor
    
    * add postgre performance monitor
    
    * update performance monitor
    
    * revert
    
    * revert
    
    * fix bug: tasks queue length error
    
    * remove datasource.properties
    
    * change chinese sql to english.
    
    * change chinese sql to english.
    
    * change chinese to english (#1202)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs
    
    * nginx conf modify
    
    * dockerfile application.properties modify
    
    * dockerfile email address change
    
    * the alert module is modified in English.
    
    * alert server comment and chinese modify
    
    * api server useless code and chinese modify
    
    * common,dao,server useless code and chinese modify
    
    * change chinese to english
    
    * remove unused code (#1204)
    
    * update english documents
    
    * refactor zk client
    
    * update documents
    
    * update zkclient
    
    * update zkclient
    
    * update documents
    
    * add architecture-design
    
    * change i18n
    
    * update i18n
    
    * update english documents
    
    * add architecture-design
    
    * update english documents
    
    * update en-US documents
    
    * add architecture-design
    
    * update demo site
    
    * add mybatis plus model
    
    * modify mybatisplus
    
    * modify mybatisplus
    
    * change interface by mybatisplus
    
    * add unit test
    
    * refactor dao interface.
    
    * add unit test for dao...
    
    * add unit test for dao...
    
    * add unit test for dao...
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
    
    * update some dao bugs
    
    * update for some bugs
    
    * update some bugs
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
    
    * update
    
    * update
    
    * add multiply settings for application.yml
    
    * add multiply settings for application.yml
    
    * revert
    
    * update configuration settings in task record dao...
    
    * change application_master to application-master
    
    * change application_master to application-master
    
    * update application.yml to application.properties
    
    * revert
    
    * revert
    
    * add properties
    
    * add properties
    
    * revert
    
    * revert
    
    * add api start up..
    add alert send try catch
    
    * update dao info level
    
    * fix bug: task cannot submit when recovery failover
    
    * fix bug: task cannot submit when recovery failover
    
    * merge from dev-db
    
    * revert
    
    * revert
    
    * fix bug: get process definition list failed.
    
    * fix bug: process instance interval is error
    
    * revert
    
    * revert
    
    * update
    
    * support stop submit success tasks
    
    * update kill process
    
    * update for stop process
    
    * update for stop process
    
    * add some logs for stop process
    
    * update for small bug.
    
    * add check strategy before submit task
    
    * revert
    
    * update
    
    * update
    
    * revert
    
    * wait task instance exists if null.
    
    * revert
    
    * update
    
    * change desc to description.
    
    * add check user and definitions function when delete tenant
    
    * update
    
    * change desc to description.
    
    * change desc to description.
    
    * change desc to description.
    
    * remove check resources when delete tenant
    
    * change desc to description.
    
    * change mybatisplus version to 3.2.0
    
    * update
    
    * change the notice to apache.
    
    * update
    
    * update postgre sql
    
    * fix bug: phone can be empty.
    
    * fix bug: postgre test error.
    
    * update create table for postgre quartz
    
    * fix some bugs about postgre.
    
    * update create table for postgre quartz
    
    * add postgre db performance monitor
    
    * add postgre performance monitor
    
    * update performance monitor
    
    * revert
    
    * revert
    
    * fix bug: tasks queue length error
    
    * remove datasource.properties
    
    * change chinese sql to english.
    
    * change chinese sql to english.
    
    * remove unused code.
    
    * remove unused code.
    
    * Modify webpack configuration (#1206)
    
    * add more message for java-doc (#1209)
    
    * move updateTaskState into try/catch block in case of exception
    
    * fix NPE
    
    * using conf.getInt instead of getString
    
    * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
    for AlertDao, correct the spelling.
    
    * duplicate
    
    * refactor getTaskWorkerGroupId
    
    * add friendly log
    
    * update hearbeat thread num = 1
    
    * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
    
    * 1. move verifyTaskInstanceIsNull after taskInstance
    2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
    
    * fix the message
    
    * delete before check to avoid KeeperException$NoNodeException
    
    * fix the message
    
    * check processInstance state before delete tenant
    
    * check processInstance state before delete worker group
    
    * refactor
    
    * merge api constants into common constatns
    
    * update the resource perm
    
    * update the dataSource perm
    
    * fix CheckUtils.checkUserParams method
    
    * update AlertGroupService, extends from BaseService, remove duplicate methods
    
    * refactor
    
    * modify method name
    
    * add hasProjectAndPerm method
    
    * using checkProject instead of getResultStatus
    
    * delete checkAuth method, using hasProjectAndPerm instead.
    
    * correct spelling
    
    * add transactional for deleteWorkerGroupById
    
    * add Transactional for deleteProcessInstanceById method
    
    * change sqlSessionTemplate singleton
    
    * change sqlSessionTemplate singleton and reformat code
    
    * fix unsuitable error message
    
    * update shutdownhook methods
    
    * fix worker log bug
    
    * fix api server debug mode bug
    
    * upgrade zk version
    
    * delete this line ,for zkClient.close() will do the whole thing
    
    * fix master server shutdown error
    
    * degrade zk version and add FourLetterWordMain class
    
    * fix PathChildrenCache not close
    
    * add Transactional for createSession method
    
    * add more message for java-doc
    
    * add java doc for common module (#1213)
    
    * dao method comments and useless code modify (#1214)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs
    
    * nginx conf modify
    
    * dockerfile application.properties modify
    
    * dockerfile email address change
    
    * the alert module is modified in English.
    
    * alert server comment and chinese modify
    
    * api server useless code and chinese modify
    
    * common,dao,server useless code and chinese modify
    
    * change chinese to english
    
    * dao method comments and useless code modify
    
    * Change all Chinese names to English (#1207)
    
    * Modify webpack configuration
    
    * Change all Chinese names to English
    
    * add progress-bar-webpack-plugin (#1215)
    
    * Modify webpack configuration
    
    * Change all Chinese names to English
    
    * add progress-bar-webpack-plugin
    
    * Add method and parameters comments (#1220)
    
    * rename from DatasourceUserMapper to DataSourceUserMapper
    
    * add unit test in UserMapper and WorkerGroupMapper
    
    * change cn.escheduler to org.apache.dolphinscheduler
    
    * add unit test in UdfFuncMapperTest
    
    * add unit test in UdfFuncMapperTest
    
    * remove DatabaseConfiguration
    
    * add ConnectionFactoryTest
    
    * cal duration in processInstancesList
    
    * change desc to description
    
    * change table name in mysql ddl
    
    * change table name in mysql ddl
    
    * change escheduler to dolphinscheduler
    
    * change escheduler to dolphinscheduler
    
    * change escheduler to dolphinscheduler
    
    * remove log4j-1.2-api and modify AlertMapperTest
    
    * remove log4j-1.2-api
    
    * Add alertDao to spring management
    
    * Add alertDao to spring management
    
    * get SqlSessionFactory from MybatisSqlSessionFactoryBean
    
    * get processDao by DaoFactory
    
    * read druid properties in ConneciontFactory
    
    * read druid properties in ConneciontFactory
    
    * change get alertDao by spring to DaoFactory
    
    * add log4j to resolve #967
    
    * resole verify udf name error and delete udf error
    
    * Determine if principal is empty
    
    * Determine whether the logon user has the right to delete the project
    
    * Fixed an issue that produced attatch file named such as ATT00002.bin
    
    * fix too many connection in upgrade or create
    
    * fix NEED_FAULT_TOLERANCE and WAITTING_THREAD count fail
    
    * Added a judgment on whether the currently login user is an administrator
    
    * fix update udf database not change and create time is changed
    
    * add enterprise.wechat.enable to decide whether to send enterprise WeChat
    
    * change method check
    
    * Remove the administrator's judgment on query access token list
    
    * only admin can create worker group
    
    * delete alert group need delete the relation of user and alert group
    
    * add timeout in proxy when upload large resource
    
    * add gets scheduled times by expect fire times
    
    * add gets scheduled times by expect fire times
    
    * Increase the judgment of whether it is admin
    
    * Increase the judgment of whether it is admin
    
    * when delete access token add whether login user has perm to delete
    
    * change mysql-connector-java scope to test
    
    * update scm test
    
    * add profile test
    
    * Add method and parameters comments
    
    * roll back
    
    * add some notes (#1221)
    
    * update english documents
    
    * refactor zk client
    
    * update documents
    
    * update zkclient
    
    * update zkclient
    
    * update documents
    
    * add architecture-design
    
    * change i18n
    
    * update i18n
    
    * update english documents
    
    * add architecture-design
    
    * update english documents
    
    * update en-US documents
    
    * add architecture-design
    
    * update demo site
    
    * add mybatis plus model
    
    * modify mybatisplus
    
    * modify mybatisplus
    
    * change interface by mybatisplus
    
    * add unit test
    
    * refactor dao interface.
    
    * add unit test for dao...
    
    * add unit test for dao...
    
    * add unit test for dao...
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
    
    * update some dao bugs
    
    * update for some bugs
    
    * update some bugs
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
    
    * update
    
    * update
    
    * add multiply settings for application.yml
    
    * add multiply settings for application.yml
    
    * revert
    
    * update configuration settings in task record dao...
    
    * change application_master to application-master
    
    * change application_master to application-master
    
    * update application.yml to application.properties
    
    * revert
    
    * revert
    
    * add properties
    
    * add properties
    
    * revert
    
    * revert
    
    * add api start up..
    add alert send try catch
    
    * update dao info level
    
    * fix bug: task cannot submit when recovery failover
    
    * fix bug: task cannot submit when recovery failover
    
    * merge from dev-db
    
    * revert
    
    * revert
    
    * fix bug: get process definition list failed.
    
    * fix bug: process instance interval is error
    
    * revert
    
    * revert
    
    * update
    
    * support stop submit success tasks
    
    * update kill process
    
    * update for stop process
    
    * update for stop process
    
    * add some logs for stop process
    
    * update for small bug.
    
    * add check strategy before submit task
    
    * revert
    
    * update
    
    * update
    
    * revert
    
    * wait task instance exists if null.
    
    * revert
    
    * update
    
    * change desc to description.
    
    * add check user and definitions function when delete tenant
    
    * update
    
    * change desc to description.
    
    * change desc to description.
    
    * change desc to description.
    
    * remove check resources when delete tenant
    
    * change desc to description.
    
    * change mybatisplus version to 3.2.0
    
    * update
    
    * change the notice to apache.
    
    * update
    
    * update postgre sql
    
    * fix bug: phone can be empty.
    
    * fix bug: postgre test error.
    
    * update create table for postgre quartz
    
    * fix some bugs about postgre.
    
    * update create table for postgre quartz
    
    * add postgre db performance monitor
    
    * add postgre performance monitor
    
    * update performance monitor
    
    * revert
    
    * revert
    
    * fix bug: tasks queue length error
    
    * remove datasource.properties
    
    * change chinese sql to english.
    
    * change chinese sql to english.
    
    * remove unused code.
    
    * remove unused code.
    
    * add some notes
    
    * update some notes
    
    * update some notes
    
    * update mbatisplus version
    
    * update lombok version
    
    * update lombok version
    
    * revert
    
    * master startup error bug fix (#1229)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs
    
    * nginx conf modify
    
    * dockerfile application.properties modify
    
    * dockerfile email address change
    
    * the alert module is modified in English.
    
    * alert server comment and chinese modify
    
    * api server useless code and chinese modify
    
    * common,dao,server useless code and chinese modify
    
    * change chinese to english
    
    * dao method comments and useless code modify
    
    * master startup error bug fix
    
    * delete class App, let spring manage connectionFactory (#1233)
    
    * move updateTaskState into try/catch block in case of exception
    
    * fix NPE
    
    * using conf.getInt instead of getString
    
    * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
    for AlertDao, correct the spelling.
    
    * duplicate
    
    * refactor getTaskWorkerGroupId
    
    * add friendly log
    
    * update hearbeat thread num = 1
    
    * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
    
    * 1. move verifyTaskInstanceIsNull after taskInstance
    2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
    
    * fix the message
    
    * delete before check to avoid KeeperException$NoNodeException
    
    * fix the message
    
    * check processInstance state before delete tenant
    
    * check processInstance state before delete worker group
    
    * refactor
    
    * merge api constants into common constatns
    
    * update the resource perm
    
    * update the dataSource perm
    
    * fix CheckUtils.checkUserParams method
    
    * update AlertGroupService, extends from BaseService, remove duplicate methods
    
    * refactor
    
    * modify method name
    
    * add hasProjectAndPerm method
    
    * using checkProject instead of getResultStatus
    
    * delete checkAuth method, using hasProjectAndPerm instead.
    
    * correct spelling
    
    * add transactional for deleteWorkerGroupById
    
    * add Transactional for deleteProcessInstanceById method
    
    * change sqlSessionTemplate singleton
    
    * change sqlSessionTemplate singleton and reformat code
    
    * fix unsuitable error message
    
    * update shutdownhook methods
    
    * fix worker log bug
    
    * fix api server debug mode bug
    
    * upgrade zk version
    
    * delete this line ,for zkClient.close() will do the whole thing
    
    * fix master server shutdown error
    
    * degrade zk version and add FourLetterWordMain class
    
    * fix PathChildrenCache not close
    
    * add Transactional for createSession method
    
    * add more message for java-doc
    
    * delete App, let spring manage connectionFactory
    
    * add license
    
    * add class Application for test support
    
    * refactor masterServer and workerServer (#1244)
    
    * move updateTaskState into try/catch block in case of exception
    
    * fix NPE
    
    * using conf.getInt instead of getString
    
    * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
    for AlertDao, correct the spelling.
    
    * duplicate
    
    * refactor getTaskWorkerGroupId
    
    * add friendly log
    
    * update hearbeat thread num = 1
    
    * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
    
    * 1. move verifyTaskInstanceIsNull after taskInstance
    2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
    
    * fix the message
    
    * delete before check to avoid KeeperException$NoNodeException
    
    * fix the message
    
    * check processInstance state before delete tenant
    
    * check processInstance state before delete worker group
    
    * refactor
    
    * merge api constants into common constatns
    
    * update the resource perm
    
    * update the dataSource perm
    
    * fix CheckUtils.checkUserParams method
    
    * update AlertGroupService, extends from BaseService, remove duplicate methods
    
    * refactor
    
    * modify method name
    
    * add hasProjectAndPerm method
    
    * using checkProject instead of getResultStatus
    
    * delete checkAuth method, using hasProjectAndPerm instead.
    
    * correct spelling
    
    * add transactional for deleteWorkerGroupById
    
    * add Transactional for deleteProcessInstanceById method
    
    * change sqlSessionTemplate singleton
    
    * change sqlSessionTemplate singleton and reformat code
    
    * fix unsuitable error message
    
    * update shutdownhook methods
    
    * fix worker log bug
    
    * fix api server debug mode bug
    
    * upgrade zk version
    
    * delete this line ,for zkClient.close() will do the whole thing
    
    * fix master server shutdown error
    
    * degrade zk version and add FourLetterWordMain class
    
    * fix PathChildrenCache not close
    
    * add Transactional for createSession method
    
    * add more message for java-doc
    
    * delete App, let spring manage connectionFactory
    
    * add license
    
    * add class Application for test support
    
    * refactor masterServer and workerServer
    
    * add args
    
    * ConnectionFactory add paging intercepter
    
    * ConnectionFactory add paging intercepter (#1250)
    
    * remove spotbugs-annotations.jar LGPL protocol
    
    * remove spotbugs-annotations.jar LGPL protocol (#1251)
    
    * ConnectionFactory add paging intercepter
    
    * remove spotbugs-annotations.jar LGPL protocol
    
    * fix #1245, make scanCommand transactional (#1246)
    
    * fix the spring transaction not worker bug  (#1252)
    
    * move updateTaskState into try/catch block in case of exception
    
    * fix NPE
    
    * using conf.getInt instead of getString
    
    * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
    for AlertDao, correct the spelling.
    
    * duplicate
    
    * refactor getTaskWorkerGroupId
    
    * add friendly log
    
    * update hearbeat thread num = 1
    
    * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
    
    * 1. move verifyTaskInstanceIsNull after taskInstance
    2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
    
    * fix the message
    
    * delete before check to avoid KeeperException$NoNodeException
    
    * fix the message
    
    * check processInstance state before delete tenant
    
    * check processInstance state before delete worker group
    
    * refactor
    
    * merge api constants into common constatns
    
    * update the resource perm
    
    * update the dataSource perm
    
    * fix CheckUtils.checkUserParams method
    
    * update AlertGroupService, extends from BaseService, remove duplicate methods
    
    * refactor
    
    * modify method name
    
    * add hasProjectAndPerm method
    
    * using checkProject instead of getResultStatus
    
    * delete checkAuth method, using hasProjectAndPerm instead.
    
    * correct spelling
    
    * add transactional for deleteWorkerGroupById
    
    * add Transactional for deleteProcessInstanceById method
    
    * change sqlSessionTemplate singleton
    
    * change sqlSessionTemplate singleton and reformat code
    
    * fix unsuitable error message
    
    * update shutdownhook methods
    
    * fix worker log bug
    
    * fix api server debug mode bug
    
    * upgrade zk version
    
    * delete this line ,for zkClient.close() will do the whole thing
    
    * fix master server shutdown error
    
    * degrade zk version and add FourLetterWordMain class
    
    * fix PathChildrenCache not close
    
    * add Transactional for createSession method
    
    * add more message for java-doc
    
    * delete App, let spring manage connectionFactory
    
    * add license
    
    * add class Application for test support
    
    * refactor masterServer and workerServer
    
    * add args
    
    * fix the spring transaction not work bug
    
    * remove author
    
    * delete @Bean annotation
    
    * rename application.properties to application-dao.properties
    
    * delete class MybatisPlusConfig (#1254)
    
    * move updateTaskState into try/catch block in case of exception
    
    * fix NPE
    
    * using conf.getInt instead of getString
    
    * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
    for AlertDao, correct the spelling.
    
    * duplicate
    
    * refactor getTaskWorkerGroupId
    
    * add friendly log
    
    * update hearbeat thread num = 1
    
    * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
    
    * 1. move verifyTaskInstanceIsNull after taskInstance
    2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
    
    * fix the message
    
    * delete before check to avoid KeeperException$NoNodeException
    
    * fix the message
    
    * check processInstance state before delete tenant
    
    * check processInstance state before delete worker group
    
    * refactor
    
    * merge api constants into common constatns
    
    * update the resource perm
    
    * update the dataSource perm
    
    * fix CheckUtils.checkUserParams method
    
    * update AlertGroupService, extends from BaseService, remove duplicate methods
    
    * refactor
    
    * modify method name
    
    * add hasProjectAndPerm method
    
    * using checkProject instead of getResultStatus
    
    * delete checkAuth method, using hasProjectAndPerm instead.
    
    * correct spelling
    
    * add transactional for deleteWorkerGroupById
    
    * add Transactional for deleteProcessInstanceById method
    
    * change sqlSessionTemplate singleton
    
    * change sqlSessionTemplate singleton and reformat code
    
    * fix unsuitable error message
    
    * update shutdownhook methods
    
    * fix worker log bug
    
    * fix api server debug mode bug
    
    * upgra…
    
    * add license in ci (#1273)
    
    * rename from DatasourceUserMapper to DataSourceUserMapper
    
    * add unit test in UserMapper and WorkerGroupMapper
    
    * change cn.escheduler to org.apache.dolphinscheduler
    
    * add unit test in UdfFuncMapperTest
    
    * add unit test in UdfFuncMapperTest
    
    * remove DatabaseConfiguration
    
    * add ConnectionFactoryTest
    
    * cal duration in processInstancesList
    
    * change desc to description
    
    * change table name in mysql ddl
    
    * change table name in mysql ddl
    
    * change escheduler to dolphinscheduler
    
    * change escheduler to dolphinscheduler
    
    * change escheduler to dolphinscheduler
    
    * remove log4j-1.2-api and modify AlertMapperTest
    
    * remove log4j-1.2-api
    
    * Add alertDao to spring management
    
    * Add alertDao to spring management
    
    * get SqlSessionFactory from MybatisSqlSessionFactoryBean
    
    * get processDao by DaoFactory
    
    * read druid properties in ConneciontFactory
    
    * read druid properties in ConneciontFactory
    
    * change get alertDao by spring to DaoFactory
    
    * add log4j to resolve #967
    
    * resole verify udf name error and delete udf error
    
    * Determine if principal is empty
    
    * Determine whether the logon user has the right to delete the project
    
    * Fixed an issue that produced attatch file named such as ATT00002.bin
    
    * fix too many connection in upgrade or create
    
    * fix NEED_FAULT_TOLERANCE and WAITTING_THREAD count fail
    
    * Added a judgment on whether the currently login user is an administrator
    
    * fix update udf database not change and create time is changed
    
    * add enterprise.wechat.enable to decide whether to send enterprise WeChat
    
    * change method check
    
    * Remove the administrator's judgment on query access token list
    
    * only admin can create worker group
    
    * delete alert group need delete the relation of user and alert group
    
    * add timeout in proxy when upload large resource
    
    * add gets scheduled times by expect fire times
    
    * add gets scheduled times by expect fire times
    
    * Increase the judgment of whether it is admin
    
    * Increase the judgment of whether it is admin
    
    * when delete access token add whether login user has perm to delete
    
    * change mysql-connector-java scope to test
    
    * update scm test
    
    * add profile test
    
    * add profile test
    
    * add maven.deploy.skip true
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * add dependency
    
    * add javadoc
    
    * add antrun
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * reset pgsql (#1178)
    
    + 1
    
    * add javadoc
    
    * add javadoc
    
    * [maven-release-plugin] rollback the release of 1.2.0
    
    * add javadoc
    
    * Ans UI upgrade to version 0.1.0 (#1181)
    
    + 1
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * Administrators group prohibit deletion (#1182)
    
    * Ans UI upgrade to version 0.1.0
    
    * Administrators group prohibit deletion
    
    * add javadoc
    
    * add ui pom
    
    * fix master server shutdown error (#1177)
    
    * move updateTaskState into try/catch block in case of exception
    
    * fix NPE
    
    * using conf.getInt instead of getString
    
    * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
    for AlertDao, correct the spelling.
    
    * duplicate
    
    * refactor getTaskWorkerGroupId
    
    * add friendly log
    
    * update hearbeat thread num = 1
    
    * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
    
    * 1. move verifyTaskInstanceIsNull after taskInstance
    2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
    
    * fix the message
    
    * delete before check to avoid KeeperException$NoNodeException
    
    * fix the message
    
    * check processInstance state before delete tenant
    
    * check processInstance state before delete worker group
    
    * refactor
    
    * merge api constants into common constatns
    
    * update the resource perm
    
    * update the dataSource perm
    
    * fix CheckUtils.checkUserParams method
    
    * update AlertGroupService, extends from BaseService, remove duplicate methods
    
    * refactor
    
    * modify method name
    
    * add hasProjectAndPerm method
    
    * using checkProject instead of getResultStatus
    
    * delete checkAuth method, using hasProjectAndPerm instead.
    
    * correct spelling
    
    * add transactional for deleteWorkerGroupById
    
    * add Transactional for deleteProcessInstanceById method
    
    * change sqlSessionTemplate singleton
    
    * change sqlSessionTemplate singleton and reformat code
    
    * fix unsuitable error message
    
    * update shutdownhook methods
    
    * fix worker log bug
    
    * fix api server debug mode bug
    
    * upgrade zk version
    
    * delete this line ,for zkClient.close() will do the whole thing
    
    * fix master server shutdown error
    
    * degrade zk version and add FourLetterWordMain class (#1183)
    
    * move updateTaskState into try/catch block in case of exception
    
    * fix NPE
    
    * using conf.getInt instead of getString
    
    * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
    for AlertDao, correct the spelling.
    
    * duplicate
    
    * refactor getTaskWorkerGroupId
    
    * add friendly log
    
    * update hearbeat thread num = 1
    
    * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
    
    * 1. move verifyTaskInstanceIsNull after taskInstance
    2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
    
    * fix the message
    
    * delete before check to avoid KeeperException$NoNodeException
    
    * fix the message
    
    * check processInstance state before delete tenant
    
    * check processInstance state before delete worker group
    
    * refactor
    
    * merge api constants into common constatns
    
    * update the resource perm
    
    * update the dataSource perm
    
    * fix CheckUtils.checkUserParams method
    
    * update AlertGroupService, extends from BaseService, remove duplicate methods
    
    * refactor
    
    * modify method name
    
    * add hasProjectAndPerm method
    
    * using checkProject instead of getResultStatus
    
    * delete checkAuth method, using hasProjectAndPerm instead.
    
    * correct spelling
    
    * add transactional for deleteWorkerGroupById
    
    * add Transactional for deleteProcessInstanceById method
    
    * change sqlSessionTemplate singleton
    
    * change sqlSessionTemplate singleton and reformat code
    
    * fix unsuitable error message
    
    * update shutdownhook methods
    
    * fix worker log bug
    
    * fix api server debug mode bug
    
    * upgrade zk version
    
    * delete this line ,for zkClient.close() will do the whole thing
    
    * fix master server shutdown error
    
    * degrade zk version and add FourLetterWordMain class
    
    * add ui pom
    
    * add src pom and assembly
    
    * fix ZKWorkerClient not close PathChildrenCache (#1185)
    
    * move updateTaskState into try/catch block in case of exception
    
    * fix NPE
    
    * using conf.getInt instead of getString
    
    * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
    for AlertDao, correct the spelling.
    
    * duplicate
    
    * refactor getTaskWorkerGroupId
    
    * add friendly log
    
    * update hearbeat thread num = 1
    
    * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
    
    * 1. move verifyTaskInstanceIsNull after taskInstance
    2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
    
    * fix the message
    
    * delete before check to avoid KeeperException$NoNodeException
    
    * fix the message
    
    * check processInstance state before delete tenant
    
    * check processInstance state before delete worker group
    
    * refactor
    
    * merge api constants into common constatns
    
    * update the resource perm
    
    * update the dataSource perm
    
    * fix CheckUtils.checkUserParams method
    
    * update AlertGroupService, extends from BaseService, remove duplicate methods
    
    * refactor
    
    * modify method name
    
    * add hasProjectAndPerm method
    
    * using checkProject instead of getResultStatus
    
    * delete checkAuth method, using hasProjectAndPerm instead.
    
    * correct spelling
    
    * add transactional for deleteWorkerGroupById
    
    * add Transactional for deleteProcessInstanceById method
    
    * change sqlSessionTemplate singleton
    
    * change sqlSessionTemplate singleton and reformat code
    
    * fix unsuitable error message
    
    * update shutdownhook methods
    
    * fix worker log bug
    
    * fix api server debug mode bug
    
    * upgrade zk version
    
    * delete this line ,for zkClient.close() will do the whole thing
    
    * fix master server shutdown error
    
    * degrade zk version and add FourLetterWordMain class
    
    * fix PathChildrenCache not close
    
    * add Transactional for createSession method (#1186)
    
    * move updateTaskState into try/catch block in case of exception
    
    * fix NPE
    
    * using conf.getInt instead of getString
    
    * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
    for AlertDao, correct the spelling.
    
    * duplicate
    
    * refactor getTaskWorkerGroupId
    
    * add friendly log
    
    * update hearbeat thread num = 1
    
    * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
    
    * 1. move verifyTaskInstanceIsNull after taskInstance
    2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
    
    * fix the message
    
    * delete before check to avoid KeeperException$NoNodeException
    
    * fix the message
    
    * check processInstance state before delete tenant
    
    * check processInstance state before delete worker group
    
    * refactor
    
    * merge api constants into common constatns
    
    * update the resource perm
    
    * update the dataSource perm
    
    * fix CheckUtils.checkUserParams method
    
    * update AlertGroupService, extends from BaseService, remove duplicate methods
    
    * refactor
    
    * modify method name
    
    * add hasProjectAndPerm method
    
    * using checkProject instead of getResultStatus
    
    * delete checkAuth method, using hasProjectAndPerm instead.
    
    * correct spelling
    
    * add transactional for deleteWorkerGroupById
    
    * add Transactional for deleteProcessInstanceById method
    
    * change sqlSessionTemplate singleton
    
    * change sqlSessionTemplate singleton and reformat code
    
    * fix unsuitable error message
    
    * update shutdownhook methods
    
    * fix worker log bug
    
    * fix api server debug mode bug
    
    * upgrade zk version
    
    * delete this line ,for zkClient.close() will do the whole thing
    
    * fix master server shutdown error
    
    * degrade zk version and add FourLetterWordMain class
    
    * fix PathChildrenCache not close
    
    * add Transactional for createSession method
    
    * add src pom and assembly
    
    * add src pom and assembly
    
    * add src pom and assembly
    
    * add src pom and assembly
    
    * dockerfile dao application.properties ,install.sh modify and application.properties modify (#1187)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * add src pom and assembly
    
    * add src pom and assembly
    
    * dockerfile startup.sh modify (#1189)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs (#1191)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs
    
    * nginx conf modify
    
    * dockerfile application.properties modify
    
    * dockerfile conf modify (#1192)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs
    
    * nginx conf modify
    
    * dockerfile application.properties modify
    
    * dockerfile conf modify (#1193)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs
    
    * nginx conf modify
    
    * dockerfile application.properties modify
    
    * dockerfile email address change (#1194)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs
    
    * nginx conf modify
    
    * dockerfile application.properties modify
    
    * dockerfile email address change
    
    * the alert module is modified in english (#1195)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs
    
    * nginx conf modify
    
    * dockerfile application.properties modify
    
    * dockerfile email address change
    
    * the alert module is modified in English.
    
    * alert server comment and chinese modify
    
    * api server useless code and chinese modify (#1198)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs
    
    * nginx conf modify
    
    * dockerfile application.properties modify
    
    * dockerfile email address change
    
    * the alert module is modified in English.
    
    * alert server comment and chinese modify
    
    * api server useless code and chinese modify
    
    * common,dao,server useless code and chinese modify (#1199)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs
    
    * nginx conf modify
    
    * dockerfile application.properties modify
    
    * dockerfile email address change
    
    * the alert module is modified in English.
    
    * alert server comment and chinese modify
    
    * api server useless code and chinese modify
    
    * common,dao,server useless code and chinese modify
    
    * change chinese sql to english. (#1200)
    
    * update english documents
    
    * refactor zk client
    
    * update documents
    
    * update zkclient
    
    * update zkclient
    
    * update documents
    
    * add architecture-design
    
    * change i18n
    
    * update i18n
    
    * update english documents
    
    * add architecture-design
    
    * update english documents
    
    * update en-US documents
    
    * add architecture-design
    
    * update demo site
    
    * add mybatis plus model
    
    * modify mybatisplus
    
    * modify mybatisplus
    
    * change interface by mybatisplus
    
    * add unit test
    
    * refactor dao interface.
    
    * add unit test for dao...
    
    * add unit test for dao...
    
    * add unit test for dao...
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
    
    * update some dao bugs
    
    * update for some bugs
    
    * update some bugs
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
    
    * update
    
    * update
    
    * add multiply settings for application.yml
    
    * add multiply settings for application.yml
    
    * revert
    
    * update configuration settings in task record dao...
    
    * change application_master to application-master
    
    * change application_master to application-master
    
    * update application.yml to application.properties
    
    * revert
    
    * revert
    
    * add properties
    
    * add properties
    
    * revert
    
    * revert
    
    * add api start up..
    add alert send try catch
    
    * update dao info level
    
    * fix bug: task cannot submit when recovery failover
    
    * fix bug: task cannot submit when recovery failover
    
    * merge from dev-db
    
    * revert
    
    * revert
    
    * fix bug: get process definition list failed.
    
    * fix bug: process instance interval is error
    
    * revert
    
    * revert
    
    * update
    
    * support stop submit success tasks
    
    * update kill process
    
    * update for stop process
    
    * update for stop process
    
    * add some logs for stop process
    
    * update for small bug.
    
    * add check strategy before submit task
    
    * revert
    
    * update
    
    * update
    
    * revert
    
    * wait task instance exists if null.
    
    * revert
    
    * update
    
    * change desc to description.
    
    * add check user and definitions function when delete tenant
    
    * update
    
    * change desc to description.
    
    * change desc to description.
    
    * change desc to description.
    
    * remove check resources when delete tenant
    
    * change desc to description.
    
    * change mybatisplus version to 3.2.0
    
    * update
    
    * change the notice to apache.
    
    * update
    
    * update postgre sql
    
    * fix bug: phone can be empty.
    
    * fix bug: postgre test error.
    
    * update create table for postgre quartz
    
    * fix some bugs about postgre.
    
    * update create table for postgre quartz
    
    * add postgre db performance monitor
    
    * add postgre performance monitor
    
    * update performance monitor
    
    * revert
    
    * revert
    
    * fix bug: tasks queue length error
    
    * remove datasource.properties
    
    * change chinese sql to english.
    
    * change chinese sql to english.
    
    * change chinese to english (#1202)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs
    
    * nginx conf modify
    
    * dockerfile application.properties modify
    
    * dockerfile email address change
    
    * the alert module is modified in English.
    
    * alert server comment and chinese modify
    
    * api server useless code and chinese modify
    
    * common,dao,server useless code and chinese modify
    
    * change chinese to english
    
    * remove unused code (#1204)
    
    * update english documents
    
    * refactor zk client
    
    * update documents
    
    * update zkclient
    
    * update zkclient
    
    * update documents
    
    * add architecture-design
    
    * change i18n
    
    * update i18n
    
    * update english documents
    
    * add architecture-design
    
    * update english documents
    
    * update en-US documents
    
    * add architecture-design
    
    * update demo site
    
    * add mybatis plus model
    
    * modify mybatisplus
    
    * modify mybatisplus
    
    * change interface by mybatisplus
    
    * add unit test
    
    * refactor dao interface.
    
    * add unit test for dao...
    
    * add unit test for dao...
    
    * add unit test for dao...
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
    
    * update some dao bugs
    
    * update for some bugs
    
    * update some bugs
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
    
    * update
    
    * update
    
    * add multiply settings for application.yml
    
    * add multiply settings for application.yml
    
    * revert
    
    * update configuration settings in task record dao...
    
    * change application_master to application-master
    
    * change application_master to application-master
    
    * update application.yml to application.properties
    
    * revert
    
    * revert
    
    * add properties
    
    * add properties
    
    * revert
    
    * revert
    
    * add api start up..
    add alert send try catch
    
    * update dao info level
    
    * fix bug: task cannot submit when recovery failover
    
    * fix bug: task cannot submit when recovery failover
    
    * merge from dev-db
    
    * revert
    
    * revert
    
    * fix bug: get process definition list failed.
    
    * fix bug: process instance interval is error
    
    * revert
    
    * revert
    
    * update
    
    * support stop submit success tasks
    
    * update kill process
    
    * update for stop process
    
    * update for stop process
    
    * add some logs for stop process
    
    * update for small bug.
    
    * add check strategy before submit task
    
    * revert
    
    * update
    
    * update
    
    * revert
    
    * wait task instance exists if null.
    
    * revert
    
    * update
    
    * change desc to description.
    
    * add check user and definitions function when delete tenant
    
    * update
    
    * change desc to description.
    
    * change desc to description.
    
    * change desc to description.
    
    * remove check resources when delete tenant
    
    * change desc to description.
    
    * change mybatisplus version to 3.2.0
    
    * update
    
    * change the notice to apache.
    
    * update
    
    * update postgre sql
    
    * fix bug: phone can be empty.
    
    * fix bug: postgre test error.
    
    * update create table for postgre quartz
    
    * fix some bugs about postgre.
    
    * update create table for postgre quartz
    
    * add postgre db performance monitor
    
    * add postgre performance monitor
    
    * update performance monitor
    
    * revert
    
    * revert
    
    * fix bug: tasks queue length error
    
    * remove datasource.properties
    
    * change chinese sql to english.
    
    * change chinese sql to english.
    
    * remove unused code.
    
    * remove unused code.
    
    * Modify webpack configuration (#1206)
    
    * add more message for java-doc (#1209)
    
    * move updateTaskState into try/catch block in case of exception
    
    * fix NPE
    
    * using conf.getInt instead of getString
    
    * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
    for AlertDao, correct the spelling.
    
    * duplicate
    
    * refactor getTaskWorkerGroupId
    
    * add friendly log
    
    * update hearbeat thread num = 1
    
    * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
    
    * 1. move verifyTaskInstanceIsNull after taskInstance
    2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
    
    * fix the message
    
    * delete before check to avoid KeeperException$NoNodeException
    
    * fix the message
    
    * check processInstance state before delete tenant
    
    * check processInstance state before delete worker group
    
    * refactor
    
    * merge api constants into common constatns
    
    * update the resource perm
    
    * update the dataSource perm
    
    * fix CheckUtils.checkUserParams method
    
    * update AlertGroupService, extends from BaseService, remove duplicate methods
    
    * refactor
    
    * modify method name
    
    * add hasProjectAndPerm method
    
    * using checkProject instead of getResultStatus
    
    * delete checkAuth method, using hasProjectAndPerm instead.
    
    * correct spelling
    
    * add transactional for deleteWorkerGroupById
    
    * add Transactional for deleteProcessInstanceById method
    
    * change sqlSessionTemplate singleton
    
    * change sqlSessionTemplate singleton and reformat code
    
    * fix unsuitable error message
    
    * update shutdownhook methods
    
    * fix worker log bug
    
    * fix api server debug mode bug
    
    * upgrade zk version
    
    * delete this line ,for zkClient.close() will do the whole thing
    
    * fix master server shutdown error
    
    * degrade zk version and add FourLetterWordMain class
    
    * fix PathChildrenCache not close
    
    * add Transactional for createSession method
    
    * add more message for java-doc
    
    * add java doc for common module (#1213)
    
    * dao method comments and useless code modify (#1214)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs
    
    * nginx conf modify
    
    * dockerfile application.properties modify
    
    * dockerfile email address change
    
    * the alert module is modified in English.
    
    * alert server comment and chinese modify
    
    * api server useless code and chinese modify
    
    * common,dao,server useless code and chinese modify
    
    * change chinese to english
    
    * dao method comments and useless code modify
    
    * Change all Chinese names to English (#1207)
    
    * Modify webpack configuration
    
    * Change all Chinese names to English
    
    * add progress-bar-webpack-plugin (#1215)
    
    * Modify webpack configuration
    
    * Change all Chinese names to English
    
    * add progress-bar-webpack-plugin
    
    * Add method and parameters comments (#1220)
    
    * rename from DatasourceUserMapper to DataSourceUserMapper
    
    * add unit test in UserMapper and WorkerGroupMapper
    
    * change cn.escheduler to org.apache.dolphinscheduler
    
    * add unit test in UdfFuncMapperTest
    
    * add unit test in UdfFuncMapperTest
    
    * remove DatabaseConfiguration
    
    * add ConnectionFactoryTest
    
    * cal duration in processInstancesList
    
    * change desc to description
    
    * change table name in mysql ddl
    
    * change table name in mysql ddl
    
    * change escheduler to dolphinscheduler
    
    * change escheduler to dolphinscheduler
    
    * change escheduler to dolphinscheduler
    
    * remove log4j-1.2-api and modify AlertMapperTest
    
    * remove log4j-1.2-api
    
    * Add alertDao to spring management
    
    * Add alertDao to spring management
    
    * get SqlSessionFactory from MybatisSqlSessionFactoryBean
    
    * get processDao by DaoFactory
    
    * read druid properties in ConneciontFactory
    
    * read druid properties in ConneciontFactory
    
    * change get alertDao by spring to DaoFactory
    
    * add log4j to resolve #967
    
    * resole verify udf name error and delete udf error
    
    * Determine if principal is empty
    
    * Determine whether the logon user has the right to delete the project
    
    * Fixed an issue that produced attatch file named such as ATT00002.bin
    
    * fix too many connection in upgrade or create
    
    * fix NEED_FAULT_TOLERANCE and WAITTING_THREAD count fail
    
    * Added a judgment on whether the currently login user is an administrator
    
    * fix update udf database not change and create time is changed
    
    * add enterprise.wechat.enable to decide whether to send enterprise WeChat
    
    * change method check
    
    * Remove the administrator's judgment on query access token list
    
    * only admin can create worker group
    
    * delete alert group need delete the relation of user and alert group
    
    * add timeout in proxy when upload large resource
    
    * add gets scheduled times by expect fire times
    
    * add gets scheduled times by expect fire times
    
    * Increase the judgment of whether it is admin
    
    * Increase the judgment of whether it is admin
    
    * when delete access token add whether login user has perm to delete
    
    * change mysql-connector-java scope to test
    
    * update scm test
    
    * add profile test
    
    * Add method and parameters comments
    
    * roll back
    
    * add some notes (#1221)
    
    * update english documents
    
    * refactor zk client
    
    * update documents
    
    * update zkclient
    
    * update zkclient
    
    * update documents
    
    * add architecture-design
    
    * change i18n
    
    * update i18n
    
    * update english documents
    
    * add architecture-design
    
    * update english documents
    
    * update en-US documents
    
    * add architecture-design
    
    * update demo site
    
    * add mybatis plus model
    
    * modify mybatisplus
    
    * modify mybatisplus
    
    * change interface by mybatisplus
    
    * add unit test
    
    * refactor dao interface.
    
    * add unit test for dao...
    
    * add unit test for dao...
    
    * add unit test for dao...
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
    
    * update some dao bugs
    
    * update for some bugs
    
    * update some bugs
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
    
    * update
    
    * update
    
    * add multiply settings for application.yml
    
    * add multiply settings for application.yml
    
    * revert
    
    * update configuration settings in task record dao...
    
    * change application_master to application-master
    
    * change application_master to application-master
    
    * update application.yml to application.properties
    
    * revert
    
    * revert
    
    * add properties
    
    * add properties
    
    * revert
    
    * revert
    
    * add api start up..
    add alert send try catch
    
    * update dao info level
    
    * fix bug: task cannot submit when recovery failover
    
    * fix bug: task cannot submit when recovery failover
    
    * merge from dev-db
    
    * revert
    
    * revert
    
    * fix bug: get process definition list failed.
    
    * fix bug: process instance interval is error
    
    * revert
    
    * revert
    
    * update
    
    * support stop submit success tasks
    
    * update kill process
    
    * update for stop process
    
    * update for stop process
    
    * add some logs for stop process
    
    * update for small bug.
    
    * add check strategy before submit task
    
    * revert
    
    * update
    
    * update
    
    * revert
    
    * wait task instance exists if null.
    
    * revert
    
    * update
    
    * change desc to description.
    
    * add check user and definitions function when delete tenant
    
    * update
    
    * change desc to description.
    
    * change desc to description.
    
    * change desc to description.
    
    * remove check resources when delete tenant
    
    * change desc to description.
    
    * change mybatisplus version to 3.2.0
    
    * update
    
    * change the notice to apache.
    
    * update
    
    * update postgre sql
    
    * fix bug: phone can be empty.
    
    * fix bug: postgre test error.
    
    * update create table for postgre quartz
    
    * fix some bugs about postgre.
    
    * update create table for postgre quartz
    
    * add postgre db performance monitor
    
    * add postgre performance monitor
    
    * update performance monitor
    
    * revert
    
    * revert
    
    * fix bug: tasks queue length error
    
    * remove datasource.properties
    
    * change chinese sql to english.
    
    * change chinese sql to english.
    
    * remove unused code.
    
    * remove unused code.
    
    * add some notes
    
    * update some notes
    
    * update some notes
    
    * update mbatisplus version
    
    * update lombok version
    
    * update lombok version
    
    * revert
    
    * merge from dev-db
    
    * remove version
    
    * update npm install pom
    
    * add front assembly
    
    * add front module
    
    * change verison to 1.2.0-release-SNAPSHOT
    
    * add name in pom and remove compile
    
    * add name in pom
    
    * add licenses in assemble
    
    * change version to 1.2.0-RC1-SNAPSHOT
    
    * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
    
    # Conflicts:
    #	dolphinscheduler-alert/pom.xml
    #	dolphinscheduler-api/pom.xml
    #	dolphinscheduler-common/pom.xml
    #	dolphinscheduler-dao/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
    #	dolphinscheduler-dist/pom.xml
    #	dolphinscheduler-rpc/pom.xml
    #	dolphinscheduler-server/pom.xml
    #	dolphinscheduler-ui/pom.xml
    #	pom.xml
    change assembly id
    
    * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
    
    # Conflicts:
    #	dolphinscheduler-alert/pom.xml
    #	dolphinscheduler-api/pom.xml
    #	dolphinscheduler-common/pom.xml
    #	dolphinscheduler-dao/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
    #	dolphinscheduler-dist/pom.xml
    #	dolphinscheduler-rpc/pom.xml
    #	dolphinscheduler-server/pom.xml
    #	dolphinscheduler-ui/pom.xml
    #	pom.xml
    add DISCLAIMER
    
    * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
    
    # Conflicts:
    #	dolphinscheduler-alert/pom.xml
    #	dolphinscheduler-api/pom.xml
    #	dolphinscheduler-common/pom.xml
    #	dolphinscheduler-dao/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
    #	dolphinscheduler-dist/pom.xml
    #	dolphinscheduler-rpc/pom.xml
    #	dolphinscheduler-server/pom.xml
    #	dolphinscheduler-ui/pom.xml
    #	pom.xml
    add license in xml and properties
    
    * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
    
    # Conflicts:
    #	dolphinscheduler-alert/pom.xml
    #	dolphinscheduler-api/pom.xml
    #	dolphinscheduler-common/pom.xml
    #	dolphinscheduler-dao/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
    #	dolphinscheduler-dist/pom.xml
    #	dolphinscheduler-rpc/pom.xml
    #	dolphinscheduler-server/pom.xml
    #	dolphinscheduler-ui/pom.xml
    #	pom.xml
    add license in dockerfile
    
    * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
    
    # Conflicts:
    #	dolphinscheduler-alert/pom.xml
    #	dolphinscheduler-api/pom.xml
    #	dolphinscheduler-common/pom.xml
    #	dolphinscheduler-dao/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
    #	dolphinscheduler-dist/pom.xml
    #	dolphinscheduler-rpc/pom.xml
    #	dolphinscheduler-server/pom.xml
    #	dolphinscheduler-ui/pom.xml
    #	pom.xml
    add license in script and sql
    
    * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
    
    # Conflicts:
    #	dolphinscheduler-alert/pom.xml
    #	dolphinscheduler-api/pom.xml
    #	dolphinscheduler-common/pom.xml
    #	dolphinscheduler-dao/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
    #	dolphinscheduler-dist/pom.xml
    #	dolphinscheduler-rpc/pom.xml
    #	dolphinscheduler-server/pom.xml
    #	dolphinscheduler-ui/pom.xml
    #	pom.xml
    add license in script and sql
    
    * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
    
    # Conflicts:
    #	dolphinscheduler-alert/pom.xml
    #	dolphinscheduler-api/pom.xml
    #	dolphinscheduler-common/pom.xml
    #	dolphinscheduler-dao/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
    #	dolphinscheduler-dist/pom.xml
    #	dolphinscheduler-rpc/pom.xml
    #	dolphinscheduler-server/pom.xml
    #	dolphinscheduler-ui/pom.xml
    #	pom.xml
    add license in ci
    
    * merge dev-db to 1.2.0-release (#1276)
    
    * reset pgsql (#1178)
    
    + 1
    
    * Ans UI upgrade to version 0.1.0 (#1181)
    
    + 1
    
    * Administrators group prohibit deletion (#1182)
    
    * Ans UI upgrade to version 0.1.0
    
    * Administrators group prohibit deletion
    
    * fix master server shutdown error (#1177)
    
    * move updateTaskState into try/catch block in case of exception
    
    * fix NPE
    
    * using conf.getInt instead of getString
    
    * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
    for AlertDao, correct the spelling.
    
    * duplicate
    
    * refactor getTaskWorkerGroupId
    
    * add friendly log
    
    * update hearbeat thread num = 1
    
    * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
    
    * 1. move verifyTaskInstanceIsNull after taskInstance
    2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
    
    * fix the message
    
    * delete before check to avoid KeeperException$NoNodeException
    
    * fix the message
    
    * check processInstance state before delete tenant
    
    * check processInstance state before delete worker group
    
    * refactor
    
    * merge api constants into common constatns
    
    * update the resource perm
    
    * update the dataSource perm
    
    * fix CheckUtils.checkUserParams method
    
    * update AlertGroupService, extends from BaseService, remove duplicate methods
    
    * refactor
    
    * modify method name
    
    * add hasProjectAndPerm method
    
    * using checkProject instead of getResultStatus
    
    * delete checkAuth method, using hasProjectAndPerm instead.
    
    * correct spelling
    
    * add transactional for deleteWorkerGroupById
    
    * add Transactional for deleteProcessInstanceById method
    
    * change sqlSessionTemplate singleton
    
    * change sqlSessionTemplate singleton and reformat code
    
    * fix unsuitable error message
    
    * update shutdownhook methods
    
    * fix worker log bug
    
    * fix api server debug mode bug
    
    * upgrade zk version
    
    * delete this line ,for zkClient.close() will do the whole thing
    
    * fix master server shutdown error
    
    * degrade zk version and add FourLetterWordMain class (#1183)
    
    * move updateTaskState into try/catch block in case of exception
    
    * fix NPE
    
    * using conf.getInt instead of getString
    
    * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
    for AlertDao, correct the spelling.
    
    * duplicate
    
    * refactor getTaskWorkerGroupId
    
    * add friendly log
    
    * update hearbeat thread num = 1
    
    * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
    
    * 1. move verifyTaskInstanceIsNull after taskInstance
    2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
    
    * fix the message
    
    * delete before check to avoid KeeperException$NoNodeException
    
    * fix the message
    
    * check processInstance state before delete tenant
    
    * check processInstance state before delete worker group
    
    * refactor
    
    * merge api constants into common constatns
    
    * update the resource perm
    
    * update the dataSource perm
    
    * fix CheckUtils.checkUserParams method
    
    * update AlertGroupService, extends from BaseService, remove duplicate methods
    
    * refactor
    
    * modify method name
    
    * add hasProjectAndPerm method
    
    * using checkProject instead of getResultStatus
    
    * delete checkAuth method, using hasProjectAndPerm instead.
    
    * correct spelling
    
    * add transactional for deleteWorkerGroupById
    
    * add Transactional for deleteProcessInstanceById method
    
    * change sqlSessionTemplate singleton
    
    * change sqlSessionTemplate singleton and reformat code
    
    * fix unsuitable error message
    
    * update shutdownhook methods
    
    * fix worker log bug
    
    * fix api server debug mode bug
    
    * upgrade zk version
    
    * delete this line ,for zkClient.close() will do the whole thing
    
    * fix master server shutdown error
    
    * degrade zk version and add FourLetterWordMain class
    
    * fix ZKWorkerClient not close PathChildrenCache (#1185)
    
    * move updateTaskState into try/catch block in case of exception
    
    * fix NPE
    
    * using conf.getInt instead of getString
    
    * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
    for AlertDao, correct the spelling.
    
    * duplicate
    
    * refactor getTaskWorkerGroupId
    
    * add friendly log
    
    * update hearbeat thread num = 1
    
    * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
    
    * 1. move verifyTaskInstanceIsNull after taskInstance
    2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
    
    * fix the message
    
    * delete before check to avoid KeeperException$NoNodeException
    
    * fix the message
    
    * check processInstance state before delete tenant
    
    * check processInstance state before delete worker group
    
    * refactor
    
    * merge api constants into common constatns
    
    * update the resource perm
    
    * update the dataSource perm
    
    * fix CheckUtils.checkUserParams method
    
    * update AlertGroupService, extends from BaseService, remove duplicate methods
    
    * refactor
    
    * modify method name
    
    * add hasProjectAndPerm method
    
    * using checkProject instead of getResultStatus
    
    * delete checkAuth method, using hasProjectAndPerm instead.
    
    * correct spelling
    
    * add transactional for deleteWorkerGroupById
    
    * add Transactional for deleteProcessInstanceById method
    
    * change sqlSessionTemplate singleton
    
    * change sqlSessionTemplate singleton and reformat code
    
    * fix unsuitable error message
    
    * update shutdownhook methods
    
    * fix worker log bug
    
    * fix api server debug mode bug
    
    * upgrade zk version
    
    * delete this line ,for zkClient.close() will do the whole thing
    
    * fix master server shutdown error
    
    * degrade zk version and add FourLetterWordMain class
    
    * fix PathChildrenCache not close
    
    * add Transactional for createSession method (#1186)
    
    * move updateTaskState into try/catch block in case of exception
    
    * fix NPE
    
    * using conf.getInt instead of getString
    
    * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
    for AlertDao, correct the spelling.
    
    * duplicate
    
    * refactor getTaskWorkerGroupId
    
    * add friendly log
    
    * update hearbeat thread num = 1
    
    * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
    
    * 1. move verifyTaskInstanceIsNull after taskInstance
    2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
    
    * fix the message
    
    * delete before check to avoid KeeperException$NoNodeException
    
    * fix the message
    
    * check processInstance state before delete tenant
    
    * check processInstance state before delete worker group
    
    * refactor
    
    * merge api constants into common constatns
    
    * update the resource perm
    
    * update the dataSource perm
    
    * fix CheckUtils.checkUserParams method
    
    * update AlertGroupService, extends from BaseService, remove duplicate methods
    
    * refactor
    
    * modify method name
    
    * add hasProjectAndPerm method
    
    * using checkProject instead of getResultStatus
    
    * delete checkAuth method, using hasProjectAndPerm instead.
    
    * correct spelling
    
    * add transactional for deleteWorkerGroupById
    
    * add Transactional for deleteProcessInstanceById method
    
    * change sqlSessionTemplate singleton
    
    * change sqlSessionTemplate singleton and reformat code
    
    * fix unsuitable error message
    
    * update shutdownhook methods
    
    * fix worker log bug
    
    * fix api server debug mode bug
    
    * upgrade zk version
    
    * delete this line ,for zkClient.close() will do the whole thing
    
    * fix master server shutdown error
    
    * degrade zk version and add FourLetterWordMain class
    
    * fix PathChildrenCache not close
    
    * add Transactional for createSession method
    
    * dockerfile dao application.properties ,install.sh modify and application.properties modify (#1187)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify (#1189)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs (#1191)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs
    
    * nginx conf modify
    
    * dockerfile application.properties modify
    
    * dockerfile conf modify (#1192)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs
    
    * nginx conf modify
    
    * dockerfile application.properties modify
    
    * dockerfile conf modify (#1193)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs
    
    * nginx conf modify
    
    * dockerfile application.properties modify
    
    * dockerfile email address change (#1194)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs
    
    * nginx conf modify
    
    * dockerfile application.properties modify
    
    * dockerfile email address change
    
    * the alert module is modified in english (#1195)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs
    
    * nginx conf modify
    
    * dockerfile application.properties modify
    
    * dockerfile email address change
    
    * the alert module is modified in English.
    
    * alert server comment and chinese modify
    
    * api server useless code and chinese modify (#1198)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs
    
    * nginx conf modify
    
    * dockerfile application.properties modify
    
    * dockerfile email address change
    
    * the alert module is modified in English.
    
    * alert server comment and chinese modify
    
    * api server useless code and chinese modify
    
    * common,dao,server useless code and chinese modify (#1199)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs
    
    * nginx conf modify
    
    * dockerfile application.properties modify
    
    * dockerfile email address change
    
    * the alert module is modified in English.
    
    * alert server comment and chinese modify
    
    * api server useless code and chinese modify
    
    * common,dao,server useless code and chinese modify
    
    * change chinese sql to english. (#1200)
    
    * update english documents
    
    * refactor zk client
    
    * update documents
    
    * update zkclient
    
    * update zkclient
    
    * update documents
    
    * add architecture-design
    
    * change i18n
    
    * update i18n
    
    * update english documents
    
    * add architecture-design
    
    * update english documents
    
    * update en-US documents
    
    * add architecture-design
    
    * update demo site
    
    * add mybatis plus model
    
    * modify mybatisplus
    
    * modify mybatisplus
    
    * change interface by mybatisplus
    
    * add unit test
    
    * refactor dao interface.
    
    * add unit test for dao...
    
    * add unit test for dao...
    
    * add unit test for dao...
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
    
    * update some dao bugs
    
    * update for some bugs
    
    * update some bugs
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
    
    * update
    
    * update
    
    * add multiply settings for application.yml
    
    * add multiply settings for application.yml
    
    * revert
    
    * update configuration settings in task record dao...
    
    * change application_master to application-master
    
    * change application_master to application-master
    
    * update application.yml to application.properties
    
    * revert
    
    * revert
    
    * add properties
    
    * add properties
    
    * revert
    
    * revert
    
    * add api start up..
    add alert send try catch
    
    * update dao info level
    
    * fix bug: task cannot submit when recovery failover
    
    * fix bug: task cannot submit when recovery failover
    
    * merge from dev-db
    
    * revert
    
    * revert
    
    * fix bug: get process definition list failed.
    
    * fix bug: process instance interval is error
    
    * revert
    
    * revert
    
    * update
    
    * support stop submit success tasks
    
    * update kill process
    
    * update for stop process
    
    * update for stop process
    
    * add some logs for stop process
    
    * update for small bug.
    
    * add check strategy before submit task
    
    * revert
    
    * update
    
    * update
    
    * revert
    
    * wait task instance exists if null.
    
    * revert
    
    * update
    
    * change desc to description.
    
    * add check user and definitions function when delete tenant
    
    * update
    
    * change desc to description.
    
    * change desc to description.
    
    * change desc to description.
    
    * remove check resources when delete tenant
    
    * change desc to description.
    
    * change mybatisplus version to 3.2.0
    
    * update
    
    * change the notice to apache.
    
    * update
    
    * update postgre sql
    
    * fix bug: phone can be empty.
    
    * fix bug: postgre test error.
    
    * update create table for postgre quartz
    
    * fix some bugs about postgre.
    
    * update create table for postgre quartz
    
    * add postgre db performance monitor
    
    * add postgre performance monitor
    
    * update performance monitor
    
    * revert
    
    * revert
    
    * fix bug: tasks queue length error
    
    * remove datasource.properties
    
    * change chinese sql to english.
    
    * change chinese sql to english.
    
    * change chinese to english (#1202)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs
    
    * nginx conf modify
    
    * dockerfile application.properties modify
    
    * dockerfile email address change
    
    * the alert module is modified in English.
    
    * alert server comment and chinese modify
    
    * api server useless code and chinese modify
    
    * common,dao,server useless code and chinese modify
    
    * change chinese to english
    
    * remove unused code (#1204)
    
    * update english documents
    
    * refactor zk client
    
    * update documents
    
    * update zkclient
    
    * update zkclient
    
    * update documents
    
    * add architecture-design
    
    * change i18n
    
    * update i18n
    
    * update english documents
    
    * add architecture-design
    
    * update english documents
    
    * update en-US documents
    
    * add architecture-design
    
    * update demo site
    
    * add mybatis plus model
    
    * modify mybatisplus
    
    * modify mybatisplus
    
    * change interface by mybatisplus
    
    * add unit test
    
    * refactor dao interface.
    
    * add unit test for dao...
    
    * add unit test for dao...
    
    * add unit test for dao...
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
    
    * update some dao bugs
    
    * update for some bugs
    
    * update some bugs
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
    
    * update
    
    * update
    
    * add multiply settings for application.yml
    
    * add multiply settings for application.yml
    
    * revert
    
    * update configuration settings in task record dao...
    
    * change application_master to application-master
    
    * change application_master to application-master
    
    * update application.yml to application.properties
    
    * revert
    
    * revert
    
    * add properties
    
    * add properties
    
    * revert
    
    * revert
    
    * add api start up..
    add alert send try catch
    
    * update dao info level
    
    * fix bug: task cannot submit when recovery failover
    
    * fix bug: task cannot submit when recovery failover
    
    * merge from dev-db
    
    * revert
    
    * revert
    
    * fix bug: get process definition list failed.
    
    * fix bug: process instance interval is error
    
    * revert
    
    * revert
    
    * update
    
    * support stop submit success tasks
    
    * update kill process
    
    * update for stop process
    
    * update for stop process
    
    * add some logs for stop process
    
    * update for small bug.
    
    * add check strategy before submit task
    
    * revert
    
    * update
    
    * update
    
    * revert
    
    * wait task instance exists if null.
    
    * revert
    
    * update
    
    * change desc to description.
    
    * add check user and definitions function when delete tenant
    
    * update
    
    * change desc to description.
    
    * change desc to description.
    
    * change desc to description.
    
    * remove check resources when delete tenant
    
    * change desc to description.
    
    * change mybatisplus version to 3.2.0
    
    * update
    
    * change the notice to apache.
    
    * update
    
    * update postgre sql
    
    * fix bug: phone can be empty.
    
    * fix bug: postgre test error.
    
    * update create table for postgre quartz
    
    * fix some bugs about postgre.
    
    * update create table for postgre quartz
    
    * add postgre db performance monitor
    
    * add postgre performance monitor
    
    * update performance monitor
    
    * revert
    
    * revert
    
    * fix bug: tasks queue length error
    
    * remove datasource.properties
    
    * change chinese sql to english.
    
    * change chinese sql to english.
    
    * remove unused code.
    
    * remove unused code.
    
    * Modify webpack configuration (#1206)
    
    * add more message for java-doc (#1209)
    
    * move updateTaskState into try/catch block in case of exception
    
    * fix NPE
    
    * using conf.getInt instead of getString
    
    * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
    for AlertDao, correct the spelling.
    
    * duplicate
    
    * refactor getTaskWorkerGroupId
    
    * add friendly log
    
    * update hearbeat thread num = 1
    
    * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
    
    * 1. move verifyTaskInstanceIsNull after taskInstance
    2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
    
    * fix the message
    
    * delete before check to avoid KeeperException$NoNodeException
    
    * fix the message
    
    * check processInstance state before delete tenant
    
    * check processInstance state before delete worker group
    
    * refactor
    
    * merge api constants into common constatns
    
    * update the resource perm
    
    * update the dataSource perm
    
    * fix CheckUtils.checkUserParams method
    
    * update AlertGroupService, extends from BaseService, remove duplicate methods
    
    * refactor
    
    * modify method name
    
    * add hasProjectAndPerm method
    
    * using checkProject instead of getResultStatus
    
    * delete checkAuth method, using hasProjectAndPerm instead.
    
    * correct spelling
    
    * add transactional for deleteWorkerGroupById
    
    * add Transactional for deleteProcessInstanceById method
    
    * change sqlSessionTemplate singleton
    
    * change sqlSessionTemplate singleton and reformat code
    
    * fix unsuitable error message
    
    * update shutdownhook methods
    
    * fix worker log bug
    
    * fix api server debug mode bug
    
    * upgrade zk version
    
    * delete this line ,for zkClient.close() will do the whole thing
    
    * fix master server shutdown error
    
    * degrade zk version and add FourLetterWordMain class
    
    * fix PathChildrenCache not close
    
    * add Transactional for createSession method
    
    * add more message for java-doc
    
    * add java doc for common module (#1213)
    
    * dao method comments and useless code modify (#1214)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs
    
    * nginx conf modify
    
    * dockerfile application.properties modify
    
    * dockerfile email address change
    
    * the alert module is modified in English.
    
    * alert server comment and chinese modify
    
    * api server useless code and chinese modify
    
    * common,dao,server useless code and chinese modify
    
    * change chinese to english
    
    * dao method comments and useless code modify
    
    * Change all Chinese names to English (#1207)
    
    * Modify webpack configuration
    
    * Change all Chinese names to English
    
    * add progress-bar-webpack-plugin (#1215)
    
    * Modify webpack configuration
    
    * Change all Chinese names to English
    
    * add progress-bar-webpack-plugin
    
    * Add method and parameters comments (#1220)
    
    * rename from DatasourceUserMapper to DataSourceUserMapper
    
    * add unit test in UserMapper and WorkerGroupMapper
    
    * change cn.escheduler to org.apache.dolphinscheduler
    
    * add unit test in UdfFuncMapperTest
    
    * add unit test in UdfFuncMapperTest
    
    * remove DatabaseConfiguration
    
    * add ConnectionFactoryTest
    
    * cal duration in processInstancesList
    
    * change desc to description
    
    * change table name in mysql ddl
    
    * change table name in mysql ddl
    
    * change escheduler to dolphinscheduler
    
    * change escheduler to dolphinscheduler
    
    * change escheduler to dolphinscheduler
    
    * remove log4j-1.2-api and modify AlertMapperTest
    
    * remove log4j-1.2-api
    
    * Add alertDao to spring management
    
    * Add alertDao to spring management
    
    * get SqlSessionFactory from MybatisSqlSessionFactoryBean
    
    * get processDao by DaoFactory
    
    * read druid properties in ConneciontFactory
    
    * read druid properties in ConneciontFactory
    
    * change get alertDao by spring to DaoFactory
    
    * add log4j to resolve #967
    
    * resole verify udf name error and delete udf error
    
    * Determine if principal is empty
    
    * Determine whether the logon user has the right to delete the project
    
    * Fixed an issue that produced attatch file named such as ATT00002.bin
    
    * fix too many connection in upgrade or create
    
    * fix NEED_FAULT_TOLERANCE and WAITTING_THREAD count fail
    
    * Added a judgment on whether the currently login user is an administrator
    
    * fix update udf database not change and create time is changed
    
    * add enterprise.wechat.enable to decide whether to send enterprise WeChat
    
    * change method check
    
    * Remove the administrator's judgment on query access token list
    
    * only admin can create worker group
    
    * delete alert group need delete the relation of user and alert group
    
    * add timeout in proxy when upload large resource
    
    * add gets scheduled times by expect fire times
    
    * add gets scheduled times by expect fire times
    
    * Increase the judgment of whether it is admin
    
    * Increase the judgment of whether it is admin
    
    * when delete access token add whether login user has perm to delete
    
    * change mysql-connector-java scope to test
    
    * update scm test
    
    * add profile test
    
    * Add method and parameters comments
    
    * roll back
    
    * add some notes (#1221)
    
    * update english documents
    
    * refactor zk client
    
    * update documents
    
    * update zkclient
    
    * update zkclient
    
    * update documents
    
    * add architecture-design
    
    * change i18n
    
    * update i18n
    
    * update english documents
    
    * add architecture-design
    
    * update english documents
    
    * update en-US documents
    
    * add architecture-design
    
    * update demo site
    
    * add mybatis plus model
    
    * modify mybatisplus
    
    * modify mybatisplus
    
    * change interface by mybatisplus
    
    * add unit test
    
    * refactor dao interface.
    
    * add unit test for dao...
    
    * add unit test for dao...
    
    * add unit test for dao...
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
    
    * update some dao bugs
    
    * update for some bugs
    
    * update some bugs
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
    
    * update
    
    * update
    
    * add multiply settings for application.yml
    
    * add multiply settings for application.yml
    
    * revert
    
    * update configuration settings in task record dao...
    
    * change application_master to application-master
    
    * change application_master to application-master
    
    * update application.yml to application.properties
    
    * revert
    
    * revert
    
    * add properties
    
    * add properties
    
    * revert
    
    * revert
    
    * add api start up..
    add alert send try catch
    
    * update dao info level
    
    * fix bug: task cannot submit when recovery failover
    
    * fix bug: task cannot submit when recovery failover
    
    * merge from dev-db
    
    * revert
    
    * revert
    
    * fix bug: get process definition list failed.
    
    * fix bug: process instance interval is error
    
    * revert
    
    * revert
    
    * update
    
    * support stop submit success tasks
    
    * update kill process
    
    * update for stop process
    
    * update for stop process
    
    * add some logs for stop process
    
    * update for small bug.
    
    * add check strategy before submit task
    
    * revert
    
    * update
    
    * update
    
    * revert
    
    * wait task instance exists if null.
    
    * revert
    
    * update
    
    * change desc to description.
    
    * add check user and definitions function when delete tenant
    
    * update
    
    * change desc to description.
    
    * change desc to description.
    
    * change desc to description.
    
    * remove check resources when delete tenant
    
    * change desc to description.
    
    * change mybatisplus version to 3.2.0
    
    * update
    
    * change the notice to apache.
    
    * update
    
    * update postgre sql
    
    * fix bug: phone can be empty.
    
    * fix bug: postgre test error.
    
    * update create table for postgre quartz
    
    * fix some bugs about postgre.
    
    * update create table for postgre quartz
    
    * add postgre db performance monitor
    
    * add postgre performance monitor
    
    * update performance monitor
    
    * revert
    
    * revert
    
    * fix bug: tasks queue length error
    
    * remove datasource.properties
    
    * change chinese sql to english.
    
    * change chinese sql to english.
    
    * remove unused code.
    
    * remove unused code.
    
    * add some notes
    
    * update some notes
    
    * update some notes
    
    * update mbatisplus version
    
    * update lombok version
    
    * update lombok version
    
    * revert
    
    * master startup error bug fix (#1229)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs
    
    * nginx conf modify
    
    * dockerfile application.properties modify
    
    * dockerfile email address change
    
    * the alert module is modified in English.
    
    * alert server comment and chinese modify
    
    * api server useless code and chinese modify
    
    * common,dao,server useless code and chinese modify
    
    * change chinese to english
    
    * dao method comments and useless code modify
    
    * master startup error bug fix
    
    * delete class App, let spring manage connectionFactory (#1233)
    
    * move updateTaskState into try/catch block in case of exception
    
    * fix NPE
    
    * using conf.getInt instead of getString
    
    * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
    for AlertDao, correct the spelling.
    
    * duplicate
    
    * refactor getTaskWorkerGroupId
    
    * add friendly log
    
    * update hearbeat thread num = 1
    
    * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
    
    * 1. move verifyTaskInstanceIsNull after taskInstance
    2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
    
    * fix the message
    
    * delete before check to avoid KeeperException$NoNodeException
    
    * fix the message
    
    * check processInstance state before delete tenant
    
    * check processInstance state before delete worker group
    
    * refactor
    
    * merge api constants into common constatns
    
    * update the resource perm
    
    * update the dataSource perm
    
    * fix CheckUtils.checkUserParams method
    
    * update AlertGroupService, extends from BaseService, remove duplicate methods
    
    * refactor
    
    * modify method name
    
    * add hasProjectAndPerm method
    
    * using checkProject instead of getResultStatus
    
    * delete checkAuth method, using hasProjectAndPerm instead.
    
    * correct spelling
    
    * add transactional for deleteWorkerGroupById
    
    * add Transactional for deleteProcessInstanceById method
    
    * change sqlSessionTemplate singleton
    
    * change sqlSessionTemplate singleton and reformat code
    
    * fix unsuitable error message
    
    * update shutdownhook methods
    
    * fix worker log bug
    
    * fix api server debug mode bug
    
    * upgrade zk version
    
    * delete this line ,for zkClient.close() will do the whole thing
    
    * fix master server shutdown error
    
    * degrade zk version and add FourLetterWordMain class
    
    * fix PathChildrenCache not close
    
    * add Transactional for createSession method
    
    * add more message for java-doc
    
    * delete App, let spring manage connectionFactory
    
    * add license
    
    * add class Application for test support
    
    * refactor masterServer and workerServer (#1244)
    
    * move updateTaskState into try/catch block in case of exception
    
    * fix NPE
    
    * using conf.getInt instead of getString
    
    * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
    for AlertDao, correct the spelling.
    
    * duplicate
    
    * refactor getTaskWorkerGroupId
    
    * add friendly log
    
    * update hearbeat thread num = 1
    
    * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
    
    * 1. move verifyTaskInstanceIsNull after taskInstance
    2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
    
    * fix the message
    
    * delete before check to avoid KeeperException$NoNodeException
    
    * fix the message
    
    * check processInstance state before delete tenant
    
    * check processInstance state before delete worker group
    
    * refactor
    
    * merge api constants into common constatns
    
    * update the resource perm
    
    * update the dataSource perm
    
    * fix CheckUtils.checkUserParams method
    
    * update AlertGroupService, extends from BaseService, remove duplicate methods
    
    * refactor
    
    * modify method name
    
    * add hasProjectAndPerm method
    
    * using checkProject instead of getResultStatus
    
    * delete checkAuth method, using hasProjectAndPerm instead.
    
    * correct spelling
    
    * add transactional for deleteWorkerGroupById
    
    * add Transactional for deleteProcessInstanceById method
    
    * change sqlSessionTemplate singleton
    
    * change sqlSessionTemplate singleton and reformat code
    
    * fix unsuitable error message
    
    * update shutdownhook methods
    
    * fix worker log bug
    
    * fix api server debug mode bug
    
    * upgrade zk version
    
    * delete this line ,for zkClient.close() will do the whole thing
    
    * fix master server shutdown error
    
    * degrade zk version and add FourLetterWordMain class
    
    * fix PathChildrenCache not close
    
    * add Transactional for createSession method
    
    * add more message for java-doc
    
    * delete App, let spring manage connectionFactory
    
    * add license
    
    * add class Application for test support
    
    * refactor masterServer and workerServer
    
    * add args
    
    * ConnectionFactory add paging intercepter
    
    * ConnectionFactory add paging intercepter (#1250)
    
    * remove spotbugs-annotations.jar LGPL protocol
    
    * remove spotbugs-annotations.jar LGPL protocol (#1251)
    
    * ConnectionFactory add paging intercepter
    
    * remove spotbugs-annotations.jar LGPL protocol
    
    * fix #1245, make scanCommand transactional (#1246)
    
    * fix the spring transaction not worker bug  (#1252)
    
    * move updateTaskState into try/catch block in case of exception
    
    * fix NPE
    
    * using conf.getInt instead of getString
    
    * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
    for AlertDao, correct the spelling.
    
    * duplicate
    
    * refactor getTaskWorkerGroupId
    
    * add friendly log
    
    * update hearbeat thread num = 1
    
    * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
    
    * 1. move verifyTaskInstanceIsNull after taskInstance
    2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
    
    * fix the message
    
    * delete before check to avoid KeeperException$NoNodeException
    
    * fix the message
    
    * check processInstance state before delete tenant
    
    * check processInstance state before delete worker group
    
    * refactor
    
    * merge api constants into common constatns
    
    * update the resource perm
    
    * update the dataSource perm
    
    * fix CheckUtils.checkUserParams method
    
    * update AlertGroupService, extends from BaseService, remove duplicate methods
    
    * refactor
    
    * modify method name
    
    * add hasProjectAndPerm method
    
    * using checkProject instead of getResultStatus
    
    * delete checkAuth method, using hasProjectAndPerm instead.
    
    * correct spelling
    
    * add transactional for deleteWorkerGroupById
    
    * add Transactional for deleteProcessInstanceById method
    
    * change sqlSessionTemplate singleton
    
    * change sqlSessionTemplate singleton and reformat code
    
    * fix unsuitable error message
    
    * update shutdownhook methods
    
    * fix worker log bug
    
    * fix api server debug mode bug
    
    * upgrade zk version
    
    * delete this line ,for zkClient.close() will do the whole thing
    
    * fix master server shutdown error
    
    * degrade zk version and add FourLetterWordMain class
    
    * fix PathChildrenCache not close
    
    * add Transactional for createSession method
    
    * add more message for java-doc
    
    * delete App, let spring manage connectionFactory
    
    * add license
    
    * add class Application for test support
    
    * refactor masterServer and workerServer
    
    * add args
    
    * fix the spring transaction not work bug
    
    * remove author
    
    * delete @Bean annotation
    
    * rename application.properties to application-dao.properties
    
    * delete class MybatisPlusConfig (#1254)
    
    * move updateTaskState into try/catch block in case of exception
    
    * fix NPE
    
    * using conf.getInt instead of getString
    
    * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
    for AlertDao, correct the spelling.
    
    * duplicate
    
    * refactor getTaskWorkerGroupId
    
    * add friendly log
    
    * update hearbeat thread num = 1
    
    * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
    
    * 1. move verifyTaskInstanceIsNull after taskInstance
    2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
    
    * fix the message
    
    * delete before check to avoid KeeperException$NoNodeException
    
    * fix the message
    
    * check processInstance state before delete tenant
    
    * check processInstance state before delete worker group
    
    * refactor
    
    * merge api constants into common constatns
    
    * update the resource perm
    
    * update the dataSource perm
    
    * fix CheckUtils.checkUserParams method
    
    * update AlertGroupService, extends from BaseService, remove duplicate methods
    
    * refactor
    
    * modify method name
    
    * add hasProjectAndPerm method
    
    * using checkProject instead of getResultStatus
    
    * delete checkAuth method, using hasProjectAndPerm instead.
    
    * correct spelling
    
    * add transactional for deleteWorkerGroupById
    
    * add Transactional for deleteProcessInstanceById method
    
    * change sqlSessionTemplate singleton
    
    * change sqlSessionTemplate singleton and reformat code
    
    * fix unsuitable error message
    
    * update shutdownhook methods
    
    * fix worker log bug
    
    * fix api server debug mode bug
    
    * upgra…
    
    * change version to 1.2.0-SNAPSHOT (#1277)
    
    * rename from DatasourceUserMapper to DataSourceUserMapper
    
    * add unit test in UserMapper and WorkerGroupMapper
    
    * change cn.escheduler to org.apache.dolphinscheduler
    
    * add unit test in UdfFuncMapperTest
    
    * add unit test in UdfFuncMapperTest
    
    * remove DatabaseConfiguration
    
    * add ConnectionFactoryTest
    
    * cal duration in processInstancesList
    
    * change desc to description
    
    * change table name in mysql ddl
    
    * change table name in mysql ddl
    
    * change escheduler to dolphinscheduler
    
    * change escheduler to dolphinscheduler
    
    * change escheduler to dolphinscheduler
    
    * remove log4j-1.2-api and modify AlertMapperTest
    
    * remove log4j-1.2-api
    
    * Add alertDao to spring management
    
    * Add alertDao to spring management
    
    * get SqlSessionFactory from MybatisSqlSessionFactoryBean
    
    * get processDao by DaoFactory
    
    * read druid properties in ConneciontFactory
    
    * read druid properties in ConneciontFactory
    
    * change get alertDao by spring to DaoFactory
    
    * add log4j to resolve #967
    
    * resole verify udf name error and delete udf error
    
    * Determine if principal is empty
    
    * Determine whether the logon user has the right to delete the project
    
    * Fixed an issue that produced attatch file named such as ATT00002.bin
    
    * fix too many connection in upgrade or create
    
    * fix NEED_FAULT_TOLERANCE and WAITTING_THREAD count fail
    
    * Added a judgment on whether the currently login user is an administrator
    
    * fix update udf database not change and create time is changed
    
    * add enterprise.wechat.enable to decide whether to send enterprise WeChat
    
    * change method check
    
    * Remove the administrator's judgment on query access token list
    
    * only admin can create worker group
    
    * delete alert group need delete the relation of user and alert group
    
    * add timeout in proxy when upload large resource
    
    * add gets scheduled times by expect fire times
    
    * add gets scheduled times by expect fire times
    
    * Increase the judgment of whether it is admin
    
    * Increase the judgment of whether it is admin
    
    * when delete access token add whether login user has perm to delete
    
    * change mysql-connector-java scope to test
    
    * update scm test
    
    * add profile test
    
    * add profile test
    
    * add maven.deploy.skip true
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * add dependency
    
    * add javadoc
    
    * add antrun
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * reset pgsql (#1178)
    
    + 1
    
    * add javadoc
    
    * add javadoc
    
    * [maven-release-plugin] rollback the release of 1.2.0
    
    * add javadoc
    
    * Ans UI upgrade to version 0.1.0 (#1181)
    
    + 1
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * Administrators group prohibit deletion (#1182)
    
    * Ans UI upgrade to version 0.1.0
    
    * Administrators group prohibit deletion
    
    * add javadoc
    
    * add ui pom
    
    * fix master server shutdown error (#1177)
    
    * move updateTaskState into try/catch block in case of exception
    
    * fix NPE
    
    * using conf.getInt instead of getString
    
    * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
    for AlertDao, correct the spelling.
    
    * duplicate
    
    * refactor getTaskWorkerGroupId
    
    * add friendly log
    
    * update hearbeat thread num = 1
    
    * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
    
    * 1. move verifyTaskInstanceIsNull after taskInstance
    2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
    
    * fix the message
    
    * delete before check to avoid KeeperException$NoNodeException
    
    * fix the message
    
    * check processInstance state before delete tenant
    
    * check processInstance state before delete worker group
    
    * refactor
    
    * merge api constants into common constatns
    
    * update the resource perm
    
    * update the dataSource perm
    
    * fix CheckUtils.checkUserParams method
    
    * update AlertGroupService, extends from BaseService, remove duplicate methods
    
    * refactor
    
    * modify method name
    
    * add hasProjectAndPerm method
    
    * using checkProject instead of getResultStatus
    
    * delete checkAuth method, using hasProjectAndPerm instead.
    
    * correct spelling
    
    * add transactional for deleteWorkerGroupById
    
    * add Transactional for deleteProcessInstanceById method
    
    * change sqlSessionTemplate singleton
    
    * change sqlSessionTemplate singleton and reformat code
    
    * fix unsuitable error message
    
    * update shutdownhook methods
    
    * fix worker log bug
    
    * fix api server debug mode bug
    
    * upgrade zk version
    
    * delete this line ,for zkClient.close() will do the whole thing
    
    * fix master server shutdown error
    
    * degrade zk version and add FourLetterWordMain class (#1183)
    
    * move updateTaskState into try/catch block in case of exception
    
    * fix NPE
    
    * using conf.getInt instead of getString
    
    * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
    for AlertDao, correct the spelling.
    
    * duplicate
    
    * refactor getTaskWorkerGroupId
    
    * add friendly log
    
    * update hearbeat thread num = 1
    
    * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
    
    * 1. move verifyTaskInstanceIsNull after taskInstance
    2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
    
    * fix the message
    
    * delete before check to avoid KeeperException$NoNodeException
    
    * fix the message
    
    * check processInstance state before delete tenant
    
    * check processInstance state before delete worker group
    
    * refactor
    
    * merge api constants into common constatns
    
    * update the resource perm
    
    * update the dataSource perm
    
    * fix CheckUtils.checkUserParams method
    
    * update AlertGroupService, extends from BaseService, remove duplicate methods
    
    * refactor
    
    * modify method name
    
    * add hasProjectAndPerm method
    
    * using checkProject instead of getResultStatus
    
    * delete checkAuth method, using hasProjectAndPerm instead.
    
    * correct spelling
    
    * add transactional for deleteWorkerGroupById
    
    * add Transactional for deleteProcessInstanceById method
    
    * change sqlSessionTemplate singleton
    
    * change sqlSessionTemplate singleton and reformat code
    
    * fix unsuitable error message
    
    * update shutdownhook methods
    
    * fix worker log bug
    
    * fix api server debug mode bug
    
    * upgrade zk version
    
    * delete this line ,for zkClient.close() will do the whole thing
    
    * fix master server shutdown error
    
    * degrade zk version and add FourLetterWordMain class
    
    * add ui pom
    
    * add src pom and assembly
    
    * fix ZKWorkerClient not close PathChildrenCache (#1185)
    
    * move updateTaskState into try/catch block in case of exception
    
    * fix NPE
    
    * using conf.getInt instead of getString
    
    * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
    for AlertDao, correct the spelling.
    
    * duplicate
    
    * refactor getTaskWorkerGroupId
    
    * add friendly log
    
    * update hearbeat thread num = 1
    
    * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
    
    * 1. move verifyTaskInstanceIsNull after taskInstance
    2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
    
    * fix the message
    
    * delete before check to avoid KeeperException$NoNodeException
    
    * fix the message
    
    * check processInstance state before delete tenant
    
    * check processInstance state before delete worker group
    
    * refactor
    
    * merge api constants into common constatns
    
    * update the resource perm
    
    * update the dataSource perm
    
    * fix CheckUtils.checkUserParams method
    
    * update AlertGroupService, extends from BaseService, remove duplicate methods
    
    * refactor
    
    * modify method name
    
    * add hasProjectAndPerm method
    
    * using checkProject instead of getResultStatus
    
    * delete checkAuth method, using hasProjectAndPerm instead.
    
    * correct spelling
    
    * add transactional for deleteWorkerGroupById
    
    * add Transactional for deleteProcessInstanceById method
    
    * change sqlSessionTemplate singleton
    
    * change sqlSessionTemplate singleton and reformat code
    
    * fix unsuitable error message
    
    * update shutdownhook methods
    
    * fix worker log bug
    
    * fix api server debug mode bug
    
    * upgrade zk version
    
    * delete this line ,for zkClient.close() will do the whole thing
    
    * fix master server shutdown error
    
    * degrade zk version and add FourLetterWordMain class
    
    * fix PathChildrenCache not close
    
    * add Transactional for createSession method (#1186)
    
    * move updateTaskState into try/catch block in case of exception
    
    * fix NPE
    
    * using conf.getInt instead of getString
    
    * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
    for AlertDao, correct the spelling.
    
    * duplicate
    
    * refactor getTaskWorkerGroupId
    
    * add friendly log
    
    * update hearbeat thread num = 1
    
    * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
    
    * 1. move verifyTaskInstanceIsNull after taskInstance
    2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
    
    * fix the message
    
    * delete before check to avoid KeeperException$NoNodeException
    
    * fix the message
    
    * check processInstance state before delete tenant
    
    * check processInstance state before delete worker group
    
    * refactor
    
    * merge api constants into common constatns
    
    * update the resource perm
    
    * update the dataSource perm
    
    * fix CheckUtils.checkUserParams method
    
    * update AlertGroupService, extends from BaseService, remove duplicate methods
    
    * refactor
    
    * modify method name
    
    * add hasProjectAndPerm method
    
    * using checkProject instead of getResultStatus
    
    * delete checkAuth method, using hasProjectAndPerm instead.
    
    * correct spelling
    
    * add transactional for deleteWorkerGroupById
    
    * add Transactional for deleteProcessInstanceById method
    
    * change sqlSessionTemplate singleton
    
    * change sqlSessionTemplate singleton and reformat code
    
    * fix unsuitable error message
    
    * update shutdownhook methods
    
    * fix worker log bug
    
    * fix api server debug mode bug
    
    * upgrade zk version
    
    * delete this line ,for zkClient.close() will do the whole thing
    
    * fix master server shutdown error
    
    * degrade zk version and add FourLetterWordMain class
    
    * fix PathChildrenCache not close
    
    * add Transactional for createSession method
    
    * add src pom and assembly
    
    * add src pom and assembly
    
    * add src pom and assembly
    
    * add src pom and assembly
    
    * dockerfile dao application.properties ,install.sh modify and application.properties modify (#1187)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * add src pom and assembly
    
    * add src pom and assembly
    
    * dockerfile startup.sh modify (#1189)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs (#1191)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs
    
    * nginx conf modify
    
    * dockerfile application.properties modify
    
    * dockerfile conf modify (#1192)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs
    
    * nginx conf modify
    
    * dockerfile application.properties modify
    
    * dockerfile conf modify (#1193)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs
    
    * nginx conf modify
    
    * dockerfile application.properties modify
    
    * dockerfile email address change (#1194)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs
    
    * nginx conf modify
    
    * dockerfile application.properties modify
    
    * dockerfile email address change
    
    * the alert module is modified in english (#1195)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs
    
    * nginx conf modify
    
    * dockerfile application.properties modify
    
    * dockerfile email address change
    
    * the alert module is modified in English.
    
    * alert server comment and chinese modify
    
    * api server useless code and chinese modify (#1198)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs
    
    * nginx conf modify
    
    * dockerfile application.properties modify
    
    * dockerfile email address change
    
    * the alert module is modified in English.
    
    * alert server comment and chinese modify
    
    * api server useless code and chinese modify
    
    * common,dao,server useless code and chinese modify (#1199)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs
    
    * nginx conf modify
    
    * dockerfile application.properties modify
    
    * dockerfile email address change
    
    * the alert module is modified in English.
    
    * alert server comment and chinese modify
    
    * api server useless code and chinese modify
    
    * common,dao,server useless code and chinese modify
    
    * change chinese sql to english. (#1200)
    
    * update english documents
    
    * refactor zk client
    
    * update documents
    
    * update zkclient
    
    * update zkclient
    
    * update documents
    
    * add architecture-design
    
    * change i18n
    
    * update i18n
    
    * update english documents
    
    * add architecture-design
    
    * update english documents
    
    * update en-US documents
    
    * add architecture-design
    
    * update demo site
    
    * add mybatis plus model
    
    * modify mybatisplus
    
    * modify mybatisplus
    
    * change interface by mybatisplus
    
    * add unit test
    
    * refactor dao interface.
    
    * add unit test for dao...
    
    * add unit test for dao...
    
    * add unit test for dao...
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
    
    * update some dao bugs
    
    * update for some bugs
    
    * update some bugs
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
    
    * update
    
    * update
    
    * add multiply settings for application.yml
    
    * add multiply settings for application.yml
    
    * revert
    
    * update configuration settings in task record dao...
    
    * change application_master to application-master
    
    * change application_master to application-master
    
    * update application.yml to application.properties
    
    * revert
    
    * revert
    
    * add properties
    
    * add properties
    
    * revert
    
    * revert
    
    * add api start up..
    add alert send try catch
    
    * update dao info level
    
    * fix bug: task cannot submit when recovery failover
    
    * fix bug: task cannot submit when recovery failover
    
    * merge from dev-db
    
    * revert
    
    * revert
    
    * fix bug: get process definition list failed.
    
    * fix bug: process instance interval is error
    
    * revert
    
    * revert
    
    * update
    
    * support stop submit success tasks
    
    * update kill process
    
    * update for stop process
    
    * update for stop process
    
    * add some logs for stop process
    
    * update for small bug.
    
    * add check strategy before submit task
    
    * revert
    
    * update
    
    * update
    
    * revert
    
    * wait task instance exists if null.
    
    * revert
    
    * update
    
    * change desc to description.
    
    * add check user and definitions function when delete tenant
    
    * update
    
    * change desc to description.
    
    * change desc to description.
    
    * change desc to description.
    
    * remove check resources when delete tenant
    
    * change desc to description.
    
    * change mybatisplus version to 3.2.0
    
    * update
    
    * change the notice to apache.
    
    * update
    
    * update postgre sql
    
    * fix bug: phone can be empty.
    
    * fix bug: postgre test error.
    
    * update create table for postgre quartz
    
    * fix some bugs about postgre.
    
    * update create table for postgre quartz
    
    * add postgre db performance monitor
    
    * add postgre performance monitor
    
    * update performance monitor
    
    * revert
    
    * revert
    
    * fix bug: tasks queue length error
    
    * remove datasource.properties
    
    * change chinese sql to english.
    
    * change chinese sql to english.
    
    * change chinese to english (#1202)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs
    
    * nginx conf modify
    
    * dockerfile application.properties modify
    
    * dockerfile email address change
    
    * the alert module is modified in English.
    
    * alert server comment and chinese modify
    
    * api server useless code and chinese modify
    
    * common,dao,server useless code and chinese modify
    
    * change chinese to english
    
    * remove unused code (#1204)
    
    * update english documents
    
    * refactor zk client
    
    * update documents
    
    * update zkclient
    
    * update zkclient
    
    * update documents
    
    * add architecture-design
    
    * change i18n
    
    * update i18n
    
    * update english documents
    
    * add architecture-design
    
    * update english documents
    
    * update en-US documents
    
    * add architecture-design
    
    * update demo site
    
    * add mybatis plus model
    
    * modify mybatisplus
    
    * modify mybatisplus
    
    * change interface by mybatisplus
    
    * add unit test
    
    * refactor dao interface.
    
    * add unit test for dao...
    
    * add unit test for dao...
    
    * add unit test for dao...
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
    
    * update some dao bugs
    
    * update for some bugs
    
    * update some bugs
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
    
    * update
    
    * update
    
    * add multiply settings for application.yml
    
    * add multiply settings for application.yml
    
    * revert
    
    * update configuration settings in task record dao...
    
    * change application_master to application-master
    
    * change application_master to application-master
    
    * update application.yml to application.properties
    
    * revert
    
    * revert
    
    * add properties
    
    * add properties
    
    * revert
    
    * revert
    
    * add api start up..
    add alert send try catch
    
    * update dao info level
    
    * fix bug: task cannot submit when recovery failover
    
    * fix bug: task cannot submit when recovery failover
    
    * merge from dev-db
    
    * revert
    
    * revert
    
    * fix bug: get process definition list failed.
    
    * fix bug: process instance interval is error
    
    * revert
    
    * revert
    
    * update
    
    * support stop submit success tasks
    
    * update kill process
    
    * update for stop process
    
    * update for stop process
    
    * add some logs for stop process
    
    * update for small bug.
    
    * add check strategy before submit task
    
    * revert
    
    * update
    
    * update
    
    * revert
    
    * wait task instance exists if null.
    
    * revert
    
    * update
    
    * change desc to description.
    
    * add check user and definitions function when delete tenant
    
    * update
    
    * change desc to description.
    
    * change desc to description.
    
    * change desc to description.
    
    * remove check resources when delete tenant
    
    * change desc to description.
    
    * change mybatisplus version to 3.2.0
    
    * update
    
    * change the notice to apache.
    
    * update
    
    * update postgre sql
    
    * fix bug: phone can be empty.
    
    * fix bug: postgre test error.
    
    * update create table for postgre quartz
    
    * fix some bugs about postgre.
    
    * update create table for postgre quartz
    
    * add postgre db performance monitor
    
    * add postgre performance monitor
    
    * update performance monitor
    
    * revert
    
    * revert
    
    * fix bug: tasks queue length error
    
    * remove datasource.properties
    
    * change chinese sql to english.
    
    * change chinese sql to english.
    
    * remove unused code.
    
    * remove unused code.
    
    * Modify webpack configuration (#1206)
    
    * add more message for java-doc (#1209)
    
    * move updateTaskState into try/catch block in case of exception
    
    * fix NPE
    
    * using conf.getInt instead of getString
    
    * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
    for AlertDao, correct the spelling.
    
    * duplicate
    
    * refactor getTaskWorkerGroupId
    
    * add friendly log
    
    * update hearbeat thread num = 1
    
    * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
    
    * 1. move verifyTaskInstanceIsNull after taskInstance
    2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
    
    * fix the message
    
    * delete before check to avoid KeeperException$NoNodeException
    
    * fix the message
    
    * check processInstance state before delete tenant
    
    * check processInstance state before delete worker group
    
    * refactor
    
    * merge api constants into common constatns
    
    * update the resource perm
    
    * update the dataSource perm
    
    * fix CheckUtils.checkUserParams method
    
    * update AlertGroupService, extends from BaseService, remove duplicate methods
    
    * refactor
    
    * modify method name
    
    * add hasProjectAndPerm method
    
    * using checkProject instead of getResultStatus
    
    * delete checkAuth method, using hasProjectAndPerm instead.
    
    * correct spelling
    
    * add transactional for deleteWorkerGroupById
    
    * add Transactional for deleteProcessInstanceById method
    
    * change sqlSessionTemplate singleton
    
    * change sqlSessionTemplate singleton and reformat code
    
    * fix unsuitable error message
    
    * update shutdownhook methods
    
    * fix worker log bug
    
    * fix api server debug mode bug
    
    * upgrade zk version
    
    * delete this line ,for zkClient.close() will do the whole thing
    
    * fix master server shutdown error
    
    * degrade zk version and add FourLetterWordMain class
    
    * fix PathChildrenCache not close
    
    * add Transactional for createSession method
    
    * add more message for java-doc
    
    * add java doc for common module (#1213)
    
    * dao method comments and useless code modify (#1214)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs
    
    * nginx conf modify
    
    * dockerfile application.properties modify
    
    * dockerfile email address change
    
    * the alert module is modified in English.
    
    * alert server comment and chinese modify
    
    * api server useless code and chinese modify
    
    * common,dao,server useless code and chinese modify
    
    * change chinese to english
    
    * dao method comments and useless code modify
    
    * Change all Chinese names to English (#1207)
    
    * Modify webpack configuration
    
    * Change all Chinese names to English
    
    * add progress-bar-webpack-plugin (#1215)
    
    * Modify webpack configuration
    
    * Change all Chinese names to English
    
    * add progress-bar-webpack-plugin
    
    * Add method and parameters comments (#1220)
    
    * rename from DatasourceUserMapper to DataSourceUserMapper
    
    * add unit test in UserMapper and WorkerGroupMapper
    
    * change cn.escheduler to org.apache.dolphinscheduler
    
    * add unit test in UdfFuncMapperTest
    
    * add unit test in UdfFuncMapperTest
    
    * remove DatabaseConfiguration
    
    * add ConnectionFactoryTest
    
    * cal duration in processInstancesList
    
    * change desc to description
    
    * change table name in mysql ddl
    
    * change table name in mysql ddl
    
    * change escheduler to dolphinscheduler
    
    * change escheduler to dolphinscheduler
    
    * change escheduler to dolphinscheduler
    
    * remove log4j-1.2-api and modify AlertMapperTest
    
    * remove log4j-1.2-api
    
    * Add alertDao to spring management
    
    * Add alertDao to spring management
    
    * get SqlSessionFactory from MybatisSqlSessionFactoryBean
    
    * get processDao by DaoFactory
    
    * read druid properties in ConneciontFactory
    
    * read druid properties in ConneciontFactory
    
    * change get alertDao by spring to DaoFactory
    
    * add log4j to resolve #967
    
    * resole verify udf name error and delete udf error
    
    * Determine if principal is empty
    
    * Determine whether the logon user has the right to delete the project
    
    * Fixed an issue that produced attatch file named such as ATT00002.bin
    
    * fix too many connection in upgrade or create
    
    * fix NEED_FAULT_TOLERANCE and WAITTING_THREAD count fail
    
    * Added a judgment on whether the currently login user is an administrator
    
    * fix update udf database not change and create time is changed
    
    * add enterprise.wechat.enable to decide whether to send enterprise WeChat
    
    * change method check
    
    * Remove the administrator's judgment on query access token list
    
    * only admin can create worker group
    
    * delete alert group need delete the relation of user and alert group
    
    * add timeout in proxy when upload large resource
    
    * add gets scheduled times by expect fire times
    
    * add gets scheduled times by expect fire times
    
    * Increase the judgment of whether it is admin
    
    * Increase the judgment of whether it is admin
    
    * when delete access token add whether login user has perm to delete
    
    * change mysql-connector-java scope to test
    
    * update scm test
    
    * add profile test
    
    * Add method and parameters comments
    
    * roll back
    
    * add some notes (#1221)
    
    * update english documents
    
    * refactor zk client
    
    * update documents
    
    * update zkclient
    
    * update zkclient
    
    * update documents
    
    * add architecture-design
    
    * change i18n
    
    * update i18n
    
    * update english documents
    
    * add architecture-design
    
    * update english documents
    
    * update en-US documents
    
    * add architecture-design
    
    * update demo site
    
    * add mybatis plus model
    
    * modify mybatisplus
    
    * modify mybatisplus
    
    * change interface by mybatisplus
    
    * add unit test
    
    * refactor dao interface.
    
    * add unit test for dao...
    
    * add unit test for dao...
    
    * add unit test for dao...
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
    
    * update some dao bugs
    
    * update for some bugs
    
    * update some bugs
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
    
    * update
    
    * update
    
    * add multiply settings for application.yml
    
    * add multiply settings for application.yml
    
    * revert
    
    * update configuration settings in task record dao...
    
    * change application_master to application-master
    
    * change application_master to application-master
    
    * update application.yml to application.properties
    
    * revert
    
    * revert
    
    * add properties
    
    * add properties
    
    * revert
    
    * revert
    
    * add api start up..
    add alert send try catch
    
    * update dao info level
    
    * fix bug: task cannot submit when recovery failover
    
    * fix bug: task cannot submit when recovery failover
    
    * merge from dev-db
    
    * revert
    
    * revert
    
    * fix bug: get process definition list failed.
    
    * fix bug: process instance interval is error
    
    * revert
    
    * revert
    
    * update
    
    * support stop submit success tasks
    
    * update kill process
    
    * update for stop process
    
    * update for stop process
    
    * add some logs for stop process
    
    * update for small bug.
    
    * add check strategy before submit task
    
    * revert
    
    * update
    
    * update
    
    * revert
    
    * wait task instance exists if null.
    
    * revert
    
    * update
    
    * change desc to description.
    
    * add check user and definitions function when delete tenant
    
    * update
    
    * change desc to description.
    
    * change desc to description.
    
    * change desc to description.
    
    * remove check resources when delete tenant
    
    * change desc to description.
    
    * change mybatisplus version to 3.2.0
    
    * update
    
    * change the notice to apache.
    
    * update
    
    * update postgre sql
    
    * fix bug: phone can be empty.
    
    * fix bug: postgre test error.
    
    * update create table for postgre quartz
    
    * fix some bugs about postgre.
    
    * update create table for postgre quartz
    
    * add postgre db performance monitor
    
    * add postgre performance monitor
    
    * update performance monitor
    
    * revert
    
    * revert
    
    * fix bug: tasks queue length error
    
    * remove datasource.properties
    
    * change chinese sql to english.
    
    * change chinese sql to english.
    
    * remove unused code.
    
    * remove unused code.
    
    * add some notes
    
    * update some notes
    
    * update some notes
    
    * update mbatisplus version
    
    * update lombok version
    
    * update lombok version
    
    * revert
    
    * merge from dev-db
    
    * remove version
    
    * update npm install pom
    
    * add front assembly
    
    * add front module
    
    * change verison to 1.2.0-release-SNAPSHOT
    
    * add name in pom and remove compile
    
    * add name in pom
    
    * add licenses in assemble
    
    * change version to 1.2.0-RC1-SNAPSHOT
    
    * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
    
    # Conflicts:
    #	dolphinscheduler-alert/pom.xml
    #	dolphinscheduler-api/pom.xml
    #	dolphinscheduler-common/pom.xml
    #	dolphinscheduler-dao/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
    #	dolphinscheduler-dist/pom.xml
    #	dolphinscheduler-rpc/pom.xml
    #	dolphinscheduler-server/pom.xml
    #	dolphinscheduler-ui/pom.xml
    #	pom.xml
    change assembly id
    
    * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
    
    # Conflicts:
    #	dolphinscheduler-alert/pom.xml
    #	dolphinscheduler-api/pom.xml
    #	dolphinscheduler-common/pom.xml
    #	dolphinscheduler-dao/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
    #	dolphinscheduler-dist/pom.xml
    #	dolphinscheduler-rpc/pom.xml
    #	dolphinscheduler-server/pom.xml
    #	dolphinscheduler-ui/pom.xml
    #	pom.xml
    add DISCLAIMER
    
    * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
    
    # Conflicts:
    #	dolphinscheduler-alert/pom.xml
    #	dolphinscheduler-api/pom.xml
    #	dolphinscheduler-common/pom.xml
    #	dolphinscheduler-dao/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
    #	dolphinscheduler-dist/pom.xml
    #	dolphinscheduler-rpc/pom.xml
    #	dolphinscheduler-server/pom.xml
    #	dolphinscheduler-ui/pom.xml
    #	pom.xml
    add license in xml and properties
    
    * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
    
    # Conflicts:
    #	dolphinscheduler-alert/pom.xml
    #	dolphinscheduler-api/pom.xml
    #	dolphinscheduler-common/pom.xml
    #	dolphinscheduler-dao/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
    #	dolphinscheduler-dist/pom.xml
    #	dolphinscheduler-rpc/pom.xml
    #	dolphinscheduler-server/pom.xml
    #	dolphinscheduler-ui/pom.xml
    #	pom.xml
    add license in dockerfile
    
    * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
    
    # Conflicts:
    #	dolphinscheduler-alert/pom.xml
    #	dolphinscheduler-api/pom.xml
    #	dolphinscheduler-common/pom.xml
    #	dolphinscheduler-dao/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
    #	dolphinscheduler-dist/pom.xml
    #	dolphinscheduler-rpc/pom.xml
    #	dolphinscheduler-server/pom.xml
    #	dolphinscheduler-ui/pom.xml
    #	pom.xml
    add license in script and sql
    
    * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
    
    # Conflicts:
    #	dolphinscheduler-alert/pom.xml
    #	dolphinscheduler-api/pom.xml
    #	dolphinscheduler-common/pom.xml
    #	dolphinscheduler-dao/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
    #	dolphinscheduler-dist/pom.xml
    #	dolphinscheduler-rpc/pom.xml
    #	dolphinscheduler-server/pom.xml
    #	dolphinscheduler-ui/pom.xml
    #	pom.xml
    add license in script and sql
    
    * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
    
    # Conflicts:
    #	dolphinscheduler-alert/pom.xml
    #	dolphinscheduler-api/pom.xml
    #	dolphinscheduler-common/pom.xml
    #	dolphinscheduler-dao/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
    #	dolphinscheduler-dist/pom.xml
    #	dolphinscheduler-rpc/pom.xml
    #	dolphinscheduler-server/pom.xml
    #	dolphinscheduler-ui/pom.xml
    #	pom.xml
    add license in ci
    
    * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
    
    # Conflicts:
    #	dolphinscheduler-alert/pom.xml
    #	dolphinscheduler-api/pom.xml
    #	dolphinscheduler-common/pom.xml
    #	dolphinscheduler-dao/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
    #	dolphinscheduler-dist/pom.xml
    #	dolphinscheduler-rpc/pom.xml
    #	dolphinscheduler-server/pom.xml
    #	dolphinscheduler-ui/pom.xml
    #	pom.xml
    change version to 1.2.0-SNAPSHOT
    
    * [maven-release-plugin] prepare release 1.2.0
    
    * [maven-release-plugin] prepare for next development iteration
    
    * set defalut db type postgresql (#1282)
    
    * rename from DatasourceUserMapper to DataSourceUserMapper
    
    * add unit test in UserMapper and WorkerGroupMapper
    
    * change cn.escheduler to org.apache.dolphinscheduler
    
    * add unit test in UdfFuncMapperTest
    
    * add unit test in UdfFuncMapperTest
    
    * remove DatabaseConfiguration
    
    * add ConnectionFactoryTest
    
    * cal duration in processInstancesList
    
    * change desc to description
    
    * change table name in mysql ddl
    
    * change table name in mysql ddl
    
    * change escheduler to dolphinscheduler
    
    * change escheduler to dolphinscheduler
    
    * change escheduler to dolphinscheduler
    
    * remove log4j-1.2-api and modify AlertMapperTest
    
    * remove log4j-1.2-api
    
    * Add alertDao to spring management
    
    * Add alertDao to spring management
    
    * get SqlSessionFactory from MybatisSqlSessionFactoryBean
    
    * get processDao by DaoFactory
    
    * read druid properties in ConneciontFactory
    
    * read druid properties in ConneciontFactory
    
    * change get alertDao by spring to DaoFactory
    
    * add log4j to resolve #967
    
    * resole verify udf name error and delete udf error
    
    * Determine if principal is empty
    
    * Determine whether the logon user has the right to delete the project
    
    * Fixed an issue that produced attatch file named such as ATT00002.bin
    
    * fix too many connection in upgrade or create
    
    * fix NEED_FAULT_TOLERANCE and WAITTING_THREAD count fail
    
    * Added a judgment on whether the currently login user is an administrator
    
    * fix update udf database not change and create time is changed
    
    * add enterprise.wechat.enable to decide whether to send enterprise WeChat
    
    * change method check
    
    * Remove the administrator's judgment on query access token list
    
    * only admin can create worker group
    
    * delete alert group need delete the relation of user and alert group
    
    * add timeout in proxy when upload large resource
    
    * add gets scheduled times by expect fire times
    
    * add gets scheduled times by expect fire times
    
    * Increase the judgment of whether it is admin
    
    * Increase the judgment of whether it is admin
    
    * when delete access token add whether login user has perm to delete
    
    * change mysql-connector-java scope to test
    
    * update scm test
    
    * add profile test
    
    * add profile test
    
    * add maven.deploy.skip true
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * add dependency
    
    * add javadoc
    
    * add antrun
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * reset pgsql (#1178)
    
    + 1
    
    * add javadoc
    
    * add javadoc
    
    * [maven-release-plugin] rollback the release of 1.2.0
    
    * add javadoc
    
    * Ans UI upgrade to version 0.1.0 (#1181)
    
    + 1
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * Administrators group prohibit deletion (#1182)
    
    * Ans UI upgrade to version 0.1.0
    
    * Administrators group prohibit deletion
    
    * add javadoc
    
    * add ui pom
    
    * fix master server shutdown error (#1177)
    
    * move updateTaskState into try/catch block in case of exception
    
    * fix NPE
    
    * using conf.getInt instead of getString
    
    * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
    for AlertDao, correct the spelling.
    
    * duplicate
    
    * refactor getTaskWorkerGroupId
    
    * add friendly log
    
    * update hearbeat thread num = 1
    
    * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
    
    * 1. move verifyTaskInstanceIsNull after taskInstance
    2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
    
    * fix the message
    
    * delete before check to avoid KeeperException$NoNodeException
    
    * fix the message
    
    * check processInstance state before delete tenant
    
    * check processInstance state before delete worker group
    
    * refactor
    
    * merge api constants into common constatns
    
    * update the resource perm
    
    * update the dataSource perm
    
    * fix CheckUtils.checkUserParams method
    
    * update AlertGroupService, extends from BaseService, remove duplicate methods
    
    * refactor
    
    * modify method name
    
    * add hasProjectAndPerm method
    
    * using checkProject instead of getResultStatus
    
    * delete checkAuth method, using hasProjectAndPerm instead.
    
    * correct spelling
    
    * add transactional for deleteWorkerGroupById
    
    * add Transactional for deleteProcessInstanceById method
    
    * change sqlSessionTemplate singleton
    
    * change sqlSessionTemplate singleton and reformat code
    
    * fix unsuitable error message
    
    * update shutdownhook methods
    
    * fix worker log bug
    
    * fix api server debug mode bug
    
    * upgrade zk version
    
    * delete this line ,for zkClient.close() will do the whole thing
    
    * fix master server shutdown error
    
    * degrade zk version and add FourLetterWordMain class (#1183)
    
    * move updateTaskState into try/catch block in case of exception
    
    * fix NPE
    
    * using conf.getInt instead of getString
    
    * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
    for AlertDao, correct the spelling.
    
    * duplicate
    
    * refactor getTaskWorkerGroupId
    
    * add friendly log
    
    * update hearbeat thread num = 1
    
    * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
    
    * 1. move verifyTaskInstanceIsNull after taskInstance
    2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
    
    * fix the message
    
    * delete before check to avoid KeeperException$NoNodeException
    
    * fix the message
    
    * check processInstance state before delete tenant
    
    * check processInstance state before delete worker group
    
    * refactor
    
    * merge api constants into common constatns
    
    * update the resource perm
    
    * update the dataSource perm
    
    * fix CheckUtils.checkUserParams method
    
    * update AlertGroupService, extends from BaseService, remove duplicate methods
    
    * refactor
    
    * modify method name
    
    * add hasProjectAndPerm method
    
    * using checkProject instead of getResultStatus
    
    * delete checkAuth method, using hasProjectAndPerm instead.
    
    * correct spelling
    
    * add transactional for deleteWorkerGroupById
    
    * add Transactional for deleteProcessInstanceById method
    
    * change sqlSessionTemplate singleton
    
    * change sqlSessionTemplate singleton and reformat code
    
    * fix unsuitable error message
    
    * update shutdownhook methods
    
    * fix worker log bug
    
    * fix api server debug mode bug
    
    * upgrade zk version
    
    * delete this line ,for zkClient.close() will do the whole thing
    
    * fix master server shutdown error
    
    * degrade zk version and add FourLetterWordMain class
    
    * add ui pom
    
    * add src pom and assembly
    
    * fix ZKWorkerClient not close PathChildrenCache (#1185)
    
    * move updateTaskState into try/catch block in case of exception
    
    * fix NPE
    
    * using conf.getInt instead of getString
    
    * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
    for AlertDao, correct the spelling.
    
    * duplicate
    
    * refactor getTaskWorkerGroupId
    
    * add friendly log
    
    * update hearbeat thread num = 1
    
    * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
    
    * 1. move verifyTaskInstanceIsNull after taskInstance
    2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
    
    * fix the message
    
    * delete before check to avoid KeeperException$NoNodeException
    
    * fix the message
    
    * check processInstance state before delete tenant
    
    * check processInstance state before delete worker group
    
    * refactor
    
    * merge api constants into common constatns
    
    * update the resource perm
    
    * update the dataSource perm
    
    * fix CheckUtils.checkUserParams method
    
    * update AlertGroupService, extends from BaseService, remove duplicate methods
    
    * refactor
    
    * modify method name
    
    * add hasProjectAndPerm method
    
    * using checkProject instead of getResultStatus
    
    * delete checkAuth method, using hasProjectAndPerm instead.
    
    * correct spelling
    
    * add transactional for deleteWorkerGroupById
    
    * add Transactional for deleteProcessInstanceById method
    
    * change sqlSessionTemplate singleton
    
    * change sqlSessionTemplate singleton and reformat code
    
    * fix unsuitable error message
    
    * update shutdownhook methods
    
    * fix worker log bug
    
    * fix api server debug mode bug
    
    * upgrade zk version
    
    * delete this line ,for zkClient.close() will do the whole thing
    
    * fix master server shutdown error
    
    * degrade zk version and add FourLetterWordMain class
    
    * fix PathChildrenCache not close
    
    * add Transactional for createSession method (#1186)
    
    * move updateTaskState into try/catch block in case of exception
    
    * fix NPE
    
    * using conf.getInt instead of getString
    
    * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
    for AlertDao, correct the spelling.
    
    * duplicate
    
    * refactor getTaskWorkerGroupId
    
    * add friendly log
    
    * update hearbeat thread num = 1
    
    * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
    
    * 1. move verifyTaskInstanceIsNull after taskInstance
    2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
    
    * fix the message
    
    * delete before check to avoid KeeperException$NoNodeException
    
    * fix the message
    
    * check processInstance state before delete tenant
    
    * check processInstance state before delete worker group
    
    * refactor
    
    * merge api constants into common constatns
    
    * update the resource perm
    
    * update the dataSource perm
    
    * fix CheckUtils.checkUserParams method
    
    * update AlertGroupService, extends from BaseService, remove duplicate methods
    
    * refactor
    
    * modify method name
    
    * add hasProjectAndPerm method
    
    * using checkProject instead of getResultStatus
    
    * delete checkAuth method, using hasProjectAndPerm instead.
    
    * correct spelling
    
    * add transactional for deleteWorkerGroupById
    
    * add Transactional for deleteProcessInstanceById method
    
    * change sqlSessionTemplate singleton
    
    * change sqlSessionTemplate singleton and reformat code
    
    * fix unsuitable error message
    
    * update shutdownhook methods
    
    * fix worker log bug
    
    * fix api server debug mode bug
    
    * upgrade zk version
    
    * delete this line ,for zkClient.close() will do the whole thing
    
    * fix master server shutdown error
    
    * degrade zk version and add FourLetterWordMain class
    
    * fix PathChildrenCache not close
    
    * add Transactional for createSession method
    
    * add src pom and assembly
    
    * add src pom and assembly
    
    * add src pom and assembly
    
    * add src pom and assembly
    
    * dockerfile dao application.properties ,install.sh modify and application.properties modify (#1187)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * add src pom and assembly
    
    * add src pom and assembly
    
    * dockerfile startup.sh modify (#1189)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs (#1191)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs
    
    * nginx conf modify
    
    * dockerfile application.properties modify
    
    * dockerfile conf modify (#1192)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs
    
    * nginx conf modify
    
    * dockerfile application.properties modify
    
    * dockerfile conf modify (#1193)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs
    
    * nginx conf modify
    
    * dockerfile application.properties modify
    
    * dockerfile email address change (#1194)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs
    
    * nginx conf modify
    
    * dockerfile application.properties modify
    
    * dockerfile email address change
    
    * the alert module is modified in english (#1195)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs
    
    * nginx conf modify
    
    * dockerfile application.properties modify
    
    * dockerfile email address change
    
    * the alert module is modified in English.
    
    * alert server comment and chinese modify
    
    * api server useless code and chinese modify (#1198)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs
    
    * nginx conf modify
    
    * dockerfile application.properties modify
    
    * dockerfile email address change
    
    * the alert module is modified in English.
    
    * alert server comment and chinese modify
    
    * api server useless code and chinese modify
    
    * common,dao,server useless code and chinese modify (#1199)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs
    
    * nginx conf modify
    
    * dockerfile application.properties modify
    
    * dockerfile email address change
    
    * the alert module is modified in English.
    
    * alert server comment and chinese modify
    
    * api server useless code and chinese modify
    
    * common,dao,server useless code and chinese modify
    
    * change chinese sql to english. (#1200)
    
    * update english documents
    
    * refactor zk client
    
    * update documents
    
    * update zkclient
    
    * update zkclient
    
    * update documents
    
    * add architecture-design
    
    * change i18n
    
    * update i18n
    
    * update english documents
    
    * add architecture-design
    
    * update english documents
    
    * update en-US documents
    
    * add architecture-design
    
    * update demo site
    
    * add mybatis plus model
    
    * modify mybatisplus
    
    * modify mybatisplus
    
    * change interface by mybatisplus
    
    * add unit test
    
    * refactor dao interface.
    
    * add unit test for dao...
    
    * add unit test for dao...
    
    * add unit test for dao...
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
    
    * update some dao bugs
    
    * update for some bugs
    
    * update some bugs
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
    
    * update
    
    * update
    
    * add multiply settings for application.yml
    
    * add multiply settings for application.yml
    
    * revert
    
    * update configuration settings in task record dao...
    
    * change application_master to application-master
    
    * change application_master to application-master
    
    * update application.yml to application.properties
    
    * revert
    
    * revert
    
    * add properties
    
    * add properties
    
    * revert
    
    * revert
    
    * add api start up..
    add alert send try catch
    
    * update dao info level
    
    * fix bug: task cannot submit when recovery failover
    
    * fix bug: task cannot submit when recovery failover
    
    * merge from dev-db
    
    * revert
    
    * revert
    
    * fix bug: get process definition list failed.
    
    * fix bug: process instance interval is error
    
    * revert
    
    * revert
    
    * update
    
    * support stop submit success tasks
    
    * update kill process
    
    * update for stop process
    
    * update for stop process
    
    * add some logs for stop process
    
    * update for small bug.
    
    * add check strategy before submit task
    
    * revert
    
    * update
    
    * update
    
    * revert
    
    * wait task instance exists if null.
    
    * revert
    
    * update
    
    * change desc to description.
    
    * add check user and definitions function when delete tenant
    
    * update
    
    * change desc to description.
    
    * change desc to description.
    
    * change desc to description.
    
    * remove check resources when delete tenant
    
    * change desc to description.
    
    * change mybatisplus version to 3.2.0
    
    * update
    
    * change the notice to apache.
    
    * update
    
    * update postgre sql
    
    * fix bug: phone can be empty.
    
    * fix bug: postgre test error.
    
    * update create table for postgre quartz
    
    * fix some bugs about postgre.
    
    * update create table for postgre quartz
    
    * add postgre db performance monitor
    
    * add postgre performance monitor
    
    * update performance monitor
    
    * revert
    
    * revert
    
    * fix bug: tasks queue length error
    
    * remove datasource.properties
    
    * change chinese sql to english.
    
    * change chinese sql to english.
    
    * change chinese to english (#1202)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs
    
    * nginx conf modify
    
    * dockerfile application.properties modify
    
    * dockerfile email address change
    
    * the alert module is modified in English.
    
    * alert server comment and chinese modify
    
    * api server useless code and chinese modify
    
    * common,dao,server useless code and chinese modify
    
    * change chinese to english
    
    * remove unused code (#1204)
    
    * update english documents
    
    * refactor zk client
    
    * update documents
    
    * update zkclient
    
    * update zkclient
    
    * update documents
    
    * add architecture-design
    
    * change i18n
    
    * update i18n
    
    * update english documents
    
    * add architecture-design
    
    * update english documents
    
    * update en-US documents
    
    * add architecture-design
    
    * update demo site
    
    * add mybatis plus model
    
    * modify mybatisplus
    
    * modify mybatisplus
    
    * change interface by mybatisplus
    
    * add unit test
    
    * refactor dao interface.
    
    * add unit test for dao...
    
    * add unit test for dao...
    
    * add unit test for dao...
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
    
    * update some dao bugs
    
    * update for some bugs
    
    * update some bugs
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
    
    * update
    
    * update
    
    * add multiply settings for application.yml
    
    * add multiply settings for application.yml
    
    * revert
    
    * update configuration settings in task record dao...
    
    * change application_master to application-master
    
    * change application_master to application-master
    
    * update application.yml to application.properties
    
    * revert
    
    * revert
    
    * add properties
    
    * add properties
    
    * revert
    
    * revert
    
    * add api start up..
    add alert send try catch
    
    * update dao info level
    
    * fix bug: task cannot submit when recovery failover
    
    * fix bug: task cannot submit when recovery failover
    
    * merge from dev-db
    
    * revert
    
    * revert
    
    * fix bug: get process definition list failed.
    
    * fix bug: process instance interval is error
    
    * revert
    
    * revert
    
    * update
    
    * support stop submit success tasks
    
    * update kill process
    
    * update for stop process
    
    * update for stop process
    
    * add some logs for stop process
    
    * update for small bug.
    
    * add check strategy before submit task
    
    * revert
    
    * update
    
    * update
    
    * revert
    
    * wait task instance exists if null.
    
    * revert
    
    * update
    
    * change desc to description.
    
    * add check user and definitions function when delete tenant
    
    * update
    
    * change desc to description.
    
    * change desc to description.
    
    * change desc to description.
    
    * remove check resources when delete tenant
    
    * change desc to description.
    
    * change mybatisplus version to 3.2.0
    
    * update
    
    * change the notice to apache.
    
    * update
    
    * update postgre sql
    
    * fix bug: phone can be empty.
    
    * fix bug: postgre test error.
    
    * update create table for postgre quartz
    
    * fix some bugs about postgre.
    
    * update create table for postgre quartz
    
    * add postgre db performance monitor
    
    * add postgre performance monitor
    
    * update performance monitor
    
    * revert
    
    * revert
    
    * fix bug: tasks queue length error
    
    * remove datasource.properties
    
    * change chinese sql to english.
    
    * change chinese sql to english.
    
    * remove unused code.
    
    * remove unused code.
    
    * Modify webpack configuration (#1206)
    
    * add more message for java-doc (#1209)
    
    * move updateTaskState into try/catch block in case of exception
    
    * fix NPE
    
    * using conf.getInt instead of getString
    
    * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
    for AlertDao, correct the spelling.
    
    * duplicate
    
    * refactor getTaskWorkerGroupId
    
    * add friendly log
    
    * update hearbeat thread num = 1
    
    * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
    
    * 1. move verifyTaskInstanceIsNull after taskInstance
    2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
    
    * fix the message
    
    * delete before check to avoid KeeperException$NoNodeException
    
    * fix the message
    
    * check processInstance state before delete tenant
    
    * check processInstance state before delete worker group
    
    * refactor
    
    * merge api constants into common constatns
    
    * update the resource perm
    
    * update the dataSource perm
    
    * fix CheckUtils.checkUserParams method
    
    * update AlertGroupService, extends from BaseService, remove duplicate methods
    
    * refactor
    
    * modify method name
    
    * add hasProjectAndPerm method
    
    * using checkProject instead of getResultStatus
    
    * delete checkAuth method, using hasProjectAndPerm instead.
    
    * correct spelling
    
    * add transactional for deleteWorkerGroupById
    
    * add Transactional for deleteProcessInstanceById method
    
    * change sqlSessionTemplate singleton
    
    * change sqlSessionTemplate singleton and reformat code
    
    * fix unsuitable error message
    
    * update shutdownhook methods
    
    * fix worker log bug
    
    * fix api server debug mode bug
    
    * upgrade zk version
    
    * delete this line ,for zkClient.close() will do the whole thing
    
    * fix master server shutdown error
    
    * degrade zk version and add FourLetterWordMain class
    
    * fix PathChildrenCache not close
    
    * add Transactional for createSession method
    
    * add more message for java-doc
    
    * add java doc for common module (#1213)
    
    * dao method comments and useless code modify (#1214)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs
    
    * nginx conf modify
    
    * dockerfile application.properties modify
    
    * dockerfile email address change
    
    * the alert module is modified in English.
    
    * alert server comment and chinese modify
    
    * api server useless code and chinese modify
    
    * common,dao,server useless code and chinese modify
    
    * change chinese to english
    
    * dao method comments and useless code modify
    
    * Change all Chinese names to English (#1207)
    
    * Modify webpack configuration
    
    * Change all Chinese names to English
    
    * add progress-bar-webpack-plugin (#1215)
    
    * Modify webpack configuration
    
    * Change all Chinese names to English
    
    * add progress-bar-webpack-plugin
    
    * Add method and parameters comments (#1220)
    
    * rename from DatasourceUserMapper to DataSourceUserMapper
    
    * add unit test in UserMapper and WorkerGroupMapper
    
    * change cn.escheduler to org.apache.dolphinscheduler
    
    * add unit test in UdfFuncMapperTest
    
    * add unit test in UdfFuncMapperTest
    
    * remove DatabaseConfiguration
    
    * add ConnectionFactoryTest
    
    * cal duration in processInstancesList
    
    * change desc to description
    
    * change table name in mysql ddl
    
    * change table name in mysql ddl
    
    * change escheduler to dolphinscheduler
    
    * change escheduler to dolphinscheduler
    
    * change escheduler to dolphinscheduler
    
    * remove log4j-1.2-api and modify AlertMapperTest
    
    * remove log4j-1.2-api
    
    * Add alertDao to spring management
    
    * Add alertDao to spring management
    
    * get SqlSessionFactory from MybatisSqlSessionFactoryBean
    
    * get processDao by DaoFactory
    
    * read druid properties in ConneciontFactory
    
    * read druid properties in ConneciontFactory
    
    * change get alertDao by spring to DaoFactory
    
    * add log4j to resolve #967
    
    * resole verify udf name error and delete udf error
    
    * Determine if principal is empty
    
    * Determine whether the logon user has the right to delete the project
    
    * Fixed an issue that produced attatch file named such as ATT00002.bin
    
    * fix too many connection in upgrade or create
    
    * fix NEED_FAULT_TOLERANCE and WAITTING_THREAD count fail
    
    * Added a judgment on whether the currently login user is an administrator
    
    * fix update udf database not change and create time is changed
    
    * add enterprise.wechat.enable to decide whether to send enterprise WeChat
    
    * change method check
    
    * Remove the administrator's judgment on query access token list
    
    * only admin can create worker group
    
    * delete alert group need delete the relation of user and alert group
    
    * add timeout in proxy when upload large resource
    
    * add gets scheduled times by expect fire times
    
    * add gets scheduled times by expect fire times
    
    * Increase the judgment of whether it is admin
    
    * Increase the judgment of whether it is admin
    
    * when delete access token add whether login user has perm to delete
    
    * change mysql-connector-java scope to test
    
    * update scm test
    
    * add profile test
    
    * Add method and parameters comments
    
    * roll back
    
    * add some notes (#1221)
    
    * update english documents
    
    * refactor zk client
    
    * update documents
    
    * update zkclient
    
    * update zkclient
    
    * update documents
    
    * add architecture-design
    
    * change i18n
    
    * update i18n
    
    * update english documents
    
    * add architecture-design
    
    * update english documents
    
    * update en-US documents
    
    * add architecture-design
    
    * update demo site
    
    * add mybatis plus model
    
    * modify mybatisplus
    
    * modify mybatisplus
    
    * change interface by mybatisplus
    
    * add unit test
    
    * refactor dao interface.
    
    * add unit test for dao...
    
    * add unit test for dao...
    
    * add unit test for dao...
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
    
    * update some dao bugs
    
    * update for some bugs
    
    * update some bugs
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
    
    * update
    
    * update
    
    * add multiply settings for application.yml
    
    * add multiply settings for application.yml
    
    * revert
    
    * update configuration settings in task record dao...
    
    * change application_master to application-master
    
    * change application_master to application-master
    
    * update application.yml to application.properties
    
    * revert
    
    * revert
    
    * add properties
    
    * add properties
    
    * revert
    
    * revert
    
    * add api start up..
    add alert send try catch
    
    * update dao info level
    
    * fix bug: task cannot submit when recovery failover
    
    * fix bug: task cannot submit when recovery failover
    
    * merge from dev-db
    
    * revert
    
    * revert
    
    * fix bug: get process definition list failed.
    
    * fix bug: process instance interval is error
    
    * revert
    
    * revert
    
    * update
    
    * support stop submit success tasks
    
    * update kill process
    
    * update for stop process
    
    * update for stop process
    
    * add some logs for stop process
    
    * update for small bug.
    
    * add check strategy before submit task
    
    * revert
    
    * update
    
    * update
    
    * revert
    
    * wait task instance exists if null.
    
    * revert
    
    * update
    
    * change desc to description.
    
    * add check user and definitions function when delete tenant
    
    * update
    
    * change desc to description.
    
    * change desc to description.
    
    * change desc to description.
    
    * remove check resources when delete tenant
    
    * change desc to description.
    
    * change mybatisplus version to 3.2.0
    
    * update
    
    * change the notice to apache.
    
    * update
    
    * update postgre sql
    
    * fix bug: phone can be empty.
    
    * fix bug: postgre test error.
    
    * update create table for postgre quartz
    
    * fix some bugs about postgre.
    
    * update create table for postgre quartz
    
    * add postgre db performance monitor
    
    * add postgre performance monitor
    
    * update performance monitor
    
    * revert
    
    * revert
    
    * fix bug: tasks queue length error
    
    * remove datasource.properties
    
    * change chinese sql to english.
    
    * change chinese sql to english.
    
    * remove unused code.
    
    * remove unused code.
    
    * add some notes
    
    * update some notes
    
    * update some notes
    
    * update mbatisplus version
    
    * update lombok version
    
    * update lombok version
    
    * revert
    
    * merge from dev-db
    
    * remove version
    
    * update npm install pom
    
    * add front assembly
    
    * add front module
    
    * change verison to 1.2.0-release-SNAPSHOT
    
    * add name in pom and remove compile
    
    * add name in pom
    
    * add licenses in assemble
    
    * change version to 1.2.0-RC1-SNAPSHOT
    
    * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
    
    # Conflicts:
    #	dolphinscheduler-alert/pom.xml
    #	dolphinscheduler-api/pom.xml
    #	dolphinscheduler-common/pom.xml
    #	dolphinscheduler-dao/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
    #	dolphinscheduler-dist/pom.xml
    #	dolphinscheduler-rpc/pom.xml
    #	dolphinscheduler-server/pom.xml
    #	dolphinscheduler-ui/pom.xml
    #	pom.xml
    change assembly id
    
    * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
    
    # Conflicts:
    #	dolphinscheduler-alert/pom.xml
    #	dolphinscheduler-api/pom.xml
    #	dolphinscheduler-common/pom.xml
    #	dolphinscheduler-dao/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
    #	dolphinscheduler-dist/pom.xml
    #	dolphinscheduler-rpc/pom.xml
    #	dolphinscheduler-server/pom.xml
    #	dolphinscheduler-ui/pom.xml
    #	pom.xml
    add DISCLAIMER
    
    * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
    
    # Conflicts:
    #	dolphinscheduler-alert/pom.xml
    #	dolphinscheduler-api/pom.xml
    #	dolphinscheduler-common/pom.xml
    #	dolphinscheduler-dao/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
    #	dolphinscheduler-dist/pom.xml
    #	dolphinscheduler-rpc/pom.xml
    #	dolphinscheduler-server/pom.xml
    #	dolphinscheduler-ui/pom.xml
    #	pom.xml
    add license in xml and properties
    
    * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
    
    # Conflicts:
    #	dolphinscheduler-alert/pom.xml
    #	dolphinscheduler-api/pom.xml
    #	dolphinscheduler-common/pom.xml
    #	dolphinscheduler-dao/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
    #	dolphinscheduler-dist/pom.xml
    #	dolphinscheduler-rpc/pom.xml
    #	dolphinscheduler-server/pom.xml
    #	dolphinscheduler-ui/pom.xml
    #	pom.xml
    add license in dockerfile
    
    * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
    
    # Conflicts:
    #	dolphinscheduler-alert/pom.xml
    #	dolphinscheduler-api/pom.xml
    #	dolphinscheduler-common/pom.xml
    #	dolphinscheduler-dao/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
    #	dolphinscheduler-dist/pom.xml
    #	dolphinscheduler-rpc/pom.xml
    #	dolphinscheduler-server/pom.xml
    #	dolphinscheduler-ui/pom.xml
    #	pom.xml
    add license in script and sql
    
    * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
    
    # Conflicts:
    #	dolphinscheduler-alert/pom.xml
    #	dolphinscheduler-api/pom.xml
    #	dolphinscheduler-common/pom.xml
    #	dolphinscheduler-dao/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
    #	dolphinscheduler-dist/pom.xml
    #	dolphinscheduler-rpc/pom.xml
    #	dolphinscheduler-server/pom.xml
    #	dolphinscheduler-ui/pom.xml
    #	pom.xml
    add license in script and sql
    
    * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
    
    # Conflicts:
    #	dolphinscheduler-alert/pom.xml
    #	dolphinscheduler-api/pom.xml
    #	dolphinscheduler-common/pom.xml
    #	dolphinscheduler-dao/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
    #	dolphinscheduler-dist/pom.xml
    #	dolphinscheduler-rpc/pom.xml
    #	dolphinscheduler-server/pom.xml
    #	dolphinscheduler-ui/pom.xml
    #	pom.xml
    add license in ci
    
    * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
    
    # Conflicts:
    #	dolphinscheduler-alert/pom.xml
    #	dolphinscheduler-api/pom.xml
    #	dolphinscheduler-common/pom.xml
    #	dolphinscheduler-dao/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
    #	dolphinscheduler-dist/pom.xml
    #	dolphinscheduler-rpc/pom.xml
    #	dolphinscheduler-server/pom.xml
    #	dolphinscheduler-ui/pom.xml
    #	pom.xml
    change version to 1.2.0-SNAPSHOT
    
    * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
    
    # Conflicts:
    #	dolphinscheduler-alert/pom.xml
    #	dolphinscheduler-api/pom.xml
    #	dolphinscheduler-common/pom.xml
    #	dolphinscheduler-dao/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
    #	dolphinscheduler-dist/pom.xml
    #	dolphinscheduler-rpc/pom.xml
    #	dolphinscheduler-server/pom.xml
    #	dolphinscheduler-ui/pom.xml
    #	pom.xml
    set defalut db type postgresql
    
    * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
    
    # Conflicts:
    #	dolphinscheduler-alert/pom.xml
    #	dolphinscheduler-api/pom.xml
    #	dolphinscheduler-common/pom.xml
    #	dolphinscheduler-dao/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
    #	dolphinscheduler-dist/pom.xml
    #	dolphinscheduler-rpc/pom.xml
    #	dolphinscheduler-server/pom.xml
    #	dolphinscheduler-ui/pom.xml
    #	pom.xml
    set defalut db type postgresql
    
    * Merge incomplete (#1283)
    
    * Add comments in method params and change org.quartz.jobStore.driverDelegateClass in docer file (#1284)
    
    * rename from DatasourceUserMapper to DataSourceUserMapper
    
    * add unit test in UserMapper and WorkerGroupMapper
    
    * change cn.escheduler to org.apache.dolphinscheduler
    
    * add unit test in UdfFuncMapperTest
    
    * add unit test in UdfFuncMapperTest
    
    * remove DatabaseConfiguration
    
    * add ConnectionFactoryTest
    
    * cal duration in processInstancesList
    
    * change desc to description
    
    * change table name in mysql ddl
    
    * change table name in mysql ddl
    
    * change escheduler to dolphinscheduler
    
    * change escheduler to dolphinscheduler
    
    * change escheduler to dolphinscheduler
    
    * remove log4j-1.2-api and modify AlertMapperTest
    
    * remove log4j-1.2-api
    
    * Add alertDao to spring management
    
    * Add alertDao to spring management
    
    * get SqlSessionFactory from MybatisSqlSessionFactoryBean
    
    * get processDao by DaoFactory
    
    * read druid properties in ConneciontFactory
    
    * read druid properties in ConneciontFactory
    
    * change get alertDao by spring to DaoFactory
    
    * add log4j to resolve #967
    
    * resole verify udf name error and delete udf error
    
    * Determine if principal is empty
    
    * Determine whether the logon user has the right to delete the project
    
    * Fixed an issue that produced attatch file named such as ATT00002.bin
    
    * fix too many connection in upgrade or create
    
    * fix NEED_FAULT_TOLERANCE and WAITTING_THREAD count fail
    
    * Added a judgment on whether the currently login user is an administrator
    
    * fix update udf database not change and create time is changed
    
    * add enterprise.wechat.enable to decide whether to send enterprise WeChat
    
    * change method check
    
    * Remove the administrator's judgment on query access token list
    
    * only admin can create worker group
    
    * delete alert group need delete the relation of user and alert group
    
    * add timeout in proxy when upload large resource
    
    * add gets scheduled times by expect fire times
    
    * add gets scheduled times by expect fire times
    
    * Increase the judgment of whether it is admin
    
    * Increase the judgment of whether it is admin
    
    * when delete access token add whether login user has perm to delete
    
    * change mysql-connector-java scope to test
    
    * update scm test
    
    * add profile test
    
    * add profile test
    
    * add maven.deploy.skip true
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * add dependency
    
    * add javadoc
    
    * add antrun
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * reset pgsql (#1178)
    
    + 1
    
    * add javadoc
    
    * add javadoc
    
    * [maven-release-plugin] rollback the release of 1.2.0
    
    * add javadoc
    
    * Ans UI upgrade to version 0.1.0 (#1181)
    
    + 1
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * Administrators group prohibit deletion (#1182)
    
    * Ans UI upgrade to version 0.1.0
    
    * Administrators group prohibit deletion
    
    * add javadoc
    
    * add ui pom
    
    * fix master server shutdown error (#1177)
    
    * move updateTaskState into try/catch block in case of exception
    
    * fix NPE
    
    * using conf.getInt instead of getString
    
    * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
    for AlertDao, correct the spelling.
    
    * duplicate
    
    * refactor getTaskWorkerGroupId
    
    * add friendly log
    
    * update hearbeat thread num = 1
    
    * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
    
    * 1. move verifyTaskInstanceIsNull after taskInstance
    2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
    
    * fix the message
    
    * delete before check to avoid KeeperException$NoNodeException
    
    * fix the message
    
    * check processInstance state before delete tenant
    
    * check processInstance state before delete worker group
    
    * refactor
    
    * merge api constants into common constatns
    
    * update the resource perm
    
    * update the dataSource perm
    
    * fix CheckUtils.checkUserParams method
    
    * update AlertGroupService, extends from BaseService, remove duplicate methods
    
    * refactor
    
    * modify method name
    
    * add hasProjectAndPerm method
    
    * using checkProject instead of getResultStatus
    
    * delete checkAuth method, using hasProjectAndPerm instead.
    
    * correct spelling
    
    * add transactional for deleteWorkerGroupById
    
    * add Transactional for deleteProcessInstanceById method
    
    * change sqlSessionTemplate singleton
    
    * change sqlSessionTemplate singleton and reformat code
    
    * fix unsuitable error message
    
    * update shutdownhook methods
    
    * fix worker log bug
    
    * fix api server debug mode bug
    
    * upgrade zk version
    
    * delete this line ,for zkClient.close() will do the whole thing
    
    * fix master server shutdown error
    
    * degrade zk version and add FourLetterWordMain class (#1183)
    
    * move updateTaskState into try/catch block in case of exception
    
    * fix NPE
    
    * using conf.getInt instead of getString
    
    * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
    for AlertDao, correct the spelling.
    
    * duplicate
    
    * refactor getTaskWorkerGroupId
    
    * add friendly log
    
    * update hearbeat thread num = 1
    
    * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
    
    * 1. move verifyTaskInstanceIsNull after taskInstance
    2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
    
    * fix the message
    
    * delete before check to avoid KeeperException$NoNodeException
    
    * fix the message
    
    * check processInstance state before delete tenant
    
    * check processInstance state before delete worker group
    
    * refactor
    
    * merge api constants into common constatns
    
    * update the resource perm
    
    * update the dataSource perm
    
    * fix CheckUtils.checkUserParams method
    
    * update AlertGroupService, extends from BaseService, remove duplicate methods
    
    * refactor
    
    * modify method name
    
    * add hasProjectAndPerm method
    
    * using checkProject instead of getResultStatus
    
    * delete checkAuth method, using hasProjectAndPerm instead.
    
    * correct spelling
    
    * add transactional for deleteWorkerGroupById
    
    * add Transactional for deleteProcessInstanceById method
    
    * change sqlSessionTemplate singleton
    
    * change sqlSessionTemplate singleton and reformat code
    
    * fix unsuitable error message
    
    * update shutdownhook methods
    
    * fix worker log bug
    
    * fix api server debug mode bug
    
    * upgrade zk version
    
    * delete this line ,for zkClient.close() will do the whole thing
    
    * fix master server shutdown error
    
    * degrade zk version and add FourLetterWordMain class
    
    * add ui pom
    
    * add src pom and assembly
    
    * fix ZKWorkerClient not close PathChildrenCache (#1185)
    
    * move updateTaskState into try/catch block in case of exception
    
    * fix NPE
    
    * using conf.getInt instead of getString
    
    * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
    for AlertDao, correct the spelling.
    
    * duplicate
    
    * refactor getTaskWorkerGroupId
    
    * add friendly log
    
    * update hearbeat thread num = 1
    
    * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
    
    * 1. move verifyTaskInstanceIsNull after taskInstance
    2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
    
    * fix the message
    
    * delete before check to avoid KeeperException$NoNodeException
    
    * fix the message
    
    * check processInstance state before delete tenant
    
    * check processInstance state before delete worker group
    
    * refactor
    
    * merge api constants into common constatns
    
    * update the resource perm
    
    * update the dataSource perm
    
    * fix CheckUtils.checkUserParams method
    
    * update AlertGroupService, extends from BaseService, remove duplicate methods
    
    * refactor
    
    * modify method name
    
    * add hasProjectAndPerm method
    
    * using checkProject instead of getResultStatus
    
    * delete checkAuth method, using hasProjectAndPerm instead.
    
    * correct spelling
    
    * add transactional for deleteWorkerGroupById
    
    * add Transactional for deleteProcessInstanceById method
    
    * change sqlSessionTemplate singleton
    
    * change sqlSessionTemplate singleton and reformat code
    
    * fix unsuitable error message
    
    * update shutdownhook methods
    
    * fix worker log bug
    
    * fix api server debug mode bug
    
    * upgrade zk version
    
    * delete this line ,for zkClient.close() will do the whole thing
    
    * fix master server shutdown error
    
    * degrade zk version and add FourLetterWordMain class
    
    * fix PathChildrenCache not close
    
    * add Transactional for createSession method (#1186)
    
    * move updateTaskState into try/catch block in case of exception
    
    * fix NPE
    
    * using conf.getInt instead of getString
    
    * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
    for AlertDao, correct the spelling.
    
    * duplicate
    
    * refactor getTaskWorkerGroupId
    
    * add friendly log
    
    * update hearbeat thread num = 1
    
    * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
    
    * 1. move verifyTaskInstanceIsNull after taskInstance
    2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
    
    * fix the message
    
    * delete before check to avoid KeeperException$NoNodeException
    
    * fix the message
    
    * check processInstance state before delete tenant
    
    * check processInstance state before delete worker group
    
    * refactor
    
    * merge api constants into common constatns
    
    * update the resource perm
    
    * update the dataSource perm
    
    * fix CheckUtils.checkUserParams method
    
    * update AlertGroupService, extends from BaseService, remove duplicate methods
    
    * refactor
    
    * modify method name
    
    * add hasProjectAndPerm method
    
    * using checkProject instead of getResultStatus
    
    * delete checkAuth method, using hasProjectAndPerm instead.
    
    * correct spelling
    
    * add transactional for deleteWorkerGroupById
    
    * add Transactional for deleteProcessInstanceById method
    
    * change sqlSessionTemplate singleton
    
    * change sqlSessionTemplate singleton and reformat code
    
    * fix unsuitable error message
    
    * update shutdownhook methods
    
    * fix worker log bug
    
    * fix api server debug mode bug
    
    * upgrade zk version
    
    * delete this line ,for zkClient.close() will do the whole thing
    
    * fix master server shutdown error
    
    * degrade zk version and add FourLetterWordMain class
    
    * fix PathChildrenCache not close
    
    * add Transactional for createSession method
    
    * add src pom and assembly
    
    * add src pom and assembly
    
    * add src pom and assembly
    
    * add src pom and assembly
    
    * dockerfile dao application.properties ,install.sh modify and application.properties modify (#1187)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * add src pom and assembly
    
    * add src pom and assembly
    
    * dockerfile startup.sh modify (#1189)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs (#1191)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs
    
    * nginx conf modify
    
    * dockerfile application.properties modify
    
    * dockerfile conf modify (#1192)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs
    
    * nginx conf modify
    
    * dockerfile application.properties modify
    
    * dockerfile conf modify (#1193)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs
    
    * nginx conf modify
    
    * dockerfile application.properties modify
    
    * dockerfile email address change (#1194)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs
    
    * nginx conf modify
    
    * dockerfile application.properties modify
    
    * dockerfile email address change
    
    * the alert module is modified in english (#1195)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs
    
    * nginx conf modify
    
    * dockerfile application.properties modify
    
    * dockerfile email address change
    
    * the alert module is modified in English.
    
    * alert server comment and chinese modify
    
    * api server useless code and chinese modify (#1198)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs
    
    * nginx conf modify
    
    * dockerfile application.properties modify
    
    * dockerfile email address change
    
    * the alert module is modified in English.
    
    * alert server comment and chinese modify
    
    * api server useless code and chinese modify
    
    * common,dao,server useless code and chinese modify (#1199)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs
    
    * nginx conf modify
    
    * dockerfile application.properties modify
    
    * dockerfile email address change
    
    * the alert module is modified in English.
    
    * alert server comment and chinese modify
    
    * api server useless code and chinese modify
    
    * common,dao,server useless code and chinese modify
    
    * change chinese sql to english. (#1200)
    
    * update english documents
    
    * refactor zk client
    
    * update documents
    
    * update zkclient
    
    * update zkclient
    
    * update documents
    
    * add architecture-design
    
    * change i18n
    
    * update i18n
    
    * update english documents
    
    * add architecture-design
    
    * update english documents
    
    * update en-US documents
    
    * add architecture-design
    
    * update demo site
    
    * add mybatis plus model
    
    * modify mybatisplus
    
    * modify mybatisplus
    
    * change interface by mybatisplus
    
    * add unit test
    
    * refactor dao interface.
    
    * add unit test for dao...
    
    * add unit test for dao...
    
    * add unit test for dao...
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
    
    * update some dao bugs
    
    * update for some bugs
    
    * update some bugs
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
    
    * update
    
    * update
    
    * add multiply settings for application.yml
    
    * add multiply settings for application.yml
    
    * revert
    
    * update configuration settings in task record dao...
    
    * change application_master to application-master
    
    * change application_master to application-master
    
    * update application.yml to application.properties
    
    * revert
    
    * revert
    
    * add properties
    
    * add properties
    
    * revert
    
    * revert
    
    * add api start up..
    add alert send try catch
    
    * update dao info level
    
    * fix bug: task cannot submit when recovery failover
    
    * fix bug: task cannot submit when recovery failover
    
    * merge from dev-db
    
    * revert
    
    * revert
    
    * fix bug: get process definition list failed.
    
    * fix bug: process instance interval is error
    
    * revert
    
    * revert
    
    * update
    
    * support stop submit success tasks
    
    * update kill process
    
    * update for stop process
    
    * update for stop process
    
    * add some logs for stop process
    
    * update for small bug.
    
    * add check strategy before submit task
    
    * revert
    
    * update
    
    * update
    
    * revert
    
    * wait task instance exists if null.
    
    * revert
    
    * update
    
    * change desc to description.
    
    * add check user and definitions function when delete tenant
    
    * update
    
    * change desc to description.
    
    * change desc to description.
    
    * change desc to description.
    
    * remove check resources when delete tenant
    
    * change desc to description.
    
    * change mybatisplus version to 3.2.0
    
    * update
    
    * change the notice to apache.
    
    * update
    
    * update postgre sql
    
    * fix bug: phone can be empty.
    
    * fix bug: postgre test error.
    
    * update create table for postgre quartz
    
    * fix some bugs about postgre.
    
    * update create table for postgre quartz
    
    * add postgre db performance monitor
    
    * add postgre performance monitor
    
    * update performance monitor
    
    * revert
    
    * revert
    
    * fix bug: tasks queue length error
    
    * remove datasource.properties
    
    * change chinese sql to english.
    
    * change chinese sql to english.
    
    * change chinese to english (#1202)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs
    
    * nginx conf modify
    
    * dockerfile application.properties modify
    
    * dockerfile email address change
    
    * the alert module is modified in English.
    
    * alert server comment and chinese modify
    
    * api server useless code and chinese modify
    
    * common,dao,server useless code and chinese modify
    
    * change chinese to english
    
    * remove unused code (#1204)
    
    * update english documents
    
    * refactor zk client
    
    * update documents
    
    * update zkclient
    
    * update zkclient
    
    * update documents
    
    * add architecture-design
    
    * change i18n
    
    * update i18n
    
    * update english documents
    
    * add architecture-design
    
    * update english documents
    
    * update en-US documents
    
    * add architecture-design
    
    * update demo site
    
    * add mybatis plus model
    
    * modify mybatisplus
    
    * modify mybatisplus
    
    * change interface by mybatisplus
    
    * add unit test
    
    * refactor dao interface.
    
    * add unit test for dao...
    
    * add unit test for dao...
    
    * add unit test for dao...
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
    
    * update some dao bugs
    
    * update for some bugs
    
    * update some bugs
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
    
    * update
    
    * update
    
    * add multiply settings for application.yml
    
    * add multiply settings for application.yml
    
    * revert
    
    * update configuration settings in task record dao...
    
    * change application_master to application-master
    
    * change application_master to application-master
    
    * update application.yml to application.properties
    
    * revert
    
    * revert
    
    * add properties
    
    * add properties
    
    * revert
    
    * revert
    
    * add api start up..
    add alert send try catch
    
    * update dao info level
    
    * fix bug: task cannot submit when recovery failover
    
    * fix bug: task cannot submit when recovery failover
    
    * merge from dev-db
    
    * revert
    
    * revert
    
    * fix bug: get process definition list failed.
    
    * fix bug: process instance interval is error
    
    * revert
    
    * revert
    
    * update
    
    * support stop submit success tasks
    
    * update kill process
    
    * update for stop process
    
    * update for stop process
    
    * add some logs for stop process
    
    * update for small bug.
    
    * add check strategy before submit task
    
    * revert
    
    * update
    
    * update
    
    * revert
    
    * wait task instance exists if null.
    
    * revert
    
    * update
    
    * change desc to description.
    
    * add check user and definitions function when delete tenant
    
    * update
    
    * change desc to description.
    
    * change desc to description.
    
    * change desc to description.
    
    * remove check resources when delete tenant
    
    * change desc to description.
    
    * change mybatisplus version to 3.2.0
    
    * update
    
    * change the notice to apache.
    
    * update
    
    * update postgre sql
    
    * fix bug: phone can be empty.
    
    * fix bug: postgre test error.
    
    * update create table for postgre quartz
    
    * fix some bugs about postgre.
    
    * update create table for postgre quartz
    
    * add postgre db performance monitor
    
    * add postgre performance monitor
    
    * update performance monitor
    
    * revert
    
    * revert
    
    * fix bug: tasks queue length error
    
    * remove datasource.properties
    
    * change chinese sql to english.
    
    * change chinese sql to english.
    
    * remove unused code.
    
    * remove unused code.
    
    * Modify webpack configuration (#1206)
    
    * add more message for java-doc (#1209)
    
    * move updateTaskState into try/catch block in case of exception
    
    * fix NPE
    
    * using conf.getInt instead of getString
    
    * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
    for AlertDao, correct the spelling.
    
    * duplicate
    
    * refactor getTaskWorkerGroupId
    
    * add friendly log
    
    * update hearbeat thread num = 1
    
    * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
    
    * 1. move verifyTaskInstanceIsNull after taskInstance
    2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
    
    * fix the message
    
    * delete before check to avoid KeeperException$NoNodeException
    
    * fix the message
    
    * check processInstance state before delete tenant
    
    * check processInstance state before delete worker group
    
    * refactor
    
    * merge api constants into common constatns
    
    * update the resource perm
    
    * update the dataSource perm
    
    * fix CheckUtils.checkUserParams method
    
    * update AlertGroupService, extends from BaseService, remove duplicate methods
    
    * refactor
    
    * modify method name
    
    * add hasProjectAndPerm method
    
    * using checkProject instead of getResultStatus
    
    * delete checkAuth method, using hasProjectAndPerm instead.
    
    * correct spelling
    
    * add transactional for deleteWorkerGroupById
    
    * add Transactional for deleteProcessInstanceById method
    
    * change sqlSessionTemplate singleton
    
    * change sqlSessionTemplate singleton and reformat code
    
    * fix unsuitable error message
    
    * update shutdownhook methods
    
    * fix worker log bug
    
    * fix api server debug mode bug
    
    * upgrade zk version
    
    * delete this line ,for zkClient.close() will do the whole thing
    
    * fix master server shutdown error
    
    * degrade zk version and add FourLetterWordMain class
    
    * fix PathChildrenCache not close
    
    * add Transactional for createSession method
    
    * add more message for java-doc
    
    * add java doc for common module (#1213)
    
    * dao method comments and useless code modify (#1214)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs
    
    * nginx conf modify
    
    * dockerfile application.properties modify
    
    * dockerfile email address change
    
    * the alert module is modified in English.
    
    * alert server comment and chinese modify
    
    * api server useless code and chinese modify
    
    * common,dao,server useless code and chinese modify
    
    * change chinese to english
    
    * dao method comments and useless code modify
    
    * Change all Chinese names to English (#1207)
    
    * Modify webpack configuration
    
    * Change all Chinese names to English
    
    * add progress-bar-webpack-plugin (#1215)
    
    * Modify webpack configuration
    
    * Change all Chinese names to English
    
    * add progress-bar-webpack-plugin
    
    * Add method and parameters comments (#1220)
    
    * rename from DatasourceUserMapper to DataSourceUserMapper
    
    * add unit test in UserMapper and WorkerGroupMapper
    
    * change cn.escheduler to org.apache.dolphinscheduler
    
    * add unit test in UdfFuncMapperTest
    
    * add unit test in UdfFuncMapperTest
    
    * remove DatabaseConfiguration
    
    * add ConnectionFactoryTest
    
    * cal duration in processInstancesList
    
    * change desc to description
    
    * change table name in mysql ddl
    
    * change table name in mysql ddl
    
    * change escheduler to dolphinscheduler
    
    * change escheduler to dolphinscheduler
    
    * change escheduler to dolphinscheduler
    
    * remove log4j-1.2-api and modify AlertMapperTest
    
    * remove log4j-1.2-api
    
    * Add alertDao to spring management
    
    * Add alertDao to spring management
    
    * get SqlSessionFactory from MybatisSqlSessionFactoryBean
    
    * get processDao by DaoFactory
    
    * read druid properties in ConneciontFactory
    
    * read druid properties in ConneciontFactory
    
    * change get alertDao by spring to DaoFactory
    
    * add log4j to resolve #967
    
    * resole verify udf name error and delete udf error
    
    * Determine if principal is empty
    
    * Determine whether the logon user has the right to delete the project
    
    * Fixed an issue that produced attatch file named such as ATT00002.bin
    
    * fix too many connection in upgrade or create
    
    * fix NEED_FAULT_TOLERANCE and WAITTING_THREAD count fail
    
    * Added a judgment on whether the currently login user is an administrator
    
    * fix update udf database not change and create time is changed
    
    * add enterprise.wechat.enable to decide whether to send enterprise WeChat
    
    * change method check
    
    * Remove the administrator's judgment on query access token list
    
    * only admin can create worker group
    
    * delete alert group need delete the relation of user and alert group
    
    * add timeout in proxy when upload large resource
    
    * add gets scheduled times by expect fire times
    
    * add gets scheduled times by expect fire times
    
    * Increase the judgment of whether it is admin
    
    * Increase the judgment of whether it is admin
    
    * when delete access token add whether login user has perm to delete
    
    * change mysql-connector-java scope to test
    
    * update scm test
    
    * add profile test
    
    * Add method and parameters comments
    
    * roll back
    
    * add some notes (#1221)
    
    * update english documents
    
    * refactor zk client
    
    * update documents
    
    * update zkclient
    
    * update zkclient
    
    * update documents
    
    * add architecture-design
    
    * change i18n
    
    * update i18n
    
    * update english documents
    
    * add architecture-design
    
    * update english documents
    
    * update en-US documents
    
    * add architecture-design
    
    * update demo site
    
    * add mybatis plus model
    
    * modify mybatisplus
    
    * modify mybatisplus
    
    * change interface by mybatisplus
    
    * add unit test
    
    * refactor dao interface.
    
    * add unit test for dao...
    
    * add unit test for dao...
    
    * add unit test for dao...
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
    
    * update some dao bugs
    
    * update for some bugs
    
    * update some bugs
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
    
    * update
    
    * update
    
    * add multiply settings for application.yml
    
    * add multiply settings for application.yml
    
    * revert
    
    * update configuration settings in task record dao...
    
    * change application_master to application-master
    
    * change application_master to application-master
    
    * update application.yml to application.properties
    
    * revert
    
    * revert
    
    * add properties
    
    * add properties
    
    * revert
    
    * revert
    
    * add api start up..
    add alert send try catch
    
    * update dao info level
    
    * fix bug: task cannot submit when recovery failover
    
    * fix bug: task cannot submit when recovery failover
    
    * merge from dev-db
    
    * revert
    
    * revert
    
    * fix bug: get process definition list failed.
    
    * fix bug: process instance interval is error
    
    * revert
    
    * revert
    
    * update
    
    * support stop submit success tasks
    
    * update kill process
    
    * update for stop process
    
    * update for stop process
    
    * add some logs for stop process
    
    * update for small bug.
    
    * add check strategy before submit task
    
    * revert
    
    * update
    
    * update
    
    * revert
    
    * wait task instance exists if null.
    
    * revert
    
    * update
    
    * change desc to description.
    
    * add check user and definitions function when delete tenant
    
    * update
    
    * change desc to description.
    
    * change desc to description.
    
    * change desc to description.
    
    * remove check resources when delete tenant
    
    * change desc to description.
    
    * change mybatisplus version to 3.2.0
    
    * update
    
    * change the notice to apache.
    
    * update
    
    * update postgre sql
    
    * fix bug: phone can be empty.
    
    * fix bug: postgre test error.
    
    * update create table for postgre quartz
    
    * fix some bugs about postgre.
    
    * update create table for postgre quartz
    
    * add postgre db performance monitor
    
    * add postgre performance monitor
    
    * update performance monitor
    
    * revert
    
    * revert
    
    * fix bug: tasks queue length error
    
    * remove datasource.properties
    
    * change chinese sql to english.
    
    * change chinese sql to english.
    
    * remove unused code.
    
    * remove unused code.
    
    * add some notes
    
    * update some notes
    
    * update some notes
    
    * update mbatisplus version
    
    * update lombok version
    
    * update lombok version
    
    * revert
    
    * merge from dev-db
    
    * remove version
    
    * update npm install pom
    
    * add front assembly
    
    * add front module
    
    * change verison to 1.2.0-release-SNAPSHOT
    
    * add name in pom and remove compile
    
    * add name in pom
    
    * add licenses in assemble
    
    * change version to 1.2.0-RC1-SNAPSHOT
    
    * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
    
    # Conflicts:
    #	dolphinscheduler-alert/pom.xml
    #	dolphinscheduler-api/pom.xml
    #	dolphinscheduler-common/pom.xml
    #	dolphinscheduler-dao/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
    #	dolphinscheduler-dist/pom.xml
    #	dolphinscheduler-rpc/pom.xml
    #	dolphinscheduler-server/pom.xml
    #	dolphinscheduler-ui/pom.xml
    #	pom.xml
    change assembly id
    
    * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
    
    # Conflicts:
    #	dolphinscheduler-alert/pom.xml
    #	dolphinscheduler-api/pom.xml
    #	dolphinscheduler-common/pom.xml
    #	dolphinscheduler-dao/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
    #	dolphinscheduler-dist/pom.xml
    #	dolphinscheduler-rpc/pom.xml
    #	dolphinscheduler-server/pom.xml
    #	dolphinscheduler-ui/pom.xml
    #	pom.xml
    add DISCLAIMER
    
    * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
    
    # Conflicts:
    #	dolphinscheduler-alert/pom.xml
    #	dolphinscheduler-api/pom.xml
    #	dolphinscheduler-common/pom.xml
    #	dolphinscheduler-dao/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
    #	dolphinscheduler-dist/pom.xml
    #	dolphinscheduler-rpc/pom.xml
    #	dolphinscheduler-server/pom.xml
    #	dolphinscheduler-ui/pom.xml
    #	pom.xml
    add license in xml and properties
    
    * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
    
    # Conflicts:
    #	dolphinscheduler-alert/pom.xml
    #	dolphinscheduler-api/pom.xml
    #	dolphinscheduler-common/pom.xml
    #	dolphinscheduler-dao/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
    #	dolphinscheduler-dist/pom.xml
    #	dolphinscheduler-rpc/pom.xml
    #	dolphinscheduler-server/pom.xml
    #	dolphinscheduler-ui/pom.xml
    #	pom.xml
    add license in dockerfile
    
    * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
    
    # Conflicts:
    #	dolphinscheduler-alert/pom.xml
    #	dolphinscheduler-api/pom.xml
    #	dolphinscheduler-common/pom.xml
    #	dolphinscheduler-dao/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
    #	dolphinscheduler-dist/pom.xml
    #	dolphinscheduler-rpc/pom.xml
    #	dolphinscheduler-server/pom.xml
    #	dolphinscheduler-ui/pom.xml
    #	pom.xml
    add license in script and sql
    
    * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
    
    # Conflicts:
    #	dolphinscheduler-alert/pom.xml
    #	dolphinscheduler-api/pom.xml
    #	dolphinscheduler-common/pom.xml
    #	dolphinscheduler-dao/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
    #	dolphinscheduler-dist/pom.xml
    #	dolphinscheduler-rpc/pom.xml
    #	dolphinscheduler-server/pom.xml
    #	dolphinscheduler-ui/pom.xml
    #	pom.xml
    add license in script and sql
    
    * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
    
    # Conflicts:
    #	dolphinscheduler-alert/pom.xml
    #	dolphinscheduler-api/pom.xml
    #	dolphinscheduler-common/pom.xml
    #	dolphinscheduler-dao/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
    #	dolphinscheduler-dist/pom.xml
    #	dolphinscheduler-rpc/pom.xml
    #	dolphinscheduler-server/pom.xml
    #	dolphinscheduler-ui/pom.xml
    #	pom.xml
    add license in ci
    
    * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
    
    # Conflicts:
    #	dolphinscheduler-alert/pom.xml
    #	dolphinscheduler-api/pom.xml
    #	dolphinscheduler-common/pom.xml
    #	dolphinscheduler-dao/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
    #	dolphinscheduler-dist/pom.xml
    #	dolphinscheduler-rpc/pom.xml
    #	dolphinscheduler-server/pom.xml
    #	dolphinscheduler-ui/pom.xml
    #	pom.xml
    change version to 1.2.0-SNAPSHOT
    
    * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
    
    # Conflicts:
    #	dolphinscheduler-alert/pom.xml
    #	dolphinscheduler-api/pom.xml
    #	dolphinscheduler-common/pom.xml
    #	dolphinscheduler-dao/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
    #	dolphinscheduler-dist/pom.xml
    #	dolphinscheduler-rpc/pom.xml
    #	dolphinscheduler-server/pom.xml
    #	dolphinscheduler-ui/pom.xml
    #	pom.xml
    set defalut db type postgresql
    
    * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
    
    # Conflicts:
    #	dolphinscheduler-alert/pom.xml
    #	dolphinscheduler-api/pom.xml
    #	dolphinscheduler-common/pom.xml
    #	dolphinscheduler-dao/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
    #	dolphinscheduler-dist/pom.xml
    #	dolphinscheduler-rpc/pom.xml
    #	dolphinscheduler-server/pom.xml
    #	dolphinscheduler-ui/pom.xml
    #	pom.xml
    set defalut db type postgresql
    
    * change org.quartz.jobStore.driverDelegateClass
    
    * Add comments in method params
    
    * REGEX_USER_NAME modify,support number and underline,task yarn status judge bug fix (#1287)
    
    * reset pgsql (#1178)
    
    + 1
    
    * Ans UI upgrade to version 0.1.0 (#1181)
    
    + 1
    
    * Administrators group prohibit deletion (#1182)
    
    * Ans UI upgrade to version 0.1.0
    
    * Administrators group prohibit deletion
    
    * fix master server shutdown error (#1177)
    
    * move updateTaskState into try/catch block in case of exception
    
    * fix NPE
    
    * using conf.getInt instead of getString
    
    * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
    for AlertDao, correct the spelling.
    
    * duplicate
    
    * refactor getTaskWorkerGroupId
    
    * add friendly log
    
    * update hearbeat thread num = 1
    
    * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
    
    * 1. move verifyTaskInstanceIsNull after taskInstance
    2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
    
    * fix the message
    
    * delete before check to avoid KeeperException$NoNodeException
    
    * fix the message
    
    * check processInstance state before delete tenant
    
    * check processInstance state before delete worker group
    
    * refactor
    
    * merge api constants into common constatns
    
    * update the resource perm
    
    * update the dataSource perm
    
    * fix CheckUtils.checkUserParams method
    
    * update AlertGroupService, extends from BaseService, remove duplicate methods
    
    * refactor
    
    * modify method name
    
    * add hasProjectAndPerm method
    
    * using checkProject instead of getResultStatus
    
    * delete checkAuth method, using hasProjectAndPerm instead.
    
    * correct spelling
    
    * add transactional for deleteWorkerGroupById
    
    * add Transactional for deleteProcessInstanceById method
    
    * change sqlSessionTemplate singleton
    
    * change sqlSessionTemplate singleton and reformat code
    
    * fix unsuitable error message
    
    * update shutdownhook methods
    
    * fix worker log bug
    
    * fix api server debug mode bug
    
    * upgrade zk version
    
    * delete this line ,for zkClient.close() will do the whole thing
    
    * fix master server shutdown error
    
    * degrade zk version and add FourLetterWordMain class (#1183)
    
    * move updateTaskState into try/catch block in case of exception
    
    * fix NPE
    
    * using conf.getInt instead of getString
    
    * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
    for AlertDao, correct the spelling.
    
    * duplicate
    
    * refactor getTaskWorkerGroupId
    
    * add friendly log
    
    * update hearbeat thread num = 1
    
    * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
    
    * 1. move verifyTaskInstanceIsNull after taskInstance
    2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
    
    * fix the message
    
    * delete before check to avoid KeeperException$NoNodeException
    
    * fix the message
    
    * check processInstance state before delete tenant
    
    * check processInstance state before delete worker group
    
    * refactor
    
    * merge api constants into common constatns
    
    * update the resource perm
    
    * update the dataSource perm
    
    * fix CheckUtils.checkUserParams method
    
    * update AlertGroupService, extends from BaseService, remove duplicate methods
    
    * refactor
    
    * modify method name
    
    * add hasProjectAndPerm method
    
    * using checkProject instead of getResultStatus
    
    * delete checkAuth method, using hasProjectAndPerm instead.
    
    * correct spelling
    
    * add transactional for deleteWorkerGroupById
    
    * add Transactional for deleteProcessInstanceById method
    
    * change sqlSessionTemplate singleton
    
    * change sqlSessionTemplate singleton and reformat code
    
    * fix unsuitable error message
    
    * update shutdownhook methods
    
    * fix worker log bug
    
    * fix api server debug mode bug
    
    * upgrade zk version
    
    * delete this line ,for zkClient.close() will do the whole thing
    
    * fix master server shutdown error
    
    * degrade zk version and add FourLetterWordMain class
    
    * fix ZKWorkerClient not close PathChildrenCache (#1185)
    
    * move updateTaskState into try/catch block in case of exception
    
    * fix NPE
    
    * using conf.getInt instead of getString
    
    * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
    for AlertDao, correct the spelling.
    
    * duplicate
    
    * refactor getTaskWorkerGroupId
    
    * add friendly log
    
    * update hearbeat thread num = 1
    
    * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
    
    * 1. move verifyTaskInstanceIsNull after taskInstance
    2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
    
    * fix the message
    
    * delete before check to avoid KeeperException$NoNodeException
    
    * fix the message
    
    * check processInstance state before delete tenant
    
    * check processInstance state before delete worker group
    
    * refactor
    
    * merge api constants into common constatns
    
    * update the resource perm
    
    * update the dataSource perm
    
    * fix CheckUtils.checkUserParams method
    
    * update AlertGroupService, extends from BaseService, remove duplicate methods
    
    * refactor
    
    * modify method name
    
    * add hasProjectAndPerm method
    
    * using checkProject instead of getResultStatus
    
    * delete checkAuth method, using hasProjectAndPerm instead.
    
    * correct spelling
    
    * add transactional for deleteWorkerGroupById
    
    * add Transactional for deleteProcessInstanceById method
    
    * change sqlSessionTemplate singleton
    
    * change sqlSessionTemplate singleton and reformat code
    
    * fix unsuitable error message
    
    * update shutdownhook methods
    
    * fix worker log bug
    
    * fix api server debug mode bug
    
    * upgrade zk version
    
    * delete this line ,for zkClient.close() will do the whole thing
    
    * fix master server shutdown error
    
    * degrade zk version and add FourLetterWordMain class
    
    * fix PathChildrenCache not close
    
    * add Transactional for createSession method (#1186)
    
    * move updateTaskState into try/catch block in case of exception
    
    * fix NPE
    
    * using conf.getInt instead of getString
    
    * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
    for AlertDao, correct the spelling.
    
    * duplicate
    
    * refactor getTaskWorkerGroupId
    
    * add friendly log
    
    * update hearbeat thread num = 1
    
    * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
    
    * 1. move verifyTaskInstanceIsNull after taskInstance
    2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
    
    * fix the message
    
    * delete before check to avoid KeeperException$NoNodeException
    
    * fix the message
    
    * check processInstance state before delete tenant
    
    * check processInstance state before delete worker group
    
    * refactor
    
    * merge api constants into common constatns
    
    * update the resource perm
    
    * update the dataSource perm
    
    * fix CheckUtils.checkUserParams method
    
    * update AlertGroupService, extends from BaseService, remove duplicate methods
    
    * refactor
    
    * modify method name
    
    * add hasProjectAndPerm method
    
    * using checkProject instead of getResultStatus
    
    * delete checkAuth method, using hasProjectAndPerm instead.
    
    * correct spelling
    
    * add transactional for deleteWorkerGroupById
    
    * add Transactional for deleteProcessInstanceById method
    
    * change sqlSessionTemplate singleton
    
    * change sqlSessionTemplate singleton and reformat code
    
    * fix unsuitable error message
    
    * update shutdownhook methods
    
    * fix worker log bug
    
    * fix api server debug mode bug
    
    * upgrade zk version
    
    * delete this line ,for zkClient.close() will do the whole thing
    
    * fix master server shutdown error
    
    * degrade zk version and add FourLetterWordMain class
    
    * fix PathChildrenCache not close
    
    * add Transactional for createSession method
    
    * dockerfile dao application.properties ,install.sh modify and application.properties modify (#1187)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify (#1189)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs (#1191)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs
    
    * nginx conf modify
    
    * dockerfile application.properties modify
    
    * dockerfile conf modify (#1192)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs
    
    * nginx conf modify
    
    * dockerfile application.properties modify
    
    * dockerfile conf modify (#1193)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs
    
    * nginx conf modify
    
    * dockerfile application.properties modify
    
    * dockerfile email address change (#1194)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs
    
    * nginx conf modify
    
    * dockerfile application.properties modify
    
    * dockerfile email address change
    
    * the alert module is modified in english (#1195)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs
    
    * nginx conf modify
    
    * dockerfile application.properties modify
    
    * dockerfile email address change
    
    * the alert module is modified in English.
    
    * alert server comment and chinese modify
    
    * api server useless code and chinese modify (#1198)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs
    
    * nginx conf modify
    
    * dockerfile application.properties modify
    
    * dockerfile email address change
    
    * the alert module is modified in English.
    
    * alert server comment and chinese modify
    
    * api server useless code and chinese modify
    
    * common,dao,server useless code and chinese modify (#1199)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs
    
    * nginx conf modify
    
    * dockerfile application.properties modify
    
    * dockerfile email address change
    
    * the alert module is modified in English.
    
    * alert server comment and chinese modify
    
    * api server useless code and chinese modify
    
    * common,dao,server useless code and chinese modify
    
    * change chinese sql to english. (#1200)
    
    * update english documents
    
    * refactor zk client
    
    * update documents
    
    * update zkclient
    
    * update zkclient
    
    * update documents
    
    * add architecture-design
    
    * change i18n
    
    * update i18n
    
    * update english documents
    
    * add architecture-design
    
    * update english documents
    
    * update en-US documents
    
    * add architecture-design
    
    * update demo site
    
    * add mybatis plus model
    
    * modify mybatisplus
    
    * modify mybatisplus
    
    * change interface by mybatisplus
    
    * add unit test
    
    * refactor dao interface.
    
    * add unit test for dao...
    
    * add unit test for dao...
    
    * add unit test for dao...
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
    
    * update some dao bugs
    
    * update for some bugs
    
    * update some bugs
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
    
    * update
    
    * update
    
    * add multiply settings for application.yml
    
    * add multiply settings for application.yml
    
    * revert
    
    * update configuration settings in task record dao...
    
    * change application_master to application-master
    
    * change application_master to application-master
    
    * update application.yml to application.properties
    
    * revert
    
    * revert
    
    * add properties
    
    * add properties
    
    * revert
    
    * revert
    
    * add api start up..
    add alert send try catch
    
    * update dao info level
    
    * fix bug: task cannot submit when recovery failover
    
    * fix bug: task cannot submit when recovery failover
    
    * merge from dev-db
    
    * revert
    
    * revert
    
    * fix bug: get process definition list failed.
    
    * fix bug: process instance interval is error
    
    * revert
    
    * revert
    
    * update
    
    * support stop submit success tasks
    
    * update kill process
    
    * update for stop process
    
    * update for stop process
    
    * add some logs for stop process
    
    * update for small bug.
    
    * add check strategy before submit task
    
    * revert
    
    * update
    
    * update
    
    * revert
    
    * wait task instance exists if null.
    
    * revert
    
    * update
    
    * change desc to description.
    
    * add check user and definitions function when delete tenant
    
    * update
    
    * change desc to description.
    
    * change desc to description.
    
    * change desc to description.
    
    * remove check resources when delete tenant
    
    * change desc to description.
    
    * change mybatisplus version to 3.2.0
    
    * update
    
    * change the notice to apache.
    
    * update
    
    * update postgre sql
    
    * fix bug: phone can be empty.
    
    * fix bug: postgre test error.
    
    * update create table for postgre quartz
    
    * fix some bugs about postgre.
    
    * update create table for postgre quartz
    
    * add postgre db performance monitor
    
    * add postgre performance monitor
    
    * update performance monitor
    
    * revert
    
    * revert
    
    * fix bug: tasks queue length error
    
    * remove datasource.properties
    
    * change chinese sql to english.
    
    * change chinese sql to english.
    
    * change chinese to english (#1202)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs
    
    * nginx conf modify
    
    * dockerfile application.properties modify
    
    * dockerfile email address change
    
    * the alert module is modified in English.
    
    * alert server comment and chinese modify
    
    * api server useless code and chinese modify
    
    * common,dao,server useless code and chinese modify
    
    * change chinese to english
    
    * remove unused code (#1204)
    
    * update english documents
    
    * refactor zk client
    
    * update documents
    
    * update zkclient
    
    * update zkclient
    
    * update documents
    
    * add architecture-design
    
    * change i18n
    
    * update i18n
    
    * update english documents
    
    * add architecture-design
    
    * update english documents
    
    * update en-US documents
    
    * add architecture-design
    
    * update demo site
    
    * add mybatis plus model
    
    * modify mybatisplus
    
    * modify mybatisplus
    
    * change interface by mybatisplus
    
    * add unit test
    
    * refactor dao interface.
    
    * add unit test for dao...
    
    * add unit test for dao...
    
    * add unit test for dao...
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
    
    * update some dao bugs
    
    * update for some bugs
    
    * update some bugs
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
    
    * update
    
    * update
    
    * add multiply settings for application.yml
    
    * add multiply settings for application.yml
    
    * revert
    
    * update configuration settings in task record dao...
    
    * change application_master to application-master
    
    * change application_master to application-master
    
    * update application.yml to application.properties
    
    * revert
    
    * revert
    
    * add properties
    
    * add properties
    
    * revert
    
    * revert
    
    * add api start up..
    add alert send try catch
    
    * update dao info level
    
    * fix bug: task cannot submit when recovery failover
    
    * fix bug: task cannot submit when recovery failover
    
    * merge from dev-db
    
    * revert
    
    * revert
    
    * fix bug: get process definition list failed.
    
    * fix bug: process instance interval is error
    
    * revert
    
    * revert
    
    * update
    
    * support stop submit success tasks
    
    * update kill process
    
    * update for stop process
    
    * update for stop process
    
    * add some logs for stop process
    
    * update for small bug.
    
    * add check strategy before submit task
    
    * revert
    
    * update
    
    * update
    
    * revert
    
    * wait task instance exists if null.
    
    * revert
    
    * update
    
    * change desc to description.
    
    * add check user and definitions function when delete tenant
    
    * update
    
    * change desc to description.
    
    * change desc to description.
    
    * change desc to description.
    
    * remove check resources when delete tenant
    
    * change desc to description.
    
    * change mybatisplus version to 3.2.0
    
    * update
    
    * change the notice to apache.
    
    * update
    
    * update postgre sql
    
    * fix bug: phone can be empty.
    
    * fix bug: postgre test error.
    
    * update create table for postgre quartz
    
    * fix some bugs about postgre.
    
    * update create table for postgre quartz
    
    * add postgre db performance monitor
    
    * add postgre performance monitor
    
    * update performance monitor
    
    * revert
    
    * revert
    
    * fix bug: tasks queue length error
    
    * remove datasource.properties
    
    * change chinese sql to english.
    
    * change chinese sql to english.
    
    * remove unused code.
    
    * remove unused code.
    
    * Modify webpack configuration (#1206)
    
    * add more message for java-doc (#1209)
    
    * move updateTaskState into try/catch block in case of exception
    
    * fix NPE
    
    * using conf.getInt instead of getString
    
    * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
    for AlertDao, correct the spelling.
    
    * duplicate
    
    * refactor getTaskWorkerGroupId
    
    * add friendly log
    
    * update hearbeat thread num = 1
    
    * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
    
    * 1. move verifyTaskInstanceIsNull after taskInstance
    2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
    
    * fix the message
    
    * delete before check to avoid KeeperException$NoNodeException
    
    * fix the message
    
    * check processInstance state before delete tenant
    
    * check processInstance state before delete worker group
    
    * refactor
    
    * merge api constants into common constatns
    
    * update the resource perm
    
    * update the dataSource perm
    
    * fix CheckUtils.checkUserParams method
    
    * update AlertGroupService, extends from BaseService, remove duplicate methods
    
    * refactor
    
    * modify method name
    
    * add hasProjectAndPerm method
    
    * using checkProject instead of getResultStatus
    
    * delete checkAuth method, using hasProjectAndPerm instead.
    
    * correct spelling
    
    * add transactional for deleteWorkerGroupById
    
    * add Transactional for deleteProcessInstanceById method
    
    * change sqlSessionTemplate singleton
    
    * change sqlSessionTemplate singleton and reformat code
    
    * fix unsuitable error message
    
    * update shutdownhook methods
    
    * fix worker log bug
    
    * fix api server debug mode bug
    
    * upgrade zk version
    
    * delete this line ,for zkClient.close() will do the whole thing
    
    * fix master server shutdown error
    
    * degrade zk version and add FourLetterWordMain class
    
    * fix PathChildrenCache not close
    
    * add Transactional for createSession method
    
    * add more message for java-doc
    
    * add java doc for common module (#1213)
    
    * dao method comments and useless code modify (#1214)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs
    
    * nginx conf modify
    
    * dockerfile application.properties modify
    
    * dockerfile email address change
    
    * the alert module is modified in English.
    
    * alert server comment and chinese modify
    
    * api server useless code and chinese modify
    
    * common,dao,server useless code and chinese modify
    
    * change chinese to english
    
    * dao method comments and useless code modify
    
    * Change all Chinese names to English (#1207)
    
    * Modify webpack configuration
    
    * Change all Chinese names to English
    
    * add progress-bar-webpack-plugin (#1215)
    
    * Modify webpack configuration
    
    * Change all Chinese names to English
    
    * add progress-bar-webpack-plugin
    
    * Add method and parameters comments (#1220)
    
    * rename from DatasourceUserMapper to DataSourceUserMapper
    
    * add unit test in UserMapper and WorkerGroupMapper
    
    * change cn.escheduler to org.apache.dolphinscheduler
    
    * add unit test in UdfFuncMapperTest
    
    * add unit test in UdfFuncMapperTest
    
    * remove DatabaseConfiguration
    
    * add ConnectionFactoryTest
    
    * cal duration in processInstancesList
    
    * change desc to description
    
    * change table name in mysql ddl
    
    * change table name in mysql ddl
    
    * change escheduler to dolphinscheduler
    
    * change escheduler to dolphinscheduler
    
    * change escheduler to dolphinscheduler
    
    * remove log4j-1.2-api and modify AlertMapperTest
    
    * remove log4j-1.2-api
    
    * Add alertDao to spring management
    
    * Add alertDao to spring management
    
    * get SqlSessionFactory from MybatisSqlSessionFactoryBean
    
    * get processDao by DaoFactory
    
    * read druid properties in ConneciontFactory
    
    * read druid properties in ConneciontFactory
    
    * change get alertDao by spring to DaoFactory
    
    * add log4j to resolve #967
    
    * resole verify udf name error and delete udf error
    
    * Determine if principal is empty
    
    * Determine whether the logon user has the right to delete the project
    
    * Fixed an issue that produced attatch file named such as ATT00002.bin
    
    * fix too many connection in upgrade or create
    
    * fix NEED_FAULT_TOLERANCE and WAITTING_THREAD count fail
    
    * Added a judgment on whether the currently login user is an administrator
    
    * fix update udf database not change and create time is changed
    
    * add enterprise.wechat.enable to decide whether to send enterprise WeChat
    
    * change method check
    
    * Remove the administrator's judgment on query access token list
    
    * only admin can create worker group
    
    * delete alert group need delete the relation of user and alert group
    
    * add timeout in proxy when upload large resource
    
    * add gets scheduled times by expect fire times
    
    * add gets scheduled times by expect fire times
    
    * Increase the judgment of whether it is admin
    
    * Increase the judgment of whether it is admin
    
    * when delete access token add whether login user has perm to delete
    
    * change mysql-connector-java scope to test
    
    * update scm test
    
    * add profile test
    
    * Add method and parameters comments
    
    * roll back
    
    * add some notes (#1221)
    
    * update english documents
    
    * refactor zk client
    
    * update documents
    
    * update zkclient
    
    * update zkclient
    
    * update documents
    
    * add architecture-design
    
    * change i18n
    
    * update i18n
    
    * update english documents
    
    * add architecture-design
    
    * update english documents
    
    * update en-US documents
    
    * add architecture-design
    
    * update demo site
    
    * add mybatis plus model
    
    * modify mybatisplus
    
    * modify mybatisplus
    
    * change interface by mybatisplus
    
    * add unit test
    
    * refactor dao interface.
    
    * add unit test for dao...
    
    * add unit test for dao...
    
    * add unit test for dao...
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
    
    * update some dao bugs
    
    * update for some bugs
    
    * update some bugs
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
    
    * update
    
    * update
    
    * add multiply settings for application.yml
    
    * add multiply settings for application.yml
    
    * revert
    
    * update configuration settings in task record dao...
    
    * change application_master to application-master
    
    * change application_master to application-master
    
    * update application.yml to application.properties
    
    * revert
    
    * revert
    
    * add properties
    
    * add properties
    
    * revert
    
    * revert
    
    * add api start up..
    add alert send try catch
    
    * update dao info level
    
    * fix bug: task cannot submit when recovery failover
    
    * fix bug: task cannot submit when recovery failover
    
    * merge from dev-db
    
    * revert
    
    * revert
    
    * fix bug: get process definition list failed.
    
    * fix bug: process instance interval is error
    
    * revert
    
    * revert
    
    * update
    
    * support stop submit success tasks
    
    * update kill process
    
    * update for stop process
    
    * update for stop process
    
    * add some logs for stop process
    
    * update for small bug.
    
    * add check strategy before submit task
    
    * revert
    
    * update
    
    * update
    
    * revert
    
    * wait task instance exists if null.
    
    * revert
    
    * update
    
    * change desc to description.
    
    * add check user and definitions function when delete tenant
    
    * update
    
    * change desc to description.
    
    * change desc to description.
    
    * change desc to description.
    
    * remove check resources when delete tenant
    
    * change desc to description.
    
    * change mybatisplus version to 3.2.0
    
    * update
    
    * change the notice to apache.
    
    * update
    
    * update postgre sql
    
    * fix bug: phone can be empty.
    
    * fix bug: postgre test error.
    
    * update create table for postgre quartz
    
    * fix some bugs about postgre.
    
    * update create table for postgre quartz
    
    * add postgre db performance monitor
    
    * add postgre performance monitor
    
    * update performance monitor
    
    * revert
    
    * revert
    
    * fix bug: tasks queue length error
    
    * remove datasource.properties
    
    * change chinese sql to english.
    
    * change chinese sql to english.
    
    * remove unused code.
    
    * remove unused code.
    
    * add some notes
    
    * update some notes
    
    * update some notes
    
    * update mbatisplus version
    
    * update lombok version
    
    * update lombok version
    
    * revert
    
    * master startup error bug fix (#1229)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs
    
    * nginx conf modify
    
    * dockerfile application.properties modify
    
    * dockerfile email address change
    
    * the alert module is modified in English.
    
    * alert server comment and chinese modify
    
    * api server useless code and chinese modify
    
    * common,dao,server useless code and chinese modify
    
    * change chinese to english
    
    * dao method comments and useless code modify
    
    * master startup error bug fix
    
    * delete class App, let spring manage connectionFactory (#1233)
    
    * move updateTaskState into try/catch block in case of exception
    
    * fix NPE
    
    * using conf.getInt instead of getString
    
    * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
    for AlertDao, correct the spelling.
    
    * duplicate
    
    * refactor getTaskWorkerGroupId
    
    * add friendly log
    
    * update hearbeat thread num = 1
    
    * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
    
    * 1. move verifyTaskInstanceIsNull after taskInstance
    2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
    
    * fix the message
    
    * delete before check to avoid KeeperException$NoNodeException
    
    * fix the message
    
    * check processInstance state before delete tenant
    
    * check processInstance state before delete worker group
    
    * refactor
    
    * merge api constants into common constatns
    
    * update the resource perm
    
    * update the dataSource perm
    
    * fix CheckUtils.checkUserParams method
    
    * update AlertGroupService, extends from BaseService, remove duplicate methods
    
    * refactor
    
    * modify method name
    
    * add hasProjectAndPerm method
    
    * using checkProject instead of getResultStatus
    
    * delete checkAuth method, using hasProjectAndPerm instead.
    
    * correct spelling
    
    * add transactional for deleteWorkerGroupById
    
    * add Transactional for deleteProcessInstanceById method
    
    * change sqlSessionTemplate singleton
    
    * change sqlSessionTemplate singleton and reformat code
    
    * fix unsuitable error message
    
    * update shutdownhook methods
    
    * fix worker log bug
    
    * fix api server debug mode bug
    
    * upgrade zk version
    
    * delete this line ,for zkClient.close() will do the whole thing
    
    * fix master server shutdown error
    
    * degrade zk version and add FourLetterWordMain class
    
    * fix PathChildrenCache not close
    
    * add Transactional for createSession method
    
    * add more message for java-doc
    
    * delete App, let spring manage connectionFactory
    
    * add license
    
    * add class Application for test support
    
    * refactor masterServer and workerServer (#1244)
    
    * move updateTaskState into try/catch block in case of exception
    
    * fix NPE
    
    * using conf.getInt instead of getString
    
    * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
    for AlertDao, correct the spelling.
    
    * duplicate
    
    * refactor getTaskWorkerGroupId
    
    * add friendly log
    
    * update hearbeat thread num = 1
    
    * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
    
    * 1. move verifyTaskInstanceIsNull after taskInstance
    2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
    
    * fix the message
    
    * delete before check to avoid KeeperException$NoNodeException
    
    * fix the message
    
    * check processInstance state before delete tenant
    
    * check processInstance state before delete worker group
    
    * refactor
    
    * merge api constants into common constatns
    
    * update the resource perm
    
    * update the dataSource perm
    
    * fix CheckUtils.checkUserParams method
    
    * update AlertGroupService, extends from BaseService, remove duplicate methods
    
    * refactor
    
    * modify method name
    
    * add hasProjectAndPerm method
    
    * using checkProject instead of getResultStatus
    
    * delete checkAuth method, using hasProjectAndPerm instead.
    
    * correct spelling
    
    * add transactional for deleteWorkerGroupById
    
    * add Transactional for deleteProcessInstanceById method
    
    * change sqlSessionTemplate singleton
    
    * change sqlSessionTemplate singleton and reformat code
    
    * fix unsuitable error message
    
    * update shutdownhook methods
    
    * fix worker log bug
    
    * fix api server debug mode bug
    
    * upgrade zk version
    
    * delete this line ,for zkClient.close() will do the whole thing
    
    * fix master server shutdown error
    
    * degrade zk version and add FourLetterWordMain class
    
    * fix PathChildrenCache not close
    
    * add Transactional for createSession method
    
    * add more message for java-doc
    
    * delete App, let spring manage connectionFactory
    
    * add license
    
    * add class Application for test support
    
    * refactor masterServer and workerServer
    
    * add args
    
    * ConnectionFactory add paging intercepter
    
    * ConnectionFactory add paging intercepter (#1250)
    
    * remove spotbugs-annotations.jar LGPL protocol
    
    * remove spotbugs-annotations.jar LGPL protocol (#1251)
    
    * ConnectionFactory add paging intercepter
    
    * remove spotbugs-annotations.jar LGPL protocol
    
    * fix #1245, make scanCommand transactional (#1246)
    
    * fix the spring transaction not worker bug  (#1252)
    
    * move updateTaskState into try/catch block in case of exception
    
    * fix NPE
    
    * using conf.getInt instead of getString
    
    * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
    for AlertDao, correct the spelling.
    
    * duplicate
    
    * refactor getTaskWorkerGroupId
    
    * add friendly log
    
    * update hearbeat thread num = 1
    
    * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
    
    * 1. move verifyTaskInstanceIsNull after taskInstance
    2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
    
    * fix the message
    
    * delete before check to avoid KeeperException$NoNodeException
    
    * fix the message
    
    * check processInstance state before delete tenant
    
    * check processInstance state before delete worker group
    
    * refactor
    
    * merge api constants into common constatns
    
    * update the resource perm
    
    * update the dataSource perm
    
    * fix CheckUtils.checkUserParams method
    
    * update AlertGroupService, extends from BaseService, remove duplicate methods
    
    * refactor
    
    * modify method name
    
    * add hasProjectAndPerm method
    
    * using checkProject instead of getResultStatus
    
    * delete checkAuth method, using hasProjectAndPerm instead.
    
    * correct spelling
    
    * add transactional for deleteWorkerGroupById
    
    * add Transactional for deleteProcessInstanceById method
    
    * change sqlSessionTemplate singleton
    
    * change sqlSessionTemplate singleton and reformat code
    
    * fix unsuitable error message
    
    * update shutdownhook methods
    
    * fix worker log bug
    
    * fix api server debug mode bug
    
    * upgrade zk version
    
    * delete this line ,for zkClient.close() will do the whole thing
    
    * fix master server shutdown error
    
    * degrade zk version and add FourLetterWordMain class
    
    * fix PathChildrenCache not close
    
    * add Transactional for createSession method
    
    * add more message for java-doc
    
    * delete App, let spring manage connectionFactory
    
    * add license
    
    * add class Application for test support
    
    * refactor masterServer and workerServer
    
    * add args
    
    * fix the spring transaction not work bug
    
    * remove author
    
    * delete @Bean annotation
    
    * rename application.properties to application-dao.properties
    
    * delete class MybatisPlusConfig (#1254)
    
    * move updateTaskState into try/catch block in case of exception
    
    * fix NPE
    
    * using conf.getInt instead of getString
    
    * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
    for AlertDao, correct the spelling.
    
    * duplicate
    
    * refactor getTaskWorkerGroupId
    
    * add friendly log
    
    * update hearbeat thread num = 1
    
    * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
    
    * 1. move verifyTaskInstanceIsNull after taskInstance
    2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
    
    * fix the message
    
    * delete before check to avoid KeeperException$NoNodeException
    
    * fix the message
    
    * check processInstance state before delete tenant
    
    * check processInstance state before delete worker group
    
    * refactor
    
    * merge api constants into common constatns
    
    * update the resource perm
    
    * update the dataSource perm
    
    * fix CheckUtils.checkUserParams method
    
    * update AlertGroupService, extends from BaseService, remove duplicate methods
    
    * refactor
    
    * modify method name
    
    * add hasProjectAndPerm method
    
    * using checkProject instead of getResultStatus
    
    * delete checkAuth method, using hasProjectAndPerm instead.
    
    * correct spelling
    
    * add transactional for deleteWorkerGroupById
    
    * add Transactional for deleteProcessInstanceById method
    
    * change sqlSessionTemplate singleton
    
    * change sqlSessionTemplate singleton and reformat code
    
    * fix unsuitable error message
    
    * update shutdownhook methods
    
    * fix worker …
    
    * add sql files for postgre/mysql (#1285)
    
    * [maven-release-plugin] prepare release 1.2.1-release
    
    * [maven-release-plugin] prepare for next development iteration
    
    * update
    
    * [maven-release-plugin] prepare release 1.2.0-release
    
    * [maven-release-plugin] prepare for next development iteration
    
    * [maven-release-plugin] prepare release 1.2.1-release
    
    * [maven-release-plugin] prepare for next development iteration
    
    * revert
    
    * [maven-release-plugin] prepare release 1.2.0-release
    
    * [maven-release-plugin] prepare for next development iteration
    
    * add sql files for postgre/mysql
    
    * add sql files
    
    * update readme from branch dev (#1288)
    
    * rename from DatasourceUserMapper to DataSourceUserMapper
    
    * add unit test in UserMapper and WorkerGroupMapper
    
    * change cn.escheduler to org.apache.dolphinscheduler
    
    * add unit test in UdfFuncMapperTest
    
    * add unit test in UdfFuncMapperTest
    
    * remove DatabaseConfiguration
    
    * add ConnectionFactoryTest
    
    * cal duration in processInstancesList
    
    * change desc to description
    
    * change table name in mysql ddl
    
    * change table name in mysql ddl
    
    * change escheduler to dolphinscheduler
    
    * change escheduler to dolphinscheduler
    
    * change escheduler to dolphinscheduler
    
    * remove log4j-1.2-api and modify AlertMapperTest
    
    * remove log4j-1.2-api
    
    * Add alertDao to spring management
    
    * Add alertDao to spring management
    
    * get SqlSessionFactory from MybatisSqlSessionFactoryBean
    
    * get processDao by DaoFactory
    
    * read druid properties in ConneciontFactory
    
    * read druid properties in ConneciontFactory
    
    * change get alertDao by spring to DaoFactory
    
    * add log4j to resolve #967
    
    * resole verify udf name error and delete udf error
    
    * Determine if principal is empty
    
    * Determine whether the logon user has the right to delete the project
    
    * Fixed an issue that produced attatch file named such as ATT00002.bin
    
    * fix too many connection in upgrade or create
    
    * fix NEED_FAULT_TOLERANCE and WAITTING_THREAD count fail
    
    * Added a judgment on whether the currently login user is an administrator
    
    * fix update udf database not change and create time is changed
    
    * add enterprise.wechat.enable to decide whether to send enterprise WeChat
    
    * change method check
    
    * Remove the administrator's judgment on query access token list
    
    * only admin can create worker group
    
    * delete alert group need delete the relation of user and alert group
    
    * add timeout in proxy when upload large resource
    
    * add gets scheduled times by expect fire times
    
    * add gets scheduled times by expect fire times
    
    * Increase the judgment of whether it is admin
    
    * Increase the judgment of whether it is admin
    
    * when delete access token add whether login user has perm to delete
    
    * change mysql-connector-java scope to test
    
    * update scm test
    
    * add profile test
    
    * add profile test
    
    * add maven.deploy.skip true
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * add dependency
    
    * add javadoc
    
    * add antrun
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * reset pgsql (#1178)
    
    + 1
    
    * add javadoc
    
    * add javadoc
    
    * [maven-release-plugin] rollback the release of 1.2.0
    
    * add javadoc
    
    * Ans UI upgrade to version 0.1.0 (#1181)
    
    + 1
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * Administrators group prohibit deletion (#1182)
    
    * Ans UI upgrade to version 0.1.0
    
    * Administrators group prohibit deletion
    
    * add javadoc
    
    * add ui pom
    
    * fix master server shutdown error (#1177)
    
    * move updateTaskState into try/catch block in case of exception
    
    * fix NPE
    
    * using conf.getInt instead of getString
    
    * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
    for AlertDao, correct the spelling.
    
    * duplicate
    
    * refactor getTaskWorkerGroupId
    
    * add friendly log
    
    * update hearbeat thread num = 1
    
    * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
    
    * 1. move verifyTaskInstanceIsNull after taskInstance
    2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
    
    * fix the message
    
    * delete before check to avoid KeeperException$NoNodeException
    
    * fix the message
    
    * check processInstance state before delete tenant
    
    * check processInstance state before delete worker group
    
    * refactor
    
    * merge api constants into common constatns
    
    * update the resource perm
    
    * update the dataSource perm
    
    * fix CheckUtils.checkUserParams method
    
    * update AlertGroupService, extends from BaseService, remove duplicate methods
    
    * refactor
    
    * modify method name
    
    * add hasProjectAndPerm method
    
    * using checkProject instead of getResultStatus
    
    * delete checkAuth method, using hasProjectAndPerm instead.
    
    * correct spelling
    
    * add transactional for deleteWorkerGroupById
    
    * add Transactional for deleteProcessInstanceById method
    
    * change sqlSessionTemplate singleton
    
    * change sqlSessionTemplate singleton and reformat code
    
    * fix unsuitable error message
    
    * update shutdownhook methods
    
    * fix worker log bug
    
    * fix api server debug mode bug
    
    * upgrade zk version
    
    * delete this line ,for zkClient.close() will do the whole thing
    
    * fix master server shutdown error
    
    * degrade zk version and add FourLetterWordMain class (#1183)
    
    * move updateTaskState into try/catch block in case of exception
    
    * fix NPE
    
    * using conf.getInt instead of getString
    
    * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
    for AlertDao, correct the spelling.
    
    * duplicate
    
    * refactor getTaskWorkerGroupId
    
    * add friendly log
    
    * update hearbeat thread num = 1
    
    * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
    
    * 1. move verifyTaskInstanceIsNull after taskInstance
    2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
    
    * fix the message
    
    * delete before check to avoid KeeperException$NoNodeException
    
    * fix the message
    
    * check processInstance state before delete tenant
    
    * check processInstance state before delete worker group
    
    * refactor
    
    * merge api constants into common constatns
    
    * update the resource perm
    
    * update the dataSource perm
    
    * fix CheckUtils.checkUserParams method
    
    * update AlertGroupService, extends from BaseService, remove duplicate methods
    
    * refactor
    
    * modify method name
    
    * add hasProjectAndPerm method
    
    * using checkProject instead of getResultStatus
    
    * delete checkAuth method, using hasProjectAndPerm instead.
    
    * correct spelling
    
    * add transactional for deleteWorkerGroupById
    
    * add Transactional for deleteProcessInstanceById method
    
    * change sqlSessionTemplate singleton
    
    * change sqlSessionTemplate singleton and reformat code
    
    * fix unsuitable error message
    
    * update shutdownhook methods
    
    * fix worker log bug
    
    * fix api server debug mode bug
    
    * upgrade zk version
    
    * delete this line ,for zkClient.close() will do the whole thing
    
    * fix master server shutdown error
    
    * degrade zk version and add FourLetterWordMain class
    
    * add ui pom
    
    * add src pom and assembly
    
    * fix ZKWorkerClient not close PathChildrenCache (#1185)
    
    * move updateTaskState into try/catch block in case of exception
    
    * fix NPE
    
    * using conf.getInt instead of getString
    
    * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
    for AlertDao, correct the spelling.
    
    * duplicate
    
    * refactor getTaskWorkerGroupId
    
    * add friendly log
    
    * update hearbeat thread num = 1
    
    * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
    
    * 1. move verifyTaskInstanceIsNull after taskInstance
    2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
    
    * fix the message
    
    * delete before check to avoid KeeperException$NoNodeException
    
    * fix the message
    
    * check processInstance state before delete tenant
    
    * check processInstance state before delete worker group
    
    * refactor
    
    * merge api constants into common constatns
    
    * update the resource perm
    
    * update the dataSource perm
    
    * fix CheckUtils.checkUserParams method
    
    * update AlertGroupService, extends from BaseService, remove duplicate methods
    
    * refactor
    
    * modify method name
    
    * add hasProjectAndPerm method
    
    * using checkProject instead of getResultStatus
    
    * delete checkAuth method, using hasProjectAndPerm instead.
    
    * correct spelling
    
    * add transactional for deleteWorkerGroupById
    
    * add Transactional for deleteProcessInstanceById method
    
    * change sqlSessionTemplate singleton
    
    * change sqlSessionTemplate singleton and reformat code
    
    * fix unsuitable error message
    
    * update shutdownhook methods
    
    * fix worker log bug
    
    * fix api server debug mode bug
    
    * upgrade zk version
    
    * delete this line ,for zkClient.close() will do the whole thing
    
    * fix master server shutdown error
    
    * degrade zk version and add FourLetterWordMain class
    
    * fix PathChildrenCache not close
    
    * add Transactional for createSession method (#1186)
    
    * move updateTaskState into try/catch block in case of exception
    
    * fix NPE
    
    * using conf.getInt instead of getString
    
    * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
    for AlertDao, correct the spelling.
    
    * duplicate
    
    * refactor getTaskWorkerGroupId
    
    * add friendly log
    
    * update hearbeat thread num = 1
    
    * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
    
    * 1. move verifyTaskInstanceIsNull after taskInstance
    2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
    
    * fix the message
    
    * delete before check to avoid KeeperException$NoNodeException
    
    * fix the message
    
    * check processInstance state before delete tenant
    
    * check processInstance state before delete worker group
    
    * refactor
    
    * merge api constants into common constatns
    
    * update the resource perm
    
    * update the dataSource perm
    
    * fix CheckUtils.checkUserParams method
    
    * update AlertGroupService, extends from BaseService, remove duplicate methods
    
    * refactor
    
    * modify method name
    
    * add hasProjectAndPerm method
    
    * using checkProject instead of getResultStatus
    
    * delete checkAuth method, using hasProjectAndPerm instead.
    
    * correct spelling
    
    * add transactional for deleteWorkerGroupById
    
    * add Transactional for deleteProcessInstanceById method
    
    * change sqlSessionTemplate singleton
    
    * change sqlSessionTemplate singleton and reformat code
    
    * fix unsuitable error message
    
    * update shutdownhook methods
    
    * fix worker log bug
    
    * fix api server debug mode bug
    
    * upgrade zk version
    
    * delete this line ,for zkClient.close() will do the whole thing
    
    * fix master server shutdown error
    
    * degrade zk version and add FourLetterWordMain class
    
    * fix PathChildrenCache not close
    
    * add Transactional for createSession method
    
    * add src pom and assembly
    
    * add src pom and assembly
    
    * add src pom and assembly
    
    * add src pom and assembly
    
    * dockerfile dao application.properties ,install.sh modify and application.properties modify (#1187)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * add src pom and assembly
    
    * add src pom and assembly
    
    * dockerfile startup.sh modify (#1189)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs (#1191)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs
    
    * nginx conf modify
    
    * dockerfile application.properties modify
    
    * dockerfile conf modify (#1192)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs
    
    * nginx conf modify
    
    * dockerfile application.properties modify
    
    * dockerfile conf modify (#1193)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs
    
    * nginx conf modify
    
    * dockerfile application.properties modify
    
    * dockerfile email address change (#1194)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs
    
    * nginx conf modify
    
    * dockerfile application.properties modify
    
    * dockerfile email address change
    
    * the alert module is modified in english (#1195)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs
    
    * nginx conf modify
    
    * dockerfile application.properties modify
    
    * dockerfile email address change
    
    * the alert module is modified in English.
    
    * alert server comment and chinese modify
    
    * api server useless code and chinese modify (#1198)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs
    
    * nginx conf modify
    
    * dockerfile application.properties modify
    
    * dockerfile email address change
    
    * the alert module is modified in English.
    
    * alert server comment and chinese modify
    
    * api server useless code and chinese modify
    
    * common,dao,server useless code and chinese modify (#1199)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs
    
    * nginx conf modify
    
    * dockerfile application.properties modify
    
    * dockerfile email address change
    
    * the alert module is modified in English.
    
    * alert server comment and chinese modify
    
    * api server useless code and chinese modify
    
    * common,dao,server useless code and chinese modify
    
    * change chinese sql to english. (#1200)
    
    * update english documents
    
    * refactor zk client
    
    * update documents
    
    * update zkclient
    
    * update zkclient
    
    * update documents
    
    * add architecture-design
    
    * change i18n
    
    * update i18n
    
    * update english documents
    
    * add architecture-design
    
    * update english documents
    
    * update en-US documents
    
    * add architecture-design
    
    * update demo site
    
    * add mybatis plus model
    
    * modify mybatisplus
    
    * modify mybatisplus
    
    * change interface by mybatisplus
    
    * add unit test
    
    * refactor dao interface.
    
    * add unit test for dao...
    
    * add unit test for dao...
    
    * add unit test for dao...
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
    
    * update some dao bugs
    
    * update for some bugs
    
    * update some bugs
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
    
    * update
    
    * update
    
    * add multiply settings for application.yml
    
    * add multiply settings for application.yml
    
    * revert
    
    * update configuration settings in task record dao...
    
    * change application_master to application-master
    
    * change application_master to application-master
    
    * update application.yml to application.properties
    
    * revert
    
    * revert
    
    * add properties
    
    * add properties
    
    * revert
    
    * revert
    
    * add api start up..
    add alert send try catch
    
    * update dao info level
    
    * fix bug: task cannot submit when recovery failover
    
    * fix bug: task cannot submit when recovery failover
    
    * merge from dev-db
    
    * revert
    
    * revert
    
    * fix bug: get process definition list failed.
    
    * fix bug: process instance interval is error
    
    * revert
    
    * revert
    
    * update
    
    * support stop submit success tasks
    
    * update kill process
    
    * update for stop process
    
    * update for stop process
    
    * add some logs for stop process
    
    * update for small bug.
    
    * add check strategy before submit task
    
    * revert
    
    * update
    
    * update
    
    * revert
    
    * wait task instance exists if null.
    
    * revert
    
    * update
    
    * change desc to description.
    
    * add check user and definitions function when delete tenant
    
    * update
    
    * change desc to description.
    
    * change desc to description.
    
    * change desc to description.
    
    * remove check resources when delete tenant
    
    * change desc to description.
    
    * change mybatisplus version to 3.2.0
    
    * update
    
    * change the notice to apache.
    
    * update
    
    * update postgre sql
    
    * fix bug: phone can be empty.
    
    * fix bug: postgre test error.
    
    * update create table for postgre quartz
    
    * fix some bugs about postgre.
    
    * update create table for postgre quartz
    
    * add postgre db performance monitor
    
    * add postgre performance monitor
    
    * update performance monitor
    
    * revert
    
    * revert
    
    * fix bug: tasks queue length error
    
    * remove datasource.properties
    
    * change chinese sql to english.
    
    * change chinese sql to english.
    
    * change chinese to english (#1202)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs
    
    * nginx conf modify
    
    * dockerfile application.properties modify
    
    * dockerfile email address change
    
    * the alert module is modified in English.
    
    * alert server comment and chinese modify
    
    * api server useless code and chinese modify
    
    * common,dao,server useless code and chinese modify
    
    * change chinese to english
    
    * remove unused code (#1204)
    
    * update english documents
    
    * refactor zk client
    
    * update documents
    
    * update zkclient
    
    * update zkclient
    
    * update documents
    
    * add architecture-design
    
    * change i18n
    
    * update i18n
    
    * update english documents
    
    * add architecture-design
    
    * update english documents
    
    * update en-US documents
    
    * add architecture-design
    
    * update demo site
    
    * add mybatis plus model
    
    * modify mybatisplus
    
    * modify mybatisplus
    
    * change interface by mybatisplus
    
    * add unit test
    
    * refactor dao interface.
    
    * add unit test for dao...
    
    * add unit test for dao...
    
    * add unit test for dao...
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
    
    * update some dao bugs
    
    * update for some bugs
    
    * update some bugs
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
    
    * update
    
    * update
    
    * add multiply settings for application.yml
    
    * add multiply settings for application.yml
    
    * revert
    
    * update configuration settings in task record dao...
    
    * change application_master to application-master
    
    * change application_master to application-master
    
    * update application.yml to application.properties
    
    * revert
    
    * revert
    
    * add properties
    
    * add properties
    
    * revert
    
    * revert
    
    * add api start up..
    add alert send try catch
    
    * update dao info level
    
    * fix bug: task cannot submit when recovery failover
    
    * fix bug: task cannot submit when recovery failover
    
    * merge from dev-db
    
    * revert
    
    * revert
    
    * fix bug: get process definition list failed.
    
    * fix bug: process instance interval is error
    
    * revert
    
    * revert
    
    * update
    
    * support stop submit success tasks
    
    * update kill process
    
    * update for stop process
    
    * update for stop process
    
    * add some logs for stop process
    
    * update for small bug.
    
    * add check strategy before submit task
    
    * revert
    
    * update
    
    * update
    
    * revert
    
    * wait task instance exists if null.
    
    * revert
    
    * update
    
    * change desc to description.
    
    * add check user and definitions function when delete tenant
    
    * update
    
    * change desc to description.
    
    * change desc to description.
    
    * change desc to description.
    
    * remove check resources when delete tenant
    
    * change desc to description.
    
    * change mybatisplus version to 3.2.0
    
    * update
    
    * change the notice to apache.
    
    * update
    
    * update postgre sql
    
    * fix bug: phone can be empty.
    
    * fix bug: postgre test error.
    
    * update create table for postgre quartz
    
    * fix some bugs about postgre.
    
    * update create table for postgre quartz
    
    * add postgre db performance monitor
    
    * add postgre performance monitor
    
    * update performance monitor
    
    * revert
    
    * revert
    
    * fix bug: tasks queue length error
    
    * remove datasource.properties
    
    * change chinese sql to english.
    
    * change chinese sql to english.
    
    * remove unused code.
    
    * remove unused code.
    
    * Modify webpack configuration (#1206)
    
    * add more message for java-doc (#1209)
    
    * move updateTaskState into try/catch block in case of exception
    
    * fix NPE
    
    * using conf.getInt instead of getString
    
    * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
    for AlertDao, correct the spelling.
    
    * duplicate
    
    * refactor getTaskWorkerGroupId
    
    * add friendly log
    
    * update hearbeat thread num = 1
    
    * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
    
    * 1. move verifyTaskInstanceIsNull after taskInstance
    2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
    
    * fix the message
    
    * delete before check to avoid KeeperException$NoNodeException
    
    * fix the message
    
    * check processInstance state before delete tenant
    
    * check processInstance state before delete worker group
    
    * refactor
    
    * merge api constants into common constatns
    
    * update the resource perm
    
    * update the dataSource perm
    
    * fix CheckUtils.checkUserParams method
    
    * update AlertGroupService, extends from BaseService, remove duplicate methods
    
    * refactor
    
    * modify method name
    
    * add hasProjectAndPerm method
    
    * using checkProject instead of getResultStatus
    
    * delete checkAuth method, using hasProjectAndPerm instead.
    
    * correct spelling
    
    * add transactional for deleteWorkerGroupById
    
    * add Transactional for deleteProcessInstanceById method
    
    * change sqlSessionTemplate singleton
    
    * change sqlSessionTemplate singleton and reformat code
    
    * fix unsuitable error message
    
    * update shutdownhook methods
    
    * fix worker log bug
    
    * fix api server debug mode bug
    
    * upgrade zk version
    
    * delete this line ,for zkClient.close() will do the whole thing
    
    * fix master server shutdown error
    
    * degrade zk version and add FourLetterWordMain class
    
    * fix PathChildrenCache not close
    
    * add Transactional for createSession method
    
    * add more message for java-doc
    
    * add java doc for common module (#1213)
    
    * dao method comments and useless code modify (#1214)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs
    
    * nginx conf modify
    
    * dockerfile application.properties modify
    
    * dockerfile email address change
    
    * the alert module is modified in English.
    
    * alert server comment and chinese modify
    
    * api server useless code and chinese modify
    
    * common,dao,server useless code and chinese modify
    
    * change chinese to english
    
    * dao method comments and useless code modify
    
    * Change all Chinese names to English (#1207)
    
    * Modify webpack configuration
    
    * Change all Chinese names to English
    
    * add progress-bar-webpack-plugin (#1215)
    
    * Modify webpack configuration
    
    * Change all Chinese names to English
    
    * add progress-bar-webpack-plugin
    
    * Add method and parameters comments (#1220)
    
    * rename from DatasourceUserMapper to DataSourceUserMapper
    
    * add unit test in UserMapper and WorkerGroupMapper
    
    * change cn.escheduler to org.apache.dolphinscheduler
    
    * add unit test in UdfFuncMapperTest
    
    * add unit test in UdfFuncMapperTest
    
    * remove DatabaseConfiguration
    
    * add ConnectionFactoryTest
    
    * cal duration in processInstancesList
    
    * change desc to description
    
    * change table name in mysql ddl
    
    * change table name in mysql ddl
    
    * change escheduler to dolphinscheduler
    
    * change escheduler to dolphinscheduler
    
    * change escheduler to dolphinscheduler
    
    * remove log4j-1.2-api and modify AlertMapperTest
    
    * remove log4j-1.2-api
    
    * Add alertDao to spring management
    
    * Add alertDao to spring management
    
    * get SqlSessionFactory from MybatisSqlSessionFactoryBean
    
    * get processDao by DaoFactory
    
    * read druid properties in ConneciontFactory
    
    * read druid properties in ConneciontFactory
    
    * change get alertDao by spring to DaoFactory
    
    * add log4j to resolve #967
    
    * resole verify udf name error and delete udf error
    
    * Determine if principal is empty
    
    * Determine whether the logon user has the right to delete the project
    
    * Fixed an issue that produced attatch file named such as ATT00002.bin
    
    * fix too many connection in upgrade or create
    
    * fix NEED_FAULT_TOLERANCE and WAITTING_THREAD count fail
    
    * Added a judgment on whether the currently login user is an administrator
    
    * fix update udf database not change and create time is changed
    
    * add enterprise.wechat.enable to decide whether to send enterprise WeChat
    
    * change method check
    
    * Remove the administrator's judgment on query access token list
    
    * only admin can create worker group
    
    * delete alert group need delete the relation of user and alert group
    
    * add timeout in proxy when upload large resource
    
    * add gets scheduled times by expect fire times
    
    * add gets scheduled times by expect fire times
    
    * Increase the judgment of whether it is admin
    
    * Increase the judgment of whether it is admin
    
    * when delete access token add whether login user has perm to delete
    
    * change mysql-connector-java scope to test
    
    * update scm test
    
    * add profile test
    
    * Add method and parameters comments
    
    * roll back
    
    * add some notes (#1221)
    
    * update english documents
    
    * refactor zk client
    
    * update documents
    
    * update zkclient
    
    * update zkclient
    
    * update documents
    
    * add architecture-design
    
    * change i18n
    
    * update i18n
    
    * update english documents
    
    * add architecture-design
    
    * update english documents
    
    * update en-US documents
    
    * add architecture-design
    
    * update demo site
    
    * add mybatis plus model
    
    * modify mybatisplus
    
    * modify mybatisplus
    
    * change interface by mybatisplus
    
    * add unit test
    
    * refactor dao interface.
    
    * add unit test for dao...
    
    * add unit test for dao...
    
    * add unit test for dao...
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
    
    * update some dao bugs
    
    * update for some bugs
    
    * update some bugs
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
    
    * update
    
    * update
    
    * add multiply settings for application.yml
    
    * add multiply settings for application.yml
    
    * revert
    
    * update configuration settings in task record dao...
    
    * change application_master to application-master
    
    * change application_master to application-master
    
    * update application.yml to application.properties
    
    * revert
    
    * revert
    
    * add properties
    
    * add properties
    
    * revert
    
    * revert
    
    * add api start up..
    add alert send try catch
    
    * update dao info level
    
    * fix bug: task cannot submit when recovery failover
    
    * fix bug: task cannot submit when recovery failover
    
    * merge from dev-db
    
    * revert
    
    * revert
    
    * fix bug: get process definition list failed.
    
    * fix bug: process instance interval is error
    
    * revert
    
    * revert
    
    * update
    
    * support stop submit success tasks
    
    * update kill process
    
    * update for stop process
    
    * update for stop process
    
    * add some logs for stop process
    
    * update for small bug.
    
    * add check strategy before submit task
    
    * revert
    
    * update
    
    * update
    
    * revert
    
    * wait task instance exists if null.
    
    * revert
    
    * update
    
    * change desc to description.
    
    * add check user and definitions function when delete tenant
    
    * update
    
    * change desc to description.
    
    * change desc to description.
    
    * change desc to description.
    
    * remove check resources when delete tenant
    
    * change desc to description.
    
    * change mybatisplus version to 3.2.0
    
    * update
    
    * change the notice to apache.
    
    * update
    
    * update postgre sql
    
    * fix bug: phone can be empty.
    
    * fix bug: postgre test error.
    
    * update create table for postgre quartz
    
    * fix some bugs about postgre.
    
    * update create table for postgre quartz
    
    * add postgre db performance monitor
    
    * add postgre performance monitor
    
    * update performance monitor
    
    * revert
    
    * revert
    
    * fix bug: tasks queue length error
    
    * remove datasource.properties
    
    * change chinese sql to english.
    
    * change chinese sql to english.
    
    * remove unused code.
    
    * remove unused code.
    
    * add some notes
    
    * update some notes
    
    * update some notes
    
    * update mbatisplus version
    
    * update lombok version
    
    * update lombok version
    
    * revert
    
    * merge from dev-db
    
    * remove version
    
    * update npm install pom
    
    * add front assembly
    
    * add front module
    
    * change verison to 1.2.0-release-SNAPSHOT
    
    * add name in pom and remove compile
    
    * add name in pom
    
    * add licenses in assemble
    
    * change version to 1.2.0-RC1-SNAPSHOT
    
    * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
    
    # Conflicts:
    #	dolphinscheduler-alert/pom.xml
    #	dolphinscheduler-api/pom.xml
    #	dolphinscheduler-common/pom.xml
    #	dolphinscheduler-dao/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
    #	dolphinscheduler-dist/pom.xml
    #	dolphinscheduler-rpc/pom.xml
    #	dolphinscheduler-server/pom.xml
    #	dolphinscheduler-ui/pom.xml
    #	pom.xml
    change assembly id
    
    * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
    
    # Conflicts:
    #	dolphinscheduler-alert/pom.xml
    #	dolphinscheduler-api/pom.xml
    #	dolphinscheduler-common/pom.xml
    #	dolphinscheduler-dao/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
    #	dolphinscheduler-dist/pom.xml
    #	dolphinscheduler-rpc/pom.xml
    #	dolphinscheduler-server/pom.xml
    #	dolphinscheduler-ui/pom.xml
    #	pom.xml
    add DISCLAIMER
    
    * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
    
    # Conflicts:
    #	dolphinscheduler-alert/pom.xml
    #	dolphinscheduler-api/pom.xml
    #	dolphinscheduler-common/pom.xml
    #	dolphinscheduler-dao/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
    #	dolphinscheduler-dist/pom.xml
    #	dolphinscheduler-rpc/pom.xml
    #	dolphinscheduler-server/pom.xml
    #	dolphinscheduler-ui/pom.xml
    #	pom.xml
    add license in xml and properties
    
    * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
    
    # Conflicts:
    #	dolphinscheduler-alert/pom.xml
    #	dolphinscheduler-api/pom.xml
    #	dolphinscheduler-common/pom.xml
    #	dolphinscheduler-dao/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
    #	dolphinscheduler-dist/pom.xml
    #	dolphinscheduler-rpc/pom.xml
    #	dolphinscheduler-server/pom.xml
    #	dolphinscheduler-ui/pom.xml
    #	pom.xml
    add license in dockerfile
    
    * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
    
    # Conflicts:
    #	dolphinscheduler-alert/pom.xml
    #	dolphinscheduler-api/pom.xml
    #	dolphinscheduler-common/pom.xml
    #	dolphinscheduler-dao/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
    #	dolphinscheduler-dist/pom.xml
    #	dolphinscheduler-rpc/pom.xml
    #	dolphinscheduler-server/pom.xml
    #	dolphinscheduler-ui/pom.xml
    #	pom.xml
    add license in script and sql
    
    * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
    
    # Conflicts:
    #	dolphinscheduler-alert/pom.xml
    #	dolphinscheduler-api/pom.xml
    #	dolphinscheduler-common/pom.xml
    #	dolphinscheduler-dao/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
    #	dolphinscheduler-dist/pom.xml
    #	dolphinscheduler-rpc/pom.xml
    #	dolphinscheduler-server/pom.xml
    #	dolphinscheduler-ui/pom.xml
    #	pom.xml
    add license in script and sql
    
    * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
    
    # Conflicts:
    #	dolphinscheduler-alert/pom.xml
    #	dolphinscheduler-api/pom.xml
    #	dolphinscheduler-common/pom.xml
    #	dolphinscheduler-dao/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
    #	dolphinscheduler-dist/pom.xml
    #	dolphinscheduler-rpc/pom.xml
    #	dolphinscheduler-server/pom.xml
    #	dolphinscheduler-ui/pom.xml
    #	pom.xml
    add license in ci
    
    * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
    
    # Conflicts:
    #	dolphinscheduler-alert/pom.xml
    #	dolphinscheduler-api/pom.xml
    #	dolphinscheduler-common/pom.xml
    #	dolphinscheduler-dao/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
    #	dolphinscheduler-dist/pom.xml
    #	dolphinscheduler-rpc/pom.xml
    #	dolphinscheduler-server/pom.xml
    #	dolphinscheduler-ui/pom.xml
    #	pom.xml
    change version to 1.2.0-SNAPSHOT
    
    * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
    
    # Conflicts:
    #	dolphinscheduler-alert/pom.xml
    #	dolphinscheduler-api/pom.xml
    #	dolphinscheduler-common/pom.xml
    #	dolphinscheduler-dao/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
    #	dolphinscheduler-dist/pom.xml
    #	dolphinscheduler-rpc/pom.xml
    #	dolphinscheduler-server/pom.xml
    #	dolphinscheduler-ui/pom.xml
    #	pom.xml
    set defalut db type postgresql
    
    * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
    
    # Conflicts:
    #	dolphinscheduler-alert/pom.xml
    #	dolphinscheduler-api/pom.xml
    #	dolphinscheduler-common/pom.xml
    #	dolphinscheduler-dao/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
    #	dolphinscheduler-dist/pom.xml
    #	dolphinscheduler-rpc/pom.xml
    #	dolphinscheduler-server/pom.xml
    #	dolphinscheduler-ui/pom.xml
    #	pom.xml
    set defalut db type postgresql
    
    * change org.quartz.jobStore.driverDelegateClass
    
    * Add comments in method params
    
    * update readme from branch dev
    
    * update content in how to contribute (#1289)
    
    * rename from DatasourceUserMapper to DataSourceUserMapper
    
    * add unit test in UserMapper and WorkerGroupMapper
    
    * change cn.escheduler to org.apache.dolphinscheduler
    
    * add unit test in UdfFuncMapperTest
    
    * add unit test in UdfFuncMapperTest
    
    * remove DatabaseConfiguration
    
    * add ConnectionFactoryTest
    
    * cal duration in processInstancesList
    
    * change desc to description
    
    * change table name in mysql ddl
    
    * change table name in mysql ddl
    
    * change escheduler to dolphinscheduler
    
    * change escheduler to dolphinscheduler
    
    * change escheduler to dolphinscheduler
    
    * remove log4j-1.2-api and modify AlertMapperTest
    
    * remove log4j-1.2-api
    
    * Add alertDao to spring management
    
    * Add alertDao to spring management
    
    * get SqlSessionFactory from MybatisSqlSessionFactoryBean
    
    * get processDao by DaoFactory
    
    * read druid properties in ConneciontFactory
    
    * read druid properties in ConneciontFactory
    
    * change get alertDao by spring to DaoFactory
    
    * add log4j to resolve #967
    
    * resole verify udf name error and delete udf error
    
    * Determine if principal is empty
    
    * Determine whether the logon user has the right to delete the project
    
    * Fixed an issue that produced attatch file named such as ATT00002.bin
    
    * fix too many connection in upgrade or create
    
    * fix NEED_FAULT_TOLERANCE and WAITTING_THREAD count fail
    
    * Added a judgment on whether the currently login user is an administrator
    
    * fix update udf database not change and create time is changed
    
    * add enterprise.wechat.enable to decide whether to send enterprise WeChat
    
    * change method check
    
    * Remove the administrator's judgment on query access token list
    
    * only admin can create worker group
    
    * delete alert group need delete the relation of user and alert group
    
    * add timeout in proxy when upload large resource
    
    * add gets scheduled times by expect fire times
    
    * add gets scheduled times by expect fire times
    
    * Increase the judgment of whether it is admin
    
    * Increase the judgment of whether it is admin
    
    * when delete access token add whether login user has perm to delete
    
    * change mysql-connector-java scope to test
    
    * update scm test
    
    * add profile test
    
    * add profile test
    
    * add maven.deploy.skip true
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * add dependency
    
    * add javadoc
    
    * add antrun
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * reset pgsql (#1178)
    
    + 1
    
    * add javadoc
    
    * add javadoc
    
    * [maven-release-plugin] rollback the release of 1.2.0
    
    * add javadoc
    
    * Ans UI upgrade to version 0.1.0 (#1181)
    
    + 1
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * Administrators group prohibit deletion (#1182)
    
    * Ans UI upgrade to version 0.1.0
    
    * Administrators group prohibit deletion
    
    * add javadoc
    
    * add ui pom
    
    * fix master server shutdown error (#1177)
    
    * move updateTaskState into try/catch block in case of exception
    
    * fix NPE
    
    * using conf.getInt instead of getString
    
    * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
    for AlertDao, correct the spelling.
    
    * duplicate
    
    * refactor getTaskWorkerGroupId
    
    * add friendly log
    
    * update hearbeat thread num = 1
    
    * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
    
    * 1. move verifyTaskInstanceIsNull after taskInstance
    2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
    
    * fix the message
    
    * delete before check to avoid KeeperException$NoNodeException
    
    * fix the message
    
    * check processInstance state before delete tenant
    
    * check processInstance state before delete worker group
    
    * refactor
    
    * merge api constants into common constatns
    
    * update the resource perm
    
    * update the dataSource perm
    
    * fix CheckUtils.checkUserParams method
    
    * update AlertGroupService, extends from BaseService, remove duplicate methods
    
    * refactor
    
    * modify method name
    
    * add hasProjectAndPerm method
    
    * using checkProject instead of getResultStatus
    
    * delete checkAuth method, using hasProjectAndPerm instead.
    
    * correct spelling
    
    * add transactional for deleteWorkerGroupById
    
    * add Transactional for deleteProcessInstanceById method
    
    * change sqlSessionTemplate singleton
    
    * change sqlSessionTemplate singleton and reformat code
    
    * fix unsuitable error message
    
    * update shutdownhook methods
    
    * fix worker log bug
    
    * fix api server debug mode bug
    
    * upgrade zk version
    
    * delete this line ,for zkClient.close() will do the whole thing
    
    * fix master server shutdown error
    
    * degrade zk version and add FourLetterWordMain class (#1183)
    
    * move updateTaskState into try/catch block in case of exception
    
    * fix NPE
    
    * using conf.getInt instead of getString
    
    * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
    for AlertDao, correct the spelling.
    
    * duplicate
    
    * refactor getTaskWorkerGroupId
    
    * add friendly log
    
    * update hearbeat thread num = 1
    
    * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
    
    * 1. move verifyTaskInstanceIsNull after taskInstance
    2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
    
    * fix the message
    
    * delete before check to avoid KeeperException$NoNodeException
    
    * fix the message
    
    * check processInstance state before delete tenant
    
    * check processInstance state before delete worker group
    
    * refactor
    
    * merge api constants into common constatns
    
    * update the resource perm
    
    * update the dataSource perm
    
    * fix CheckUtils.checkUserParams method
    
    * update AlertGroupService, extends from BaseService, remove duplicate methods
    
    * refactor
    
    * modify method name
    
    * add hasProjectAndPerm method
    
    * using checkProject instead of getResultStatus
    
    * delete checkAuth method, using hasProjectAndPerm instead.
    
    * correct spelling
    
    * add transactional for deleteWorkerGroupById
    
    * add Transactional for deleteProcessInstanceById method
    
    * change sqlSessionTemplate singleton
    
    * change sqlSessionTemplate singleton and reformat code
    
    * fix unsuitable error message
    
    * update shutdownhook methods
    
    * fix worker log bug
    
    * fix api server debug mode bug
    
    * upgrade zk version
    
    * delete this line ,for zkClient.close() will do the whole thing
    
    * fix master server shutdown error
    
    * degrade zk version and add FourLetterWordMain class
    
    * add ui pom
    
    * add src pom and assembly
    
    * fix ZKWorkerClient not close PathChildrenCache (#1185)
    
    * move updateTaskState into try/catch block in case of exception
    
    * fix NPE
    
    * using conf.getInt instead of getString
    
    * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
    for AlertDao, correct the spelling.
    
    * duplicate
    
    * refactor getTaskWorkerGroupId
    
    * add friendly log
    
    * update hearbeat thread num = 1
    
    * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
    
    * 1. move verifyTaskInstanceIsNull after taskInstance
    2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
    
    * fix the message
    
    * delete before check to avoid KeeperException$NoNodeException
    
    * fix the message
    
    * check processInstance state before delete tenant
    
    * check processInstance state before delete worker group
    
    * refactor
    
    * merge api constants into common constatns
    
    * update the resource perm
    
    * update the dataSource perm
    
    * fix CheckUtils.checkUserParams method
    
    * update AlertGroupService, extends from BaseService, remove duplicate methods
    
    * refactor
    
    * modify method name
    
    * add hasProjectAndPerm method
    
    * using checkProject instead of getResultStatus
    
    * delete checkAuth method, using hasProjectAndPerm instead.
    
    * correct spelling
    
    * add transactional for deleteWorkerGroupById
    
    * add Transactional for deleteProcessInstanceById method
    
    * change sqlSessionTemplate singleton
    
    * change sqlSessionTemplate singleton and reformat code
    
    * fix unsuitable error message
    
    * update shutdownhook methods
    
    * fix worker log bug
    
    * fix api server debug mode bug
    
    * upgrade zk version
    
    * delete this line ,for zkClient.close() will do the whole thing
    
    * fix master server shutdown error
    
    * degrade zk version and add FourLetterWordMain class
    
    * fix PathChildrenCache not close
    
    * add Transactional for createSession method (#1186)
    
    * move updateTaskState into try/catch block in case of exception
    
    * fix NPE
    
    * using conf.getInt instead of getString
    
    * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
    for AlertDao, correct the spelling.
    
    * duplicate
    
    * refactor getTaskWorkerGroupId
    
    * add friendly log
    
    * update hearbeat thread num = 1
    
    * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
    
    * 1. move verifyTaskInstanceIsNull after taskInstance
    2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
    
    * fix the message
    
    * delete before check to avoid KeeperException$NoNodeException
    
    * fix the message
    
    * check processInstance state before delete tenant
    
    * check processInstance state before delete worker group
    
    * refactor
    
    * merge api constants into common constatns
    
    * update the resource perm
    
    * update the dataSource perm
    
    * fix CheckUtils.checkUserParams method
    
    * update AlertGroupService, extends from BaseService, remove duplicate methods
    
    * refactor
    
    * modify method name
    
    * add hasProjectAndPerm method
    
    * using checkProject instead of getResultStatus
    
    * delete checkAuth method, using hasProjectAndPerm instead.
    
    * correct spelling
    
    * add transactional for deleteWorkerGroupById
    
    * add Transactional for deleteProcessInstanceById method
    
    * change sqlSessionTemplate singleton
    
    * change sqlSessionTemplate singleton and reformat code
    
    * fix unsuitable error message
    
    * update shutdownhook methods
    
    * fix worker log bug
    
    * fix api server debug mode bug
    
    * upgrade zk version
    
    * delete this line ,for zkClient.close() will do the whole thing
    
    * fix master server shutdown error
    
    * degrade zk version and add FourLetterWordMain class
    
    * fix PathChildrenCache not close
    
    * add Transactional for createSession method
    
    * add src pom and assembly
    
    * add src pom and assembly
    
    * add src pom and assembly
    
    * add src pom and assembly
    
    * dockerfile dao application.properties ,install.sh modify and application.properties modify (#1187)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * add src pom and assembly
    
    * add src pom and assembly
    
    * dockerfile startup.sh modify (#1189)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs (#1191)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs
    
    * nginx conf modify
    
    * dockerfile application.properties modify
    
    * dockerfile conf modify (#1192)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs
    
    * nginx conf modify
    
    * dockerfile application.properties modify
    
    * dockerfile conf modify (#1193)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs
    
    * nginx conf modify
    
    * dockerfile application.properties modify
    
    * dockerfile email address change (#1194)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs
    
    * nginx conf modify
    
    * dockerfile application.properties modify
    
    * dockerfile email address change
    
    * the alert module is modified in english (#1195)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs
    
    * nginx conf modify
    
    * dockerfile application.properties modify
    
    * dockerfile email address change
    
    * the alert module is modified in English.
    
    * alert server comment and chinese modify
    
    * api server useless code and chinese modify (#1198)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs
    
    * nginx conf modify
    
    * dockerfile application.properties modify
    
    * dockerfile email address change
    
    * the alert module is modified in English.
    
    * alert server comment and chinese modify
    
    * api server useless code and chinese modify
    
    * common,dao,server useless code and chinese modify (#1199)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs
    
    * nginx conf modify
    
    * dockerfile application.properties modify
    
    * dockerfile email address change
    
    * the alert module is modified in English.
    
    * alert server comment and chinese modify
    
    * api server useless code and chinese modify
    
    * common,dao,server useless code and chinese modify
    
    * change chinese sql to english. (#1200)
    
    * update english documents
    
    * refactor zk client
    
    * update documents
    
    * update zkclient
    
    * update zkclient
    
    * update documents
    
    * add architecture-design
    
    * change i18n
    
    * update i18n
    
    * update english documents
    
    * add architecture-design
    
    * update english documents
    
    * update en-US documents
    
    * add architecture-design
    
    * update demo site
    
    * add mybatis plus model
    
    * modify mybatisplus
    
    * modify mybatisplus
    
    * change interface by mybatisplus
    
    * add unit test
    
    * refactor dao interface.
    
    * add unit test for dao...
    
    * add unit test for dao...
    
    * add unit test for dao...
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
    
    * update some dao bugs
    
    * update for some bugs
    
    * update some bugs
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
    
    * update
    
    * update
    
    * add multiply settings for application.yml
    
    * add multiply settings for application.yml
    
    * revert
    
    * update configuration settings in task record dao...
    
    * change application_master to application-master
    
    * change application_master to application-master
    
    * update application.yml to application.properties
    
    * revert
    
    * revert
    
    * add properties
    
    * add properties
    
    * revert
    
    * revert
    
    * add api start up..
    add alert send try catch
    
    * update dao info level
    
    * fix bug: task cannot submit when recovery failover
    
    * fix bug: task cannot submit when recovery failover
    
    * merge from dev-db
    
    * revert
    
    * revert
    
    * fix bug: get process definition list failed.
    
    * fix bug: process instance interval is error
    
    * revert
    
    * revert
    
    * update
    
    * support stop submit success tasks
    
    * update kill process
    
    * update for stop process
    
    * update for stop process
    
    * add some logs for stop process
    
    * update for small bug.
    
    * add check strategy before submit task
    
    * revert
    
    * update
    
    * update
    
    * revert
    
    * wait task instance exists if null.
    
    * revert
    
    * update
    
    * change desc to description.
    
    * add check user and definitions function when delete tenant
    
    * update
    
    * change desc to description.
    
    * change desc to description.
    
    * change desc to description.
    
    * remove check resources when delete tenant
    
    * change desc to description.
    
    * change mybatisplus version to 3.2.0
    
    * update
    
    * change the notice to apache.
    
    * update
    
    * update postgre sql
    
    * fix bug: phone can be empty.
    
    * fix bug: postgre test error.
    
    * update create table for postgre quartz
    
    * fix some bugs about postgre.
    
    * update create table for postgre quartz
    
    * add postgre db performance monitor
    
    * add postgre performance monitor
    
    * update performance monitor
    
    * revert
    
    * revert
    
    * fix bug: tasks queue length error
    
    * remove datasource.properties
    
    * change chinese sql to english.
    
    * change chinese sql to english.
    
    * change chinese to english (#1202)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs
    
    * nginx conf modify
    
    * dockerfile application.properties modify
    
    * dockerfile email address change
    
    * the alert module is modified in English.
    
    * alert server comment and chinese modify
    
    * api server useless code and chinese modify
    
    * common,dao,server useless code and chinese modify
    
    * change chinese to english
    
    * remove unused code (#1204)
    
    * update english documents
    
    * refactor zk client
    
    * update documents
    
    * update zkclient
    
    * update zkclient
    
    * update documents
    
    * add architecture-design
    
    * change i18n
    
    * update i18n
    
    * update english documents
    
    * add architecture-design
    
    * update english documents
    
    * update en-US documents
    
    * add architecture-design
    
    * update demo site
    
    * add mybatis plus model
    
    * modify mybatisplus
    
    * modify mybatisplus
    
    * change interface by mybatisplus
    
    * add unit test
    
    * refactor dao interface.
    
    * add unit test for dao...
    
    * add unit test for dao...
    
    * add unit test for dao...
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
    
    * update some dao bugs
    
    * update for some bugs
    
    * update some bugs
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
    
    * update
    
    * update
    
    * add multiply settings for application.yml
    
    * add multiply settings for application.yml
    
    * revert
    
    * update configuration settings in task record dao...
    
    * change application_master to application-master
    
    * change application_master to application-master
    
    * update application.yml to application.properties
    
    * revert
    
    * revert
    
    * add properties
    
    * add properties
    
    * revert
    
    * revert
    
    * add api start up..
    add alert send try catch
    
    * update dao info level
    
    * fix bug: task cannot submit when recovery failover
    
    * fix bug: task cannot submit when recovery failover
    
    * merge from dev-db
    
    * revert
    
    * revert
    
    * fix bug: get process definition list failed.
    
    * fix bug: process instance interval is error
    
    * revert
    
    * revert
    
    * update
    
    * support stop submit success tasks
    
    * update kill process
    
    * update for stop process
    
    * update for stop process
    
    * add some logs for stop process
    
    * update for small bug.
    
    * add check strategy before submit task
    
    * revert
    
    * update
    
    * update
    
    * revert
    
    * wait task instance exists if null.
    
    * revert
    
    * update
    
    * change desc to description.
    
    * add check user and definitions function when delete tenant
    
    * update
    
    * change desc to description.
    
    * change desc to description.
    
    * change desc to description.
    
    * remove check resources when delete tenant
    
    * change desc to description.
    
    * change mybatisplus version to 3.2.0
    
    * update
    
    * change the notice to apache.
    
    * update
    
    * update postgre sql
    
    * fix bug: phone can be empty.
    
    * fix bug: postgre test error.
    
    * update create table for postgre quartz
    
    * fix some bugs about postgre.
    
    * update create table for postgre quartz
    
    * add postgre db performance monitor
    
    * add postgre performance monitor
    
    * update performance monitor
    
    * revert
    
    * revert
    
    * fix bug: tasks queue length error
    
    * remove datasource.properties
    
    * change chinese sql to english.
    
    * change chinese sql to english.
    
    * remove unused code.
    
    * remove unused code.
    
    * Modify webpack configuration (#1206)
    
    * add more message for java-doc (#1209)
    
    * move updateTaskState into try/catch block in case of exception
    
    * fix NPE
    
    * using conf.getInt instead of getString
    
    * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
    for AlertDao, correct the spelling.
    
    * duplicate
    
    * refactor getTaskWorkerGroupId
    
    * add friendly log
    
    * update hearbeat thread num = 1
    
    * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
    
    * 1. move verifyTaskInstanceIsNull after taskInstance
    2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
    
    * fix the message
    
    * delete before check to avoid KeeperException$NoNodeException
    
    * fix the message
    
    * check processInstance state before delete tenant
    
    * check processInstance state before delete worker group
    
    * refactor
    
    * merge api constants into common constatns
    
    * update the resource perm
    
    * update the dataSource perm
    
    * fix CheckUtils.checkUserParams method
    
    * update AlertGroupService, extends from BaseService, remove duplicate methods
    
    * refactor
    
    * modify method name
    
    * add hasProjectAndPerm method
    
    * using checkProject instead of getResultStatus
    
    * delete checkAuth method, using hasProjectAndPerm instead.
    
    * correct spelling
    
    * add transactional for deleteWorkerGroupById
    
    * add Transactional for deleteProcessInstanceById method
    
    * change sqlSessionTemplate singleton
    
    * change sqlSessionTemplate singleton and reformat code
    
    * fix unsuitable error message
    
    * update shutdownhook methods
    
    * fix worker log bug
    
    * fix api server debug mode bug
    
    * upgrade zk version
    
    * delete this line ,for zkClient.close() will do the whole thing
    
    * fix master server shutdown error
    
    * degrade zk version and add FourLetterWordMain class
    
    * fix PathChildrenCache not close
    
    * add Transactional for createSession method
    
    * add more message for java-doc
    
    * add java doc for common module (#1213)
    
    * dao method comments and useless code modify (#1214)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs
    
    * nginx conf modify
    
    * dockerfile application.properties modify
    
    * dockerfile email address change
    
    * the alert module is modified in English.
    
    * alert server comment and chinese modify
    
    * api server useless code and chinese modify
    
    * common,dao,server useless code and chinese modify
    
    * change chinese to english
    
    * dao method comments and useless code modify
    
    * Change all Chinese names to English (#1207)
    
    * Modify webpack configuration
    
    * Change all Chinese names to English
    
    * add progress-bar-webpack-plugin (#1215)
    
    * Modify webpack configuration
    
    * Change all Chinese names to English
    
    * add progress-bar-webpack-plugin
    
    * Add method and parameters comments (#1220)
    
    * rename from DatasourceUserMapper to DataSourceUserMapper
    
    * add unit test in UserMapper and WorkerGroupMapper
    
    * change cn.escheduler to org.apache.dolphinscheduler
    
    * add unit test in UdfFuncMapperTest
    
    * add unit test in UdfFuncMapperTest
    
    * remove DatabaseConfiguration
    
    * add ConnectionFactoryTest
    
    * cal duration in processInstancesList
    
    * change desc to description
    
    * change table name in mysql ddl
    
    * change table name in mysql ddl
    
    * change escheduler to dolphinscheduler
    
    * change escheduler to dolphinscheduler
    
    * change escheduler to dolphinscheduler
    
    * remove log4j-1.2-api and modify AlertMapperTest
    
    * remove log4j-1.2-api
    
    * Add alertDao to spring management
    
    * Add alertDao to spring management
    
    * get SqlSessionFactory from MybatisSqlSessionFactoryBean
    
    * get processDao by DaoFactory
    
    * read druid properties in ConneciontFactory
    
    * read druid properties in ConneciontFactory
    
    * change get alertDao by spring to DaoFactory
    
    * add log4j to resolve #967
    
    * resole verify udf name error and delete udf error
    
    * Determine if principal is empty
    
    * Determine whether the logon user has the right to delete the project
    
    * Fixed an issue that produced attatch file named such as ATT00002.bin
    
    * fix too many connection in upgrade or create
    
    * fix NEED_FAULT_TOLERANCE and WAITTING_THREAD count fail
    
    * Added a judgment on whether the currently login user is an administrator
    
    * fix update udf database not change and create time is changed
    
    * add enterprise.wechat.enable to decide whether to send enterprise WeChat
    
    * change method check
    
    * Remove the administrator's judgment on query access token list
    
    * only admin can create worker group
    
    * delete alert group need delete the relation of user and alert group
    
    * add timeout in proxy when upload large resource
    
    * add gets scheduled times by expect fire times
    
    * add gets scheduled times by expect fire times
    
    * Increase the judgment of whether it is admin
    
    * Increase the judgment of whether it is admin
    
    * when delete access token add whether login user has perm to delete
    
    * change mysql-connector-java scope to test
    
    * update scm test
    
    * add profile test
    
    * Add method and parameters comments
    
    * roll back
    
    * add some notes (#1221)
    
    * update english documents
    
    * refactor zk client
    
    * update documents
    
    * update zkclient
    
    * update zkclient
    
    * update documents
    
    * add architecture-design
    
    * change i18n
    
    * update i18n
    
    * update english documents
    
    * add architecture-design
    
    * update english documents
    
    * update en-US documents
    
    * add architecture-design
    
    * update demo site
    
    * add mybatis plus model
    
    * modify mybatisplus
    
    * modify mybatisplus
    
    * change interface by mybatisplus
    
    * add unit test
    
    * refactor dao interface.
    
    * add unit test for dao...
    
    * add unit test for dao...
    
    * add unit test for dao...
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
    
    * update some dao bugs
    
    * update for some bugs
    
    * update some bugs
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
    
    * update
    
    * update
    
    * add multiply settings for application.yml
    
    * add multiply settings for application.yml
    
    * revert
    
    * update configuration settings in task record dao...
    
    * change application_master to application-master
    
    * change application_master to application-master
    
    * update application.yml to application.properties
    
    * revert
    
    * revert
    
    * add properties
    
    * add properties
    
    * revert
    
    * revert
    
    * add api start up..
    add alert send try catch
    
    * update dao info level
    
    * fix bug: task cannot submit when recovery failover
    
    * fix bug: task cannot submit when recovery failover
    
    * merge from dev-db
    
    * revert
    
    * revert
    
    * fix bug: get process definition list failed.
    
    * fix bug: process instance interval is error
    
    * revert
    
    * revert
    
    * update
    
    * support stop submit success tasks
    
    * update kill process
    
    * update for stop process
    
    * update for stop process
    
    * add some logs for stop process
    
    * update for small bug.
    
    * add check strategy before submit task
    
    * revert
    
    * update
    
    * update
    
    * revert
    
    * wait task instance exists if null.
    
    * revert
    
    * update
    
    * change desc to description.
    
    * add check user and definitions function when delete tenant
    
    * update
    
    * change desc to description.
    
    * change desc to description.
    
    * change desc to description.
    
    * remove check resources when delete tenant
    
    * change desc to description.
    
    * change mybatisplus version to 3.2.0
    
    * update
    
    * change the notice to apache.
    
    * update
    
    * update postgre sql
    
    * fix bug: phone can be empty.
    
    * fix bug: postgre test error.
    
    * update create table for postgre quartz
    
    * fix some bugs about postgre.
    
    * update create table for postgre quartz
    
    * add postgre db performance monitor
    
    * add postgre performance monitor
    
    * update performance monitor
    
    * revert
    
    * revert
    
    * fix bug: tasks queue length error
    
    * remove datasource.properties
    
    * change chinese sql to english.
    
    * change chinese sql to english.
    
    * remove unused code.
    
    * remove unused code.
    
    * add some notes
    
    * update some notes
    
    * update some notes
    
    * update mbatisplus version
    
    * update lombok version
    
    * update lombok version
    
    * revert
    
    * merge from dev-db
    
    * remove version
    
    * update npm install pom
    
    * add front assembly
    
    * add front module
    
    * change verison to 1.2.0-release-SNAPSHOT
    
    * add name in pom and remove compile
    
    * add name in pom
    
    * add licenses in assemble
    
    * change version to 1.2.0-RC1-SNAPSHOT
    
    * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
    
    # Conflicts:
    #	dolphinscheduler-alert/pom.xml
    #	dolphinscheduler-api/pom.xml
    #	dolphinscheduler-common/pom.xml
    #	dolphinscheduler-dao/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
    #	dolphinscheduler-dist/pom.xml
    #	dolphinscheduler-rpc/pom.xml
    #	dolphinscheduler-server/pom.xml
    #	dolphinscheduler-ui/pom.xml
    #	pom.xml
    change assembly id
    
    * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
    
    # Conflicts:
    #	dolphinscheduler-alert/pom.xml
    #	dolphinscheduler-api/pom.xml
    #	dolphinscheduler-common/pom.xml
    #	dolphinscheduler-dao/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
    #	dolphinscheduler-dist/pom.xml
    #	dolphinscheduler-rpc/pom.xml
    #	dolphinscheduler-server/pom.xml
    #	dolphinscheduler-ui/pom.xml
    #	pom.xml
    add DISCLAIMER
    
    * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
    
    # Conflicts:
    #	dolphinscheduler-alert/pom.xml
    #	dolphinscheduler-api/pom.xml
    #	dolphinscheduler-common/pom.xml
    #	dolphinscheduler-dao/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
    #	dolphinscheduler-dist/pom.xml
    #	dolphinscheduler-rpc/pom.xml
    #	dolphinscheduler-server/pom.xml
    #	dolphinscheduler-ui/pom.xml
    #	pom.xml
    add license in xml and properties
    
    * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
    
    # Conflicts:
    #	dolphinscheduler-alert/pom.xml
    #	dolphinscheduler-api/pom.xml
    #	dolphinscheduler-common/pom.xml
    #	dolphinscheduler-dao/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
    #	dolphinscheduler-dist/pom.xml
    #	dolphinscheduler-rpc/pom.xml
    #	dolphinscheduler-server/pom.xml
    #	dolphinscheduler-ui/pom.xml
    #	pom.xml
    add license in dockerfile
    
    * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
    
    # Conflicts:
    #	dolphinscheduler-alert/pom.xml
    #	dolphinscheduler-api/pom.xml
    #	dolphinscheduler-common/pom.xml
    #	dolphinscheduler-dao/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
    #	dolphinscheduler-dist/pom.xml
    #	dolphinscheduler-rpc/pom.xml
    #	dolphinscheduler-server/pom.xml
    #	dolphinscheduler-ui/pom.xml
    #	pom.xml
    add license in script and sql
    
    * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
    
    # Conflicts:
    #	dolphinscheduler-alert/pom.xml
    #	dolphinscheduler-api/pom.xml
    #	dolphinscheduler-common/pom.xml
    #	dolphinscheduler-dao/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
    #	dolphinscheduler-dist/pom.xml
    #	dolphinscheduler-rpc/pom.xml
    #	dolphinscheduler-server/pom.xml
    #	dolphinscheduler-ui/pom.xml
    #	pom.xml
    add license in script and sql
    
    * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
    
    # Conflicts:
    #	dolphinscheduler-alert/pom.xml
    #	dolphinscheduler-api/pom.xml
    #	dolphinscheduler-common/pom.xml
    #	dolphinscheduler-dao/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
    #	dolphinscheduler-dist/pom.xml
    #	dolphinscheduler-rpc/pom.xml
    #	dolphinscheduler-server/pom.xml
    #	dolphinscheduler-ui/pom.xml
    #	pom.xml
    add license in ci
    
    * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
    
    # Conflicts:
    #	dolphinscheduler-alert/pom.xml
    #	dolphinscheduler-api/pom.xml
    #	dolphinscheduler-common/pom.xml
    #	dolphinscheduler-dao/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
    #	dolphinscheduler-dist/pom.xml
    #	dolphinscheduler-rpc/pom.xml
    #	dolphinscheduler-server/pom.xml
    #	dolphinscheduler-ui/pom.xml
    #	pom.xml
    change version to 1.2.0-SNAPSHOT
    
    * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
    
    # Conflicts:
    #	dolphinscheduler-alert/pom.xml
    #	dolphinscheduler-api/pom.xml
    #	dolphinscheduler-common/pom.xml
    #	dolphinscheduler-dao/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
    #	dolphinscheduler-dist/pom.xml
    #	dolphinscheduler-rpc/pom.xml
    #	dolphinscheduler-server/pom.xml
    #	dolphinscheduler-ui/pom.xml
    #	pom.xml
    set defalut db type postgresql
    
    * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
    
    # Conflicts:
    #	dolphinscheduler-alert/pom.xml
    #	dolphinscheduler-api/pom.xml
    #	dolphinscheduler-common/pom.xml
    #	dolphinscheduler-dao/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
    #	dolphinscheduler-dist/pom.xml
    #	dolphinscheduler-rpc/pom.xml
    #	dolphinscheduler-server/pom.xml
    #	dolphinscheduler-ui/pom.xml
    #	pom.xml
    set defalut db type postgresql
    
    * change org.quartz.jobStore.driverDelegateClass
    
    * Add comments in method params
    
    * update readme from branch dev
    
    * update content in how to contribute
    
    * Update README_zh_CN.md
    
    * change postgresql default port (#1290)
    
    * rename from DatasourceUserMapper to DataSourceUserMapper
    
    * add unit test in UserMapper and WorkerGroupMapper
    
    * change cn.escheduler to org.apache.dolphinscheduler
    
    * add unit test in UdfFuncMapperTest
    
    * add unit test in UdfFuncMapperTest
    
    * remove DatabaseConfiguration
    
    * add ConnectionFactoryTest
    
    * cal duration in processInstancesList
    
    * change desc to description
    
    * change table name in mysql ddl
    
    * change table name in mysql ddl
    
    * change escheduler to dolphinscheduler
    
    * change escheduler to dolphinscheduler
    
    * change escheduler to dolphinscheduler
    
    * remove log4j-1.2-api and modify AlertMapperTest
    
    * remove log4j-1.2-api
    
    * Add alertDao to spring management
    
    * Add alertDao to spring management
    
    * get SqlSessionFactory from MybatisSqlSessionFactoryBean
    
    * get processDao by DaoFactory
    
    * read druid properties in ConneciontFactory
    
    * read druid properties in ConneciontFactory
    
    * change get alertDao by spring to DaoFactory
    
    * add log4j to resolve #967
    
    * resole verify udf name error and delete udf error
    
    * Determine if principal is empty
    
    * Determine whether the logon user has the right to delete the project
    
    * Fixed an issue that produced attatch file named such as ATT00002.bin
    
    * fix too many connection in upgrade or create
    
    * fix NEED_FAULT_TOLERANCE and WAITTING_THREAD count fail
    
    * Added a judgment on whether the currently login user is an administrator
    
    * fix update udf database not change and create time is changed
    
    * add enterprise.wechat.enable to decide whether to send enterprise WeChat
    
    * change method check
    
    * Remove the administrator's judgment on query access token list
    
    * only admin can create worker group
    
    * delete alert group need delete the relation of user and alert group
    
    * add timeout in proxy when upload large resource
    
    * add gets scheduled times by expect fire times
    
    * add gets scheduled times by expect fire times
    
    * Increase the judgment of whether it is admin
    
    * Increase the judgment of whether it is admin
    
    * when delete access token add whether login user has perm to delete
    
    * change mysql-connector-java scope to test
    
    * update scm test
    
    * add profile test
    
    * add profile test
    
    * add maven.deploy.skip true
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * add dependency
    
    * add javadoc
    
    * add antrun
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * reset pgsql (#1178)
    
    + 1
    
    * add javadoc
    
    * add javadoc
    
    * [maven-release-plugin] rollback the release of 1.2.0
    
    * add javadoc
    
    * Ans UI upgrade to version 0.1.0 (#1181)
    
    + 1
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * Administrators group prohibit deletion (#1182)
    
    * Ans UI upgrade to version 0.1.0
    
    * Administrators group prohibit deletion
    
    * add javadoc
    
    * add ui pom
    
    * fix master server shutdown error (#1177)
    
    * move updateTaskState into try/catch block in case of exception
    
    * fix NPE
    
    * using conf.getInt instead of getString
    
    * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
    for AlertDao, correct the spelling.
    
    * duplicate
    
    * refactor getTaskWorkerGroupId
    
    * add friendly log
    
    * update hearbeat thread num = 1
    
    * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
    
    * 1. move verifyTaskInstanceIsNull after taskInstance
    2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
    
    * fix the message
    
    * delete before check to avoid KeeperException$NoNodeException
    
    * fix the message
    
    * check processInstance state before delete tenant
    
    * check processInstance state before delete worker group
    
    * refactor
    
    * merge api constants into common constatns
    
    * update the resource perm
    
    * update the dataSource perm
    
    * fix CheckUtils.checkUserParams method
    
    * update AlertGroupService, extends from BaseService, remove duplicate methods
    
    * refactor
    
    * modify method name
    
    * add hasProjectAndPerm method
    
    * using checkProject instead of getResultStatus
    
    * delete checkAuth method, using hasProjectAndPerm instead.
    
    * correct spelling
    
    * add transactional for deleteWorkerGroupById
    
    * add Transactional for deleteProcessInstanceById method
    
    * change sqlSessionTemplate singleton
    
    * change sqlSessionTemplate singleton and reformat code
    
    * fix unsuitable error message
    
    * update shutdownhook methods
    
    * fix worker log bug
    
    * fix api server debug mode bug
    
    * upgrade zk version
    
    * delete this line ,for zkClient.close() will do the whole thing
    
    * fix master server shutdown error
    
    * degrade zk version and add FourLetterWordMain class (#1183)
    
    * move updateTaskState into try/catch block in case of exception
    
    * fix NPE
    
    * using conf.getInt instead of getString
    
    * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
    for AlertDao, correct the spelling.
    
    * duplicate
    
    * refactor getTaskWorkerGroupId
    
    * add friendly log
    
    * update hearbeat thread num = 1
    
    * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
    
    * 1. move verifyTaskInstanceIsNull after taskInstance
    2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
    
    * fix the message
    
    * delete before check to avoid KeeperException$NoNodeException
    
    * fix the message
    
    * check processInstance state before delete tenant
    
    * check processInstance state before delete worker group
    
    * refactor
    
    * merge api constants into common constatns
    
    * update the resource perm
    
    * update the dataSource perm
    
    * fix CheckUtils.checkUserParams method
    
    * update AlertGroupService, extends from BaseService, remove duplicate methods
    
    * refactor
    
    * modify method name
    
    * add hasProjectAndPerm method
    
    * using checkProject instead of getResultStatus
    
    * delete checkAuth method, using hasProjectAndPerm instead.
    
    * correct spelling
    
    * add transactional for deleteWorkerGroupById
    
    * add Transactional for deleteProcessInstanceById method
    
    * change sqlSessionTemplate singleton
    
    * change sqlSessionTemplate singleton and reformat code
    
    * fix unsuitable error message
    
    * update shutdownhook methods
    
    * fix worker log bug
    
    * fix api server debug mode bug
    
    * upgrade zk version
    
    * delete this line ,for zkClient.close() will do the whole thing
    
    * fix master server shutdown error
    
    * degrade zk version and add FourLetterWordMain class
    
    * add ui pom
    
    * add src pom and assembly
    
    * fix ZKWorkerClient not close PathChildrenCache (#1185)
    
    * move updateTaskState into try/catch block in case of exception
    
    * fix NPE
    
    * using conf.getInt instead of getString
    
    * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
    for AlertDao, correct the spelling.
    
    * duplicate
    
    * refactor getTaskWorkerGroupId
    
    * add friendly log
    
    * update hearbeat thread num = 1
    
    * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
    
    * 1. move verifyTaskInstanceIsNull after taskInstance
    2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
    
    * fix the message
    
    * delete before check to avoid KeeperException$NoNodeException
    
    * fix the message
    
    * check processInstance state before delete tenant
    
    * check processInstance state before delete worker group
    
    * refactor
    
    * merge api constants into common constatns
    
    * update the resource perm
    
    * update the dataSource perm
    
    * fix CheckUtils.checkUserParams method
    
    * update AlertGroupService, extends from BaseService, remove duplicate methods
    
    * refactor
    
    * modify method name
    
    * add hasProjectAndPerm method
    
    * using checkProject instead of getResultStatus
    
    * delete checkAuth method, using hasProjectAndPerm instead.
    
    * correct spelling
    
    * add transactional for deleteWorkerGroupById
    
    * add Transactional for deleteProcessInstanceById method
    
    * change sqlSessionTemplate singleton
    
    * change sqlSessionTemplate singleton and reformat code
    
    * fix unsuitable error message
    
    * update shutdownhook methods
    
    * fix worker log bug
    
    * fix api server debug mode bug
    
    * upgrade zk version
    
    * delete this line ,for zkClient.close() will do the whole thing
    
    * fix master server shutdown error
    
    * degrade zk version and add FourLetterWordMain class
    
    * fix PathChildrenCache not close
    
    * add Transactional for createSession method (#1186)
    
    * move updateTaskState into try/catch block in case of exception
    
    * fix NPE
    
    * using conf.getInt instead of getString
    
    * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
    for AlertDao, correct the spelling.
    
    * duplicate
    
    * refactor getTaskWorkerGroupId
    
    * add friendly log
    
    * update hearbeat thread num = 1
    
    * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
    
    * 1. move verifyTaskInstanceIsNull after taskInstance
    2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
    
    * fix the message
    
    * delete before check to avoid KeeperException$NoNodeException
    
    * fix the message
    
    * check processInstance state before delete tenant
    
    * check processInstance state before delete worker group
    
    * refactor
    
    * merge api constants into common constatns
    
    * update the resource perm
    
    * update the dataSource perm
    
    * fix CheckUtils.checkUserParams method
    
    * update AlertGroupService, extends from BaseService, remove duplicate methods
    
    * refactor
    
    * modify method name
    
    * add hasProjectAndPerm method
    
    * using checkProject instead of getResultStatus
    
    * delete checkAuth method, using hasProjectAndPerm instead.
    
    * correct spelling
    
    * add transactional for deleteWorkerGroupById
    
    * add Transactional for deleteProcessInstanceById method
    
    * change sqlSessionTemplate singleton
    
    * change sqlSessionTemplate singleton and reformat code
    
    * fix unsuitable error message
    
    * update shutdownhook methods
    
    * fix worker log bug
    
    * fix api server debug mode bug
    
    * upgrade zk version
    
    * delete this line ,for zkClient.close() will do the whole thing
    
    * fix master server shutdown error
    
    * degrade zk version and add FourLetterWordMain class
    
    * fix PathChildrenCache not close
    
    * add Transactional for createSession method
    
    * add src pom and assembly
    
    * add src pom and assembly
    
    * add src pom and assembly
    
    * add src pom and assembly
    
    * dockerfile dao application.properties ,install.sh modify and application.properties modify (#1187)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * add src pom and assembly
    
    * add src pom and assembly
    
    * dockerfile startup.sh modify (#1189)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs (#1191)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs
    
    * nginx conf modify
    
    * dockerfile application.properties modify
    
    * dockerfile conf modify (#1192)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs
    
    * nginx conf modify
    
    * dockerfile application.properties modify
    
    * dockerfile conf modify (#1193)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs
    
    * nginx conf modify
    
    * dockerfile application.properties modify
    
    * dockerfile email address change (#1194)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs
    
    * nginx conf modify
    
    * dockerfile application.properties modify
    
    * dockerfile email address change
    
    * the alert module is modified in english (#1195)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs
    
    * nginx conf modify
    
    * dockerfile application.properties modify
    
    * dockerfile email address change
    
    * the alert module is modified in English.
    
    * alert server comment and chinese modify
    
    * api server useless code and chinese modify (#1198)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs
    
    * nginx conf modify
    
    * dockerfile application.properties modify
    
    * dockerfile email address change
    
    * the alert module is modified in English.
    
    * alert server comment and chinese modify
    
    * api server useless code and chinese modify
    
    * common,dao,server useless code and chinese modify (#1199)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs
    
    * nginx conf modify
    
    * dockerfile application.properties modify
    
    * dockerfile email address change
    
    * the alert module is modified in English.
    
    * alert server comment and chinese modify
    
    * api server useless code and chinese modify
    
    * common,dao,server useless code and chinese modify
    
    * change chinese sql to english. (#1200)
    
    * update english documents
    
    * refactor zk client
    
    * update documents
    
    * update zkclient
    
    * update zkclient
    
    * update documents
    
    * add architecture-design
    
    * change i18n
    
    * update i18n
    
    * update english documents
    
    * add architecture-design
    
    * update english documents
    
    * update en-US documents
    
    * add architecture-design
    
    * update demo site
    
    * add mybatis plus model
    
    * modify mybatisplus
    
    * modify mybatisplus
    
    * change interface by mybatisplus
    
    * add unit test
    
    * refactor dao interface.
    
    * add unit test for dao...
    
    * add unit test for dao...
    
    * add unit test for dao...
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
    
    * update some dao bugs
    
    * update for some bugs
    
    * update some bugs
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
    
    * update
    
    * update
    
    * add multiply settings for application.yml
    
    * add multiply settings for application.yml
    
    * revert
    
    * update configuration settings in task record dao...
    
    * change application_master to application-master
    
    * change application_master to application-master
    
    * update application.yml to application.properties
    
    * revert
    
    * revert
    
    * add properties
    
    * add properties
    
    * revert
    
    * revert
    
    * add api start up..
    add alert send try catch
    
    * update dao info level
    
    * fix bug: task cannot submit when recovery failover
    
    * fix bug: task cannot submit when recovery failover
    
    * merge from dev-db
    
    * revert
    
    * revert
    
    * fix bug: get process definition list failed.
    
    * fix bug: process instance interval is error
    
    * revert
    
    * revert
    
    * update
    
    * support stop submit success tasks
    
    * update kill process
    
    * update for stop process
    
    * update for stop process
    
    * add some logs for stop process
    
    * update for small bug.
    
    * add check strategy before submit task
    
    * revert
    
    * update
    
    * update
    
    * revert
    
    * wait task instance exists if null.
    
    * revert
    
    * update
    
    * change desc to description.
    
    * add check user and definitions function when delete tenant
    
    * update
    
    * change desc to description.
    
    * change desc to description.
    
    * change desc to description.
    
    * remove check resources when delete tenant
    
    * change desc to description.
    
    * change mybatisplus version to 3.2.0
    
    * update
    
    * change the notice to apache.
    
    * update
    
    * update postgre sql
    
    * fix bug: phone can be empty.
    
    * fix bug: postgre test error.
    
    * update create table for postgre quartz
    
    * fix some bugs about postgre.
    
    * update create table for postgre quartz
    
    * add postgre db performance monitor
    
    * add postgre performance monitor
    
    * update performance monitor
    
    * revert
    
    * revert
    
    * fix bug: tasks queue length error
    
    * remove datasource.properties
    
    * change chinese sql to english.
    
    * change chinese sql to english.
    
    * change chinese to english (#1202)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs
    
    * nginx conf modify
    
    * dockerfile application.properties modify
    
    * dockerfile email address change
    
    * the alert module is modified in English.
    
    * alert server comment and chinese modify
    
    * api server useless code and chinese modify
    
    * common,dao,server useless code and chinese modify
    
    * change chinese to english
    
    * remove unused code (#1204)
    
    * update english documents
    
    * refactor zk client
    
    * update documents
    
    * update zkclient
    
    * update zkclient
    
    * update documents
    
    * add architecture-design
    
    * change i18n
    
    * update i18n
    
    * update english documents
    
    * add architecture-design
    
    * update english documents
    
    * update en-US documents
    
    * add architecture-design
    
    * update demo site
    
    * add mybatis plus model
    
    * modify mybatisplus
    
    * modify mybatisplus
    
    * change interface by mybatisplus
    
    * add unit test
    
    * refactor dao interface.
    
    * add unit test for dao...
    
    * add unit test for dao...
    
    * add unit test for dao...
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
    
    * update some dao bugs
    
    * update for some bugs
    
    * update some bugs
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
    
    * update
    
    * update
    
    * add multiply settings for application.yml
    
    * add multiply settings for application.yml
    
    * revert
    
    * update configuration settings in task record dao...
    
    * change application_master to application-master
    
    * change application_master to application-master
    
    * update application.yml to application.properties
    
    * revert
    
    * revert
    
    * add properties
    
    * add properties
    
    * revert
    
    * revert
    
    * add api start up..
    add alert send try catch
    
    * update dao info level
    
    * fix bug: task cannot submit when recovery failover
    
    * fix bug: task cannot submit when recovery failover
    
    * merge from dev-db
    
    * revert
    
    * revert
    
    * fix bug: get process definition list failed.
    
    * fix bug: process instance interval is error
    
    * revert
    
    * revert
    
    * update
    
    * support stop submit success tasks
    
    * update kill process
    
    * update for stop process
    
    * update for stop process
    
    * add some logs for stop process
    
    * update for small bug.
    
    * add check strategy before submit task
    
    * revert
    
    * update
    
    * update
    
    * revert
    
    * wait task instance exists if null.
    
    * revert
    
    * update
    
    * change desc to description.
    
    * add check user and definitions function when delete tenant
    
    * update
    
    * change desc to description.
    
    * change desc to description.
    
    * change desc to description.
    
    * remove check resources when delete tenant
    
    * change desc to description.
    
    * change mybatisplus version to 3.2.0
    
    * update
    
    * change the notice to apache.
    
    * update
    
    * update postgre sql
    
    * fix bug: phone can be empty.
    
    * fix bug: postgre test error.
    
    * update create table for postgre quartz
    
    * fix some bugs about postgre.
    
    * update create table for postgre quartz
    
    * add postgre db performance monitor
    
    * add postgre performance monitor
    
    * update performance monitor
    
    * revert
    
    * revert
    
    * fix bug: tasks queue length error
    
    * remove datasource.properties
    
    * change chinese sql to english.
    
    * change chinese sql to english.
    
    * remove unused code.
    
    * remove unused code.
    
    * Modify webpack configuration (#1206)
    
    * add more message for java-doc (#1209)
    
    * move updateTaskState into try/catch block in case of exception
    
    * fix NPE
    
    * using conf.getInt instead of getString
    
    * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
    for AlertDao, correct the spelling.
    
    * duplicate
    
    * refactor getTaskWorkerGroupId
    
    * add friendly log
    
    * update hearbeat thread num = 1
    
    * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
    
    * 1. move verifyTaskInstanceIsNull after taskInstance
    2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
    
    * fix the message
    
    * delete before check to avoid KeeperException$NoNodeException
    
    * fix the message
    
    * check processInstance state before delete tenant
    
    * check processInstance state before delete worker group
    
    * refactor
    
    * merge api constants into common constatns
    
    * update the resource perm
    
    * update the dataSource perm
    
    * fix CheckUtils.checkUserParams method
    
    * update AlertGroupService, extends from BaseService, remove duplicate methods
    
    * refactor
    
    * modify method name
    
    * add hasProjectAndPerm method
    
    * using checkProject instead of getResultStatus
    
    * delete checkAuth method, using hasProjectAndPerm instead.
    
    * correct spelling
    
    * add transactional for deleteWorkerGroupById
    
    * add Transactional for deleteProcessInstanceById method
    
    * change sqlSessionTemplate singleton
    
    * change sqlSessionTemplate singleton and reformat code
    
    * fix unsuitable error message
    
    * update shutdownhook methods
    
    * fix worker log bug
    
    * fix api server debug mode bug
    
    * upgrade zk version
    
    * delete this line ,for zkClient.close() will do the whole thing
    
    * fix master server shutdown error
    
    * degrade zk version and add FourLetterWordMain class
    
    * fix PathChildrenCache not close
    
    * add Transactional for createSession method
    
    * add more message for java-doc
    
    * add java doc for common module (#1213)
    
    * dao method comments and useless code modify (#1214)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs
    
    * nginx conf modify
    
    * dockerfile application.properties modify
    
    * dockerfile email address change
    
    * the alert module is modified in English.
    
    * alert server comment and chinese modify
    
    * api server useless code and chinese modify
    
    * common,dao,server useless code and chinese modify
    
    * change chinese to english
    
    * dao method comments and useless code modify
    
    * Change all Chinese names to English (#1207)
    
    * Modify webpack configuration
    
    * Change all Chinese names to English
    
    * add progress-bar-webpack-plugin (#1215)
    
    * Modify webpack configuration
    
    * Change all Chinese names to English
    
    * add progress-bar-webpack-plugin
    
    * Add method and parameters comments (#1220)
    
    * rename from DatasourceUserMapper to DataSourceUserMapper
    
    * add unit test in UserMapper and WorkerGroupMapper
    
    * change cn.escheduler to org.apache.dolphinscheduler
    
    * add unit test in UdfFuncMapperTest
    
    * add unit test in UdfFuncMapperTest
    
    * remove DatabaseConfiguration
    
    * add ConnectionFactoryTest
    
    * cal duration in processInstancesList
    
    * change desc to description
    
    * change table name in mysql ddl
    
    * change table name in mysql ddl
    
    * change escheduler to dolphinscheduler
    
    * change escheduler to dolphinscheduler
    
    * change escheduler to dolphinscheduler
    
    * remove log4j-1.2-api and modify AlertMapperTest
    
    * remove log4j-1.2-api
    
    * Add alertDao to spring management
    
    * Add alertDao to spring management
    
    * get SqlSessionFactory from MybatisSqlSessionFactoryBean
    
    * get processDao by DaoFactory
    
    * read druid properties in ConneciontFactory
    
    * read druid properties in ConneciontFactory
    
    * change get alertDao by spring to DaoFactory
    
    * add log4j to resolve #967
    
    * resole verify udf name error and delete udf error
    
    * Determine if principal is empty
    
    * Determine whether the logon user has the right to delete the project
    
    * Fixed an issue that produced attatch file named such as ATT00002.bin
    
    * fix too many connection in upgrade or create
    
    * fix NEED_FAULT_TOLERANCE and WAITTING_THREAD count fail
    
    * Added a judgment on whether the currently login user is an administrator
    
    * fix update udf database not change and create time is changed
    
    * add enterprise.wechat.enable to decide whether to send enterprise WeChat
    
    * change method check
    
    * Remove the administrator's judgment on query access token list
    
    * only admin can create worker group
    
    * delete alert group need delete the relation of user and alert group
    
    * add timeout in proxy when upload large resource
    
    * add gets scheduled times by expect fire times
    
    * add gets scheduled times by expect fire times
    
    * Increase the judgment of whether it is admin
    
    * Increase the judgment of whether it is admin
    
    * when delete access token add whether login user has perm to delete
    
    * change mysql-connector-java scope to test
    
    * update scm test
    
    * add profile test
    
    * Add method and parameters comments
    
    * roll back
    
    * add some notes (#1221)
    
    * update english documents
    
    * refactor zk client
    
    * update documents
    
    * update zkclient
    
    * update zkclient
    
    * update documents
    
    * add architecture-design
    
    * change i18n
    
    * update i18n
    
    * update english documents
    
    * add architecture-design
    
    * update english documents
    
    * update en-US documents
    
    * add architecture-design
    
    * update demo site
    
    * add mybatis plus model
    
    * modify mybatisplus
    
    * modify mybatisplus
    
    * change interface by mybatisplus
    
    * add unit test
    
    * refactor dao interface.
    
    * add unit test for dao...
    
    * add unit test for dao...
    
    * add unit test for dao...
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
    
    * update some dao bugs
    
    * update for some bugs
    
    * update some bugs
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
    
    * update
    
    * update
    
    * add multiply settings for application.yml
    
    * add multiply settings for application.yml
    
    * revert
    
    * update configuration settings in task record dao...
    
    * change application_master to application-master
    
    * change application_master to application-master
    
    * update application.yml to application.properties
    
    * revert
    
    * revert
    
    * add properties
    
    * add properties
    
    * revert
    
    * revert
    
    * add api start up..
    add alert send try catch
    
    * update dao info level
    
    * fix bug: task cannot submit when recovery failover
    
    * fix bug: task cannot submit when recovery failover
    
    * merge from dev-db
    
    * revert
    
    * revert
    
    * fix bug: get process definition list failed.
    
    * fix bug: process instance interval is error
    
    * revert
    
    * revert
    
    * update
    
    * support stop submit success tasks
    
    * update kill process
    
    * update for stop process
    
    * update for stop process
    
    * add some logs for stop process
    
    * update for small bug.
    
    * add check strategy before submit task
    
    * revert
    
    * update
    
    * update
    
    * revert
    
    * wait task instance exists if null.
    
    * revert
    
    * update
    
    * change desc to description.
    
    * add check user and definitions function when delete tenant
    
    * update
    
    * change desc to description.
    
    * change desc to description.
    
    * change desc to description.
    
    * remove check resources when delete tenant
    
    * change desc to description.
    
    * change mybatisplus version to 3.2.0
    
    * update
    
    * change the notice to apache.
    
    * update
    
    * update postgre sql
    
    * fix bug: phone can be empty.
    
    * fix bug: postgre test error.
    
    * update create table for postgre quartz
    
    * fix some bugs about postgre.
    
    * update create table for postgre quartz
    
    * add postgre db performance monitor
    
    * add postgre performance monitor
    
    * update performance monitor
    
    * revert
    
    * revert
    
    * fix bug: tasks queue length error
    
    * remove datasource.properties
    
    * change chinese sql to english.
    
    * change chinese sql to english.
    
    * remove unused code.
    
    * remove unused code.
    
    * add some notes
    
    * update some notes
    
    * update some notes
    
    * update mbatisplus version
    
    * update lombok version
    
    * update lombok version
    
    * revert
    
    * merge from dev-db
    
    * remove version
    
    * update npm install pom
    
    * add front assembly
    
    * add front module
    
    * change verison to 1.2.0-release-SNAPSHOT
    
    * add name in pom and remove compile
    
    * add name in pom
    
    * add licenses in assemble
    
    * change version to 1.2.0-RC1-SNAPSHOT
    
    * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
    
    # Conflicts:
    #	dolphinscheduler-alert/pom.xml
    #	dolphinscheduler-api/pom.xml
    #	dolphinscheduler-common/pom.xml
    #	dolphinscheduler-dao/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
    #	dolphinscheduler-dist/pom.xml
    #	dolphinscheduler-rpc/pom.xml
    #	dolphinscheduler-server/pom.xml
    #	dolphinscheduler-ui/pom.xml
    #	pom.xml
    change assembly id
    
    * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
    
    # Conflicts:
    #	dolphinscheduler-alert/pom.xml
    #	dolphinscheduler-api/pom.xml
    #	dolphinscheduler-common/pom.xml
    #	dolphinscheduler-dao/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
    #	dolphinscheduler-dist/pom.xml
    #	dolphinscheduler-rpc/pom.xml
    #	dolphinscheduler-server/pom.xml
    #	dolphinscheduler-ui/pom.xml
    #	pom.xml
    add DISCLAIMER
    
    * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
    
    # Conflicts:
    #	dolphinscheduler-alert/pom.xml
    #	dolphinscheduler-api/pom.xml
    #	dolphinscheduler-common/pom.xml
    #	dolphinscheduler-dao/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
    #	dolphinscheduler-dist/pom.xml
    #	dolphinscheduler-rpc/pom.xml
    #	dolphinscheduler-server/pom.xml
    #	dolphinscheduler-ui/pom.xml
    #	pom.xml
    add license in xml and properties
    
    * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
    
    # Conflicts:
    #	dolphinscheduler-alert/pom.xml
    #	dolphinscheduler-api/pom.xml
    #	dolphinscheduler-common/pom.xml
    #	dolphinscheduler-dao/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
    #	dolphinscheduler-dist/pom.xml
    #	dolphinscheduler-rpc/pom.xml
    #	dolphinscheduler-server/pom.xml
    #	dolphinscheduler-ui/pom.xml
    #	pom.xml
    add license in dockerfile
    
    * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
    
    # Conflicts:
    #	dolphinscheduler-alert/pom.xml
    #	dolphinscheduler-api/pom.xml
    #	dolphinscheduler-common/pom.xml
    #	dolphinscheduler-dao/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
    #	dolphinscheduler-dist/pom.xml
    #	dolphinscheduler-rpc/pom.xml
    #	dolphinscheduler-server/pom.xml
    #	dolphinscheduler-ui/pom.xml
    #	pom.xml
    add license in script and sql
    
    * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
    
    # Conflicts:
    #	dolphinscheduler-alert/pom.xml
    #	dolphinscheduler-api/pom.xml
    #	dolphinscheduler-common/pom.xml
    #	dolphinscheduler-dao/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
    #	dolphinscheduler-dist/pom.xml
    #	dolphinscheduler-rpc/pom.xml
    #	dolphinscheduler-server/pom.xml
    #	dolphinscheduler-ui/pom.xml
    #	pom.xml
    add license in script and sql
    
    * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
    
    # Conflicts:
    #	dolphinscheduler-alert/pom.xml
    #	dolphinscheduler-api/pom.xml
    #	dolphinscheduler-common/pom.xml
    #	dolphinscheduler-dao/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
    #	dolphinscheduler-dist/pom.xml
    #	dolphinscheduler-rpc/pom.xml
    #	dolphinscheduler-server/pom.xml
    #	dolphinscheduler-ui/pom.xml
    #	pom.xml
    add license in ci
    
    * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
    
    # Conflicts:
    #	dolphinscheduler-alert/pom.xml
    #	dolphinscheduler-api/pom.xml
    #	dolphinscheduler-common/pom.xml
    #	dolphinscheduler-dao/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
    #	dolphinscheduler-dist/pom.xml
    #	dolphinscheduler-rpc/pom.xml
    #	dolphinscheduler-server/pom.xml
    #	dolphinscheduler-ui/pom.xml
    #	pom.xml
    change version to 1.2.0-SNAPSHOT
    
    * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
    
    # Conflicts:
    #	dolphinscheduler-alert/pom.xml
    #	dolphinscheduler-api/pom.xml
    #	dolphinscheduler-common/pom.xml
    #	dolphinscheduler-dao/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
    #	dolphinscheduler-dist/pom.xml
    #	dolphinscheduler-rpc/pom.xml
    #	dolphinscheduler-server/pom.xml
    #	dolphinscheduler-ui/pom.xml
    #	pom.xml
    set defalut db type postgresql
    
    * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
    
    # Conflicts:
    #	dolphinscheduler-alert/pom.xml
    #	dolphinscheduler-api/pom.xml
    #	dolphinscheduler-common/pom.xml
    #	dolphinscheduler-dao/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
    #	dolphinscheduler-dist/pom.xml
    #	dolphinscheduler-rpc/pom.xml
    #	dolphinscheduler-server/pom.xml
    #	dolphinscheduler-ui/pom.xml
    #	pom.xml
    set defalut db type postgresql
    
    * change org.quartz.jobStore.driverDelegateClass
    
    * Add comments in method params
    
    * update readme from branch dev
    
    * update content in how to contribute
    
    * change postgresql default port
    
    * change version 1.2.0-SNAPSHOT (#1291)
    
    * rename from DatasourceUserMapper to DataSourceUserMapper
    
    * add unit test in UserMapper and WorkerGroupMapper
    
    * change cn.escheduler to org.apache.dolphinscheduler
    
    * add unit test in UdfFuncMapperTest
    
    * add unit test in UdfFuncMapperTest
    
    * remove DatabaseConfiguration
    
    * add ConnectionFactoryTest
    
    * cal duration in processInstancesList
    
    * change desc to description
    
    * change table name in mysql ddl
    
    * change table name in mysql ddl
    
    * change escheduler to dolphinscheduler
    
    * change escheduler to dolphinscheduler
    
    * change escheduler to dolphinscheduler
    
    * remove log4j-1.2-api and modify AlertMapperTest
    
    * remove log4j-1.2-api
    
    * Add alertDao to spring management
    
    * Add alertDao to spring management
    
    * get SqlSessionFactory from MybatisSqlSessionFactoryBean
    
    * get processDao by DaoFactory
    
    * read druid properties in ConneciontFactory
    
    * read druid properties in ConneciontFactory
    
    * change get alertDao by spring to DaoFactory
    
    * add log4j to resolve #967
    
    * resole verify udf name error and delete udf error
    
    * Determine if principal is empty
    
    * Determine whether the logon user has the right to delete the project
    
    * Fixed an issue that produced attatch file named such as ATT00002.bin
    
    * fix too many connection in upgrade or create
    
    * fix NEED_FAULT_TOLERANCE and WAITTING_THREAD count fail
    
    * Added a judgment on whether the currently login user is an administrator
    
    * fix update udf database not change and create time is changed
    
    * add enterprise.wechat.enable to decide whether to send enterprise WeChat
    
    * change method check
    
    * Remove the administrator's judgment on query access token list
    
    * only admin can create worker group
    
    * delete alert group need delete the relation of user and alert group
    
    * add timeout in proxy when upload large resource
    
    * add gets scheduled times by expect fire times
    
    * add gets scheduled times by expect fire times
    
    * Increase the judgment of whether it is admin
    
    * Increase the judgment of whether it is admin
    
    * when delete access token add whether login user has perm to delete
    
    * change mysql-connector-java scope to test
    
    * update scm test
    
    * add profile test
    
    * add profile test
    
    * add maven.deploy.skip true
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * add dependency
    
    * add javadoc
    
    * add antrun
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * reset pgsql (#1178)
    
    + 1
    
    * add javadoc
    
    * add javadoc
    
    * [maven-release-plugin] rollback the release of 1.2.0
    
    * add javadoc
    
    * Ans UI upgrade to version 0.1.0 (#1181)
    
    + 1
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * Administrators group prohibit deletion (#1182)
    
    * Ans UI upgrade to version 0.1.0
    
    * Administrators group prohibit deletion
    
    * add javadoc
    
    * add ui pom
    
    * fix master server shutdown error (#1177)
    
    * move updateTaskState into try/catch block in case of exception
    
    * fix NPE
    
    * using conf.getInt instead of getString
    
    * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
    for AlertDao, correct the spelling.
    
    * duplicate
    
    * refactor getTaskWorkerGroupId
    
    * add friendly log
    
    * update hearbeat thread num = 1
    
    * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
    
    * 1. move verifyTaskInstanceIsNull after taskInstance
    2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
    
    * fix the message
    
    * delete before check to avoid KeeperException$NoNodeException
    
    * fix the message
    
    * check processInstance state before delete tenant
    
    * check processInstance state before delete worker group
    
    * refactor
    
    * merge api constants into common constatns
    
    * update the resource perm
    
    * update the dataSource perm
    
    * fix CheckUtils.checkUserParams method
    
    * update AlertGroupService, extends from BaseService, remove duplicate methods
    
    * refactor
    
    * modify method name
    
    * add hasProjectAndPerm method
    
    * using checkProject instead of getResultStatus
    
    * delete checkAuth method, using hasProjectAndPerm instead.
    
    * correct spelling
    
    * add transactional for deleteWorkerGroupById
    
    * add Transactional for deleteProcessInstanceById method
    
    * change sqlSessionTemplate singleton
    
    * change sqlSessionTemplate singleton and reformat code
    
    * fix unsuitable error message
    
    * update shutdownhook methods
    
    * fix worker log bug
    
    * fix api server debug mode bug
    
    * upgrade zk version
    
    * delete this line ,for zkClient.close() will do the whole thing
    
    * fix master server shutdown error
    
    * degrade zk version and add FourLetterWordMain class (#1183)
    
    * move updateTaskState into try/catch block in case of exception
    
    * fix NPE
    
    * using conf.getInt instead of getString
    
    * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
    for AlertDao, correct the spelling.
    
    * duplicate
    
    * refactor getTaskWorkerGroupId
    
    * add friendly log
    
    * update hearbeat thread num = 1
    
    * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
    
    * 1. move verifyTaskInstanceIsNull after taskInstance
    2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
    
    * fix the message
    
    * delete before check to avoid KeeperException$NoNodeException
    
    * fix the message
    
    * check processInstance state before delete tenant
    
    * check processInstance state before delete worker group
    
    * refactor
    
    * merge api constants into common constatns
    
    * update the resource perm
    
    * update the dataSource perm
    
    * fix CheckUtils.checkUserParams method
    
    * update AlertGroupService, extends from BaseService, remove duplicate methods
    
    * refactor
    
    * modify method name
    
    * add hasProjectAndPerm method
    
    * using checkProject instead of getResultStatus
    
    * delete checkAuth method, using hasProjectAndPerm instead.
    
    * correct spelling
    
    * add transactional for deleteWorkerGroupById
    
    * add Transactional for deleteProcessInstanceById method
    
    * change sqlSessionTemplate singleton
    
    * change sqlSessionTemplate singleton and reformat code
    
    * fix unsuitable error message
    
    * update shutdownhook methods
    
    * fix worker log bug
    
    * fix api server debug mode bug
    
    * upgrade zk version
    
    * delete this line ,for zkClient.close() will do the whole thing
    
    * fix master server shutdown error
    
    * degrade zk version and add FourLetterWordMain class
    
    * add ui pom
    
    * add src pom and assembly
    
    * fix ZKWorkerClient not close PathChildrenCache (#1185)
    
    * move updateTaskState into try/catch block in case of exception
    
    * fix NPE
    
    * using conf.getInt instead of getString
    
    * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
    for AlertDao, correct the spelling.
    
    * duplicate
    
    * refactor getTaskWorkerGroupId
    
    * add friendly log
    
    * update hearbeat thread num = 1
    
    * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
    
    * 1. move verifyTaskInstanceIsNull after taskInstance
    2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
    
    * fix the message
    
    * delete before check to avoid KeeperException$NoNodeException
    
    * fix the message
    
    * check processInstance state before delete tenant
    
    * check processInstance state before delete worker group
    
    * refactor
    
    * merge api constants into common constatns
    
    * update the resource perm
    
    * update the dataSource perm
    
    * fix CheckUtils.checkUserParams method
    
    * update AlertGroupService, extends from BaseService, remove duplicate methods
    
    * refactor
    
    * modify method name
    
    * add hasProjectAndPerm method
    
    * using checkProject instead of getResultStatus
    
    * delete checkAuth method, using hasProjectAndPerm instead.
    
    * correct spelling
    
    * add transactional for deleteWorkerGroupById
    
    * add Transactional for deleteProcessInstanceById method
    
    * change sqlSessionTemplate singleton
    
    * change sqlSessionTemplate singleton and reformat code
    
    * fix unsuitable error message
    
    * update shutdownhook methods
    
    * fix worker log bug
    
    * fix api server debug mode bug
    
    * upgrade zk version
    
    * delete this line ,for zkClient.close() will do the whole thing
    
    * fix master server shutdown error
    
    * degrade zk version and add FourLetterWordMain class
    
    * fix PathChildrenCache not close
    
    * add Transactional for createSession method (#1186)
    
    * move updateTaskState into try/catch block in case of exception
    
    * fix NPE
    
    * using conf.getInt instead of getString
    
    * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
    for AlertDao, correct the spelling.
    
    * duplicate
    
    * refactor getTaskWorkerGroupId
    
    * add friendly log
    
    * update hearbeat thread num = 1
    
    * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
    
    * 1. move verifyTaskInstanceIsNull after taskInstance
    2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
    
    * fix the message
    
    * delete before check to avoid KeeperException$NoNodeException
    
    * fix the message
    
    * check processInstance state before delete tenant
    
    * check processInstance state before delete worker group
    
    * refactor
    
    * merge api constants into common constatns
    
    * update the resource perm
    
    * update the dataSource perm
    
    * fix CheckUtils.checkUserParams method
    
    * update AlertGroupService, extends from BaseService, remove duplicate methods
    
    * refactor
    
    * modify method name
    
    * add hasProjectAndPerm method
    
    * using checkProject instead of getResultStatus
    
    * delete checkAuth method, using hasProjectAndPerm instead.
    
    * correct spelling
    
    * add transactional for deleteWorkerGroupById
    
    * add Transactional for deleteProcessInstanceById method
    
    * change sqlSessionTemplate singleton
    
    * change sqlSessionTemplate singleton and reformat code
    
    * fix unsuitable error message
    
    * update shutdownhook methods
    
    * fix worker log bug
    
    * fix api server debug mode bug
    
    * upgrade zk version
    
    * delete this line ,for zkClient.close() will do the whole thing
    
    * fix master server shutdown error
    
    * degrade zk version and add FourLetterWordMain class
    
    * fix PathChildrenCache not close
    
    * add Transactional for createSession method
    
    * add src pom and assembly
    
    * add src pom and assembly
    
    * add src pom and assembly
    
    * add src pom and assembly
    
    * dockerfile dao application.properties ,install.sh modify and application.properties modify (#1187)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * add src pom and assembly
    
    * add src pom and assembly
    
    * dockerfile startup.sh modify (#1189)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs (#1191)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs
    
    * nginx conf modify
    
    * dockerfile application.properties modify
    
    * dockerfile conf modify (#1192)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs
    
    * nginx conf modify
    
    * dockerfile application.properties modify
    
    * dockerfile conf modify (#1193)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs
    
    * nginx conf modify
    
    * dockerfile application.properties modify
    
    * dockerfile email address change (#1194)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs
    
    * nginx conf modify
    
    * dockerfile application.properties modify
    
    * dockerfile email address change
    
    * the alert module is modified in english (#1195)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs
    
    * nginx conf modify
    
    * dockerfile application.properties modify
    
    * dockerfile email address change
    
    * the alert module is modified in English.
    
    * alert server comment and chinese modify
    
    * api server useless code and chinese modify (#1198)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs
    
    * nginx conf modify
    
    * dockerfile application.properties modify
    
    * dockerfile email address change
    
    * the alert module is modified in English.
    
    * alert server comment and chinese modify
    
    * api server useless code and chinese modify
    
    * common,dao,server useless code and chinese modify (#1199)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs
    
    * nginx conf modify
    
    * dockerfile application.properties modify
    
    * dockerfile email address change
    
    * the alert module is modified in English.
    
    * alert server comment and chinese modify
    
    * api server useless code and chinese modify
    
    * common,dao,server useless code and chinese modify
    
    * change chinese sql to english. (#1200)
    
    * update english documents
    
    * refactor zk client
    
    * update documents
    
    * update zkclient
    
    * update zkclient
    
    * update documents
    
    * add architecture-design
    
    * change i18n
    
    * update i18n
    
    * update english documents
    
    * add architecture-design
    
    * update english documents
    
    * update en-US documents
    
    * add architecture-design
    
    * update demo site
    
    * add mybatis plus model
    
    * modify mybatisplus
    
    * modify mybatisplus
    
    * change interface by mybatisplus
    
    * add unit test
    
    * refactor dao interface.
    
    * add unit test for dao...
    
    * add unit test for dao...
    
    * add unit test for dao...
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
    
    * update some dao bugs
    
    * update for some bugs
    
    * update some bugs
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
    
    * update
    
    * update
    
    * add multiply settings for application.yml
    
    * add multiply settings for application.yml
    
    * revert
    
    * update configuration settings in task record dao...
    
    * change application_master to application-master
    
    * change application_master to application-master
    
    * update application.yml to application.properties
    
    * revert
    
    * revert
    
    * add properties
    
    * add properties
    
    * revert
    
    * revert
    
    * add api start up..
    add alert send try catch
    
    * update dao info level
    
    * fix bug: task cannot submit when recovery failover
    
    * fix bug: task cannot submit when recovery failover
    
    * merge from dev-db
    
    * revert
    
    * revert
    
    * fix bug: get process definition list failed.
    
    * fix bug: process instance interval is error
    
    * revert
    
    * revert
    
    * update
    
    * support stop submit success tasks
    
    * update kill process
    
    * update for stop process
    
    * update for stop process
    
    * add some logs for stop process
    
    * update for small bug.
    
    * add check strategy before submit task
    
    * revert
    
    * update
    
    * update
    
    * revert
    
    * wait task instance exists if null.
    
    * revert
    
    * update
    
    * change desc to description.
    
    * add check user and definitions function when delete tenant
    
    * update
    
    * change desc to description.
    
    * change desc to description.
    
    * change desc to description.
    
    * remove check resources when delete tenant
    
    * change desc to description.
    
    * change mybatisplus version to 3.2.0
    
    * update
    
    * change the notice to apache.
    
    * update
    
    * update postgre sql
    
    * fix bug: phone can be empty.
    
    * fix bug: postgre test error.
    
    * update create table for postgre quartz
    
    * fix some bugs about postgre.
    
    * update create table for postgre quartz
    
    * add postgre db performance monitor
    
    * add postgre performance monitor
    
    * update performance monitor
    
    * revert
    
    * revert
    
    * fix bug: tasks queue length error
    
    * remove datasource.properties
    
    * change chinese sql to english.
    
    * change chinese sql to english.
    
    * change chinese to english (#1202)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs
    
    * nginx conf modify
    
    * dockerfile application.properties modify
    
    * dockerfile email address change
    
    * the alert module is modified in English.
    
    * alert server comment and chinese modify
    
    * api server useless code and chinese modify
    
    * common,dao,server useless code and chinese modify
    
    * change chinese to english
    
    * remove unused code (#1204)
    
    * update english documents
    
    * refactor zk client
    
    * update documents
    
    * update zkclient
    
    * update zkclient
    
    * update documents
    
    * add architecture-design
    
    * change i18n
    
    * update i18n
    
    * update english documents
    
    * add architecture-design
    
    * update english documents
    
    * update en-US documents
    
    * add architecture-design
    
    * update demo site
    
    * add mybatis plus model
    
    * modify mybatisplus
    
    * modify mybatisplus
    
    * change interface by mybatisplus
    
    * add unit test
    
    * refactor dao interface.
    
    * add unit test for dao...
    
    * add unit test for dao...
    
    * add unit test for dao...
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
    
    * update some dao bugs
    
    * update for some bugs
    
    * update some bugs
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
    
    * update
    
    * update
    
    * add multiply settings for application.yml
    
    * add multiply settings for application.yml
    
    * revert
    
    * update configuration settings in task record dao...
    
    * change application_master to application-master
    
    * change application_master to application-master
    
    * update application.yml to application.properties
    
    * revert
    
    * revert
    
    * add properties
    
    * add properties
    
    * revert
    
    * revert
    
    * add api start up..
    add alert send try catch
    
    * update dao info level
    
    * fix bug: task cannot submit when recovery failover
    
    * fix bug: task cannot submit when recovery failover
    
    * merge from dev-db
    
    * revert
    
    * revert
    
    * fix bug: get process definition list failed.
    
    * fix bug: process instance interval is error
    
    * revert
    
    * revert
    
    * update
    
    * support stop submit success tasks
    
    * update kill process
    
    * update for stop process
    
    * update for stop process
    
    * add some logs for stop process
    
    * update for small bug.
    
    * add check strategy before submit task
    
    * revert
    
    * update
    
    * update
    
    * revert
    
    * wait task instance exists if null.
    
    * revert
    
    * update
    
    * change desc to description.
    
    * add check user and definitions function when delete tenant
    
    * update
    
    * change desc to description.
    
    * change desc to description.
    
    * change desc to description.
    
    * remove check resources when delete tenant
    
    * change desc to description.
    
    * change mybatisplus version to 3.2.0
    
    * update
    
    * change the notice to apache.
    
    * update
    
    * update postgre sql
    
    * fix bug: phone can be empty.
    
    * fix bug: postgre test error.
    
    * update create table for postgre quartz
    
    * fix some bugs about postgre.
    
    * update create table for postgre quartz
    
    * add postgre db performance monitor
    
    * add postgre performance monitor
    
    * update performance monitor
    
    * revert
    
    * revert
    
    * fix bug: tasks queue length error
    
    * remove datasource.properties
    
    * change chinese sql to english.
    
    * change chinese sql to english.
    
    * remove unused code.
    
    * remove unused code.
    
    * Modify webpack configuration (#1206)
    
    * add more message for java-doc (#1209)
    
    * move updateTaskState into try/catch block in case of exception
    
    * fix NPE
    
    * using conf.getInt instead of getString
    
    * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
    for AlertDao, correct the spelling.
    
    * duplicate
    
    * refactor getTaskWorkerGroupId
    
    * add friendly log
    
    * update hearbeat thread num = 1
    
    * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
    
    * 1. move verifyTaskInstanceIsNull after taskInstance
    2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
    
    * fix the message
    
    * delete before check to avoid KeeperException$NoNodeException
    
    * fix the message
    
    * check processInstance state before delete tenant
    
    * check processInstance state before delete worker group
    
    * refactor
    
    * merge api constants into common constatns
    
    * update the resource perm
    
    * update the dataSource perm
    
    * fix CheckUtils.checkUserParams method
    
    * update AlertGroupService, extends from BaseService, remove duplicate methods
    
    * refactor
    
    * modify method name
    
    * add hasProjectAndPerm method
    
    * using checkProject instead of getResultStatus
    
    * delete checkAuth method, using hasProjectAndPerm instead.
    
    * correct spelling
    
    * add transactional for deleteWorkerGroupById
    
    * add Transactional for deleteProcessInstanceById method
    
    * change sqlSessionTemplate singleton
    
    * change sqlSessionTemplate singleton and reformat code
    
    * fix unsuitable error message
    
    * update shutdownhook methods
    
    * fix worker log bug
    
    * fix api server debug mode bug
    
    * upgrade zk version
    
    * delete this line ,for zkClient.close() will do the whole thing
    
    * fix master server shutdown error
    
    * degrade zk version and add FourLetterWordMain class
    
    * fix PathChildrenCache not close
    
    * add Transactional for createSession method
    
    * add more message for java-doc
    
    * add java doc for common module (#1213)
    
    * dao method comments and useless code modify (#1214)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs
    
    * nginx conf modify
    
    * dockerfile application.properties modify
    
    * dockerfile email address change
    
    * the alert module is modified in English.
    
    * alert server comment and chinese modify
    
    * api server useless code and chinese modify
    
    * common,dao,server useless code and chinese modify
    
    * change chinese to english
    
    * dao method comments and useless code modify
    
    * Change all Chinese names to English (#1207)
    
    * Modify webpack configuration
    
    * Change all Chinese names to English
    
    * add progress-bar-webpack-plugin (#1215)
    
    * Modify webpack configuration
    
    * Change all Chinese names to English
    
    * add progress-bar-webpack-plugin
    
    * Add method and parameters comments (#1220)
    
    * rename from DatasourceUserMapper to DataSourceUserMapper
    
    * add unit test in UserMapper and WorkerGroupMapper
    
    * change cn.escheduler to org.apache.dolphinscheduler
    
    * add unit test in UdfFuncMapperTest
    
    * add unit test in UdfFuncMapperTest
    
    * remove DatabaseConfiguration
    
    * add ConnectionFactoryTest
    
    * cal duration in processInstancesList
    
    * change desc to description
    
    * change table name in mysql ddl
    
    * change table name in mysql ddl
    
    * change escheduler to dolphinscheduler
    
    * change escheduler to dolphinscheduler
    
    * change escheduler to dolphinscheduler
    
    * remove log4j-1.2-api and modify AlertMapperTest
    
    * remove log4j-1.2-api
    
    * Add alertDao to spring management
    
    * Add alertDao to spring management
    
    * get SqlSessionFactory from MybatisSqlSessionFactoryBean
    
    * get processDao by DaoFactory
    
    * read druid properties in ConneciontFactory
    
    * read druid properties in ConneciontFactory
    
    * change get alertDao by spring to DaoFactory
    
    * add log4j to resolve #967
    
    * resole verify udf name error and delete udf error
    
    * Determine if principal is empty
    
    * Determine whether the logon user has the right to delete the project
    
    * Fixed an issue that produced attatch file named such as ATT00002.bin
    
    * fix too many connection in upgrade or create
    
    * fix NEED_FAULT_TOLERANCE and WAITTING_THREAD count fail
    
    * Added a judgment on whether the currently login user is an administrator
    
    * fix update udf database not change and create time is changed
    
    * add enterprise.wechat.enable to decide whether to send enterprise WeChat
    
    * change method check
    
    * Remove the administrator's judgment on query access token list
    
    * only admin can create worker group
    
    * delete alert group need delete the relation of user and alert group
    
    * add timeout in proxy when upload large resource
    
    * add gets scheduled times by expect fire times
    
    * add gets scheduled times by expect fire times
    
    * Increase the judgment of whether it is admin
    
    * Increase the judgment of whether it is admin
    
    * when delete access token add whether login user has perm to delete
    
    * change mysql-connector-java scope to test
    
    * update scm test
    
    * add profile test
    
    * Add method and parameters comments
    
    * roll back
    
    * add some notes (#1221)
    
    * update english documents
    
    * refactor zk client
    
    * update documents
    
    * update zkclient
    
    * update zkclient
    
    * update documents
    
    * add architecture-design
    
    * change i18n
    
    * update i18n
    
    * update english documents
    
    * add architecture-design
    
    * update english documents
    
    * update en-US documents
    
    * add architecture-design
    
    * update demo site
    
    * add mybatis plus model
    
    * modify mybatisplus
    
    * modify mybatisplus
    
    * change interface by mybatisplus
    
    * add unit test
    
    * refactor dao interface.
    
    * add unit test for dao...
    
    * add unit test for dao...
    
    * add unit test for dao...
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
    
    * update some dao bugs
    
    * update for some bugs
    
    * update some bugs
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
    
    * update
    
    * update
    
    * add multiply settings for application.yml
    
    * add multiply settings for application.yml
    
    * revert
    
    * update configuration settings in task record dao...
    
    * change application_master to application-master
    
    * change application_master to application-master
    
    * update application.yml to application.properties
    
    * revert
    
    * revert
    
    * add properties
    
    * add properties
    
    * revert
    
    * revert
    
    * add api start up..
    add alert send try catch
    
    * update dao info level
    
    * fix bug: task cannot submit when recovery failover
    
    * fix bug: task cannot submit when recovery failover
    
    * merge from dev-db
    
    * revert
    
    * revert
    
    * fix bug: get process definition list failed.
    
    * fix bug: process instance interval is error
    
    * revert
    
    * revert
    
    * update
    
    * support stop submit success tasks
    
    * update kill process
    
    * update for stop process
    
    * update for stop process
    
    * add some logs for stop process
    
    * update for small bug.
    
    * add check strategy before submit task
    
    * revert
    
    * update
    
    * update
    
    * revert
    
    * wait task instance exists if null.
    
    * revert
    
    * update
    
    * change desc to description.
    
    * add check user and definitions function when delete tenant
    
    * update
    
    * change desc to description.
    
    * change desc to description.
    
    * change desc to description.
    
    * remove check resources when delete tenant
    
    * change desc to description.
    
    * change mybatisplus version to 3.2.0
    
    * update
    
    * change the notice to apache.
    
    * update
    
    * update postgre sql
    
    * fix bug: phone can be empty.
    
    * fix bug: postgre test error.
    
    * update create table for postgre quartz
    
    * fix some bugs about postgre.
    
    * update create table for postgre quartz
    
    * add postgre db performance monitor
    
    * add postgre performance monitor
    
    * update performance monitor
    
    * revert
    
    * revert
    
    * fix bug: tasks queue length error
    
    * remove datasource.properties
    
    * change chinese sql to english.
    
    * change chinese sql to english.
    
    * remove unused code.
    
    * remove unused code.
    
    * add some notes
    
    * update some notes
    
    * update some notes
    
    * update mbatisplus version
    
    * update lombok version
    
    * update lombok version
    
    * revert
    
    * merge from dev-db
    
    * remove version
    
    * update npm install pom
    
    * add front assembly
    
    * add front module
    
    * change verison to 1.2.0-release-SNAPSHOT
    
    * add name in pom and remove compile
    
    * add name in pom
    
    * add licenses in assemble
    
    * change version to 1.2.0-RC1-SNAPSHOT
    
    * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
    
    # Conflicts:
    #	dolphinscheduler-alert/pom.xml
    #	dolphinscheduler-api/pom.xml
    #	dolphinscheduler-common/pom.xml
    #	dolphinscheduler-dao/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
    #	dolphinscheduler-dist/pom.xml
    #	dolphinscheduler-rpc/pom.xml
    #	dolphinscheduler-server/pom.xml
    #	dolphinscheduler-ui/pom.xml
    #	pom.xml
    change assembly id
    
    * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
    
    # Conflicts:
    #	dolphinscheduler-alert/pom.xml
    #	dolphinscheduler-api/pom.xml
    #	dolphinscheduler-common/pom.xml
    #	dolphinscheduler-dao/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
    #	dolphinscheduler-dist/pom.xml
    #	dolphinscheduler-rpc/pom.xml
    #	dolphinscheduler-server/pom.xml
    #	dolphinscheduler-ui/pom.xml
    #	pom.xml
    add DISCLAIMER
    
    * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
    
    # Conflicts:
    #	dolphinscheduler-alert/pom.xml
    #	dolphinscheduler-api/pom.xml
    #	dolphinscheduler-common/pom.xml
    #	dolphinscheduler-dao/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
    #	dolphinscheduler-dist/pom.xml
    #	dolphinscheduler-rpc/pom.xml
    #	dolphinscheduler-server/pom.xml
    #	dolphinscheduler-ui/pom.xml
    #	pom.xml
    add license in xml and properties
    
    * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
    
    # Conflicts:
    #	dolphinscheduler-alert/pom.xml
    #	dolphinscheduler-api/pom.xml
    #	dolphinscheduler-common/pom.xml
    #	dolphinscheduler-dao/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
    #	dolphinscheduler-dist/pom.xml
    #	dolphinscheduler-rpc/pom.xml
    #	dolphinscheduler-server/pom.xml
    #	dolphinscheduler-ui/pom.xml
    #	pom.xml
    add license in dockerfile
    
    * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
    
    # Conflicts:
    #	dolphinscheduler-alert/pom.xml
    #	dolphinscheduler-api/pom.xml
    #	dolphinscheduler-common/pom.xml
    #	dolphinscheduler-dao/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
    #	dolphinscheduler-dist/pom.xml
    #	dolphinscheduler-rpc/pom.xml
    #	dolphinscheduler-server/pom.xml
    #	dolphinscheduler-ui/pom.xml
    #	pom.xml
    add license in script and sql
    
    * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
    
    # Conflicts:
    #	dolphinscheduler-alert/pom.xml
    #	dolphinscheduler-api/pom.xml
    #	dolphinscheduler-common/pom.xml
    #	dolphinscheduler-dao/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
    #	dolphinscheduler-dist/pom.xml
    #	dolphinscheduler-rpc/pom.xml
    #	dolphinscheduler-server/pom.xml
    #	dolphinscheduler-ui/pom.xml
    #	pom.xml
    add license in script and sql
    
    * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
    
    # Conflicts:
    #	dolphinscheduler-alert/pom.xml
    #	dolphinscheduler-api/pom.xml
    #	dolphinscheduler-common/pom.xml
    #	dolphinscheduler-dao/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
    #	dolphinscheduler-dist/pom.xml
    #	dolphinscheduler-rpc/pom.xml
    #	dolphinscheduler-server/pom.xml
    #	dolphinscheduler-ui/pom.xml
    #	pom.xml
    add license in ci
    
    * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
    
    # Conflicts:
    #	dolphinscheduler-alert/pom.xml
    #	dolphinscheduler-api/pom.xml
    #	dolphinscheduler-common/pom.xml
    #	dolphinscheduler-dao/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
    #	dolphinscheduler-dist/pom.xml
    #	dolphinscheduler-rpc/pom.xml
    #	dolphinscheduler-server/pom.xml
    #	dolphinscheduler-ui/pom.xml
    #	pom.xml
    change version to 1.2.0-SNAPSHOT
    
    * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
    
    # Conflicts:
    #	dolphinscheduler-alert/pom.xml
    #	dolphinscheduler-api/pom.xml
    #	dolphinscheduler-common/pom.xml
    #	dolphinscheduler-dao/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
    #	dolphinscheduler-dist/pom.xml
    #	dolphinscheduler-rpc/pom.xml
    #	dolphinscheduler-server/pom.xml
    #	dolphinscheduler-ui/pom.xml
    #	pom.xml
    set defalut db type postgresql
    
    * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
    
    # Conflicts:
    #	dolphinscheduler-alert/pom.xml
    #	dolphinscheduler-api/pom.xml
    #	dolphinscheduler-common/pom.xml
    #	dolphinscheduler-dao/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
    #	dolphinscheduler-dist/pom.xml
    #	dolphinscheduler-rpc/pom.xml
    #	dolphinscheduler-server/pom.xml
    #	dolphinscheduler-ui/pom.xml
    #	pom.xml
    set defalut db type postgresql
    
    * change org.quartz.jobStore.driverDelegateClass
    
    * Add comments in method params
    
    * update readme from branch dev
    
    * update content in how to contribute
    
    * change postgresql default port
    
    * change version 1.2.0-SNAPSHOT
    
    * remove antrun plugin (#1292)
    
    * rename from DatasourceUserMapper to DataSourceUserMapper
    
    * add unit test in UserMapper and WorkerGroupMapper
    
    * change cn.escheduler to org.apache.dolphinscheduler
    
    * add unit test in UdfFuncMapperTest
    
    * add unit test in UdfFuncMapperTest
    
    * remove DatabaseConfiguration
    
    * add ConnectionFactoryTest
    
    * cal duration in processInstancesList
    
    * change desc to description
    
    * change table name in mysql ddl
    
    * change table name in mysql ddl
    
    * change escheduler to dolphinscheduler
    
    * change escheduler to dolphinscheduler
    
    * change escheduler to dolphinscheduler
    
    * remove log4j-1.2-api and modify AlertMapperTest
    
    * remove log4j-1.2-api
    
    * Add alertDao to spring management
    
    * Add alertDao to spring management
    
    * get SqlSessionFactory from MybatisSqlSessionFactoryBean
    
    * get processDao by DaoFactory
    
    * read druid properties in ConneciontFactory
    
    * read druid properties in ConneciontFactory
    
    * change get alertDao by spring to DaoFactory
    
    * add log4j to resolve #967
    
    * resole verify udf name error and delete udf error
    
    * Determine if principal is empty
    
    * Determine whether the logon user has the right to delete the project
    
    * Fixed an issue that produced attatch file named such as ATT00002.bin
    
    * fix too many connection in upgrade or create
    
    * fix NEED_FAULT_TOLERANCE and WAITTING_THREAD count fail
    
    * Added a judgment on whether the currently login user is an administrator
    
    * fix update udf database not change and create time is changed
    
    * add enterprise.wechat.enable to decide whether to send enterprise WeChat
    
    * change method check
    
    * Remove the administrator's judgment on query access token list
    
    * only admin can create worker group
    
    * delete alert group need delete the relation of user and alert group
    
    * add timeout in proxy when upload large resource
    
    * add gets scheduled times by expect fire times
    
    * add gets scheduled times by expect fire times
    
    * Increase the judgment of whether it is admin
    
    * Increase the judgment of whether it is admin
    
    * when delete access token add whether login user has perm to delete
    
    * change mysql-connector-java scope to test
    
    * update scm test
    
    * add profile test
    
    * add profile test
    
    * add maven.deploy.skip true
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * add dependency
    
    * add javadoc
    
    * add antrun
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * reset pgsql (#1178)
    
    + 1
    
    * add javadoc
    
    * add javadoc
    
    * [maven-release-plugin] rollback the release of 1.2.0
    
    * add javadoc
    
    * Ans UI upgrade to version 0.1.0 (#1181)
    
    + 1
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * Administrators group prohibit deletion (#1182)
    
    * Ans UI upgrade to version 0.1.0
    
    * Administrators group prohibit deletion
    
    * add javadoc
    
    * add ui pom
    
    * fix master server shutdown error (#1177)
    
    * move updateTaskState into try/catch block in case of exception
    
    * fix NPE
    
    * using conf.getInt instead of getString
    
    * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
    for AlertDao, correct the spelling.
    
    * duplicate
    
    * refactor getTaskWorkerGroupId
    
    * add friendly log
    
    * update hearbeat thread num = 1
    
    * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
    
    * 1. move verifyTaskInstanceIsNull after taskInstance
    2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
    
    * fix the message
    
    * delete before check to avoid KeeperException$NoNodeException
    
    * fix the message
    
    * check processInstance state before delete tenant
    
    * check processInstance state before delete worker group
    
    * refactor
    
    * merge api constants into common constatns
    
    * update the resource perm
    
    * update the dataSource perm
    
    * fix CheckUtils.checkUserParams method
    
    * update AlertGroupService, extends from BaseService, remove duplicate methods
    
    * refactor
    
    * modify method name
    
    * add hasProjectAndPerm method
    
    * using checkProject instead of getResultStatus
    
    * delete checkAuth method, using hasProjectAndPerm instead.
    
    * correct spelling
    
    * add transactional for deleteWorkerGroupById
    
    * add Transactional for deleteProcessInstanceById method
    
    * change sqlSessionTemplate singleton
    
    * change sqlSessionTemplate singleton and reformat code
    
    * fix unsuitable error message
    
    * update shutdownhook methods
    
    * fix worker log bug
    
    * fix api server debug mode bug
    
    * upgrade zk version
    
    * delete this line ,for zkClient.close() will do the whole thing
    
    * fix master server shutdown error
    
    * degrade zk version and add FourLetterWordMain class (#1183)
    
    * move updateTaskState into try/catch block in case of exception
    
    * fix NPE
    
    * using conf.getInt instead of getString
    
    * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
    for AlertDao, correct the spelling.
    
    * duplicate
    
    * refactor getTaskWorkerGroupId
    
    * add friendly log
    
    * update hearbeat thread num = 1
    
    * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
    
    * 1. move verifyTaskInstanceIsNull after taskInstance
    2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
    
    * fix the message
    
    * delete before check to avoid KeeperException$NoNodeException
    
    * fix the message
    
    * check processInstance state before delete tenant
    
    * check processInstance state before delete worker group
    
    * refactor
    
    * merge api constants into common constatns
    
    * update the resource perm
    
    * update the dataSource perm
    
    * fix CheckUtils.checkUserParams method
    
    * update AlertGroupService, extends from BaseService, remove duplicate methods
    
    * refactor
    
    * modify method name
    
    * add hasProjectAndPerm method
    
    * using checkProject instead of getResultStatus
    
    * delete checkAuth method, using hasProjectAndPerm instead.
    
    * correct spelling
    
    * add transactional for deleteWorkerGroupById
    
    * add Transactional for deleteProcessInstanceById method
    
    * change sqlSessionTemplate singleton
    
    * change sqlSessionTemplate singleton and reformat code
    
    * fix unsuitable error message
    
    * update shutdownhook methods
    
    * fix worker log bug
    
    * fix api server debug mode bug
    
    * upgrade zk version
    
    * delete this line ,for zkClient.close() will do the whole thing
    
    * fix master server shutdown error
    
    * degrade zk version and add FourLetterWordMain class
    
    * add ui pom
    
    * add src pom and assembly
    
    * fix ZKWorkerClient not close PathChildrenCache (#1185)
    
    * move updateTaskState into try/catch block in case of exception
    
    * fix NPE
    
    * using conf.getInt instead of getString
    
    * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
    for AlertDao, correct the spelling.
    
    * duplicate
    
    * refactor getTaskWorkerGroupId
    
    * add friendly log
    
    * update hearbeat thread num = 1
    
    * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
    
    * 1. move verifyTaskInstanceIsNull after taskInstance
    2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
    
    * fix the message
    
    * delete before check to avoid KeeperException$NoNodeException
    
    * fix the message
    
    * check processInstance state before delete tenant
    
    * check processInstance state before delete worker group
    
    * refactor
    
    * merge api constants into common constatns
    
    * update the resource perm
    
    * update the dataSource perm
    
    * fix CheckUtils.checkUserParams method
    
    * update AlertGroupService, extends from BaseService, remove duplicate methods
    
    * refactor
    
    * modify method name
    
    * add hasProjectAndPerm method
    
    * using checkProject instead of getResultStatus
    
    * delete checkAuth method, using hasProjectAndPerm instead.
    
    * correct spelling
    
    * add transactional for deleteWorkerGroupById
    
    * add Transactional for deleteProcessInstanceById method
    
    * change sqlSessionTemplate singleton
    
    * change sqlSessionTemplate singleton and reformat code
    
    * fix unsuitable error message
    
    * update shutdownhook methods
    
    * fix worker log bug
    
    * fix api server debug mode bug
    
    * upgrade zk version
    
    * delete this line ,for zkClient.close() will do the whole thing
    
    * fix master server shutdown error
    
    * degrade zk version and add FourLetterWordMain class
    
    * fix PathChildrenCache not close
    
    * add Transactional for createSession method (#1186)
    
    * move updateTaskState into try/catch block in case of exception
    
    * fix NPE
    
    * using conf.getInt instead of getString
    
    * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
    for AlertDao, correct the spelling.
    
    * duplicate
    
    * refactor getTaskWorkerGroupId
    
    * add friendly log
    
    * update hearbeat thread num = 1
    
    * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
    
    * 1. move verifyTaskInstanceIsNull after taskInstance
    2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
    
    * fix the message
    
    * delete before check to avoid KeeperException$NoNodeException
    
    * fix the message
    
    * check processInstance state before delete tenant
    
    * check processInstance state before delete worker group
    
    * refactor
    
    * merge api constants into common constatns
    
    * update the resource perm
    
    * update the dataSource perm
    
    * fix CheckUtils.checkUserParams method
    
    * update AlertGroupService, extends from BaseService, remove duplicate methods
    
    * refactor
    
    * modify method name
    
    * add hasProjectAndPerm method
    
    * using checkProject instead of getResultStatus
    
    * delete checkAuth method, using hasProjectAndPerm instead.
    
    * correct spelling
    
    * add transactional for deleteWorkerGroupById
    
    * add Transactional for deleteProcessInstanceById method
    
    * change sqlSessionTemplate singleton
    
    * change sqlSessionTemplate singleton and reformat code
    
    * fix unsuitable error message
    
    * update shutdownhook methods
    
    * fix worker log bug
    
    * fix api server debug mode bug
    
    * upgrade zk version
    
    * delete this line ,for zkClient.close() will do the whole thing
    
    * fix master server shutdown error
    
    * degrade zk version and add FourLetterWordMain class
    
    * fix PathChildrenCache not close
    
    * add Transactional for createSession method
    
    * add src pom and assembly
    
    * add src pom and assembly
    
    * add src pom and assembly
    
    * add src pom and assembly
    
    * dockerfile dao application.properties ,install.sh modify and application.properties modify (#1187)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * add src pom and assembly
    
    * add src pom and assembly
    
    * dockerfile startup.sh modify (#1189)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs (#1191)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs
    
    * nginx conf modify
    
    * dockerfile application.properties modify
    
    * dockerfile conf modify (#1192)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs
    
    * nginx conf modify
    
    * dockerfile application.properties modify
    
    * dockerfile conf modify (#1193)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs
    
    * nginx conf modify
    
    * dockerfile application.properties modify
    
    * dockerfile email address change (#1194)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs
    
    * nginx conf modify
    
    * dockerfile application.properties modify
    
    * dockerfile email address change
    
    * the alert module is modified in english (#1195)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs
    
    * nginx conf modify
    
    * dockerfile application.properties modify
    
    * dockerfile email address change
    
    * the alert module is modified in English.
    
    * alert server comment and chinese modify
    
    * api server useless code and chinese modify (#1198)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs
    
    * nginx conf modify
    
    * dockerfile application.properties modify
    
    * dockerfile email address change
    
    * the alert module is modified in English.
    
    * alert server comment and chinese modify
    
    * api server useless code and chinese modify
    
    * common,dao,server useless code and chinese modify (#1199)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs
    
    * nginx conf modify
    
    * dockerfile application.properties modify
    
    * dockerfile email address change
    
    * the alert module is modified in English.
    
    * alert server comment and chinese modify
    
    * api server useless code and chinese modify
    
    * common,dao,server useless code and chinese modify
    
    * change chinese sql to english. (#1200)
    
    * update english documents
    
    * refactor zk client
    
    * update documents
    
    * update zkclient
    
    * update zkclient
    
    * update documents
    
    * add architecture-design
    
    * change i18n
    
    * update i18n
    
    * update english documents
    
    * add architecture-design
    
    * update english documents
    
    * update en-US documents
    
    * add architecture-design
    
    * update demo site
    
    * add mybatis plus model
    
    * modify mybatisplus
    
    * modify mybatisplus
    
    * change interface by mybatisplus
    
    * add unit test
    
    * refactor dao interface.
    
    * add unit test for dao...
    
    * add unit test for dao...
    
    * add unit test for dao...
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
    
    * update some dao bugs
    
    * update for some bugs
    
    * update some bugs
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
    
    * update
    
    * update
    
    * add multiply settings for application.yml
    
    * add multiply settings for application.yml
    
    * revert
    
    * update configuration settings in task record dao...
    
    * change application_master to application-master
    
    * change application_master to application-master
    
    * update application.yml to application.properties
    
    * revert
    
    * revert
    
    * add properties
    
    * add properties
    
    * revert
    
    * revert
    
    * add api start up..
    add alert send try catch
    
    * update dao info level
    
    * fix bug: task cannot submit when recovery failover
    
    * fix bug: task cannot submit when recovery failover
    
    * merge from dev-db
    
    * revert
    
    * revert
    
    * fix bug: get process definition list failed.
    
    * fix bug: process instance interval is error
    
    * revert
    
    * revert
    
    * update
    
    * support stop submit success tasks
    
    * update kill process
    
    * update for stop process
    
    * update for stop process
    
    * add some logs for stop process
    
    * update for small bug.
    
    * add check strategy before submit task
    
    * revert
    
    * update
    
    * update
    
    * revert
    
    * wait task instance exists if null.
    
    * revert
    
    * update
    
    * change desc to description.
    
    * add check user and definitions function when delete tenant
    
    * update
    
    * change desc to description.
    
    * change desc to description.
    
    * change desc to description.
    
    * remove check resources when delete tenant
    
    * change desc to description.
    
    * change mybatisplus version to 3.2.0
    
    * update
    
    * change the notice to apache.
    
    * update
    
    * update postgre sql
    
    * fix bug: phone can be empty.
    
    * fix bug: postgre test error.
    
    * update create table for postgre quartz
    
    * fix some bugs about postgre.
    
    * update create table for postgre quartz
    
    * add postgre db performance monitor
    
    * add postgre performance monitor
    
    * update performance monitor
    
    * revert
    
    * revert
    
    * fix bug: tasks queue length error
    
    * remove datasource.properties
    
    * change chinese sql to english.
    
    * change chinese sql to english.
    
    * change chinese to english (#1202)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs
    
    * nginx conf modify
    
    * dockerfile application.properties modify
    
    * dockerfile email address change
    
    * the alert module is modified in English.
    
    * alert server comment and chinese modify
    
    * api server useless code and chinese modify
    
    * common,dao,server useless code and chinese modify
    
    * change chinese to english
    
    * remove unused code (#1204)
    
    * update english documents
    
    * refactor zk client
    
    * update documents
    
    * update zkclient
    
    * update zkclient
    
    * update documents
    
    * add architecture-design
    
    * change i18n
    
    * update i18n
    
    * update english documents
    
    * add architecture-design
    
    * update english documents
    
    * update en-US documents
    
    * add architecture-design
    
    * update demo site
    
    * add mybatis plus model
    
    * modify mybatisplus
    
    * modify mybatisplus
    
    * change interface by mybatisplus
    
    * add unit test
    
    * refactor dao interface.
    
    * add unit test for dao...
    
    * add unit test for dao...
    
    * add unit test for dao...
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
    
    * update some dao bugs
    
    * update for some bugs
    
    * update some bugs
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
    
    * update
    
    * update
    
    * add multiply settings for application.yml
    
    * add multiply settings for application.yml
    
    * revert
    
    * update configuration settings in task record dao...
    
    * change application_master to application-master
    
    * change application_master to application-master
    
    * update application.yml to application.properties
    
    * revert
    
    * revert
    
    * add properties
    
    * add properties
    
    * revert
    
    * revert
    
    * add api start up..
    add alert send try catch
    
    * update dao info level
    
    * fix bug: task cannot submit when recovery failover
    
    * fix bug: task cannot submit when recovery failover
    
    * merge from dev-db
    
    * revert
    
    * revert
    
    * fix bug: get process definition list failed.
    
    * fix bug: process instance interval is error
    
    * revert
    
    * revert
    
    * update
    
    * support stop submit success tasks
    
    * update kill process
    
    * update for stop process
    
    * update for stop process
    
    * add some logs for stop process
    
    * update for small bug.
    
    * add check strategy before submit task
    
    * revert
    
    * update
    
    * update
    
    * revert
    
    * wait task instance exists if null.
    
    * revert
    
    * update
    
    * change desc to description.
    
    * add check user and definitions function when delete tenant
    
    * update
    
    * change desc to description.
    
    * change desc to description.
    
    * change desc to description.
    
    * remove check resources when delete tenant
    
    * change desc to description.
    
    * change mybatisplus version to 3.2.0
    
    * update
    
    * change the notice to apache.
    
    * update
    
    * update postgre sql
    
    * fix bug: phone can be empty.
    
    * fix bug: postgre test error.
    
    * update create table for postgre quartz
    
    * fix some bugs about postgre.
    
    * update create table for postgre quartz
    
    * add postgre db performance monitor
    
    * add postgre performance monitor
    
    * update performance monitor
    
    * revert
    
    * revert
    
    * fix bug: tasks queue length error
    
    * remove datasource.properties
    
    * change chinese sql to english.
    
    * change chinese sql to english.
    
    * remove unused code.
    
    * remove unused code.
    
    * Modify webpack configuration (#1206)
    
    * add more message for java-doc (#1209)
    
    * move updateTaskState into try/catch block in case of exception
    
    * fix NPE
    
    * using conf.getInt instead of getString
    
    * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
    for AlertDao, correct the spelling.
    
    * duplicate
    
    * refactor getTaskWorkerGroupId
    
    * add friendly log
    
    * update hearbeat thread num = 1
    
    * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
    
    * 1. move verifyTaskInstanceIsNull after taskInstance
    2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
    
    * fix the message
    
    * delete before check to avoid KeeperException$NoNodeException
    
    * fix the message
    
    * check processInstance state before delete tenant
    
    * check processInstance state before delete worker group
    
    * refactor
    
    * merge api constants into common constatns
    
    * update the resource perm
    
    * update the dataSource perm
    
    * fix CheckUtils.checkUserParams method
    
    * update AlertGroupService, extends from BaseService, remove duplicate methods
    
    * refactor
    
    * modify method name
    
    * add hasProjectAndPerm method
    
    * using checkProject instead of getResultStatus
    
    * delete checkAuth method, using hasProjectAndPerm instead.
    
    * correct spelling
    
    * add transactional for deleteWorkerGroupById
    
    * add Transactional for deleteProcessInstanceById method
    
    * change sqlSessionTemplate singleton
    
    * change sqlSessionTemplate singleton and reformat code
    
    * fix unsuitable error message
    
    * update shutdownhook methods
    
    * fix worker log bug
    
    * fix api server debug mode bug
    
    * upgrade zk version
    
    * delete this line ,for zkClient.close() will do the whole thing
    
    * fix master server shutdown error
    
    * degrade zk version and add FourLetterWordMain class
    
    * fix PathChildrenCache not close
    
    * add Transactional for createSession method
    
    * add more message for java-doc
    
    * add java doc for common module (#1213)
    
    * dao method comments and useless code modify (#1214)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs
    
    * nginx conf modify
    
    * dockerfile application.properties modify
    
    * dockerfile email address change
    
    * the alert module is modified in English.
    
    * alert server comment and chinese modify
    
    * api server useless code and chinese modify
    
    * common,dao,server useless code and chinese modify
    
    * change chinese to english
    
    * dao method comments and useless code modify
    
    * Change all Chinese names to English (#1207)
    
    * Modify webpack configuration
    
    * Change all Chinese names to English
    
    * add progress-bar-webpack-plugin (#1215)
    
    * Modify webpack configuration
    
    * Change all Chinese names to English
    
    * add progress-bar-webpack-plugin
    
    * Add method and parameters comments (#1220)
    
    * rename from DatasourceUserMapper to DataSourceUserMapper
    
    * add unit test in UserMapper and WorkerGroupMapper
    
    * change cn.escheduler to org.apache.dolphinscheduler
    
    * add unit test in UdfFuncMapperTest
    
    * add unit test in UdfFuncMapperTest
    
    * remove DatabaseConfiguration
    
    * add ConnectionFactoryTest
    
    * cal duration in processInstancesList
    
    * change desc to description
    
    * change table name in mysql ddl
    
    * change table name in mysql ddl
    
    * change escheduler to dolphinscheduler
    
    * change escheduler to dolphinscheduler
    
    * change escheduler to dolphinscheduler
    
    * remove log4j-1.2-api and modify AlertMapperTest
    
    * remove log4j-1.2-api
    
    * Add alertDao to spring management
    
    * Add alertDao to spring management
    
    * get SqlSessionFactory from MybatisSqlSessionFactoryBean
    
    * get processDao by DaoFactory
    
    * read druid properties in ConneciontFactory
    
    * read druid properties in ConneciontFactory
    
    * change get alertDao by spring to DaoFactory
    
    * add log4j to resolve #967
    
    * resole verify udf name error and delete udf error
    
    * Determine if principal is empty
    
    * Determine whether the logon user has the right to delete the project
    
    * Fixed an issue that produced attatch file named such as ATT00002.bin
    
    * fix too many connection in upgrade or create
    
    * fix NEED_FAULT_TOLERANCE and WAITTING_THREAD count fail
    
    * Added a judgment on whether the currently login user is an administrator
    
    * fix update udf database not change and create time is changed
    
    * add enterprise.wechat.enable to decide whether to send enterprise WeChat
    
    * change method check
    
    * Remove the administrator's judgment on query access token list
    
    * only admin can create worker group
    
    * delete alert group need delete the relation of user and alert group
    
    * add timeout in proxy when upload large resource
    
    * add gets scheduled times by expect fire times
    
    * add gets scheduled times by expect fire times
    
    * Increase the judgment of whether it is admin
    
    * Increase the judgment of whether it is admin
    
    * when delete access token add whether login user has perm to delete
    
    * change mysql-connector-java scope to test
    
    * update scm test
    
    * add profile test
    
    * Add method and parameters comments
    
    * roll back
    
    * add some notes (#1221)
    
    * update english documents
    
    * refactor zk client
    
    * update documents
    
    * update zkclient
    
    * update zkclient
    
    * update documents
    
    * add architecture-design
    
    * change i18n
    
    * update i18n
    
    * update english documents
    
    * add architecture-design
    
    * update english documents
    
    * update en-US documents
    
    * add architecture-design
    
    * update demo site
    
    * add mybatis plus model
    
    * modify mybatisplus
    
    * modify mybatisplus
    
    * change interface by mybatisplus
    
    * add unit test
    
    * refactor dao interface.
    
    * add unit test for dao...
    
    * add unit test for dao...
    
    * add unit test for dao...
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
    
    * update some dao bugs
    
    * update for some bugs
    
    * update some bugs
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
    
    * update
    
    * update
    
    * add multiply settings for application.yml
    
    * add multiply settings for application.yml
    
    * revert
    
    * update configuration settings in task record dao...
    
    * change application_master to application-master
    
    * change application_master to application-master
    
    * update application.yml to application.properties
    
    * revert
    
    * revert
    
    * add properties
    
    * add properties
    
    * revert
    
    * revert
    
    * add api start up..
    add alert send try catch
    
    * update dao info level
    
    * fix bug: task cannot submit when recovery failover
    
    * fix bug: task cannot submit when recovery failover
    
    * merge from dev-db
    
    * revert
    
    * revert
    
    * fix bug: get process definition list failed.
    
    * fix bug: process instance interval is error
    
    * revert
    
    * revert
    
    * update
    
    * support stop submit success tasks
    
    * update kill process
    
    * update for stop process
    
    * update for stop process
    
    * add some logs for stop process
    
    * update for small bug.
    
    * add check strategy before submit task
    
    * revert
    
    * update
    
    * update
    
    * revert
    
    * wait task instance exists if null.
    
    * revert
    
    * update
    
    * change desc to description.
    
    * add check user and definitions function when delete tenant
    
    * update
    
    * change desc to description.
    
    * change desc to description.
    
    * change desc to description.
    
    * remove check resources when delete tenant
    
    * change desc to description.
    
    * change mybatisplus version to 3.2.0
    
    * update
    
    * change the notice to apache.
    
    * update
    
    * update postgre sql
    
    * fix bug: phone can be empty.
    
    * fix bug: postgre test error.
    
    * update create table for postgre quartz
    
    * fix some bugs about postgre.
    
    * update create table for postgre quartz
    
    * add postgre db performance monitor
    
    * add postgre performance monitor
    
    * update performance monitor
    
    * revert
    
    * revert
    
    * fix bug: tasks queue length error
    
    * remove datasource.properties
    
    * change chinese sql to english.
    
    * change chinese sql to english.
    
    * remove unused code.
    
    * remove unused code.
    
    * add some notes
    
    * update some notes
    
    * update some notes
    
    * update mbatisplus version
    
    * update lombok version
    
    * update lombok version
    
    * revert
    
    * merge from dev-db
    
    * remove version
    
    * update npm install pom
    
    * add front assembly
    
    * add front module
    
    * change verison to 1.2.0-release-SNAPSHOT
    
    * add name in pom and remove compile
    
    * add name in pom
    
    * add licenses in assemble
    
    * change version to 1.2.0-RC1-SNAPSHOT
    
    * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
    
    # Conflicts:
    #	dolphinscheduler-alert/pom.xml
    #	dolphinscheduler-api/pom.xml
    #	dolphinscheduler-common/pom.xml
    #	dolphinscheduler-dao/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
    #	dolphinscheduler-dist/pom.xml
    #	dolphinscheduler-rpc/pom.xml
    #	dolphinscheduler-server/pom.xml
    #	dolphinscheduler-ui/pom.xml
    #	pom.xml
    change assembly id
    
    * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
    
    # Conflicts:
    #	dolphinscheduler-alert/pom.xml
    #	dolphinscheduler-api/pom.xml
    #	dolphinscheduler-common/pom.xml
    #	dolphinscheduler-dao/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
    #	dolphinscheduler-dist/pom.xml
    #	dolphinscheduler-rpc/pom.xml
    #	dolphinscheduler-server/pom.xml
    #	dolphinscheduler-ui/pom.xml
    #	pom.xml
    add DISCLAIMER
    
    * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
    
    # Conflicts:
    #	dolphinscheduler-alert/pom.xml
    #	dolphinscheduler-api/pom.xml
    #	dolphinscheduler-common/pom.xml
    #	dolphinscheduler-dao/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
    #	dolphinscheduler-dist/pom.xml
    #	dolphinscheduler-rpc/pom.xml
    #	dolphinscheduler-server/pom.xml
    #	dolphinscheduler-ui/pom.xml
    #	pom.xml
    add license in xml and properties
    
    * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
    
    # Conflicts:
    #	dolphinscheduler-alert/pom.xml
    #	dolphinscheduler-api/pom.xml
    #	dolphinscheduler-common/pom.xml
    #	dolphinscheduler-dao/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
    #	dolphinscheduler-dist/pom.xml
    #	dolphinscheduler-rpc/pom.xml
    #	dolphinscheduler-server/pom.xml
    #	dolphinscheduler-ui/pom.xml
    #	pom.xml
    add license in dockerfile
    
    * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
    
    # Conflicts:
    #	dolphinscheduler-alert/pom.xml
    #	dolphinscheduler-api/pom.xml
    #	dolphinscheduler-common/pom.xml
    #	dolphinscheduler-dao/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
    #	dolphinscheduler-dist/pom.xml
    #	dolphinscheduler-rpc/pom.xml
    #	dolphinscheduler-server/pom.xml
    #	dolphinscheduler-ui/pom.xml
    #	pom.xml
    add license in script and sql
    
    * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
    
    # Conflicts:
    #	dolphinscheduler-alert/pom.xml
    #	dolphinscheduler-api/pom.xml
    #	dolphinscheduler-common/pom.xml
    #	dolphinscheduler-dao/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
    #	dolphinscheduler-dist/pom.xml
    #	dolphinscheduler-rpc/pom.xml
    #	dolphinscheduler-server/pom.xml
    #	dolphinscheduler-ui/pom.xml
    #	pom.xml
    add license in script and sql
    
    * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
    
    # Conflicts:
    #	dolphinscheduler-alert/pom.xml
    #	dolphinscheduler-api/pom.xml
    #	dolphinscheduler-common/pom.xml
    #	dolphinscheduler-dao/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
    #	dolphinscheduler-dist/pom.xml
    #	dolphinscheduler-rpc/pom.xml
    #	dolphinscheduler-server/pom.xml
    #	dolphinscheduler-ui/pom.xml
    #	pom.xml
    add license in ci
    
    * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
    
    # Conflicts:
    #	dolphinscheduler-alert/pom.xml
    #	dolphinscheduler-api/pom.xml
    #	dolphinscheduler-common/pom.xml
    #	dolphinscheduler-dao/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
    #	dolphinscheduler-dist/pom.xml
    #	dolphinscheduler-rpc/pom.xml
    #	dolphinscheduler-server/pom.xml
    #	dolphinscheduler-ui/pom.xml
    #	pom.xml
    change version to 1.2.0-SNAPSHOT
    
    * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
    
    # Conflicts:
    #	dolphinscheduler-alert/pom.xml
    #	dolphinscheduler-api/pom.xml
    #	dolphinscheduler-common/pom.xml
    #	dolphinscheduler-dao/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
    #	dolphinscheduler-dist/pom.xml
    #	dolphinscheduler-rpc/pom.xml
    #	dolphinscheduler-server/pom.xml
    #	dolphinscheduler-ui/pom.xml
    #	pom.xml
    set defalut db type postgresql
    
    * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
    
    # Conflicts:
    #	dolphinscheduler-alert/pom.xml
    #	dolphinscheduler-api/pom.xml
    #	dolphinscheduler-common/pom.xml
    #	dolphinscheduler-dao/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
    #	dolphinscheduler-dist/pom.xml
    #	dolphinscheduler-rpc/pom.xml
    #	dolphinscheduler-server/pom.xml
    #	dolphinscheduler-ui/pom.xml
    #	pom.xml
    set defalut db type postgresql
    
    * change org.quartz.jobStore.driverDelegateClass
    
    * Add comments in method params
    
    * update readme from branch dev
    
    * update content in how to contribute
    
    * change postgresql default port
    
    * change version 1.2.0-SNAPSHOT
    
    * remove antrun plugin
    
    * fix bug: remove 'between' in sql search. (#1293)
    
    * [maven-release-plugin] prepare release 1.2.1-release
    
    * [maven-release-plugin] prepare for next development iteration
    
    * update
    
    * [maven-release-plugin] prepare release 1.2.0-release
    
    * [maven-release-plugin] prepare for next development iteration
    
    * [maven-release-plugin] prepare release 1.2.1-release
    
    * [maven-release-plugin] prepare for next development iteration
    
    * revert
    
    * [maven-release-plugin] prepare release 1.2.0-release
    
    * [maven-release-plugin] prepare for next development iteration
    
    * add sql files for postgre/mysql
    
    * add sql files
    
    * fix bug: postgre cannot support between.
    
    * fix bug: remove 'between' in sql search.
    
    * add release note
    
    * add release note
    
    * [maven-release-plugin] prepare release 1.2.0
    
    * [maven-release-plugin] prepare for next development iteration
    
    * fix bug: list resource user a error interface. (#1294)
    
    * [maven-release-plugin] prepare release 1.2.1-release
    
    * [maven-release-plugin] prepare for next development iteration
    
    * update
    
    * [maven-release-plugin] prepare release 1.2.0-release
    
    * [maven-release-plugin] prepare for next development iteration
    
    * [maven-release-plugin] prepare release 1.2.1-release
    
    * [maven-release-plugin] prepare for next development iteration
    
    * revert
    
    * [maven-release-plugin] prepare release 1.2.0-release
    
    * [maven-release-plugin] prepare for next development iteration
    
    * add sql files for postgre/mysql
    
    * add sql files
    
    * fix bug: postgre cannot support between.
    
    * fix bug: remove 'between' in sql search.
    
    * add release note
    
    * add release note
    
    * fix bug: list resource user a error interface.
    
    * Fix spelling mistakes
    
    * revert version to 1.2.0 (#1295)
    
    * [maven-release-plugin] prepare release 1.2.1-release
    
    * [maven-release-plugin] prepare for next development iteration
    
    * update
    
    * [maven-release-plugin] prepare release 1.2.0-release
    
    * [maven-release-plugin] prepare for next development iteration
    
    * [maven-release-plugin] prepare release 1.2.1-release
    
    * [maven-release-plugin] prepare for next development iteration
    
    * revert
    
    * [maven-release-plugin] prepare release 1.2.0-release
    
    * [maven-release-plugin] prepare for next development iteration
    
    * add sql files for postgre/mysql
    
    * add sql files
    
    * fix bug: postgre cannot support between.
    
    * fix bug: remove 'between' in sql search.
    
    * add release note
    
    * add release note
    
    * fix bug: list resource user a error interface.
    
    * Fix spelling mistakes
    
    * revert version to 1.2.0
    
    * [maven-release-plugin] prepare release 1.2.0
    
    * [maven-release-plugin] prepare for next development iteration
    
    * Parse the applicationId bug fix in the task log,#1298 (#1299)
    
    * reset pgsql (#1178)
    
    + 1
    
    * Ans UI upgrade to version 0.1.0 (#1181)
    
    + 1
    
    * Administrators group prohibit deletion (#1182)
    
    * Ans UI upgrade to version 0.1.0
    
    * Administrators group prohibit deletion
    
    * fix master server shutdown error (#1177)
    
    * move updateTaskState into try/catch block in case of exception
    
    * fix NPE
    
    * using conf.getInt instead of getString
    
    * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
    for AlertDao, correct the spelling.
    
    * duplicate
    
    * refactor getTaskWorkerGroupId
    
    * add friendly log
    
    * update hearbeat thread num = 1
    
    * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
    
    * 1. move verifyTaskInstanceIsNull after taskInstance
    2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
    
    * fix the message
    
    * delete before check to avoid KeeperException$NoNodeException
    
    * fix the message
    
    * check processInstance state before delete tenant
    
    * check processInstance state before delete worker group
    
    * refactor
    
    * merge api constants into common constatns
    
    * update the resource perm
    
    * update the dataSource perm
    
    * fix CheckUtils.checkUserParams method
    
    * update AlertGroupService, extends from BaseService, remove duplicate methods
    
    * refactor
    
    * modify method name
    
    * add hasProjectAndPerm method
    
    * using checkProject instead of getResultStatus
    
    * delete checkAuth method, using hasProjectAndPerm instead.
    
    * correct spelling
    
    * add transactional for deleteWorkerGroupById
    
    * add Transactional for deleteProcessInstanceById method
    
    * change sqlSessionTemplate singleton
    
    * change sqlSessionTemplate singleton and reformat code
    
    * fix unsuitable error message
    
    * update shutdownhook methods
    
    * fix worker log bug
    
    * fix api server debug mode bug
    
    * upgrade zk version
    
    * delete this line ,for zkClient.close() will do the whole thing
    
    * fix master server shutdown error
    
    * degrade zk version and add FourLetterWordMain class (#1183)
    
    * move updateTaskState into try/catch block in case of exception
    
    * fix NPE
    
    * using conf.getInt instead of getString
    
    * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
    for AlertDao, correct the spelling.
    
    * duplicate
    
    * refactor getTaskWorkerGroupId
    
    * add friendly log
    
    * update hearbeat thread num = 1
    
    * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
    
    * 1. move verifyTaskInstanceIsNull after taskInstance
    2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
    
    * fix the message
    
    * delete before check to avoid KeeperException$NoNodeException
    
    * fix the message
    
    * check processInstance state before delete tenant
    
    * check processInstance state before delete worker group
    
    * refactor
    
    * merge api constants into common constatns
    
    * update the resource perm
    
    * update the dataSource perm
    
    * fix CheckUtils.checkUserParams method
    
    * update AlertGroupService, extends from BaseService, remove duplicate methods
    
    * refactor
    
    * modify method name
    
    * add hasProjectAndPerm method
    
    * using checkProject instead of getResultStatus
    
    * delete checkAuth method, using hasProjectAndPerm instead.
    
    * correct spelling
    
    * add transactional for deleteWorkerGroupById
    
    * add Transactional for deleteProcessInstanceById method
    
    * change sqlSessionTemplate singleton
    
    * change sqlSessionTemplate singleton and reformat code
    
    * fix unsuitable error message
    
    * update shutdownhook methods
    
    * fix worker log bug
    
    * fix api server debug mode bug
    
    * upgrade zk version
    
    * delete this line ,for zkClient.close() will do the whole thing
    
    * fix master server shutdown error
    
    * degrade zk version and add FourLetterWordMain class
    
    * fix ZKWorkerClient not close PathChildrenCache (#1185)
    
    * move updateTaskState into try/catch block in case of exception
    
    * fix NPE
    
    * using conf.getInt instead of getString
    
    * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
    for AlertDao, correct the spelling.
    
    * duplicate
    
    * refactor getTaskWorkerGroupId
    
    * add friendly log
    
    * update hearbeat thread num = 1
    
    * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
    
    * 1. move verifyTaskInstanceIsNull after taskInstance
    2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
    
    * fix the message
    
    * delete before check to avoid KeeperException$NoNodeException
    
    * fix the message
    
    * check processInstance state before delete tenant
    
    * check processInstance state before delete worker group
    
    * refactor
    
    * merge api constants into common constatns
    
    * update the resource perm
    
    * update the dataSource perm
    
    * fix CheckUtils.checkUserParams method
    
    * update AlertGroupService, extends from BaseService, remove duplicate methods
    
    * refactor
    
    * modify method name
    
    * add hasProjectAndPerm method
    
    * using checkProject instead of getResultStatus
    
    * delete checkAuth method, using hasProjectAndPerm instead.
    
    * correct spelling
    
    * add transactional for deleteWorkerGroupById
    
    * add Transactional for deleteProcessInstanceById method
    
    * change sqlSessionTemplate singleton
    
    * change sqlSessionTemplate singleton and reformat code
    
    * fix unsuitable error message
    
    * update shutdownhook methods
    
    * fix worker log bug
    
    * fix api server debug mode bug
    
    * upgrade zk version
    
    * delete this line ,for zkClient.close() will do the whole thing
    
    * fix master server shutdown error
    
    * degrade zk version and add FourLetterWordMain class
    
    * fix PathChildrenCache not close
    
    * add Transactional for createSession method (#1186)
    
    * move updateTaskState into try/catch block in case of exception
    
    * fix NPE
    
    * using conf.getInt instead of getString
    
    * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
    for AlertDao, correct the spelling.
    
    * duplicate
    
    * refactor getTaskWorkerGroupId
    
    * add friendly log
    
    * update hearbeat thread num = 1
    
    * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
    
    * 1. move verifyTaskInstanceIsNull after taskInstance
    2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
    
    * fix the message
    
    * delete before check to avoid KeeperException$NoNodeException
    
    * fix the message
    
    * check processInstance state before delete tenant
    
    * check processInstance state before delete worker group
    
    * refactor
    
    * merge api constants into common constatns
    
    * update the resource perm
    
    * update the dataSource perm
    
    * fix CheckUtils.checkUserParams method
    
    * update AlertGroupService, extends from BaseService, remove duplicate methods
    
    * refactor
    
    * modify method name
    
    * add hasProjectAndPerm method
    
    * using checkProject instead of getResultStatus
    
    * delete checkAuth method, using hasProjectAndPerm instead.
    
    * correct spelling
    
    * add transactional for deleteWorkerGroupById
    
    * add Transactional for deleteProcessInstanceById method
    
    * change sqlSessionTemplate singleton
    
    * change sqlSessionTemplate singleton and reformat code
    
    * fix unsuitable error message
    
    * update shutdownhook methods
    
    * fix worker log bug
    
    * fix api server debug mode bug
    
    * upgrade zk version
    
    * delete this line ,for zkClient.close() will do the whole thing
    
    * fix master server shutdown error
    
    * degrade zk version and add FourLetterWordMain class
    
    * fix PathChildrenCache not close
    
    * add Transactional for createSession method
    
    * dockerfile dao application.properties ,install.sh modify and application.properties modify (#1187)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify (#1189)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs (#1191)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs
    
    * nginx conf modify
    
    * dockerfile application.properties modify
    
    * dockerfile conf modify (#1192)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs
    
    * nginx conf modify
    
    * dockerfile application.properties modify
    
    * dockerfile conf modify (#1193)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs
    
    * nginx conf modify
    
    * dockerfile application.properties modify
    
    * dockerfile email address change (#1194)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs
    
    * nginx conf modify
    
    * dockerfile application.properties modify
    
    * dockerfile email address change
    
    * the alert module is modified in english (#1195)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs
    
    * nginx conf modify
    
    * dockerfile application.properties modify
    
    * dockerfile email address change
    
    * the alert module is modified in English.
    
    * alert server comment and chinese modify
    
    * api server useless code and chinese modify (#1198)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs
    
    * nginx conf modify
    
    * dockerfile application.properties modify
    
    * dockerfile email address change
    
    * the alert module is modified in English.
    
    * alert server comment and chinese modify
    
    * api server useless code and chinese modify
    
    * common,dao,server useless code and chinese modify (#1199)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs
    
    * nginx conf modify
    
    * dockerfile application.properties modify
    
    * dockerfile email address change
    
    * the alert module is modified in English.
    
    * alert server comment and chinese modify
    
    * api server useless code and chinese modify
    
    * common,dao,server useless code and chinese modify
    
    * change chinese sql to english. (#1200)
    
    * update english documents
    
    * refactor zk client
    
    * update documents
    
    * update zkclient
    
    * update zkclient
    
    * update documents
    
    * add architecture-design
    
    * change i18n
    
    * update i18n
    
    * update english documents
    
    * add architecture-design
    
    * update english documents
    
    * update en-US documents
    
    * add architecture-design
    
    * update demo site
    
    * add mybatis plus model
    
    * modify mybatisplus
    
    * modify mybatisplus
    
    * change interface by mybatisplus
    
    * add unit test
    
    * refactor dao interface.
    
    * add unit test for dao...
    
    * add unit test for dao...
    
    * add unit test for dao...
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
    
    * update some dao bugs
    
    * update for some bugs
    
    * update some bugs
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
    
    * update
    
    * update
    
    * add multiply settings for application.yml
    
    * add multiply settings for application.yml
    
    * revert
    
    * update configuration settings in task record dao...
    
    * change application_master to application-master
    
    * change application_master to application-master
    
    * update application.yml to application.properties
    
    * revert
    
    * revert
    
    * add properties
    
    * add properties
    
    * revert
    
    * revert
    
    * add api start up..
    add alert send try catch
    
    * update dao info level
    
    * fix bug: task cannot submit when recovery failover
    
    * fix bug: task cannot submit when recovery failover
    
    * merge from dev-db
    
    * revert
    
    * revert
    
    * fix bug: get process definition list failed.
    
    * fix bug: process instance interval is error
    
    * revert
    
    * revert
    
    * update
    
    * support stop submit success tasks
    
    * update kill process
    
    * update for stop process
    
    * update for stop process
    
    * add some logs for stop process
    
    * update for small bug.
    
    * add check strategy before submit task
    
    * revert
    
    * update
    
    * update
    
    * revert
    
    * wait task instance exists if null.
    
    * revert
    
    * update
    
    * change desc to description.
    
    * add check user and definitions function when delete tenant
    
    * update
    
    * change desc to description.
    
    * change desc to description.
    
    * change desc to description.
    
    * remove check resources when delete tenant
    
    * change desc to description.
    
    * change mybatisplus version to 3.2.0
    
    * update
    
    * change the notice to apache.
    
    * update
    
    * update postgre sql
    
    * fix bug: phone can be empty.
    
    * fix bug: postgre test error.
    
    * update create table for postgre quartz
    
    * fix some bugs about postgre.
    
    * update create table for postgre quartz
    
    * add postgre db performance monitor
    
    * add postgre performance monitor
    
    * update performance monitor
    
    * revert
    
    * revert
    
    * fix bug: tasks queue length error
    
    * remove datasource.properties
    
    * change chinese sql to english.
    
    * change chinese sql to english.
    
    * change chinese to english (#1202)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs
    
    * nginx conf modify
    
    * dockerfile application.properties modify
    
    * dockerfile email address change
    
    * the alert module is modified in English.
    
    * alert server comment and chinese modify
    
    * api server useless code and chinese modify
    
    * common,dao,server useless code and chinese modify
    
    * change chinese to english
    
    * remove unused code (#1204)
    
    * update english documents
    
    * refactor zk client
    
    * update documents
    
    * update zkclient
    
    * update zkclient
    
    * update documents
    
    * add architecture-design
    
    * change i18n
    
    * update i18n
    
    * update english documents
    
    * add architecture-design
    
    * update english documents
    
    * update en-US documents
    
    * add architecture-design
    
    * update demo site
    
    * add mybatis plus model
    
    * modify mybatisplus
    
    * modify mybatisplus
    
    * change interface by mybatisplus
    
    * add unit test
    
    * refactor dao interface.
    
    * add unit test for dao...
    
    * add unit test for dao...
    
    * add unit test for dao...
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
    
    * update some dao bugs
    
    * update for some bugs
    
    * update some bugs
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
    
    * update
    
    * update
    
    * add multiply settings for application.yml
    
    * add multiply settings for application.yml
    
    * revert
    
    * update configuration settings in task record dao...
    
    * change application_master to application-master
    
    * change application_master to application-master
    
    * update application.yml to application.properties
    
    * revert
    
    * revert
    
    * add properties
    
    * add properties
    
    * revert
    
    * revert
    
    * add api start up..
    add alert send try catch
    
    * update dao info level
    
    * fix bug: task cannot submit when recovery failover
    
    * fix bug: task cannot submit when recovery failover
    
    * merge from dev-db
    
    * revert
    
    * revert
    
    * fix bug: get process definition list failed.
    
    * fix bug: process instance interval is error
    
    * revert
    
    * revert
    
    * update
    
    * support stop submit success tasks
    
    * update kill process
    
    * update for stop process
    
    * update for stop process
    
    * add some logs for stop process
    
    * update for small bug.
    
    * add check strategy before submit task
    
    * revert
    
    * update
    
    * update
    
    * revert
    
    * wait task instance exists if null.
    
    * revert
    
    * update
    
    * change desc to description.
    
    * add check user and definitions function when delete tenant
    
    * update
    
    * change desc to description.
    
    * change desc to description.
    
    * change desc to description.
    
    * remove check resources when delete tenant
    
    * change desc to description.
    
    * change mybatisplus version to 3.2.0
    
    * update
    
    * change the notice to apache.
    
    * update
    
    * update postgre sql
    
    * fix bug: phone can be empty.
    
    * fix bug: postgre test error.
    
    * update create table for postgre quartz
    
    * fix some bugs about postgre.
    
    * update create table for postgre quartz
    
    * add postgre db performance monitor
    
    * add postgre performance monitor
    
    * update performance monitor
    
    * revert
    
    * revert
    
    * fix bug: tasks queue length error
    
    * remove datasource.properties
    
    * change chinese sql to english.
    
    * change chinese sql to english.
    
    * remove unused code.
    
    * remove unused code.
    
    * Modify webpack configuration (#1206)
    
    * add more message for java-doc (#1209)
    
    * move updateTaskState into try/catch block in case of exception
    
    * fix NPE
    
    * using conf.getInt instead of getString
    
    * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
    for AlertDao, correct the spelling.
    
    * duplicate
    
    * refactor getTaskWorkerGroupId
    
    * add friendly log
    
    * update hearbeat thread num = 1
    
    * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
    
    * 1. move verifyTaskInstanceIsNull after taskInstance
    2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
    
    * fix the message
    
    * delete before check to avoid KeeperException$NoNodeException
    
    * fix the message
    
    * check processInstance state before delete tenant
    
    * check processInstance state before delete worker group
    
    * refactor
    
    * merge api constants into common constatns
    
    * update the resource perm
    
    * update the dataSource perm
    
    * fix CheckUtils.checkUserParams method
    
    * update AlertGroupService, extends from BaseService, remove duplicate methods
    
    * refactor
    
    * modify method name
    
    * add hasProjectAndPerm method
    
    * using checkProject instead of getResultStatus
    
    * delete checkAuth method, using hasProjectAndPerm instead.
    
    * correct spelling
    
    * add transactional for deleteWorkerGroupById
    
    * add Transactional for deleteProcessInstanceById method
    
    * change sqlSessionTemplate singleton
    
    * change sqlSessionTemplate singleton and reformat code
    
    * fix unsuitable error message
    
    * update shutdownhook methods
    
    * fix worker log bug
    
    * fix api server debug mode bug
    
    * upgrade zk version
    
    * delete this line ,for zkClient.close() will do the whole thing
    
    * fix master server shutdown error
    
    * degrade zk version and add FourLetterWordMain class
    
    * fix PathChildrenCache not close
    
    * add Transactional for createSession method
    
    * add more message for java-doc
    
    * add java doc for common module (#1213)
    
    * dao method comments and useless code modify (#1214)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs
    
    * nginx conf modify
    
    * dockerfile application.properties modify
    
    * dockerfile email address change
    
    * the alert module is modified in English.
    
    * alert server comment and chinese modify
    
    * api server useless code and chinese modify
    
    * common,dao,server useless code and chinese modify
    
    * change chinese to english
    
    * dao method comments and useless code modify
    
    * Change all Chinese names to English (#1207)
    
    * Modify webpack configuration
    
    * Change all Chinese names to English
    
    * add progress-bar-webpack-plugin (#1215)
    
    * Modify webpack configuration
    
    * Change all Chinese names to English
    
    * add progress-bar-webpack-plugin
    
    * Add method and parameters comments (#1220)
    
    * rename from DatasourceUserMapper to DataSourceUserMapper
    
    * add unit test in UserMapper and WorkerGroupMapper
    
    * change cn.escheduler to org.apache.dolphinscheduler
    
    * add unit test in UdfFuncMapperTest
    
    * add unit test in UdfFuncMapperTest
    
    * remove DatabaseConfiguration
    
    * add ConnectionFactoryTest
    
    * cal duration in processInstancesList
    
    * change desc to description
    
    * change table name in mysql ddl
    
    * change table name in mysql ddl
    
    * change escheduler to dolphinscheduler
    
    * change escheduler to dolphinscheduler
    
    * change escheduler to dolphinscheduler
    
    * remove log4j-1.2-api and modify AlertMapperTest
    
    * remove log4j-1.2-api
    
    * Add alertDao to spring management
    
    * Add alertDao to spring management
    
    * get SqlSessionFactory from MybatisSqlSessionFactoryBean
    
    * get processDao by DaoFactory
    
    * read druid properties in ConneciontFactory
    
    * read druid properties in ConneciontFactory
    
    * change get alertDao by spring to DaoFactory
    
    * add log4j to resolve #967
    
    * resole verify udf name error and delete udf error
    
    * Determine if principal is empty
    
    * Determine whether the logon user has the right to delete the project
    
    * Fixed an issue that produced attatch file named such as ATT00002.bin
    
    * fix too many connection in upgrade or create
    
    * fix NEED_FAULT_TOLERANCE and WAITTING_THREAD count fail
    
    * Added a judgment on whether the currently login user is an administrator
    
    * fix update udf database not change and create time is changed
    
    * add enterprise.wechat.enable to decide whether to send enterprise WeChat
    
    * change method check
    
    * Remove the administrator's judgment on query access token list
    
    * only admin can create worker group
    
    * delete alert group need delete the relation of user and alert group
    
    * add timeout in proxy when upload large resource
    
    * add gets scheduled times by expect fire times
    
    * add gets scheduled times by expect fire times
    
    * Increase the judgment of whether it is admin
    
    * Increase the judgment of whether it is admin
    
    * when delete access token add whether login user has perm to delete
    
    * change mysql-connector-java scope to test
    
    * update scm test
    
    * add profile test
    
    * Add method and parameters comments
    
    * roll back
    
    * add some notes (#1221)
    
    * update english documents
    
    * refactor zk client
    
    * update documents
    
    * update zkclient
    
    * update zkclient
    
    * update documents
    
    * add architecture-design
    
    * change i18n
    
    * update i18n
    
    * update english documents
    
    * add architecture-design
    
    * update english documents
    
    * update en-US documents
    
    * add architecture-design
    
    * update demo site
    
    * add mybatis plus model
    
    * modify mybatisplus
    
    * modify mybatisplus
    
    * change interface by mybatisplus
    
    * add unit test
    
    * refactor dao interface.
    
    * add unit test for dao...
    
    * add unit test for dao...
    
    * add unit test for dao...
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
    
    * update some dao bugs
    
    * update for some bugs
    
    * update some bugs
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
    
    * update
    
    * update
    
    * add multiply settings for application.yml
    
    * add multiply settings for application.yml
    
    * revert
    
    * update configuration settings in task record dao...
    
    * change application_master to application-master
    
    * change application_master to application-master
    
    * update application.yml to application.properties
    
    * revert
    
    * revert
    
    * add properties
    
    * add properties
    
    * revert
    
    * revert
    
    * add api start up..
    add alert send try catch
    
    * update dao info level
    
    * fix bug: task cannot submit when recovery failover
    
    * fix bug: task cannot submit when recovery failover
    
    * merge from dev-db
    
    * revert
    
    * revert
    
    * fix bug: get process definition list failed.
    
    * fix bug: process instance interval is error
    
    * revert
    
    * revert
    
    * update
    
    * support stop submit success tasks
    
    * update kill process
    
    * update for stop process
    
    * update for stop process
    
    * add some logs for stop process
    
    * update for small bug.
    
    * add check strategy before submit task
    
    * revert
    
    * update
    
    * update
    
    * revert
    
    * wait task instance exists if null.
    
    * revert
    
    * update
    
    * change desc to description.
    
    * add check user and definitions function when delete tenant
    
    * update
    
    * change desc to description.
    
    * change desc to description.
    
    * change desc to description.
    
    * remove check resources when delete tenant
    
    * change desc to description.
    
    * change mybatisplus version to 3.2.0
    
    * update
    
    * change the notice to apache.
    
    * update
    
    * update postgre sql
    
    * fix bug: phone can be empty.
    
    * fix bug: postgre test error.
    
    * update create table for postgre quartz
    
    * fix some bugs about postgre.
    
    * update create table for postgre quartz
    
    * add postgre db performance monitor
    
    * add postgre performance monitor
    
    * update performance monitor
    
    * revert
    
    * revert
    
    * fix bug: tasks queue length error
    
    * remove datasource.properties
    
    * change chinese sql to english.
    
    * change chinese sql to english.
    
    * remove unused code.
    
    * remove unused code.
    
    * add some notes
    
    * update some notes
    
    * update some notes
    
    * update mbatisplus version
    
    * update lombok version
    
    * update lombok version
    
    * revert
    
    * master startup error bug fix (#1229)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs
    
    * nginx conf modify
    
    * dockerfile application.properties modify
    
    * dockerfile email address change
    
    * the alert module is modified in English.
    
    * alert server comment and chinese modify
    
    * api server useless code and chinese modify
    
    * common,dao,server useless code and chinese modify
    
    * change chinese to english
    
    * dao method comments and useless code modify
    
    * master startup error bug fix
    
    * delete class App, let spring manage connectionFactory (#1233)
    
    * move updateTaskState into try/catch block in case of exception
    
    * fix NPE
    
    * using conf.getInt instead of getString
    
    * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
    for AlertDao, correct the spelling.
    
    * duplicate
    
    * refactor getTaskWorkerGroupId
    
    * add friendly log
    
    * update hearbeat thread num = 1
    
    * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
    
    * 1. move verifyTaskInstanceIsNull after taskInstance
    2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
    
    * fix the message
    
    * delete before check to avoid KeeperException$NoNodeException
    
    * fix the message
    
    * check processInstance state before delete tenant
    
    * check processInstance state before delete worker group
    
    * refactor
    
    * merge api constants into common constatns
    
    * update the resource perm
    
    * update the dataSource perm
    
    * fix CheckUtils.checkUserParams method
    
    * update AlertGroupService, extends from BaseService, remove duplicate methods
    
    * refactor
    
    * modify method name
    
    * add hasProjectAndPerm method
    
    * using checkProject instead of getResultStatus
    
    * delete checkAuth method, using hasProjectAndPerm instead.
    
    * correct spelling
    
    * add transactional for deleteWorkerGroupById
    
    * add Transactional for deleteProcessInstanceById method
    
    * change sqlSessionTemplate singleton
    
    * change sqlSessionTemplate singleton and reformat code
    
    * fix unsuitable error message
    
    * update shutdownhook methods
    
    * fix worker log bug
    
    * fix api server debug mode bug
    
    * upgrade zk version
    
    * delete this line ,for zkClient.close() will do the whole thing
    
    * fix master server shutdown error
    
    * degrade zk version and add FourLetterWordMain class
    
    * fix PathChildrenCache not close
    
    * add Transactional for createSession method
    
    * add more message for java-doc
    
    * delete App, let spring manage connectionFactory
    
    * add license
    
    * add class Application for test support
    
    * refactor masterServer and workerServer (#1244)
    
    * move updateTaskState into try/catch block in case of exception
    
    * fix NPE
    
    * using conf.getInt instead of getString
    
    * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
    for AlertDao, correct the spelling.
    
    * duplicate
    
    * refactor getTaskWorkerGroupId
    
    * add friendly log
    
    * update hearbeat thread num = 1
    
    * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
    
    * 1. move verifyTaskInstanceIsNull after taskInstance
    2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
    
    * fix the message
    
    * delete before check to avoid KeeperException$NoNodeException
    
    * fix the message
    
    * check processInstance state before delete tenant
    
    * check processInstance state before delete worker group
    
    * refactor
    
    * merge api constants into common constatns
    
    * update the resource perm
    
    * update the dataSource perm
    
    * fix CheckUtils.checkUserParams method
    
    * update AlertGroupService, extends from BaseService, remove duplicate methods
    
    * refactor
    
    * modify method name
    
    * add hasProjectAndPerm method
    
    * using checkProject instead of getResultStatus
    
    * delete checkAuth method, using hasProjectAndPerm instead.
    
    * correct spelling
    
    * add transactional for deleteWorkerGroupById
    
    * add Transactional for deleteProcessInstanceById method
    
    * change sqlSessionTemplate singleton
    
    * change sqlSessionTemplate singleton and reformat code
    
    * fix unsuitable error message
    
    * update shutdownhook methods
    
    * fix worker log bug
    
    * fix api server debug mode bug
    
    * upgrade zk version
    
    * delete this line ,for zkClient.close() will do the whole thing
    
    * fix master server shutdown error
    
    * degrade zk version and add FourLetterWordMain class
    
    * fix PathChildrenCache not close
    
    * add Transactional for createSession method
    
    * add more message for java-doc
    
    * delete App, let spring manage connectionFactory
    
    * add license
    
    * add class Application for test support
    
    * refactor masterServer and workerServer
    
    * add args
    
    * ConnectionFactory add paging intercepter
    
    * ConnectionFactory add paging intercepter (#1250)
    
    * remove spotbugs-annotations.jar LGPL protocol
    
    * remove spotbugs-annotations.jar LGPL protocol (#1251)
    
    * ConnectionFactory add paging intercepter
    
    * remove spotbugs-annotations.jar LGPL protocol
    
    * fix #1245, make scanCommand transactional (#1246)
    
    * fix the spring transaction not worker bug  (#1252)
    
    * move updateTaskState into try/catch block in case of exception
    
    * fix NPE
    
    * using conf.getInt instead of getString
    
    * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
    for AlertDao, correct the spelling.
    
    * duplicate
    
    * refactor getTaskWorkerGroupId
    
    * add friendly log
    
    * update hearbeat thread num = 1
    
    * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
    
    * 1. move verifyTaskInstanceIsNull after taskInstance
    2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
    
    * fix the message
    
    * delete before check to avoid KeeperException$NoNodeException
    
    * fix the message
    
    * check processInstance state before delete tenant
    
    * check processInstance state before delete worker group
    
    * refactor
    
    * merge api constants into common constatns
    
    * update the resource perm
    
    * update the dataSource perm
    
    * fix CheckUtils.checkUserParams method
    
    * update AlertGroupService, extends from BaseService, remove duplicate methods
    
    * refactor
    
    * modify method name
    
    * add hasProjectAndPerm method
    
    * using checkProject instead of getResultStatus
    
    * delete checkAuth method, using hasProjectAndPerm instead.
    
    * correct spelling
    
    * add transactional for deleteWorkerGroupById
    
    * add Transactional for deleteProcessInstanceById method
    
    * change sqlSessionTemplate singleton
    
    * change sqlSessionTemplate singleton and reformat code
    
    * fix unsuitable error message
    
    * update shutdownhook methods
    
    * fix worker log bug
    
    * fix api server debug mode bug
    
    * upgrade zk version
    
    * delete this line ,for zkClient.close() will do the whole thing
    
    * fix master server shutdown error
    
    * degrade zk version and add FourLetterWordMain class
    
    * fix PathChildrenCache not close
    
    * add Transactional for createSession method
    
    * add more message for java-doc
    
    * delete App, let spring manage connectionFactory
    
    * add license
    
    * add class Application for test support
    
    * refactor masterServer and workerServer
    
    * add args
    
    * fix the spring transaction not work bug
    
    * remove author
    
    * delete @Bean annotation
    
    * rename application.properties to application-dao.properties
    
    * delete class MybatisPlusConfig (#1254)
    
    * move updateTaskState into try/catch block in case of exception
    
    * fix NPE
    
    * using conf.getInt instead of getString
    
    * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
    for AlertDao, correct the spelling.
    
    * duplicate
    
    * refactor getTaskWorkerGroupId
    
    * add friendly log
    
    * update hearbeat thread num = 1
    
    * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
    
    * 1. move verifyTaskInstanceIsNull after taskInstance
    2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
    
    * fix the message
    
    * delete before check to avoid KeeperException$NoNodeException
    
    * fix the message
    
    * check processInstance state before delete tenant
    
    * check processInstance state before delete worker group
    
    * refactor
    
    * merge api constants into common constatns
    
    * update the resource perm
    
    * update the dataSource perm
    
    * fix CheckUtils.checkUserParams method
    
    * update AlertGroupService, extends from BaseService, remove duplicate methods
    
    * refactor
    
    * modify method name
    
    * add hasProjectAndPerm method
    
    * using checkProject instead of getResultStatus
    
    * delete checkAuth method, using hasProjectAndPerm instead.
    
    * correct spelling
    
    * add transactional for deleteWorkerGroupById
    
    * add Transactional for deleteProcessInstanceById method
    
    * change sqlSessionTemplate singleton
    
    * change sqlSessionTemplate singleton and reformat code
    
    * fix unsuitable error message
    
    * update shutdownhook methods
    
    * fix worker log bug
    
    * fix api server d…
    
    * add how to build (#1301)
    
    * rename from DatasourceUserMapper to DataSourceUserMapper
    
    * add unit test in UserMapper and WorkerGroupMapper
    
    * change cn.escheduler to org.apache.dolphinscheduler
    
    * add unit test in UdfFuncMapperTest
    
    * add unit test in UdfFuncMapperTest
    
    * remove DatabaseConfiguration
    
    * add ConnectionFactoryTest
    
    * cal duration in processInstancesList
    
    * change desc to description
    
    * change table name in mysql ddl
    
    * change table name in mysql ddl
    
    * change escheduler to dolphinscheduler
    
    * change escheduler to dolphinscheduler
    
    * change escheduler to dolphinscheduler
    
    * remove log4j-1.2-api and modify AlertMapperTest
    
    * remove log4j-1.2-api
    
    * Add alertDao to spring management
    
    * Add alertDao to spring management
    
    * get SqlSessionFactory from MybatisSqlSessionFactoryBean
    
    * get processDao by DaoFactory
    
    * read druid properties in ConneciontFactory
    
    * read druid properties in ConneciontFactory
    
    * change get alertDao by spring to DaoFactory
    
    * add log4j to resolve #967
    
    * resole verify udf name error and delete udf error
    
    * Determine if principal is empty
    
    * Determine whether the logon user has the right to delete the project
    
    * Fixed an issue that produced attatch file named such as ATT00002.bin
    
    * fix too many connection in upgrade or create
    
    * fix NEED_FAULT_TOLERANCE and WAITTING_THREAD count fail
    
    * Added a judgment on whether the currently login user is an administrator
    
    * fix update udf database not change and create time is changed
    
    * add enterprise.wechat.enable to decide whether to send enterprise WeChat
    
    * change method check
    
    * Remove the administrator's judgment on query access token list
    
    * only admin can create worker group
    
    * delete alert group need delete the relation of user and alert group
    
    * add timeout in proxy when upload large resource
    
    * add gets scheduled times by expect fire times
    
    * add gets scheduled times by expect fire times
    
    * Increase the judgment of whether it is admin
    
    * Increase the judgment of whether it is admin
    
    * when delete access token add whether login user has perm to delete
    
    * change mysql-connector-java scope to test
    
    * update scm test
    
    * add profile test
    
    * add profile test
    
    * add maven.deploy.skip true
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * add dependency
    
    * add javadoc
    
    * add antrun
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * reset pgsql (#1178)
    
    + 1
    
    * add javadoc
    
    * add javadoc
    
    * [maven-release-plugin] rollback the release of 1.2.0
    
    * add javadoc
    
    * Ans UI upgrade to version 0.1.0 (#1181)
    
    + 1
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * Administrators group prohibit deletion (#1182)
    
    * Ans UI upgrade to version 0.1.0
    
    * Administrators group prohibit deletion
    
    * add javadoc
    
    * add ui pom
    
    * fix master server shutdown error (#1177)
    
    * move updateTaskState into try/catch block in case of exception
    
    * fix NPE
    
    * using conf.getInt instead of getString
    
    * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
    for AlertDao, correct the spelling.
    
    * duplicate
    
    * refactor getTaskWorkerGroupId
    
    * add friendly log
    
    * update hearbeat thread num = 1
    
    * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
    
    * 1. move verifyTaskInstanceIsNull after taskInstance
    2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
    
    * fix the message
    
    * delete before check to avoid KeeperException$NoNodeException
    
    * fix the message
    
    * check processInstance state before delete tenant
    
    * check processInstance state before delete worker group
    
    * refactor
    
    * merge api constants into common constatns
    
    * update the resource perm
    
    * update the dataSource perm
    
    * fix CheckUtils.checkUserParams method
    
    * update AlertGroupService, extends from BaseService, remove duplicate methods
    
    * refactor
    
    * modify method name
    
    * add hasProjectAndPerm method
    
    * using checkProject instead of getResultStatus
    
    * delete checkAuth method, using hasProjectAndPerm instead.
    
    * correct spelling
    
    * add transactional for deleteWorkerGroupById
    
    * add Transactional for deleteProcessInstanceById method
    
    * change sqlSessionTemplate singleton
    
    * change sqlSessionTemplate singleton and reformat code
    
    * fix unsuitable error message
    
    * update shutdownhook methods
    
    * fix worker log bug
    
    * fix api server debug mode bug
    
    * upgrade zk version
    
    * delete this line ,for zkClient.close() will do the whole thing
    
    * fix master server shutdown error
    
    * degrade zk version and add FourLetterWordMain class (#1183)
    
    * move updateTaskState into try/catch block in case of exception
    
    * fix NPE
    
    * using conf.getInt instead of getString
    
    * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
    for AlertDao, correct the spelling.
    
    * duplicate
    
    * refactor getTaskWorkerGroupId
    
    * add friendly log
    
    * update hearbeat thread num = 1
    
    * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
    
    * 1. move verifyTaskInstanceIsNull after taskInstance
    2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
    
    * fix the message
    
    * delete before check to avoid KeeperException$NoNodeException
    
    * fix the message
    
    * check processInstance state before delete tenant
    
    * check processInstance state before delete worker group
    
    * refactor
    
    * merge api constants into common constatns
    
    * update the resource perm
    
    * update the dataSource perm
    
    * fix CheckUtils.checkUserParams method
    
    * update AlertGroupService, extends from BaseService, remove duplicate methods
    
    * refactor
    
    * modify method name
    
    * add hasProjectAndPerm method
    
    * using checkProject instead of getResultStatus
    
    * delete checkAuth method, using hasProjectAndPerm instead.
    
    * correct spelling
    
    * add transactional for deleteWorkerGroupById
    
    * add Transactional for deleteProcessInstanceById method
    
    * change sqlSessionTemplate singleton
    
    * change sqlSessionTemplate singleton and reformat code
    
    * fix unsuitable error message
    
    * update shutdownhook methods
    
    * fix worker log bug
    
    * fix api server debug mode bug
    
    * upgrade zk version
    
    * delete this line ,for zkClient.close() will do the whole thing
    
    * fix master server shutdown error
    
    * degrade zk version and add FourLetterWordMain class
    
    * add ui pom
    
    * add src pom and assembly
    
    * fix ZKWorkerClient not close PathChildrenCache (#1185)
    
    * move updateTaskState into try/catch block in case of exception
    
    * fix NPE
    
    * using conf.getInt instead of getString
    
    * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
    for AlertDao, correct the spelling.
    
    * duplicate
    
    * refactor getTaskWorkerGroupId
    
    * add friendly log
    
    * update hearbeat thread num = 1
    
    * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
    
    * 1. move verifyTaskInstanceIsNull after taskInstance
    2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
    
    * fix the message
    
    * delete before check to avoid KeeperException$NoNodeException
    
    * fix the message
    
    * check processInstance state before delete tenant
    
    * check processInstance state before delete worker group
    
    * refactor
    
    * merge api constants into common constatns
    
    * update the resource perm
    
    * update the dataSource perm
    
    * fix CheckUtils.checkUserParams method
    
    * update AlertGroupService, extends from BaseService, remove duplicate methods
    
    * refactor
    
    * modify method name
    
    * add hasProjectAndPerm method
    
    * using checkProject instead of getResultStatus
    
    * delete checkAuth method, using hasProjectAndPerm instead.
    
    * correct spelling
    
    * add transactional for deleteWorkerGroupById
    
    * add Transactional for deleteProcessInstanceById method
    
    * change sqlSessionTemplate singleton
    
    * change sqlSessionTemplate singleton and reformat code
    
    * fix unsuitable error message
    
    * update shutdownhook methods
    
    * fix worker log bug
    
    * fix api server debug mode bug
    
    * upgrade zk version
    
    * delete this line ,for zkClient.close() will do the whole thing
    
    * fix master server shutdown error
    
    * degrade zk version and add FourLetterWordMain class
    
    * fix PathChildrenCache not close
    
    * add Transactional for createSession method (#1186)
    
    * move updateTaskState into try/catch block in case of exception
    
    * fix NPE
    
    * using conf.getInt instead of getString
    
    * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
    for AlertDao, correct the spelling.
    
    * duplicate
    
    * refactor getTaskWorkerGroupId
    
    * add friendly log
    
    * update hearbeat thread num = 1
    
    * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
    
    * 1. move verifyTaskInstanceIsNull after taskInstance
    2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
    
    * fix the message
    
    * delete before check to avoid KeeperException$NoNodeException
    
    * fix the message
    
    * check processInstance state before delete tenant
    
    * check processInstance state before delete worker group
    
    * refactor
    
    * merge api constants into common constatns
    
    * update the resource perm
    
    * update the dataSource perm
    
    * fix CheckUtils.checkUserParams method
    
    * update AlertGroupService, extends from BaseService, remove duplicate methods
    
    * refactor
    
    * modify method name
    
    * add hasProjectAndPerm method
    
    * using checkProject instead of getResultStatus
    
    * delete checkAuth method, using hasProjectAndPerm instead.
    
    * correct spelling
    
    * add transactional for deleteWorkerGroupById
    
    * add Transactional for deleteProcessInstanceById method
    
    * change sqlSessionTemplate singleton
    
    * change sqlSessionTemplate singleton and reformat code
    
    * fix unsuitable error message
    
    * update shutdownhook methods
    
    * fix worker log bug
    
    * fix api server debug mode bug
    
    * upgrade zk version
    
    * delete this line ,for zkClient.close() will do the whole thing
    
    * fix master server shutdown error
    
    * degrade zk version and add FourLetterWordMain class
    
    * fix PathChildrenCache not close
    
    * add Transactional for createSession method
    
    * add src pom and assembly
    
    * add src pom and assembly
    
    * add src pom and assembly
    
    * add src pom and assembly
    
    * dockerfile dao application.properties ,install.sh modify and application.properties modify (#1187)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * add src pom and assembly
    
    * add src pom and assembly
    
    * dockerfile startup.sh modify (#1189)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs (#1191)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs
    
    * nginx conf modify
    
    * dockerfile application.properties modify
    
    * dockerfile conf modify (#1192)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs
    
    * nginx conf modify
    
    * dockerfile application.properties modify
    
    * dockerfile conf modify (#1193)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs
    
    * nginx conf modify
    
    * dockerfile application.properties modify
    
    * dockerfile email address change (#1194)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs
    
    * nginx conf modify
    
    * dockerfile application.properties modify
    
    * dockerfile email address change
    
    * the alert module is modified in english (#1195)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs
    
    * nginx conf modify
    
    * dockerfile application.properties modify
    
    * dockerfile email address change
    
    * the alert module is modified in English.
    
    * alert server comment and chinese modify
    
    * api server useless code and chinese modify (#1198)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs
    
    * nginx conf modify
    
    * dockerfile application.properties modify
    
    * dockerfile email address change
    
    * the alert module is modified in English.
    
    * alert server comment and chinese modify
    
    * api server useless code and chinese modify
    
    * common,dao,server useless code and chinese modify (#1199)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs
    
    * nginx conf modify
    
    * dockerfile application.properties modify
    
    * dockerfile email address change
    
    * the alert module is modified in English.
    
    * alert server comment and chinese modify
    
    * api server useless code and chinese modify
    
    * common,dao,server useless code and chinese modify
    
    * change chinese sql to english. (#1200)
    
    * update english documents
    
    * refactor zk client
    
    * update documents
    
    * update zkclient
    
    * update zkclient
    
    * update documents
    
    * add architecture-design
    
    * change i18n
    
    * update i18n
    
    * update english documents
    
    * add architecture-design
    
    * update english documents
    
    * update en-US documents
    
    * add architecture-design
    
    * update demo site
    
    * add mybatis plus model
    
    * modify mybatisplus
    
    * modify mybatisplus
    
    * change interface by mybatisplus
    
    * add unit test
    
    * refactor dao interface.
    
    * add unit test for dao...
    
    * add unit test for dao...
    
    * add unit test for dao...
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
    
    * update some dao bugs
    
    * update for some bugs
    
    * update some bugs
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
    
    * update
    
    * update
    
    * add multiply settings for application.yml
    
    * add multiply settings for application.yml
    
    * revert
    
    * update configuration settings in task record dao...
    
    * change application_master to application-master
    
    * change application_master to application-master
    
    * update application.yml to application.properties
    
    * revert
    
    * revert
    
    * add properties
    
    * add properties
    
    * revert
    
    * revert
    
    * add api start up..
    add alert send try catch
    
    * update dao info level
    
    * fix bug: task cannot submit when recovery failover
    
    * fix bug: task cannot submit when recovery failover
    
    * merge from dev-db
    
    * revert
    
    * revert
    
    * fix bug: get process definition list failed.
    
    * fix bug: process instance interval is error
    
    * revert
    
    * revert
    
    * update
    
    * support stop submit success tasks
    
    * update kill process
    
    * update for stop process
    
    * update for stop process
    
    * add some logs for stop process
    
    * update for small bug.
    
    * add check strategy before submit task
    
    * revert
    
    * update
    
    * update
    
    * revert
    
    * wait task instance exists if null.
    
    * revert
    
    * update
    
    * change desc to description.
    
    * add check user and definitions function when delete tenant
    
    * update
    
    * change desc to description.
    
    * change desc to description.
    
    * change desc to description.
    
    * remove check resources when delete tenant
    
    * change desc to description.
    
    * change mybatisplus version to 3.2.0
    
    * update
    
    * change the notice to apache.
    
    * update
    
    * update postgre sql
    
    * fix bug: phone can be empty.
    
    * fix bug: postgre test error.
    
    * update create table for postgre quartz
    
    * fix some bugs about postgre.
    
    * update create table for postgre quartz
    
    * add postgre db performance monitor
    
    * add postgre performance monitor
    
    * update performance monitor
    
    * revert
    
    * revert
    
    * fix bug: tasks queue length error
    
    * remove datasource.properties
    
    * change chinese sql to english.
    
    * change chinese sql to english.
    
    * change chinese to english (#1202)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs
    
    * nginx conf modify
    
    * dockerfile application.properties modify
    
    * dockerfile email address change
    
    * the alert module is modified in English.
    
    * alert server comment and chinese modify
    
    * api server useless code and chinese modify
    
    * common,dao,server useless code and chinese modify
    
    * change chinese to english
    
    * remove unused code (#1204)
    
    * update english documents
    
    * refactor zk client
    
    * update documents
    
    * update zkclient
    
    * update zkclient
    
    * update documents
    
    * add architecture-design
    
    * change i18n
    
    * update i18n
    
    * update english documents
    
    * add architecture-design
    
    * update english documents
    
    * update en-US documents
    
    * add architecture-design
    
    * update demo site
    
    * add mybatis plus model
    
    * modify mybatisplus
    
    * modify mybatisplus
    
    * change interface by mybatisplus
    
    * add unit test
    
    * refactor dao interface.
    
    * add unit test for dao...
    
    * add unit test for dao...
    
    * add unit test for dao...
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
    
    * update some dao bugs
    
    * update for some bugs
    
    * update some bugs
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
    
    * update
    
    * update
    
    * add multiply settings for application.yml
    
    * add multiply settings for application.yml
    
    * revert
    
    * update configuration settings in task record dao...
    
    * change application_master to application-master
    
    * change application_master to application-master
    
    * update application.yml to application.properties
    
    * revert
    
    * revert
    
    * add properties
    
    * add properties
    
    * revert
    
    * revert
    
    * add api start up..
    add alert send try catch
    
    * update dao info level
    
    * fix bug: task cannot submit when recovery failover
    
    * fix bug: task cannot submit when recovery failover
    
    * merge from dev-db
    
    * revert
    
    * revert
    
    * fix bug: get process definition list failed.
    
    * fix bug: process instance interval is error
    
    * revert
    
    * revert
    
    * update
    
    * support stop submit success tasks
    
    * update kill process
    
    * update for stop process
    
    * update for stop process
    
    * add some logs for stop process
    
    * update for small bug.
    
    * add check strategy before submit task
    
    * revert
    
    * update
    
    * update
    
    * revert
    
    * wait task instance exists if null.
    
    * revert
    
    * update
    
    * change desc to description.
    
    * add check user and definitions function when delete tenant
    
    * update
    
    * change desc to description.
    
    * change desc to description.
    
    * change desc to description.
    
    * remove check resources when delete tenant
    
    * change desc to description.
    
    * change mybatisplus version to 3.2.0
    
    * update
    
    * change the notice to apache.
    
    * update
    
    * update postgre sql
    
    * fix bug: phone can be empty.
    
    * fix bug: postgre test error.
    
    * update create table for postgre quartz
    
    * fix some bugs about postgre.
    
    * update create table for postgre quartz
    
    * add postgre db performance monitor
    
    * add postgre performance monitor
    
    * update performance monitor
    
    * revert
    
    * revert
    
    * fix bug: tasks queue length error
    
    * remove datasource.properties
    
    * change chinese sql to english.
    
    * change chinese sql to english.
    
    * remove unused code.
    
    * remove unused code.
    
    * Modify webpack configuration (#1206)
    
    * add more message for java-doc (#1209)
    
    * move updateTaskState into try/catch block in case of exception
    
    * fix NPE
    
    * using conf.getInt instead of getString
    
    * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
    for AlertDao, correct the spelling.
    
    * duplicate
    
    * refactor getTaskWorkerGroupId
    
    * add friendly log
    
    * update hearbeat thread num = 1
    
    * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
    
    * 1. move verifyTaskInstanceIsNull after taskInstance
    2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
    
    * fix the message
    
    * delete before check to avoid KeeperException$NoNodeException
    
    * fix the message
    
    * check processInstance state before delete tenant
    
    * check processInstance state before delete worker group
    
    * refactor
    
    * merge api constants into common constatns
    
    * update the resource perm
    
    * update the dataSource perm
    
    * fix CheckUtils.checkUserParams method
    
    * update AlertGroupService, extends from BaseService, remove duplicate methods
    
    * refactor
    
    * modify method name
    
    * add hasProjectAndPerm method
    
    * using checkProject instead of getResultStatus
    
    * delete checkAuth method, using hasProjectAndPerm instead.
    
    * correct spelling
    
    * add transactional for deleteWorkerGroupById
    
    * add Transactional for deleteProcessInstanceById method
    
    * change sqlSessionTemplate singleton
    
    * change sqlSessionTemplate singleton and reformat code
    
    * fix unsuitable error message
    
    * update shutdownhook methods
    
    * fix worker log bug
    
    * fix api server debug mode bug
    
    * upgrade zk version
    
    * delete this line ,for zkClient.close() will do the whole thing
    
    * fix master server shutdown error
    
    * degrade zk version and add FourLetterWordMain class
    
    * fix PathChildrenCache not close
    
    * add Transactional for createSession method
    
    * add more message for java-doc
    
    * add java doc for common module (#1213)
    
    * dao method comments and useless code modify (#1214)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs
    
    * nginx conf modify
    
    * dockerfile application.properties modify
    
    * dockerfile email address change
    
    * the alert module is modified in English.
    
    * alert server comment and chinese modify
    
    * api server useless code and chinese modify
    
    * common,dao,server useless code and chinese modify
    
    * change chinese to english
    
    * dao method comments and useless code modify
    
    * Change all Chinese names to English (#1207)
    
    * Modify webpack configuration
    
    * Change all Chinese names to English
    
    * add progress-bar-webpack-plugin (#1215)
    
    * Modify webpack configuration
    
    * Change all Chinese names to English
    
    * add progress-bar-webpack-plugin
    
    * Add method and parameters comments (#1220)
    
    * rename from DatasourceUserMapper to DataSourceUserMapper
    
    * add unit test in UserMapper and WorkerGroupMapper
    
    * change cn.escheduler to org.apache.dolphinscheduler
    
    * add unit test in UdfFuncMapperTest
    
    * add unit test in UdfFuncMapperTest
    
    * remove DatabaseConfiguration
    
    * add ConnectionFactoryTest
    
    * cal duration in processInstancesList
    
    * change desc to description
    
    * change table name in mysql ddl
    
    * change table name in mysql ddl
    
    * change escheduler to dolphinscheduler
    
    * change escheduler to dolphinscheduler
    
    * change escheduler to dolphinscheduler
    
    * remove log4j-1.2-api and modify AlertMapperTest
    
    * remove log4j-1.2-api
    
    * Add alertDao to spring management
    
    * Add alertDao to spring management
    
    * get SqlSessionFactory from MybatisSqlSessionFactoryBean
    
    * get processDao by DaoFactory
    
    * read druid properties in ConneciontFactory
    
    * read druid properties in ConneciontFactory
    
    * change get alertDao by spring to DaoFactory
    
    * add log4j to resolve #967
    
    * resole verify udf name error and delete udf error
    
    * Determine if principal is empty
    
    * Determine whether the logon user has the right to delete the project
    
    * Fixed an issue that produced attatch file named such as ATT00002.bin
    
    * fix too many connection in upgrade or create
    
    * fix NEED_FAULT_TOLERANCE and WAITTING_THREAD count fail
    
    * Added a judgment on whether the currently login user is an administrator
    
    * fix update udf database not change and create time is changed
    
    * add enterprise.wechat.enable to decide whether to send enterprise WeChat
    
    * change method check
    
    * Remove the administrator's judgment on query access token list
    
    * only admin can create worker group
    
    * delete alert group need delete the relation of user and alert group
    
    * add timeout in proxy when upload large resource
    
    * add gets scheduled times by expect fire times
    
    * add gets scheduled times by expect fire times
    
    * Increase the judgment of whether it is admin
    
    * Increase the judgment of whether it is admin
    
    * when delete access token add whether login user has perm to delete
    
    * change mysql-connector-java scope to test
    
    * update scm test
    
    * add profile test
    
    * Add method and parameters comments
    
    * roll back
    
    * add some notes (#1221)
    
    * update english documents
    
    * refactor zk client
    
    * update documents
    
    * update zkclient
    
    * update zkclient
    
    * update documents
    
    * add architecture-design
    
    * change i18n
    
    * update i18n
    
    * update english documents
    
    * add architecture-design
    
    * update english documents
    
    * update en-US documents
    
    * add architecture-design
    
    * update demo site
    
    * add mybatis plus model
    
    * modify mybatisplus
    
    * modify mybatisplus
    
    * change interface by mybatisplus
    
    * add unit test
    
    * refactor dao interface.
    
    * add unit test for dao...
    
    * add unit test for dao...
    
    * add unit test for dao...
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
    
    * update some dao bugs
    
    * update for some bugs
    
    * update some bugs
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
    
    * update
    
    * update
    
    * add multiply settings for application.yml
    
    * add multiply settings for application.yml
    
    * revert
    
    * update configuration settings in task record dao...
    
    * change application_master to application-master
    
    * change application_master to application-master
    
    * update application.yml to application.properties
    
    * revert
    
    * revert
    
    * add properties
    
    * add properties
    
    * revert
    
    * revert
    
    * add api start up..
    add alert send try catch
    
    * update dao info level
    
    * fix bug: task cannot submit when recovery failover
    
    * fix bug: task cannot submit when recovery failover
    
    * merge from dev-db
    
    * revert
    
    * revert
    
    * fix bug: get process definition list failed.
    
    * fix bug: process instance interval is error
    
    * revert
    
    * revert
    
    * update
    
    * support stop submit success tasks
    
    * update kill process
    
    * update for stop process
    
    * update for stop process
    
    * add some logs for stop process
    
    * update for small bug.
    
    * add check strategy before submit task
    
    * revert
    
    * update
    
    * update
    
    * revert
    
    * wait task instance exists if null.
    
    * revert
    
    * update
    
    * change desc to description.
    
    * add check user and definitions function when delete tenant
    
    * update
    
    * change desc to description.
    
    * change desc to description.
    
    * change desc to description.
    
    * remove check resources when delete tenant
    
    * change desc to description.
    
    * change mybatisplus version to 3.2.0
    
    * update
    
    * change the notice to apache.
    
    * update
    
    * update postgre sql
    
    * fix bug: phone can be empty.
    
    * fix bug: postgre test error.
    
    * update create table for postgre quartz
    
    * fix some bugs about postgre.
    
    * update create table for postgre quartz
    
    * add postgre db performance monitor
    
    * add postgre performance monitor
    
    * update performance monitor
    
    * revert
    
    * revert
    
    * fix bug: tasks queue length error
    
    * remove datasource.properties
    
    * change chinese sql to english.
    
    * change chinese sql to english.
    
    * remove unused code.
    
    * remove unused code.
    
    * add some notes
    
    * update some notes
    
    * update some notes
    
    * update mbatisplus version
    
    * update lombok version
    
    * update lombok version
    
    * revert
    
    * merge from dev-db
    
    * remove version
    
    * update npm install pom
    
    * add front assembly
    
    * add front module
    
    * change verison to 1.2.0-release-SNAPSHOT
    
    * add name in pom and remove compile
    
    * add name in pom
    
    * add licenses in assemble
    
    * change version to 1.2.0-RC1-SNAPSHOT
    
    * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
    
    # Conflicts:
    #	dolphinscheduler-alert/pom.xml
    #	dolphinscheduler-api/pom.xml
    #	dolphinscheduler-common/pom.xml
    #	dolphinscheduler-dao/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
    #	dolphinscheduler-dist/pom.xml
    #	dolphinscheduler-rpc/pom.xml
    #	dolphinscheduler-server/pom.xml
    #	dolphinscheduler-ui/pom.xml
    #	pom.xml
    change assembly id
    
    * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
    
    # Conflicts:
    #	dolphinscheduler-alert/pom.xml
    #	dolphinscheduler-api/pom.xml
    #	dolphinscheduler-common/pom.xml
    #	dolphinscheduler-dao/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
    #	dolphinscheduler-dist/pom.xml
    #	dolphinscheduler-rpc/pom.xml
    #	dolphinscheduler-server/pom.xml
    #	dolphinscheduler-ui/pom.xml
    #	pom.xml
    add DISCLAIMER
    
    * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
    
    # Conflicts:
    #	dolphinscheduler-alert/pom.xml
    #	dolphinscheduler-api/pom.xml
    #	dolphinscheduler-common/pom.xml
    #	dolphinscheduler-dao/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
    #	dolphinscheduler-dist/pom.xml
    #	dolphinscheduler-rpc/pom.xml
    #	dolphinscheduler-server/pom.xml
    #	dolphinscheduler-ui/pom.xml
    #	pom.xml
    add license in xml and properties
    
    * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
    
    # Conflicts:
    #	dolphinscheduler-alert/pom.xml
    #	dolphinscheduler-api/pom.xml
    #	dolphinscheduler-common/pom.xml
    #	dolphinscheduler-dao/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
    #	dolphinscheduler-dist/pom.xml
    #	dolphinscheduler-rpc/pom.xml
    #	dolphinscheduler-server/pom.xml
    #	dolphinscheduler-ui/pom.xml
    #	pom.xml
    add license in dockerfile
    
    * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
    
    # Conflicts:
    #	dolphinscheduler-alert/pom.xml
    #	dolphinscheduler-api/pom.xml
    #	dolphinscheduler-common/pom.xml
    #	dolphinscheduler-dao/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
    #	dolphinscheduler-dist/pom.xml
    #	dolphinscheduler-rpc/pom.xml
    #	dolphinscheduler-server/pom.xml
    #	dolphinscheduler-ui/pom.xml
    #	pom.xml
    add license in script and sql
    
    * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
    
    # Conflicts:
    #	dolphinscheduler-alert/pom.xml
    #	dolphinscheduler-api/pom.xml
    #	dolphinscheduler-common/pom.xml
    #	dolphinscheduler-dao/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
    #	dolphinscheduler-dist/pom.xml
    #	dolphinscheduler-rpc/pom.xml
    #	dolphinscheduler-server/pom.xml
    #	dolphinscheduler-ui/pom.xml
    #	pom.xml
    add license in script and sql
    
    * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
    
    # Conflicts:
    #	dolphinscheduler-alert/pom.xml
    #	dolphinscheduler-api/pom.xml
    #	dolphinscheduler-common/pom.xml
    #	dolphinscheduler-dao/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
    #	dolphinscheduler-dist/pom.xml
    #	dolphinscheduler-rpc/pom.xml
    #	dolphinscheduler-server/pom.xml
    #	dolphinscheduler-ui/pom.xml
    #	pom.xml
    add license in ci
    
    * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
    
    # Conflicts:
    #	dolphinscheduler-alert/pom.xml
    #	dolphinscheduler-api/pom.xml
    #	dolphinscheduler-common/pom.xml
    #	dolphinscheduler-dao/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
    #	dolphinscheduler-dist/pom.xml
    #	dolphinscheduler-rpc/pom.xml
    #	dolphinscheduler-server/pom.xml
    #	dolphinscheduler-ui/pom.xml
    #	pom.xml
    change version to 1.2.0-SNAPSHOT
    
    * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
    
    # Conflicts:
    #	dolphinscheduler-alert/pom.xml
    #	dolphinscheduler-api/pom.xml
    #	dolphinscheduler-common/pom.xml
    #	dolphinscheduler-dao/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
    #	dolphinscheduler-dist/pom.xml
    #	dolphinscheduler-rpc/pom.xml
    #	dolphinscheduler-server/pom.xml
    #	dolphinscheduler-ui/pom.xml
    #	pom.xml
    set defalut db type postgresql
    
    * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
    
    # Conflicts:
    #	dolphinscheduler-alert/pom.xml
    #	dolphinscheduler-api/pom.xml
    #	dolphinscheduler-common/pom.xml
    #	dolphinscheduler-dao/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
    #	dolphinscheduler-dist/pom.xml
    #	dolphinscheduler-rpc/pom.xml
    #	dolphinscheduler-server/pom.xml
    #	dolphinscheduler-ui/pom.xml
    #	pom.xml
    set defalut db type postgresql
    
    * change org.quartz.jobStore.driverDelegateClass
    
    * Add comments in method params
    
    * update readme from branch dev
    
    * update content in how to contribute
    
    * change postgresql default port
    
    * change version 1.2.0-SNAPSHOT
    
    * remove antrun plugin
    
    * add how to build
    
    * add how to build
    
    * fix bug: add milliseconds in start time and end time for dependent task. (#1302)
    
    * [maven-release-plugin] prepare release 1.2.1-release
    
    * [maven-release-plugin] prepare for next development iteration
    
    * update
    
    * [maven-release-plugin] prepare release 1.2.0-release
    
    * [maven-release-plugin] prepare for next development iteration
    
    * [maven-release-plugin] prepare release 1.2.1-release
    
    * [maven-release-plugin] prepare for next development iteration
    
    * revert
    
    * [maven-release-plugin] prepare release 1.2.0-release
    
    * [maven-release-plugin] prepare for next development iteration
    
    * add sql files for postgre/mysql
    
    * add sql files
    
    * fix bug: postgre cannot support between.
    
    * fix bug: remove 'between' in sql search.
    
    * add release note
    
    * add release note
    
    * fix bug: list resource user a error interface.
    
    * Fix spelling mistakes
    
    * revert version to 1.2.0
    
    * add milliseconds in start time and end time for dependent task.
    
    * fix bug: add user failed first time on postgre.
    
    * fix bug: add user failed first time.
    
    * update
    
    * update
    
    * update
    
    * remove dir format in assembly (#1304)
    
    * rename from DatasourceUserMapper to DataSourceUserMapper
    
    * add unit test in UserMapper and WorkerGroupMapper
    
    * change cn.escheduler to org.apache.dolphinscheduler
    
    * add unit test in UdfFuncMapperTest
    
    * add unit test in UdfFuncMapperTest
    
    * remove DatabaseConfiguration
    
    * add ConnectionFactoryTest
    
    * cal duration in processInstancesList
    
    * change desc to description
    
    * change table name in mysql ddl
    
    * change table name in mysql ddl
    
    * change escheduler to dolphinscheduler
    
    * change escheduler to dolphinscheduler
    
    * change escheduler to dolphinscheduler
    
    * remove log4j-1.2-api and modify AlertMapperTest
    
    * remove log4j-1.2-api
    
    * Add alertDao to spring management
    
    * Add alertDao to spring management
    
    * get SqlSessionFactory from MybatisSqlSessionFactoryBean
    
    * get processDao by DaoFactory
    
    * read druid properties in ConneciontFactory
    
    * read druid properties in ConneciontFactory
    
    * change get alertDao by spring to DaoFactory
    
    * add log4j to resolve #967
    
    * resole verify udf name error and delete udf error
    
    * Determine if principal is empty
    
    * Determine whether the logon user has the right to delete the project
    
    * Fixed an issue that produced attatch file named such as ATT00002.bin
    
    * fix too many connection in upgrade or create
    
    * fix NEED_FAULT_TOLERANCE and WAITTING_THREAD count fail
    
    * Added a judgment on whether the currently login user is an administrator
    
    * fix update udf database not change and create time is changed
    
    * add enterprise.wechat.enable to decide whether to send enterprise WeChat
    
    * change method check
    
    * Remove the administrator's judgment on query access token list
    
    * only admin can create worker group
    
    * delete alert group need delete the relation of user and alert group
    
    * add timeout in proxy when upload large resource
    
    * add gets scheduled times by expect fire times
    
    * add gets scheduled times by expect fire times
    
    * Increase the judgment of whether it is admin
    
    * Increase the judgment of whether it is admin
    
    * when delete access token add whether login user has perm to delete
    
    * change mysql-connector-java scope to test
    
    * update scm test
    
    * add profile test
    
    * add profile test
    
    * add maven.deploy.skip true
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * add dependency
    
    * add javadoc
    
    * add antrun
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * reset pgsql (#1178)
    
    + 1
    
    * add javadoc
    
    * add javadoc
    
    * [maven-release-plugin] rollback the release of 1.2.0
    
    * add javadoc
    
    * Ans UI upgrade to version 0.1.0 (#1181)
    
    + 1
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * Administrators group prohibit deletion (#1182)
    
    * Ans UI upgrade to version 0.1.0
    
    * Administrators group prohibit deletion
    
    * add javadoc
    
    * add ui pom
    
    * fix master server shutdown error (#1177)
    
    * move updateTaskState into try/catch block in case of exception
    
    * fix NPE
    
    * using conf.getInt instead of getString
    
    * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
    for AlertDao, correct the spelling.
    
    * duplicate
    
    * refactor getTaskWorkerGroupId
    
    * add friendly log
    
    * update hearbeat thread num = 1
    
    * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
    
    * 1. move verifyTaskInstanceIsNull after taskInstance
    2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
    
    * fix the message
    
    * delete before check to avoid KeeperException$NoNodeException
    
    * fix the message
    
    * check processInstance state before delete tenant
    
    * check processInstance state before delete worker group
    
    * refactor
    
    * merge api constants into common constatns
    
    * update the resource perm
    
    * update the dataSource perm
    
    * fix CheckUtils.checkUserParams method
    
    * update AlertGroupService, extends from BaseService, remove duplicate methods
    
    * refactor
    
    * modify method name
    
    * add hasProjectAndPerm method
    
    * using checkProject instead of getResultStatus
    
    * delete checkAuth method, using hasProjectAndPerm instead.
    
    * correct spelling
    
    * add transactional for deleteWorkerGroupById
    
    * add Transactional for deleteProcessInstanceById method
    
    * change sqlSessionTemplate singleton
    
    * change sqlSessionTemplate singleton and reformat code
    
    * fix unsuitable error message
    
    * update shutdownhook methods
    
    * fix worker log bug
    
    * fix api server debug mode bug
    
    * upgrade zk version
    
    * delete this line ,for zkClient.close() will do the whole thing
    
    * fix master server shutdown error
    
    * degrade zk version and add FourLetterWordMain class (#1183)
    
    * move updateTaskState into try/catch block in case of exception
    
    * fix NPE
    
    * using conf.getInt instead of getString
    
    * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
    for AlertDao, correct the spelling.
    
    * duplicate
    
    * refactor getTaskWorkerGroupId
    
    * add friendly log
    
    * update hearbeat thread num = 1
    
    * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
    
    * 1. move verifyTaskInstanceIsNull after taskInstance
    2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
    
    * fix the message
    
    * delete before check to avoid KeeperException$NoNodeException
    
    * fix the message
    
    * check processInstance state before delete tenant
    
    * check processInstance state before delete worker group
    
    * refactor
    
    * merge api constants into common constatns
    
    * update the resource perm
    
    * update the dataSource perm
    
    * fix CheckUtils.checkUserParams method
    
    * update AlertGroupService, extends from BaseService, remove duplicate methods
    
    * refactor
    
    * modify method name
    
    * add hasProjectAndPerm method
    
    * using checkProject instead of getResultStatus
    
    * delete checkAuth method, using hasProjectAndPerm instead.
    
    * correct spelling
    
    * add transactional for deleteWorkerGroupById
    
    * add Transactional for deleteProcessInstanceById method
    
    * change sqlSessionTemplate singleton
    
    * change sqlSessionTemplate singleton and reformat code
    
    * fix unsuitable error message
    
    * update shutdownhook methods
    
    * fix worker log bug
    
    * fix api server debug mode bug
    
    * upgrade zk version
    
    * delete this line ,for zkClient.close() will do the whole thing
    
    * fix master server shutdown error
    
    * degrade zk version and add FourLetterWordMain class
    
    * add ui pom
    
    * add src pom and assembly
    
    * fix ZKWorkerClient not close PathChildrenCache (#1185)
    
    * move updateTaskState into try/catch block in case of exception
    
    * fix NPE
    
    * using conf.getInt instead of getString
    
    * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
    for AlertDao, correct the spelling.
    
    * duplicate
    
    * refactor getTaskWorkerGroupId
    
    * add friendly log
    
    * update hearbeat thread num = 1
    
    * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
    
    * 1. move verifyTaskInstanceIsNull after taskInstance
    2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
    
    * fix the message
    
    * delete before check to avoid KeeperException$NoNodeException
    
    * fix the message
    
    * check processInstance state before delete tenant
    
    * check processInstance state before delete worker group
    
    * refactor
    
    * merge api constants into common constatns
    
    * update the resource perm
    
    * update the dataSource perm
    
    * fix CheckUtils.checkUserParams method
    
    * update AlertGroupService, extends from BaseService, remove duplicate methods
    
    * refactor
    
    * modify method name
    
    * add hasProjectAndPerm method
    
    * using checkProject instead of getResultStatus
    
    * delete checkAuth method, using hasProjectAndPerm instead.
    
    * correct spelling
    
    * add transactional for deleteWorkerGroupById
    
    * add Transactional for deleteProcessInstanceById method
    
    * change sqlSessionTemplate singleton
    
    * change sqlSessionTemplate singleton and reformat code
    
    * fix unsuitable error message
    
    * update shutdownhook methods
    
    * fix worker log bug
    
    * fix api server debug mode bug
    
    * upgrade zk version
    
    * delete this line ,for zkClient.close() will do the whole thing
    
    * fix master server shutdown error
    
    * degrade zk version and add FourLetterWordMain class
    
    * fix PathChildrenCache not close
    
    * add Transactional for createSession method (#1186)
    
    * move updateTaskState into try/catch block in case of exception
    
    * fix NPE
    
    * using conf.getInt instead of getString
    
    * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
    for AlertDao, correct the spelling.
    
    * duplicate
    
    * refactor getTaskWorkerGroupId
    
    * add friendly log
    
    * update hearbeat thread num = 1
    
    * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
    
    * 1. move verifyTaskInstanceIsNull after taskInstance
    2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
    
    * fix the message
    
    * delete before check to avoid KeeperException$NoNodeException
    
    * fix the message
    
    * check processInstance state before delete tenant
    
    * check processInstance state before delete worker group
    
    * refactor
    
    * merge api constants into common constatns
    
    * update the resource perm
    
    * update the dataSource perm
    
    * fix CheckUtils.checkUserParams method
    
    * update AlertGroupService, extends from BaseService, remove duplicate methods
    
    * refactor
    
    * modify method name
    
    * add hasProjectAndPerm method
    
    * using checkProject instead of getResultStatus
    
    * delete checkAuth method, using hasProjectAndPerm instead.
    
    * correct spelling
    
    * add transactional for deleteWorkerGroupById
    
    * add Transactional for deleteProcessInstanceById method
    
    * change sqlSessionTemplate singleton
    
    * change sqlSessionTemplate singleton and reformat code
    
    * fix unsuitable error message
    
    * update shutdownhook methods
    
    * fix worker log bug
    
    * fix api server debug mode bug
    
    * upgrade zk version
    
    * delete this line ,for zkClient.close() will do the whole thing
    
    * fix master server shutdown error
    
    * degrade zk version and add FourLetterWordMain class
    
    * fix PathChildrenCache not close
    
    * add Transactional for createSession method
    
    * add src pom and assembly
    
    * add src pom and assembly
    
    * add src pom and assembly
    
    * add src pom and assembly
    
    * dockerfile dao application.properties ,install.sh modify and application.properties modify (#1187)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * add src pom and assembly
    
    * add src pom and assembly
    
    * dockerfile startup.sh modify (#1189)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs (#1191)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs
    
    * nginx conf modify
    
    * dockerfile application.properties modify
    
    * dockerfile conf modify (#1192)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs
    
    * nginx conf modify
    
    * dockerfile application.properties modify
    
    * dockerfile conf modify (#1193)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs
    
    * nginx conf modify
    
    * dockerfile application.properties modify
    
    * dockerfile email address change (#1194)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs
    
    * nginx conf modify
    
    * dockerfile application.properties modify
    
    * dockerfile email address change
    
    * the alert module is modified in english (#1195)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs
    
    * nginx conf modify
    
    * dockerfile application.properties modify
    
    * dockerfile email address change
    
    * the alert module is modified in English.
    
    * alert server comment and chinese modify
    
    * api server useless code and chinese modify (#1198)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs
    
    * nginx conf modify
    
    * dockerfile application.properties modify
    
    * dockerfile email address change
    
    * the alert module is modified in English.
    
    * alert server comment and chinese modify
    
    * api server useless code and chinese modify
    
    * common,dao,server useless code and chinese modify (#1199)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs
    
    * nginx conf modify
    
    * dockerfile application.properties modify
    
    * dockerfile email address change
    
    * the alert module is modified in English.
    
    * alert server comment and chinese modify
    
    * api server useless code and chinese modify
    
    * common,dao,server useless code and chinese modify
    
    * change chinese sql to english. (#1200)
    
    * update english documents
    
    * refactor zk client
    
    * update documents
    
    * update zkclient
    
    * update zkclient
    
    * update documents
    
    * add architecture-design
    
    * change i18n
    
    * update i18n
    
    * update english documents
    
    * add architecture-design
    
    * update english documents
    
    * update en-US documents
    
    * add architecture-design
    
    * update demo site
    
    * add mybatis plus model
    
    * modify mybatisplus
    
    * modify mybatisplus
    
    * change interface by mybatisplus
    
    * add unit test
    
    * refactor dao interface.
    
    * add unit test for dao...
    
    * add unit test for dao...
    
    * add unit test for dao...
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
    
    * update some dao bugs
    
    * update for some bugs
    
    * update some bugs
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
    
    * update
    
    * update
    
    * add multiply settings for application.yml
    
    * add multiply settings for application.yml
    
    * revert
    
    * update configuration settings in task record dao...
    
    * change application_master to application-master
    
    * change application_master to application-master
    
    * update application.yml to application.properties
    
    * revert
    
    * revert
    
    * add properties
    
    * add properties
    
    * revert
    
    * revert
    
    * add api start up..
    add alert send try catch
    
    * update dao info level
    
    * fix bug: task cannot submit when recovery failover
    
    * fix bug: task cannot submit when recovery failover
    
    * merge from dev-db
    
    * revert
    
    * revert
    
    * fix bug: get process definition list failed.
    
    * fix bug: process instance interval is error
    
    * revert
    
    * revert
    
    * update
    
    * support stop submit success tasks
    
    * update kill process
    
    * update for stop process
    
    * update for stop process
    
    * add some logs for stop process
    
    * update for small bug.
    
    * add check strategy before submit task
    
    * revert
    
    * update
    
    * update
    
    * revert
    
    * wait task instance exists if null.
    
    * revert
    
    * update
    
    * change desc to description.
    
    * add check user and definitions function when delete tenant
    
    * update
    
    * change desc to description.
    
    * change desc to description.
    
    * change desc to description.
    
    * remove check resources when delete tenant
    
    * change desc to description.
    
    * change mybatisplus version to 3.2.0
    
    * update
    
    * change the notice to apache.
    
    * update
    
    * update postgre sql
    
    * fix bug: phone can be empty.
    
    * fix bug: postgre test error.
    
    * update create table for postgre quartz
    
    * fix some bugs about postgre.
    
    * update create table for postgre quartz
    
    * add postgre db performance monitor
    
    * add postgre performance monitor
    
    * update performance monitor
    
    * revert
    
    * revert
    
    * fix bug: tasks queue length error
    
    * remove datasource.properties
    
    * change chinese sql to english.
    
    * change chinese sql to english.
    
    * change chinese to english (#1202)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs
    
    * nginx conf modify
    
    * dockerfile application.properties modify
    
    * dockerfile email address change
    
    * the alert module is modified in English.
    
    * alert server comment and chinese modify
    
    * api server useless code and chinese modify
    
    * common,dao,server useless code and chinese modify
    
    * change chinese to english
    
    * remove unused code (#1204)
    
    * update english documents
    
    * refactor zk client
    
    * update documents
    
    * update zkclient
    
    * update zkclient
    
    * update documents
    
    * add architecture-design
    
    * change i18n
    
    * update i18n
    
    * update english documents
    
    * add architecture-design
    
    * update english documents
    
    * update en-US documents
    
    * add architecture-design
    
    * update demo site
    
    * add mybatis plus model
    
    * modify mybatisplus
    
    * modify mybatisplus
    
    * change interface by mybatisplus
    
    * add unit test
    
    * refactor dao interface.
    
    * add unit test for dao...
    
    * add unit test for dao...
    
    * add unit test for dao...
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
    
    * update some dao bugs
    
    * update for some bugs
    
    * update some bugs
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
    
    * update
    
    * update
    
    * add multiply settings for application.yml
    
    * add multiply settings for application.yml
    
    * revert
    
    * update configuration settings in task record dao...
    
    * change application_master to application-master
    
    * change application_master to application-master
    
    * update application.yml to application.properties
    
    * revert
    
    * revert
    
    * add properties
    
    * add properties
    
    * revert
    
    * revert
    
    * add api start up..
    add alert send try catch
    
    * update dao info level
    
    * fix bug: task cannot submit when recovery failover
    
    * fix bug: task cannot submit when recovery failover
    
    * merge from dev-db
    
    * revert
    
    * revert
    
    * fix bug: get process definition list failed.
    
    * fix bug: process instance interval is error
    
    * revert
    
    * revert
    
    * update
    
    * support stop submit success tasks
    
    * update kill process
    
    * update for stop process
    
    * update for stop process
    
    * add some logs for stop process
    
    * update for small bug.
    
    * add check strategy before submit task
    
    * revert
    
    * update
    
    * update
    
    * revert
    
    * wait task instance exists if null.
    
    * revert
    
    * update
    
    * change desc to description.
    
    * add check user and definitions function when delete tenant
    
    * update
    
    * change desc to description.
    
    * change desc to description.
    
    * change desc to description.
    
    * remove check resources when delete tenant
    
    * change desc to description.
    
    * change mybatisplus version to 3.2.0
    
    * update
    
    * change the notice to apache.
    
    * update
    
    * update postgre sql
    
    * fix bug: phone can be empty.
    
    * fix bug: postgre test error.
    
    * update create table for postgre quartz
    
    * fix some bugs about postgre.
    
    * update create table for postgre quartz
    
    * add postgre db performance monitor
    
    * add postgre performance monitor
    
    * update performance monitor
    
    * revert
    
    * revert
    
    * fix bug: tasks queue length error
    
    * remove datasource.properties
    
    * change chinese sql to english.
    
    * change chinese sql to english.
    
    * remove unused code.
    
    * remove unused code.
    
    * Modify webpack configuration (#1206)
    
    * add more message for java-doc (#1209)
    
    * move updateTaskState into try/catch block in case of exception
    
    * fix NPE
    
    * using conf.getInt instead of getString
    
    * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
    for AlertDao, correct the spelling.
    
    * duplicate
    
    * refactor getTaskWorkerGroupId
    
    * add friendly log
    
    * update hearbeat thread num = 1
    
    * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
    
    * 1. move verifyTaskInstanceIsNull after taskInstance
    2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
    
    * fix the message
    
    * delete before check to avoid KeeperException$NoNodeException
    
    * fix the message
    
    * check processInstance state before delete tenant
    
    * check processInstance state before delete worker group
    
    * refactor
    
    * merge api constants into common constatns
    
    * update the resource perm
    
    * update the dataSource perm
    
    * fix CheckUtils.checkUserParams method
    
    * update AlertGroupService, extends from BaseService, remove duplicate methods
    
    * refactor
    
    * modify method name
    
    * add hasProjectAndPerm method
    
    * using checkProject instead of getResultStatus
    
    * delete checkAuth method, using hasProjectAndPerm instead.
    
    * correct spelling
    
    * add transactional for deleteWorkerGroupById
    
    * add Transactional for deleteProcessInstanceById method
    
    * change sqlSessionTemplate singleton
    
    * change sqlSessionTemplate singleton and reformat code
    
    * fix unsuitable error message
    
    * update shutdownhook methods
    
    * fix worker log bug
    
    * fix api server debug mode bug
    
    * upgrade zk version
    
    * delete this line ,for zkClient.close() will do the whole thing
    
    * fix master server shutdown error
    
    * degrade zk version and add FourLetterWordMain class
    
    * fix PathChildrenCache not close
    
    * add Transactional for createSession method
    
    * add more message for java-doc
    
    * add java doc for common module (#1213)
    
    * dao method comments and useless code modify (#1214)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs
    
    * nginx conf modify
    
    * dockerfile application.properties modify
    
    * dockerfile email address change
    
    * the alert module is modified in English.
    
    * alert server comment and chinese modify
    
    * api server useless code and chinese modify
    
    * common,dao,server useless code and chinese modify
    
    * change chinese to english
    
    * dao method comments and useless code modify
    
    * Change all Chinese names to English (#1207)
    
    * Modify webpack configuration
    
    * Change all Chinese names to English
    
    * add progress-bar-webpack-plugin (#1215)
    
    * Modify webpack configuration
    
    * Change all Chinese names to English
    
    * add progress-bar-webpack-plugin
    
    * Add method and parameters comments (#1220)
    
    * rename from DatasourceUserMapper to DataSourceUserMapper
    
    * add unit test in UserMapper and WorkerGroupMapper
    
    * change cn.escheduler to org.apache.dolphinscheduler
    
    * add unit test in UdfFuncMapperTest
    
    * add unit test in UdfFuncMapperTest
    
    * remove DatabaseConfiguration
    
    * add ConnectionFactoryTest
    
    * cal duration in processInstancesList
    
    * change desc to description
    
    * change table name in mysql ddl
    
    * change table name in mysql ddl
    
    * change escheduler to dolphinscheduler
    
    * change escheduler to dolphinscheduler
    
    * change escheduler to dolphinscheduler
    
    * remove log4j-1.2-api and modify AlertMapperTest
    
    * remove log4j-1.2-api
    
    * Add alertDao to spring management
    
    * Add alertDao to spring management
    
    * get SqlSessionFactory from MybatisSqlSessionFactoryBean
    
    * get processDao by DaoFactory
    
    * read druid properties in ConneciontFactory
    
    * read druid properties in ConneciontFactory
    
    * change get alertDao by spring to DaoFactory
    
    * add log4j to resolve #967
    
    * resole verify udf name error and delete udf error
    
    * Determine if principal is empty
    
    * Determine whether the logon user has the right to delete the project
    
    * Fixed an issue that produced attatch file named such as ATT00002.bin
    
    * fix too many connection in upgrade or create
    
    * fix NEED_FAULT_TOLERANCE and WAITTING_THREAD count fail
    
    * Added a judgment on whether the currently login user is an administrator
    
    * fix update udf database not change and create time is changed
    
    * add enterprise.wechat.enable to decide whether to send enterprise WeChat
    
    * change method check
    
    * Remove the administrator's judgment on query access token list
    
    * only admin can create worker group
    
    * delete alert group need delete the relation of user and alert group
    
    * add timeout in proxy when upload large resource
    
    * add gets scheduled times by expect fire times
    
    * add gets scheduled times by expect fire times
    
    * Increase the judgment of whether it is admin
    
    * Increase the judgment of whether it is admin
    
    * when delete access token add whether login user has perm to delete
    
    * change mysql-connector-java scope to test
    
    * update scm test
    
    * add profile test
    
    * Add method and parameters comments
    
    * roll back
    
    * add some notes (#1221)
    
    * update english documents
    
    * refactor zk client
    
    * update documents
    
    * update zkclient
    
    * update zkclient
    
    * update documents
    
    * add architecture-design
    
    * change i18n
    
    * update i18n
    
    * update english documents
    
    * add architecture-design
    
    * update english documents
    
    * update en-US documents
    
    * add architecture-design
    
    * update demo site
    
    * add mybatis plus model
    
    * modify mybatisplus
    
    * modify mybatisplus
    
    * change interface by mybatisplus
    
    * add unit test
    
    * refactor dao interface.
    
    * add unit test for dao...
    
    * add unit test for dao...
    
    * add unit test for dao...
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
    
    * update some dao bugs
    
    * update for some bugs
    
    * update some bugs
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
    
    * update
    
    * update
    
    * add multiply settings for application.yml
    
    * add multiply settings for application.yml
    
    * revert
    
    * update configuration settings in task record dao...
    
    * change application_master to application-master
    
    * change application_master to application-master
    
    * update application.yml to application.properties
    
    * revert
    
    * revert
    
    * add properties
    
    * add properties
    
    * revert
    
    * revert
    
    * add api start up..
    add alert send try catch
    
    * update dao info level
    
    * fix bug: task cannot submit when recovery failover
    
    * fix bug: task cannot submit when recovery failover
    
    * merge from dev-db
    
    * revert
    
    * revert
    
    * fix bug: get process definition list failed.
    
    * fix bug: process instance interval is error
    
    * revert
    
    * revert
    
    * update
    
    * support stop submit success tasks
    
    * update kill process
    
    * update for stop process
    
    * update for stop process
    
    * add some logs for stop process
    
    * update for small bug.
    
    * add check strategy before submit task
    
    * revert
    
    * update
    
    * update
    
    * revert
    
    * wait task instance exists if null.
    
    * revert
    
    * update
    
    * change desc to description.
    
    * add check user and definitions function when delete tenant
    
    * update
    
    * change desc to description.
    
    * change desc to description.
    
    * change desc to description.
    
    * remove check resources when delete tenant
    
    * change desc to description.
    
    * change mybatisplus version to 3.2.0
    
    * update
    
    * change the notice to apache.
    
    * update
    
    * update postgre sql
    
    * fix bug: phone can be empty.
    
    * fix bug: postgre test error.
    
    * update create table for postgre quartz
    
    * fix some bugs about postgre.
    
    * update create table for postgre quartz
    
    * add postgre db performance monitor
    
    * add postgre performance monitor
    
    * update performance monitor
    
    * revert
    
    * revert
    
    * fix bug: tasks queue length error
    
    * remove datasource.properties
    
    * change chinese sql to english.
    
    * change chinese sql to english.
    
    * remove unused code.
    
    * remove unused code.
    
    * add some notes
    
    * update some notes
    
    * update some notes
    
    * update mbatisplus version
    
    * update lombok version
    
    * update lombok version
    
    * revert
    
    * merge from dev-db
    
    * remove version
    
    * update npm install pom
    
    * add front assembly
    
    * add front module
    
    * change verison to 1.2.0-release-SNAPSHOT
    
    * add name in pom and remove compile
    
    * add name in pom
    
    * add licenses in assemble
    
    * change version to 1.2.0-RC1-SNAPSHOT
    
    * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
    
    # Conflicts:
    #	dolphinscheduler-alert/pom.xml
    #	dolphinscheduler-api/pom.xml
    #	dolphinscheduler-common/pom.xml
    #	dolphinscheduler-dao/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
    #	dolphinscheduler-dist/pom.xml
    #	dolphinscheduler-rpc/pom.xml
    #	dolphinscheduler-server/pom.xml
    #	dolphinscheduler-ui/pom.xml
    #	pom.xml
    change assembly id
    
    * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
    
    # Conflicts:
    #	dolphinscheduler-alert/pom.xml
    #	dolphinscheduler-api/pom.xml
    #	dolphinscheduler-common/pom.xml
    #	dolphinscheduler-dao/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
    #	dolphinscheduler-dist/pom.xml
    #	dolphinscheduler-rpc/pom.xml
    #	dolphinscheduler-server/pom.xml
    #	dolphinscheduler-ui/pom.xml
    #	pom.xml
    add DISCLAIMER
    
    * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
    
    # Conflicts:
    #	dolphinscheduler-alert/pom.xml
    #	dolphinscheduler-api/pom.xml
    #	dolphinscheduler-common/pom.xml
    #	dolphinscheduler-dao/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
    #	dolphinscheduler-dist/pom.xml
    #	dolphinscheduler-rpc/pom.xml
    #	dolphinscheduler-server/pom.xml
    #	dolphinscheduler-ui/pom.xml
    #	pom.xml
    add license in xml and properties
    
    * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
    
    # Conflicts:
    #	dolphinscheduler-alert/pom.xml
    #	dolphinscheduler-api/pom.xml
    #	dolphinscheduler-common/pom.xml
    #	dolphinscheduler-dao/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
    #	dolphinscheduler-dist/pom.xml
    #	dolphinscheduler-rpc/pom.xml
    #	dolphinscheduler-server/pom.xml
    #	dolphinscheduler-ui/pom.xml
    #	pom.xml
    add license in dockerfile
    
    * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
    
    # Conflicts:
    #	dolphinscheduler-alert/pom.xml
    #	dolphinscheduler-api/pom.xml
    #	dolphinscheduler-common/pom.xml
    #	dolphinscheduler-dao/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
    #	dolphinscheduler-dist/pom.xml
    #	dolphinscheduler-rpc/pom.xml
    #	dolphinscheduler-server/pom.xml
    #	dolphinscheduler-ui/pom.xml
    #	pom.xml
    add license in script and sql
    
    * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
    
    # Conflicts:
    #	dolphinscheduler-alert/pom.xml
    #	dolphinscheduler-api/pom.xml
    #	dolphinscheduler-common/pom.xml
    #	dolphinscheduler-dao/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
    #	dolphinscheduler-dist/pom.xml
    #	dolphinscheduler-rpc/pom.xml
    #	dolphinscheduler-server/pom.xml
    #	dolphinscheduler-ui/pom.xml
    #	pom.xml
    add license in script and sql
    
    * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
    
    # Conflicts:
    #	dolphinscheduler-alert/pom.xml
    #	dolphinscheduler-api/pom.xml
    #	dolphinscheduler-common/pom.xml
    #	dolphinscheduler-dao/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
    #	dolphinscheduler-dist/pom.xml
    #	dolphinscheduler-rpc/pom.xml
    #	dolphinscheduler-server/pom.xml
    #	dolphinscheduler-ui/pom.xml
    #	pom.xml
    add license in ci
    
    * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
    
    # Conflicts:
    #	dolphinscheduler-alert/pom.xml
    #	dolphinscheduler-api/pom.xml
    #	dolphinscheduler-common/pom.xml
    #	dolphinscheduler-dao/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
    #	dolphinscheduler-dist/pom.xml
    #	dolphinscheduler-rpc/pom.xml
    #	dolphinscheduler-server/pom.xml
    #	dolphinscheduler-ui/pom.xml
    #	pom.xml
    change version to 1.2.0-SNAPSHOT
    
    * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
    
    # Conflicts:
    #	dolphinscheduler-alert/pom.xml
    #	dolphinscheduler-api/pom.xml
    #	dolphinscheduler-common/pom.xml
    #	dolphinscheduler-dao/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
    #	dolphinscheduler-dist/pom.xml
    #	dolphinscheduler-rpc/pom.xml
    #	dolphinscheduler-server/pom.xml
    #	dolphinscheduler-ui/pom.xml
    #	pom.xml
    set defalut db type postgresql
    
    * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
    
    # Conflicts:
    #	dolphinscheduler-alert/pom.xml
    #	dolphinscheduler-api/pom.xml
    #	dolphinscheduler-common/pom.xml
    #	dolphinscheduler-dao/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
    #	dolphinscheduler-dist/pom.xml
    #	dolphinscheduler-rpc/pom.xml
    #	dolphinscheduler-server/pom.xml
    #	dolphinscheduler-ui/pom.xml
    #	pom.xml
    set defalut db type postgresql
    
    * change org.quartz.jobStore.driverDelegateClass
    
    * Add comments in method params
    
    * update readme from branch dev
    
    * update content in how to contribute
    
    * change postgresql default port
    
    * change version 1.2.0-SNAPSHOT
    
    * remove antrun plugin
    
    * add how to build
    
    * add how to build
    
    * remove dir format in assembly
    
    * dockerfile maven package modify (#1305)
    
    * reset pgsql (#1178)
    
    + 1
    
    * Ans UI upgrade to version 0.1.0 (#1181)
    
    + 1
    
    * Administrators group prohibit deletion (#1182)
    
    * Ans UI upgrade to version 0.1.0
    
    * Administrators group prohibit deletion
    
    * fix master server shutdown error (#1177)
    
    * move updateTaskState into try/catch block in case of exception
    
    * fix NPE
    
    * using conf.getInt instead of getString
    
    * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
    for AlertDao, correct the spelling.
    
    * duplicate
    
    * refactor getTaskWorkerGroupId
    
    * add friendly log
    
    * update hearbeat thread num = 1
    
    * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
    
    * 1. move verifyTaskInstanceIsNull after taskInstance
    2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
    
    * fix the message
    
    * delete before check to avoid KeeperException$NoNodeException
    
    * fix the message
    
    * check processInstance state before delete tenant
    
    * check processInstance state before delete worker group
    
    * refactor
    
    * merge api constants into common constatns
    
    * update the resource perm
    
    * update the dataSource perm
    
    * fix CheckUtils.checkUserParams method
    
    * update AlertGroupService, extends from BaseService, remove duplicate methods
    
    * refactor
    
    * modify method name
    
    * add hasProjectAndPerm method
    
    * using checkProject instead of getResultStatus
    
    * delete checkAuth method, using hasProjectAndPerm instead.
    
    * correct spelling
    
    * add transactional for deleteWorkerGroupById
    
    * add Transactional for deleteProcessInstanceById method
    
    * change sqlSessionTemplate singleton
    
    * change sqlSessionTemplate singleton and reformat code
    
    * fix unsuitable error message
    
    * update shutdownhook methods
    
    * fix worker log bug
    
    * fix api server debug mode bug
    
    * upgrade zk version
    
    * delete this line ,for zkClient.close() will do the whole thing
    
    * fix master server shutdown error
    
    * degrade zk version and add FourLetterWordMain class (#1183)
    
    * move updateTaskState into try/catch block in case of exception
    
    * fix NPE
    
    * using conf.getInt instead of getString
    
    * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
    for AlertDao, correct the spelling.
    
    * duplicate
    
    * refactor getTaskWorkerGroupId
    
    * add friendly log
    
    * update hearbeat thread num = 1
    
    * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
    
    * 1. move verifyTaskInstanceIsNull after taskInstance
    2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
    
    * fix the message
    
    * delete before check to avoid KeeperException$NoNodeException
    
    * fix the message
    
    * check processInstance state before delete tenant
    
    * check processInstance state before delete worker group
    
    * refactor
    
    * merge api constants into common constatns
    
    * update the resource perm
    
    * update the dataSource perm
    
    * fix CheckUtils.checkUserParams method
    
    * update AlertGroupService, extends from BaseService, remove duplicate methods
    
    * refactor
    
    * modify method name
    
    * add hasProjectAndPerm method
    
    * using checkProject instead of getResultStatus
    
    * delete checkAuth method, using hasProjectAndPerm instead.
    
    * correct spelling
    
    * add transactional for deleteWorkerGroupById
    
    * add Transactional for deleteProcessInstanceById method
    
    * change sqlSessionTemplate singleton
    
    * change sqlSessionTemplate singleton and reformat code
    
    * fix unsuitable error message
    
    * update shutdownhook methods
    
    * fix worker log bug
    
    * fix api server debug mode bug
    
    * upgrade zk version
    
    * delete this line ,for zkClient.close() will do the whole thing
    
    * fix master server shutdown error
    
    * degrade zk version and add FourLetterWordMain class
    
    * fix ZKWorkerClient not close PathChildrenCache (#1185)
    
    * move updateTaskState into try/catch block in case of exception
    
    * fix NPE
    
    * using conf.getInt instead of getString
    
    * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
    for AlertDao, correct the spelling.
    
    * duplicate
    
    * refactor getTaskWorkerGroupId
    
    * add friendly log
    
    * update hearbeat thread num = 1
    
    * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
    
    * 1. move verifyTaskInstanceIsNull after taskInstance
    2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
    
    * fix the message
    
    * delete before check to avoid KeeperException$NoNodeException
    
    * fix the message
    
    * check processInstance state before delete tenant
    
    * check processInstance state before delete worker group
    
    * refactor
    
    * merge api constants into common constatns
    
    * update the resource perm
    
    * update the dataSource perm
    
    * fix CheckUtils.checkUserParams method
    
    * update AlertGroupService, extends from BaseService, remove duplicate methods
    
    * refactor
    
    * modify method name
    
    * add hasProjectAndPerm method
    
    * using checkProject instead of getResultStatus
    
    * delete checkAuth method, using hasProjectAndPerm instead.
    
    * correct spelling
    
    * add transactional for deleteWorkerGroupById
    
    * add Transactional for deleteProcessInstanceById method
    
    * change sqlSessionTemplate singleton
    
    * change sqlSessionTemplate singleton and reformat code
    
    * fix unsuitable error message
    
    * update shutdownhook methods
    
    * fix worker log bug
    
    * fix api server debug mode bug
    
    * upgrade zk version
    
    * delete this line ,for zkClient.close() will do the whole thing
    
    * fix master server shutdown error
    
    * degrade zk version and add FourLetterWordMain class
    
    * fix PathChildrenCache not close
    
    * add Transactional for createSession method (#1186)
    
    * move updateTaskState into try/catch block in case of exception
    
    * fix NPE
    
    * using conf.getInt instead of getString
    
    * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
    for AlertDao, correct the spelling.
    
    * duplicate
    
    * refactor getTaskWorkerGroupId
    
    * add friendly log
    
    * update hearbeat thread num = 1
    
    * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
    
    * 1. move verifyTaskInstanceIsNull after taskInstance
    2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
    
    * fix the message
    
    * delete before check to avoid KeeperException$NoNodeException
    
    * fix the message
    
    * check processInstance state before delete tenant
    
    * check processInstance state before delete worker group
    
    * refactor
    
    * merge api constants into common constatns
    
    * update the resource perm
    
    * update the dataSource perm
    
    * fix CheckUtils.checkUserParams method
    
    * update AlertGroupService, extends from BaseService, remove duplicate methods
    
    * refactor
    
    * modify method name
    
    * add hasProjectAndPerm method
    
    * using checkProject instead of getResultStatus
    
    * delete checkAuth method, using hasProjectAndPerm instead.
    
    * correct spelling
    
    * add transactional for deleteWorkerGroupById
    
    * add Transactional for deleteProcessInstanceById method
    
    * change sqlSessionTemplate singleton
    
    * change sqlSessionTemplate singleton and reformat code
    
    * fix unsuitable error message
    
    * update shutdownhook methods
    
    * fix worker log bug
    
    * fix api server debug mode bug
    
    * upgrade zk version
    
    * delete this line ,for zkClient.close() will do the whole thing
    
    * fix master server shutdown error
    
    * degrade zk version and add FourLetterWordMain class
    
    * fix PathChildrenCache not close
    
    * add Transactional for createSession method
    
    * dockerfile dao application.properties ,install.sh modify and application.properties modify (#1187)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify (#1189)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs (#1191)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs
    
    * nginx conf modify
    
    * dockerfile application.properties modify
    
    * dockerfile conf modify (#1192)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs
    
    * nginx conf modify
    
    * dockerfile application.properties modify
    
    * dockerfile conf modify (#1193)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs
    
    * nginx conf modify
    
    * dockerfile application.properties modify
    
    * dockerfile email address change (#1194)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs
    
    * nginx conf modify
    
    * dockerfile application.properties modify
    
    * dockerfile email address change
    
    * the alert module is modified in english (#1195)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs
    
    * nginx conf modify
    
    * dockerfile application.properties modify
    
    * dockerfile email address change
    
    * the alert module is modified in English.
    
    * alert server comment and chinese modify
    
    * api server useless code and chinese modify (#1198)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs
    
    * nginx conf modify
    
    * dockerfile application.properties modify
    
    * dockerfile email address change
    
    * the alert module is modified in English.
    
    * alert server comment and chinese modify
    
    * api server useless code and chinese modify
    
    * common,dao,server useless code and chinese modify (#1199)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs
    
    * nginx conf modify
    
    * dockerfile application.properties modify
    
    * dockerfile email address change
    
    * the alert module is modified in English.
    
    * alert server comment and chinese modify
    
    * api server useless code and chinese modify
    
    * common,dao,server useless code and chinese modify
    
    * change chinese sql to english. (#1200)
    
    * update english documents
    
    * refactor zk client
    
    * update documents
    
    * update zkclient
    
    * update zkclient
    
    * update documents
    
    * add architecture-design
    
    * change i18n
    
    * update i18n
    
    * update english documents
    
    * add architecture-design
    
    * update english documents
    
    * update en-US documents
    
    * add architecture-design
    
    * update demo site
    
    * add mybatis plus model
    
    * modify mybatisplus
    
    * modify mybatisplus
    
    * change interface by mybatisplus
    
    * add unit test
    
    * refactor dao interface.
    
    * add unit test for dao...
    
    * add unit test for dao...
    
    * add unit test for dao...
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
    
    * update some dao bugs
    
    * update for some bugs
    
    * update some bugs
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
    
    * update
    
    * update
    
    * add multiply settings for application.yml
    
    * add multiply settings for application.yml
    
    * revert
    
    * update configuration settings in task record dao...
    
    * change application_master to application-master
    
    * change application_master to application-master
    
    * update application.yml to application.properties
    
    * revert
    
    * revert
    
    * add properties
    
    * add properties
    
    * revert
    
    * revert
    
    * add api start up..
    add alert send try catch
    
    * update dao info level
    
    * fix bug: task cannot submit when recovery failover
    
    * fix bug: task cannot submit when recovery failover
    
    * merge from dev-db
    
    * revert
    
    * revert
    
    * fix bug: get process definition list failed.
    
    * fix bug: process instance interval is error
    
    * revert
    
    * revert
    
    * update
    
    * support stop submit success tasks
    
    * update kill process
    
    * update for stop process
    
    * update for stop process
    
    * add some logs for stop process
    
    * update for small bug.
    
    * add check strategy before submit task
    
    * revert
    
    * update
    
    * update
    
    * revert
    
    * wait task instance exists if null.
    
    * revert
    
    * update
    
    * change desc to description.
    
    * add check user and definitions function when delete tenant
    
    * update
    
    * change desc to description.
    
    * change desc to description.
    
    * change desc to description.
    
    * remove check resources when delete tenant
    
    * change desc to description.
    
    * change mybatisplus version to 3.2.0
    
    * update
    
    * change the notice to apache.
    
    * update
    
    * update postgre sql
    
    * fix bug: phone can be empty.
    
    * fix bug: postgre test error.
    
    * update create table for postgre quartz
    
    * fix some bugs about postgre.
    
    * update create table for postgre quartz
    
    * add postgre db performance monitor
    
    * add postgre performance monitor
    
    * update performance monitor
    
    * revert
    
    * revert
    
    * fix bug: tasks queue length error
    
    * remove datasource.properties
    
    * change chinese sql to english.
    
    * change chinese sql to english.
    
    * change chinese to english (#1202)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs
    
    * nginx conf modify
    
    * dockerfile application.properties modify
    
    * dockerfile email address change
    
    * the alert module is modified in English.
    
    * alert server comment and chinese modify
    
    * api server useless code and chinese modify
    
    * common,dao,server useless code and chinese modify
    
    * change chinese to english
    
    * remove unused code (#1204)
    
    * update english documents
    
    * refactor zk client
    
    * update documents
    
    * update zkclient
    
    * update zkclient
    
    * update documents
    
    * add architecture-design
    
    * change i18n
    
    * update i18n
    
    * update english documents
    
    * add architecture-design
    
    * update english documents
    
    * update en-US documents
    
    * add architecture-design
    
    * update demo site
    
    * add mybatis plus model
    
    * modify mybatisplus
    
    * modify mybatisplus
    
    * change interface by mybatisplus
    
    * add unit test
    
    * refactor dao interface.
    
    * add unit test for dao...
    
    * add unit test for dao...
    
    * add unit test for dao...
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
    
    * update some dao bugs
    
    * update for some bugs
    
    * update some bugs
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
    
    * update
    
    * update
    
    * add multiply settings for application.yml
    
    * add multiply settings for application.yml
    
    * revert
    
    * update configuration settings in task record dao...
    
    * change application_master to application-master
    
    * change application_master to application-master
    
    * update application.yml to application.properties
    
    * revert
    
    * revert
    
    * add properties
    
    * add properties
    
    * revert
    
    * revert
    
    * add api start up..
    add alert send try catch
    
    * update dao info level
    
    * fix bug: task cannot submit when recovery failover
    
    * fix bug: task cannot submit when recovery failover
    
    * merge from dev-db
    
    * revert
    
    * revert
    
    * fix bug: get process definition list failed.
    
    * fix bug: process instance interval is error
    
    * revert
    
    * revert
    
    * update
    
    * support stop submit success tasks
    
    * update kill process
    
    * update for stop process
    
    * update for stop process
    
    * add some logs for stop process
    
    * update for small bug.
    
    * add check strategy before submit task
    
    * revert
    
    * update
    
    * update
    
    * revert
    
    * wait task instance exists if null.
    
    * revert
    
    * update
    
    * change desc to description.
    
    * add check user and definitions function when delete tenant
    
    * update
    
    * change desc to description.
    
    * change desc to description.
    
    * change desc to description.
    
    * remove check resources when delete tenant
    
    * change desc to description.
    
    * change mybatisplus version to 3.2.0
    
    * update
    
    * change the notice to apache.
    
    * update
    
    * update postgre sql
    
    * fix bug: phone can be empty.
    
    * fix bug: postgre test error.
    
    * update create table for postgre quartz
    
    * fix some bugs about postgre.
    
    * update create table for postgre quartz
    
    * add postgre db performance monitor
    
    * add postgre performance monitor
    
    * update performance monitor
    
    * revert
    
    * revert
    
    * fix bug: tasks queue length error
    
    * remove datasource.properties
    
    * change chinese sql to english.
    
    * change chinese sql to english.
    
    * remove unused code.
    
    * remove unused code.
    
    * Modify webpack configuration (#1206)
    
    * add more message for java-doc (#1209)
    
    * move updateTaskState into try/catch block in case of exception
    
    * fix NPE
    
    * using conf.getInt instead of getString
    
    * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
    for AlertDao, correct the spelling.
    
    * duplicate
    
    * refactor getTaskWorkerGroupId
    
    * add friendly log
    
    * update hearbeat thread num = 1
    
    * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
    
    * 1. move verifyTaskInstanceIsNull after taskInstance
    2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
    
    * fix the message
    
    * delete before check to avoid KeeperException$NoNodeException
    
    * fix the message
    
    * check processInstance state before delete tenant
    
    * check processInstance state before delete worker group
    
    * refactor
    
    * merge api constants into common constatns
    
    * update the resource perm
    
    * update the dataSource perm
    
    * fix CheckUtils.checkUserParams method
    
    * update AlertGroupService, extends from BaseService, remove duplicate methods
    
    * refactor
    
    * modify method name
    
    * add hasProjectAndPerm method
    
    * using checkProject instead of getResultStatus
    
    * delete checkAuth method, using hasProjectAndPerm instead.
    
    * correct spelling
    
    * add transactional for deleteWorkerGroupById
    
    * add Transactional for deleteProcessInstanceById method
    
    * change sqlSessionTemplate singleton
    
    * change sqlSessionTemplate singleton and reformat code
    
    * fix unsuitable error message
    
    * update shutdownhook methods
    
    * fix worker log bug
    
    * fix api server debug mode bug
    
    * upgrade zk version
    
    * delete this line ,for zkClient.close() will do the whole thing
    
    * fix master server shutdown error
    
    * degrade zk version and add FourLetterWordMain class
    
    * fix PathChildrenCache not close
    
    * add Transactional for createSession method
    
    * add more message for java-doc
    
    * add java doc for common module (#1213)
    
    * dao method comments and useless code modify (#1214)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs
    
    * nginx conf modify
    
    * dockerfile application.properties modify
    
    * dockerfile email address change
    
    * the alert module is modified in English.
    
    * alert server comment and chinese modify
    
    * api server useless code and chinese modify
    
    * common,dao,server useless code and chinese modify
    
    * change chinese to english
    
    * dao method comments and useless code modify
    
    * Change all Chinese names to English (#1207)
    
    * Modify webpack configuration
    
    * Change all Chinese names to English
    
    * add progress-bar-webpack-plugin (#1215)
    
    * Modify webpack configuration
    
    * Change all Chinese names to English
    
    * add progress-bar-webpack-plugin
    
    * Add method and parameters comments (#1220)
    
    * rename from DatasourceUserMapper to DataSourceUserMapper
    
    * add unit test in UserMapper and WorkerGroupMapper
    
    * change cn.escheduler to org.apache.dolphinscheduler
    
    * add unit test in UdfFuncMapperTest
    
    * add unit test in UdfFuncMapperTest
    
    * remove DatabaseConfiguration
    
    * add ConnectionFactoryTest
    
    * cal duration in processInstancesList
    
    * change desc to description
    
    * change table name in mysql ddl
    
    * change table name in mysql ddl
    
    * change escheduler to dolphinscheduler
    
    * change escheduler to dolphinscheduler
    
    * change escheduler to dolphinscheduler
    
    * remove log4j-1.2-api and modify AlertMapperTest
    
    * remove log4j-1.2-api
    
    * Add alertDao to spring management
    
    * Add alertDao to spring management
    
    * get SqlSessionFactory from MybatisSqlSessionFactoryBean
    
    * get processDao by DaoFactory
    
    * read druid properties in ConneciontFactory
    
    * read druid properties in ConneciontFactory
    
    * change get alertDao by spring to DaoFactory
    
    * add log4j to resolve #967
    
    * resole verify udf name error and delete udf error
    
    * Determine if principal is empty
    
    * Determine whether the logon user has the right to delete the project
    
    * Fixed an issue that produced attatch file named such as ATT00002.bin
    
    * fix too many connection in upgrade or create
    
    * fix NEED_FAULT_TOLERANCE and WAITTING_THREAD count fail
    
    * Added a judgment on whether the currently login user is an administrator
    
    * fix update udf database not change and create time is changed
    
    * add enterprise.wechat.enable to decide whether to send enterprise WeChat
    
    * change method check
    
    * Remove the administrator's judgment on query access token list
    
    * only admin can create worker group
    
    * delete alert group need delete the relation of user and alert group
    
    * add timeout in proxy when upload large resource
    
    * add gets scheduled times by expect fire times
    
    * add gets scheduled times by expect fire times
    
    * Increase the judgment of whether it is admin
    
    * Increase the judgment of whether it is admin
    
    * when delete access token add whether login user has perm to delete
    
    * change mysql-connector-java scope to test
    
    * update scm test
    
    * add profile test
    
    * Add method and parameters comments
    
    * roll back
    
    * add some notes (#1221)
    
    * update english documents
    
    * refactor zk client
    
    * update documents
    
    * update zkclient
    
    * update zkclient
    
    * update documents
    
    * add architecture-design
    
    * change i18n
    
    * update i18n
    
    * update english documents
    
    * add architecture-design
    
    * update english documents
    
    * update en-US documents
    
    * add architecture-design
    
    * update demo site
    
    * add mybatis plus model
    
    * modify mybatisplus
    
    * modify mybatisplus
    
    * change interface by mybatisplus
    
    * add unit test
    
    * refactor dao interface.
    
    * add unit test for dao...
    
    * add unit test for dao...
    
    * add unit test for dao...
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
    
    * update some dao bugs
    
    * update for some bugs
    
    * update some bugs
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
    
    * update
    
    * update
    
    * add multiply settings for application.yml
    
    * add multiply settings for application.yml
    
    * revert
    
    * update configuration settings in task record dao...
    
    * change application_master to application-master
    
    * change application_master to application-master
    
    * update application.yml to application.properties
    
    * revert
    
    * revert
    
    * add properties
    
    * add properties
    
    * revert
    
    * revert
    
    * add api start up..
    add alert send try catch
    
    * update dao info level
    
    * fix bug: task cannot submit when recovery failover
    
    * fix bug: task cannot submit when recovery failover
    
    * merge from dev-db
    
    * revert
    
    * revert
    
    * fix bug: get process definition list failed.
    
    * fix bug: process instance interval is error
    
    * revert
    
    * revert
    
    * update
    
    * support stop submit success tasks
    
    * update kill process
    
    * update for stop process
    
    * update for stop process
    
    * add some logs for stop process
    
    * update for small bug.
    
    * add check strategy before submit task
    
    * revert
    
    * update
    
    * update
    
    * revert
    
    * wait task instance exists if null.
    
    * revert
    
    * update
    
    * change desc to description.
    
    * add check user and definitions function when delete tenant
    
    * update
    
    * change desc to description.
    
    * change desc to description.
    
    * change desc to description.
    
    * remove check resources when delete tenant
    
    * change desc to description.
    
    * change mybatisplus version to 3.2.0
    
    * update
    
    * change the notice to apache.
    
    * update
    
    * update postgre sql
    
    * fix bug: phone can be empty.
    
    * fix bug: postgre test error.
    
    * update create table for postgre quartz
    
    * fix some bugs about postgre.
    
    * update create table for postgre quartz
    
    * add postgre db performance monitor
    
    * add postgre performance monitor
    
    * update performance monitor
    
    * revert
    
    * revert
    
    * fix bug: tasks queue length error
    
    * remove datasource.properties
    
    * change chinese sql to english.
    
    * change chinese sql to english.
    
    * remove unused code.
    
    * remove unused code.
    
    * add some notes
    
    * update some notes
    
    * update some notes
    
    * update mbatisplus version
    
    * update lombok version
    
    * update lombok version
    
    * revert
    
    * master startup error bug fix (#1229)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs
    
    * nginx conf modify
    
    * dockerfile application.properties modify
    
    * dockerfile email address change
    
    * the alert module is modified in English.
    
    * alert server comment and chinese modify
    
    * api server useless code and chinese modify
    
    * common,dao,server useless code and chinese modify
    
    * change chinese to english
    
    * dao method comments and useless code modify
    
    * master startup error bug fix
    
    * delete class App, let spring manage connectionFactory (#1233)
    
    * move updateTaskState into try/catch block in case of exception
    
    * fix NPE
    
    * using conf.getInt instead of getString
    
    * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
    for AlertDao, correct the spelling.
    
    * duplicate
    
    * refactor getTaskWorkerGroupId
    
    * add friendly log
    
    * update hearbeat thread num = 1
    
    * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
    
    * 1. move verifyTaskInstanceIsNull after taskInstance
    2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
    
    * fix the message
    
    * delete before check to avoid KeeperException$NoNodeException
    
    * fix the message
    
    * check processInstance state before delete tenant
    
    * check processInstance state before delete worker group
    
    * refactor
    
    * merge api constants into common constatns
    
    * update the resource perm
    
    * update the dataSource perm
    
    * fix CheckUtils.checkUserParams method
    
    * update AlertGroupService, extends from BaseService, remove duplicate methods
    
    * refactor
    
    * modify method name
    
    * add hasProjectAndPerm method
    
    * using checkProject instead of getResultStatus
    
    * delete checkAuth method, using hasProjectAndPerm instead.
    
    * correct spelling
    
    * add transactional for deleteWorkerGroupById
    
    * add Transactional for deleteProcessInstanceById method
    
    * change sqlSessionTemplate singleton
    
    * change sqlSessionTemplate singleton and reformat code
    
    * fix unsuitable error message
    
    * update shutdownhook methods
    
    * fix worker log bug
    
    * fix api server debug mode bug
    
    * upgrade zk version
    
    * delete this line ,for zkClient.close() will do the whole thing
    
    * fix master server shutdown error
    
    * degrade zk version and add FourLetterWordMain class
    
    * fix PathChildrenCache not close
    
    * add Transactional for createSession method
    
    * add more message for java-doc
    
    * delete App, let spring manage connectionFactory
    
    * add license
    
    * add class Application for test support
    
    * refactor masterServer and workerServer (#1244)
    
    * move updateTaskState into try/catch block in case of exception
    
    * fix NPE
    
    * using conf.getInt instead of getString
    
    * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
    for AlertDao, correct the spelling.
    
    * duplicate
    
    * refactor getTaskWorkerGroupId
    
    * add friendly log
    
    * update hearbeat thread num = 1
    
    * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
    
    * 1. move verifyTaskInstanceIsNull after taskInstance
    2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
    
    * fix the message
    
    * delete before check to avoid KeeperException$NoNodeException
    
    * fix the message
    
    * check processInstance state before delete tenant
    
    * check processInstance state before delete worker group
    
    * refactor
    
    * merge api constants into common constatns
    
    * update the resource perm
    
    * update the dataSource perm
    
    * fix CheckUtils.checkUserParams method
    
    * update AlertGroupService, extends from BaseService, remove duplicate methods
    
    * refactor
    
    * modify method name
    
    * add hasProjectAndPerm method
    
    * using checkProject instead of getResultStatus
    
    * delete checkAuth method, using hasProjectAndPerm instead.
    
    * correct spelling
    
    * add transactional for deleteWorkerGroupById
    
    * add Transactional for deleteProcessInstanceById method
    
    * change sqlSessionTemplate singleton
    
    * change sqlSessionTemplate singleton and reformat code
    
    * fix unsuitable error message
    
    * update shutdownhook methods
    
    * fix worker log bug
    
    * fix api server debug mode bug
    
    * upgrade zk version
    
    * delete this line ,for zkClient.close() will do the whole thing
    
    * fix master server shutdown error
    
    * degrade zk version and add FourLetterWordMain class
    
    * fix PathChildrenCache not close
    
    * add Transactional for createSession method
    
    * add more message for java-doc
    
    * delete App, let spring manage connectionFactory
    
    * add license
    
    * add class Application for test support
    
    * refactor masterServer and workerServer
    
    * add args
    
    * ConnectionFactory add paging intercepter
    
    * ConnectionFactory add paging intercepter (#1250)
    
    * remove spotbugs-annotations.jar LGPL protocol
    
    * remove spotbugs-annotations.jar LGPL protocol (#1251)
    
    * ConnectionFactory add paging intercepter
    
    * remove spotbugs-annotations.jar LGPL protocol
    
    * fix #1245, make scanCommand transactional (#1246)
    
    * fix the spring transaction not worker bug  (#1252)
    
    * move updateTaskState into try/catch block in case of exception
    
    * fix NPE
    
    * using conf.getInt instead of getString
    
    * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
    for AlertDao, correct the spelling.
    
    * duplicate
    
    * refactor getTaskWorkerGroupId
    
    * add friendly log
    
    * update hearbeat thread num = 1
    
    * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
    
    * 1. move verifyTaskInstanceIsNull after taskInstance
    2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
    
    * fix the message
    
    * delete before check to avoid KeeperException$NoNodeException
    
    * fix the message
    
    * check processInstance state before delete tenant
    
    * check processInstance state before delete worker group
    
    * refactor
    
    * merge api constants into common constatns
    
    * update the resource perm
    
    * update the dataSource perm
    
    * fix CheckUtils.checkUserParams method
    
    * update AlertGroupService, extends from BaseService, remove duplicate methods
    
    * refactor
    
    * modify method name
    
    * add hasProjectAndPerm method
    
    * using checkProject instead of getResultStatus
    
    * delete checkAuth method, using hasProjectAndPerm instead.
    
    * correct spelling
    
    * add transactional for deleteWorkerGroupById
    
    * add Transactional for deleteProcessInstanceById method
    
    * change sqlSessionTemplate singleton
    
    * change sqlSessionTemplate singleton and reformat code
    
    * fix unsuitable error message
    
    * update shutdownhook methods
    
    * fix worker log bug
    
    * fix api server debug mode bug
    
    * upgrade zk version
    
    * delete this line ,for zkClient.close() will do the whole thing
    
    * fix master server shutdown error
    
    * degrade zk version and add FourLetterWordMain class
    
    * fix PathChildrenCache not close
    
    * add Transactional for createSession method
    
    * add more message for java-doc
    
    * delete App, let spring manage connectionFactory
    
    * add license
    
    * add class Application for test support
    
    * refactor masterServer and workerServer
    
    * add args
    
    * fix the spring transaction not work bug
    
    * remove author
    
    * delete @Bean annotation
    
    * rename application.properties to application-dao.properties
    
    * delete class MybatisPlusConfig (#1254)
    
    * move updateTaskState into try/catch block in case of exception
    
    * fix NPE
    
    * using conf.getInt instead of getString
    
    * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
    for AlertDao, correct the spelling.
    
    * duplicate
    
    * refactor getTaskWorkerGroupId
    
    * add friendly log
    
    * update hearbeat thread num = 1
    
    * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
    
    * 1. move verifyTaskInstanceIsNull after taskInstance
    2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
    
    * fix the message
    
    * delete before check to avoid KeeperException$NoNodeException
    
    * fix the message
    
    * check processInstance state before delete tenant
    
    * check processInstance state before delete worker group
    
    * refactor
    
    * merge api constants into common constatns
    
    * update the resource perm
    
    * update the dataSource perm
    
    * fix CheckUtils.checkUserParams method
    
    * update AlertGroupService, extends from BaseService, remove duplicate methods
    
    * refactor
    
    * modify method name
    
    * add hasProjectAndPerm method
    
    * using checkProject instead of getResultStatus
    
    * delete checkAuth method, using hasProjectAndPerm instead.
    
    * correct spelling
    
    * add transactional for deleteWorkerGroupById
    
    * add Transactional for deleteProcessInstanceById method
    
    * change sqlSessionTemplate singleton
    
    * change sqlSessionTemplate singleton and reformat code
    
    * fix unsuitable error message
    
    * update shutdownhook methods
    
    * fix worker log bug
    
    * fix api server debug mode bug
    
    * upg…
    
    * [maven-release-plugin] prepare release 1.2.0
    
    * [maven-release-plugin] prepare for next development iteration
    
    * Remove the judgment of whether it is admin (#1308)
    
    * rename from DatasourceUserMapper to DataSourceUserMapper
    
    * add unit test in UserMapper and WorkerGroupMapper
    
    * change cn.escheduler to org.apache.dolphinscheduler
    
    * add unit test in UdfFuncMapperTest
    
    * add unit test in UdfFuncMapperTest
    
    * remove DatabaseConfiguration
    
    * add ConnectionFactoryTest
    
    * cal duration in processInstancesList
    
    * change desc to description
    
    * change table name in mysql ddl
    
    * change table name in mysql ddl
    
    * change escheduler to dolphinscheduler
    
    * change escheduler to dolphinscheduler
    
    * change escheduler to dolphinscheduler
    
    * remove log4j-1.2-api and modify AlertMapperTest
    
    * remove log4j-1.2-api
    
    * Add alertDao to spring management
    
    * Add alertDao to spring management
    
    * get SqlSessionFactory from MybatisSqlSessionFactoryBean
    
    * get processDao by DaoFactory
    
    * read druid properties in ConneciontFactory
    
    * read druid properties in ConneciontFactory
    
    * change get alertDao by spring to DaoFactory
    
    * add log4j to resolve #967
    
    * resole verify udf name error and delete udf error
    
    * Determine if principal is empty
    
    * Determine whether the logon user has the right to delete the project
    
    * Fixed an issue that produced attatch file named such as ATT00002.bin
    
    * fix too many connection in upgrade or create
    
    * fix NEED_FAULT_TOLERANCE and WAITTING_THREAD count fail
    
    * Added a judgment on whether the currently login user is an administrator
    
    * fix update udf database not change and create time is changed
    
    * add enterprise.wechat.enable to decide whether to send enterprise WeChat
    
    * change method check
    
    * Remove the administrator's judgment on query access token list
    
    * only admin can create worker group
    
    * delete alert group need delete the relation of user and alert group
    
    * add timeout in proxy when upload large resource
    
    * add gets scheduled times by expect fire times
    
    * add gets scheduled times by expect fire times
    
    * Increase the judgment of whether it is admin
    
    * Increase the judgment of whether it is admin
    
    * when delete access token add whether login user has perm to delete
    
    * change mysql-connector-java scope to test
    
    * update scm test
    
    * add profile test
    
    * add profile test
    
    * add maven.deploy.skip true
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * add dependency
    
    * add javadoc
    
    * add antrun
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * reset pgsql (#1178)
    
    + 1
    
    * add javadoc
    
    * add javadoc
    
    * [maven-release-plugin] rollback the release of 1.2.0
    
    * add javadoc
    
    * Ans UI upgrade to version 0.1.0 (#1181)
    
    + 1
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * Administrators group prohibit deletion (#1182)
    
    * Ans UI upgrade to version 0.1.0
    
    * Administrators group prohibit deletion
    
    * add javadoc
    
    * add ui pom
    
    * fix master server shutdown error (#1177)
    
    * move updateTaskState into try/catch block in case of exception
    
    * fix NPE
    
    * using conf.getInt instead of getString
    
    * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
    for AlertDao, correct the spelling.
    
    * duplicate
    
    * refactor getTaskWorkerGroupId
    
    * add friendly log
    
    * update hearbeat thread num = 1
    
    * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
    
    * 1. move verifyTaskInstanceIsNull after taskInstance
    2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
    
    * fix the message
    
    * delete before check to avoid KeeperException$NoNodeException
    
    * fix the message
    
    * check processInstance state before delete tenant
    
    * check processInstance state before delete worker group
    
    * refactor
    
    * merge api constants into common constatns
    
    * update the resource perm
    
    * update the dataSource perm
    
    * fix CheckUtils.checkUserParams method
    
    * update AlertGroupService, extends from BaseService, remove duplicate methods
    
    * refactor
    
    * modify method name
    
    * add hasProjectAndPerm method
    
    * using checkProject instead of getResultStatus
    
    * delete checkAuth method, using hasProjectAndPerm instead.
    
    * correct spelling
    
    * add transactional for deleteWorkerGroupById
    
    * add Transactional for deleteProcessInstanceById method
    
    * change sqlSessionTemplate singleton
    
    * change sqlSessionTemplate singleton and reformat code
    
    * fix unsuitable error message
    
    * update shutdownhook methods
    
    * fix worker log bug
    
    * fix api server debug mode bug
    
    * upgrade zk version
    
    * delete this line ,for zkClient.close() will do the whole thing
    
    * fix master server shutdown error
    
    * degrade zk version and add FourLetterWordMain class (#1183)
    
    * move updateTaskState into try/catch block in case of exception
    
    * fix NPE
    
    * using conf.getInt instead of getString
    
    * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
    for AlertDao, correct the spelling.
    
    * duplicate
    
    * refactor getTaskWorkerGroupId
    
    * add friendly log
    
    * update hearbeat thread num = 1
    
    * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
    
    * 1. move verifyTaskInstanceIsNull after taskInstance
    2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
    
    * fix the message
    
    * delete before check to avoid KeeperException$NoNodeException
    
    * fix the message
    
    * check processInstance state before delete tenant
    
    * check processInstance state before delete worker group
    
    * refactor
    
    * merge api constants into common constatns
    
    * update the resource perm
    
    * update the dataSource perm
    
    * fix CheckUtils.checkUserParams method
    
    * update AlertGroupService, extends from BaseService, remove duplicate methods
    
    * refactor
    
    * modify method name
    
    * add hasProjectAndPerm method
    
    * using checkProject instead of getResultStatus
    
    * delete checkAuth method, using hasProjectAndPerm instead.
    
    * correct spelling
    
    * add transactional for deleteWorkerGroupById
    
    * add Transactional for deleteProcessInstanceById method
    
    * change sqlSessionTemplate singleton
    
    * change sqlSessionTemplate singleton and reformat code
    
    * fix unsuitable error message
    
    * update shutdownhook methods
    
    * fix worker log bug
    
    * fix api server debug mode bug
    
    * upgrade zk version
    
    * delete this line ,for zkClient.close() will do the whole thing
    
    * fix master server shutdown error
    
    * degrade zk version and add FourLetterWordMain class
    
    * add ui pom
    
    * add src pom and assembly
    
    * fix ZKWorkerClient not close PathChildrenCache (#1185)
    
    * move updateTaskState into try/catch block in case of exception
    
    * fix NPE
    
    * using conf.getInt instead of getString
    
    * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
    for AlertDao, correct the spelling.
    
    * duplicate
    
    * refactor getTaskWorkerGroupId
    
    * add friendly log
    
    * update hearbeat thread num = 1
    
    * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
    
    * 1. move verifyTaskInstanceIsNull after taskInstance
    2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
    
    * fix the message
    
    * delete before check to avoid KeeperException$NoNodeException
    
    * fix the message
    
    * check processInstance state before delete tenant
    
    * check processInstance state before delete worker group
    
    * refactor
    
    * merge api constants into common constatns
    
    * update the resource perm
    
    * update the dataSource perm
    
    * fix CheckUtils.checkUserParams method
    
    * update AlertGroupService, extends from BaseService, remove duplicate methods
    
    * refactor
    
    * modify method name
    
    * add hasProjectAndPerm method
    
    * using checkProject instead of getResultStatus
    
    * delete checkAuth method, using hasProjectAndPerm instead.
    
    * correct spelling
    
    * add transactional for deleteWorkerGroupById
    
    * add Transactional for deleteProcessInstanceById method
    
    * change sqlSessionTemplate singleton
    
    * change sqlSessionTemplate singleton and reformat code
    
    * fix unsuitable error message
    
    * update shutdownhook methods
    
    * fix worker log bug
    
    * fix api server debug mode bug
    
    * upgrade zk version
    
    * delete this line ,for zkClient.close() will do the whole thing
    
    * fix master server shutdown error
    
    * degrade zk version and add FourLetterWordMain class
    
    * fix PathChildrenCache not close
    
    * add Transactional for createSession method (#1186)
    
    * move updateTaskState into try/catch block in case of exception
    
    * fix NPE
    
    * using conf.getInt instead of getString
    
    * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
    for AlertDao, correct the spelling.
    
    * duplicate
    
    * refactor getTaskWorkerGroupId
    
    * add friendly log
    
    * update hearbeat thread num = 1
    
    * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
    
    * 1. move verifyTaskInstanceIsNull after taskInstance
    2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
    
    * fix the message
    
    * delete before check to avoid KeeperException$NoNodeException
    
    * fix the message
    
    * check processInstance state before delete tenant
    
    * check processInstance state before delete worker group
    
    * refactor
    
    * merge api constants into common constatns
    
    * update the resource perm
    
    * update the dataSource perm
    
    * fix CheckUtils.checkUserParams method
    
    * update AlertGroupService, extends from BaseService, remove duplicate methods
    
    * refactor
    
    * modify method name
    
    * add hasProjectAndPerm method
    
    * using checkProject instead of getResultStatus
    
    * delete checkAuth method, using hasProjectAndPerm instead.
    
    * correct spelling
    
    * add transactional for deleteWorkerGroupById
    
    * add Transactional for deleteProcessInstanceById method
    
    * change sqlSessionTemplate singleton
    
    * change sqlSessionTemplate singleton and reformat code
    
    * fix unsuitable error message
    
    * update shutdownhook methods
    
    * fix worker log bug
    
    * fix api server debug mode bug
    
    * upgrade zk version
    
    * delete this line ,for zkClient.close() will do the whole thing
    
    * fix master server shutdown error
    
    * degrade zk version and add FourLetterWordMain class
    
    * fix PathChildrenCache not close
    
    * add Transactional for createSession method
    
    * add src pom and assembly
    
    * add src pom and assembly
    
    * add src pom and assembly
    
    * add src pom and assembly
    
    * dockerfile dao application.properties ,install.sh modify and application.properties modify (#1187)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * add src pom and assembly
    
    * add src pom and assembly
    
    * dockerfile startup.sh modify (#1189)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs (#1191)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs
    
    * nginx conf modify
    
    * dockerfile application.properties modify
    
    * dockerfile conf modify (#1192)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs
    
    * nginx conf modify
    
    * dockerfile application.properties modify
    
    * dockerfile conf modify (#1193)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs
    
    * nginx conf modify
    
    * dockerfile application.properties modify
    
    * dockerfile email address change (#1194)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs
    
    * nginx conf modify
    
    * dockerfile application.properties modify
    
    * dockerfile email address change
    
    * the alert module is modified in english (#1195)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs
    
    * nginx conf modify
    
    * dockerfile application.properties modify
    
    * dockerfile email address change
    
    * the alert module is modified in English.
    
    * alert server comment and chinese modify
    
    * api server useless code and chinese modify (#1198)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs
    
    * nginx conf modify
    
    * dockerfile application.properties modify
    
    * dockerfile email address change
    
    * the alert module is modified in English.
    
    * alert server comment and chinese modify
    
    * api server useless code and chinese modify
    
    * common,dao,server useless code and chinese modify (#1199)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs
    
    * nginx conf modify
    
    * dockerfile application.properties modify
    
    * dockerfile email address change
    
    * the alert module is modified in English.
    
    * alert server comment and chinese modify
    
    * api server useless code and chinese modify
    
    * common,dao,server useless code and chinese modify
    
    * change chinese sql to english. (#1200)
    
    * update english documents
    
    * refactor zk client
    
    * update documents
    
    * update zkclient
    
    * update zkclient
    
    * update documents
    
    * add architecture-design
    
    * change i18n
    
    * update i18n
    
    * update english documents
    
    * add architecture-design
    
    * update english documents
    
    * update en-US documents
    
    * add architecture-design
    
    * update demo site
    
    * add mybatis plus model
    
    * modify mybatisplus
    
    * modify mybatisplus
    
    * change interface by mybatisplus
    
    * add unit test
    
    * refactor dao interface.
    
    * add unit test for dao...
    
    * add unit test for dao...
    
    * add unit test for dao...
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
    
    * update some dao bugs
    
    * update for some bugs
    
    * update some bugs
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
    
    * update
    
    * update
    
    * add multiply settings for application.yml
    
    * add multiply settings for application.yml
    
    * revert
    
    * update configuration settings in task record dao...
    
    * change application_master to application-master
    
    * change application_master to application-master
    
    * update application.yml to application.properties
    
    * revert
    
    * revert
    
    * add properties
    
    * add properties
    
    * revert
    
    * revert
    
    * add api start up..
    add alert send try catch
    
    * update dao info level
    
    * fix bug: task cannot submit when recovery failover
    
    * fix bug: task cannot submit when recovery failover
    
    * merge from dev-db
    
    * revert
    
    * revert
    
    * fix bug: get process definition list failed.
    
    * fix bug: process instance interval is error
    
    * revert
    
    * revert
    
    * update
    
    * support stop submit success tasks
    
    * update kill process
    
    * update for stop process
    
    * update for stop process
    
    * add some logs for stop process
    
    * update for small bug.
    
    * add check strategy before submit task
    
    * revert
    
    * update
    
    * update
    
    * revert
    
    * wait task instance exists if null.
    
    * revert
    
    * update
    
    * change desc to description.
    
    * add check user and definitions function when delete tenant
    
    * update
    
    * change desc to description.
    
    * change desc to description.
    
    * change desc to description.
    
    * remove check resources when delete tenant
    
    * change desc to description.
    
    * change mybatisplus version to 3.2.0
    
    * update
    
    * change the notice to apache.
    
    * update
    
    * update postgre sql
    
    * fix bug: phone can be empty.
    
    * fix bug: postgre test error.
    
    * update create table for postgre quartz
    
    * fix some bugs about postgre.
    
    * update create table for postgre quartz
    
    * add postgre db performance monitor
    
    * add postgre performance monitor
    
    * update performance monitor
    
    * revert
    
    * revert
    
    * fix bug: tasks queue length error
    
    * remove datasource.properties
    
    * change chinese sql to english.
    
    * change chinese sql to english.
    
    * change chinese to english (#1202)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs
    
    * nginx conf modify
    
    * dockerfile application.properties modify
    
    * dockerfile email address change
    
    * the alert module is modified in English.
    
    * alert server comment and chinese modify
    
    * api server useless code and chinese modify
    
    * common,dao,server useless code and chinese modify
    
    * change chinese to english
    
    * remove unused code (#1204)
    
    * update english documents
    
    * refactor zk client
    
    * update documents
    
    * update zkclient
    
    * update zkclient
    
    * update documents
    
    * add architecture-design
    
    * change i18n
    
    * update i18n
    
    * update english documents
    
    * add architecture-design
    
    * update english documents
    
    * update en-US documents
    
    * add architecture-design
    
    * update demo site
    
    * add mybatis plus model
    
    * modify mybatisplus
    
    * modify mybatisplus
    
    * change interface by mybatisplus
    
    * add unit test
    
    * refactor dao interface.
    
    * add unit test for dao...
    
    * add unit test for dao...
    
    * add unit test for dao...
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
    
    * update some dao bugs
    
    * update for some bugs
    
    * update some bugs
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
    
    * update
    
    * update
    
    * add multiply settings for application.yml
    
    * add multiply settings for application.yml
    
    * revert
    
    * update configuration settings in task record dao...
    
    * change application_master to application-master
    
    * change application_master to application-master
    
    * update application.yml to application.properties
    
    * revert
    
    * revert
    
    * add properties
    
    * add properties
    
    * revert
    
    * revert
    
    * add api start up..
    add alert send try catch
    
    * update dao info level
    
    * fix bug: task cannot submit when recovery failover
    
    * fix bug: task cannot submit when recovery failover
    
    * merge from dev-db
    
    * revert
    
    * revert
    
    * fix bug: get process definition list failed.
    
    * fix bug: process instance interval is error
    
    * revert
    
    * revert
    
    * update
    
    * support stop submit success tasks
    
    * update kill process
    
    * update for stop process
    
    * update for stop process
    
    * add some logs for stop process
    
    * update for small bug.
    
    * add check strategy before submit task
    
    * revert
    
    * update
    
    * update
    
    * revert
    
    * wait task instance exists if null.
    
    * revert
    
    * update
    
    * change desc to description.
    
    * add check user and definitions function when delete tenant
    
    * update
    
    * change desc to description.
    
    * change desc to description.
    
    * change desc to description.
    
    * remove check resources when delete tenant
    
    * change desc to description.
    
    * change mybatisplus version to 3.2.0
    
    * update
    
    * change the notice to apache.
    
    * update
    
    * update postgre sql
    
    * fix bug: phone can be empty.
    
    * fix bug: postgre test error.
    
    * update create table for postgre quartz
    
    * fix some bugs about postgre.
    
    * update create table for postgre quartz
    
    * add postgre db performance monitor
    
    * add postgre performance monitor
    
    * update performance monitor
    
    * revert
    
    * revert
    
    * fix bug: tasks queue length error
    
    * remove datasource.properties
    
    * change chinese sql to english.
    
    * change chinese sql to english.
    
    * remove unused code.
    
    * remove unused code.
    
    * Modify webpack configuration (#1206)
    
    * add more message for java-doc (#1209)
    
    * move updateTaskState into try/catch block in case of exception
    
    * fix NPE
    
    * using conf.getInt instead of getString
    
    * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
    for AlertDao, correct the spelling.
    
    * duplicate
    
    * refactor getTaskWorkerGroupId
    
    * add friendly log
    
    * update hearbeat thread num = 1
    
    * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
    
    * 1. move verifyTaskInstanceIsNull after taskInstance
    2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
    
    * fix the message
    
    * delete before check to avoid KeeperException$NoNodeException
    
    * fix the message
    
    * check processInstance state before delete tenant
    
    * check processInstance state before delete worker group
    
    * refactor
    
    * merge api constants into common constatns
    
    * update the resource perm
    
    * update the dataSource perm
    
    * fix CheckUtils.checkUserParams method
    
    * update AlertGroupService, extends from BaseService, remove duplicate methods
    
    * refactor
    
    * modify method name
    
    * add hasProjectAndPerm method
    
    * using checkProject instead of getResultStatus
    
    * delete checkAuth method, using hasProjectAndPerm instead.
    
    * correct spelling
    
    * add transactional for deleteWorkerGroupById
    
    * add Transactional for deleteProcessInstanceById method
    
    * change sqlSessionTemplate singleton
    
    * change sqlSessionTemplate singleton and reformat code
    
    * fix unsuitable error message
    
    * update shutdownhook methods
    
    * fix worker log bug
    
    * fix api server debug mode bug
    
    * upgrade zk version
    
    * delete this line ,for zkClient.close() will do the whole thing
    
    * fix master server shutdown error
    
    * degrade zk version and add FourLetterWordMain class
    
    * fix PathChildrenCache not close
    
    * add Transactional for createSession method
    
    * add more message for java-doc
    
    * add java doc for common module (#1213)
    
    * dao method comments and useless code modify (#1214)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs
    
    * nginx conf modify
    
    * dockerfile application.properties modify
    
    * dockerfile email address change
    
    * the alert module is modified in English.
    
    * alert server comment and chinese modify
    
    * api server useless code and chinese modify
    
    * common,dao,server useless code and chinese modify
    
    * change chinese to english
    
    * dao method comments and useless code modify
    
    * Change all Chinese names to English (#1207)
    
    * Modify webpack configuration
    
    * Change all Chinese names to English
    
    * add progress-bar-webpack-plugin (#1215)
    
    * Modify webpack configuration
    
    * Change all Chinese names to English
    
    * add progress-bar-webpack-plugin
    
    * Add method and parameters comments (#1220)
    
    * rename from DatasourceUserMapper to DataSourceUserMapper
    
    * add unit test in UserMapper and WorkerGroupMapper
    
    * change cn.escheduler to org.apache.dolphinscheduler
    
    * add unit test in UdfFuncMapperTest
    
    * add unit test in UdfFuncMapperTest
    
    * remove DatabaseConfiguration
    
    * add ConnectionFactoryTest
    
    * cal duration in processInstancesList
    
    * change desc to description
    
    * change table name in mysql ddl
    
    * change table name in mysql ddl
    
    * change escheduler to dolphinscheduler
    
    * change escheduler to dolphinscheduler
    
    * change escheduler to dolphinscheduler
    
    * remove log4j-1.2-api and modify AlertMapperTest
    
    * remove log4j-1.2-api
    
    * Add alertDao to spring management
    
    * Add alertDao to spring management
    
    * get SqlSessionFactory from MybatisSqlSessionFactoryBean
    
    * get processDao by DaoFactory
    
    * read druid properties in ConneciontFactory
    
    * read druid properties in ConneciontFactory
    
    * change get alertDao by spring to DaoFactory
    
    * add log4j to resolve #967
    
    * resole verify udf name error and delete udf error
    
    * Determine if principal is empty
    
    * Determine whether the logon user has the right to delete the project
    
    * Fixed an issue that produced attatch file named such as ATT00002.bin
    
    * fix too many connection in upgrade or create
    
    * fix NEED_FAULT_TOLERANCE and WAITTING_THREAD count fail
    
    * Added a judgment on whether the currently login user is an administrator
    
    * fix update udf database not change and create time is changed
    
    * add enterprise.wechat.enable to decide whether to send enterprise WeChat
    
    * change method check
    
    * Remove the administrator's judgment on query access token list
    
    * only admin can create worker group
    
    * delete alert group need delete the relation of user and alert group
    
    * add timeout in proxy when upload large resource
    
    * add gets scheduled times by expect fire times
    
    * add gets scheduled times by expect fire times
    
    * Increase the judgment of whether it is admin
    
    * Increase the judgment of whether it is admin
    
    * when delete access token add whether login user has perm to delete
    
    * change mysql-connector-java scope to test
    
    * update scm test
    
    * add profile test
    
    * Add method and parameters comments
    
    * roll back
    
    * add some notes (#1221)
    
    * update english documents
    
    * refactor zk client
    
    * update documents
    
    * update zkclient
    
    * update zkclient
    
    * update documents
    
    * add architecture-design
    
    * change i18n
    
    * update i18n
    
    * update english documents
    
    * add architecture-design
    
    * update english documents
    
    * update en-US documents
    
    * add architecture-design
    
    * update demo site
    
    * add mybatis plus model
    
    * modify mybatisplus
    
    * modify mybatisplus
    
    * change interface by mybatisplus
    
    * add unit test
    
    * refactor dao interface.
    
    * add unit test for dao...
    
    * add unit test for dao...
    
    * add unit test for dao...
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
    
    * update some dao bugs
    
    * update for some bugs
    
    * update some bugs
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
    
    * update
    
    * update
    
    * add multiply settings for application.yml
    
    * add multiply settings for application.yml
    
    * revert
    
    * update configuration settings in task record dao...
    
    * change application_master to application-master
    
    * change application_master to application-master
    
    * update application.yml to application.properties
    
    * revert
    
    * revert
    
    * add properties
    
    * add properties
    
    * revert
    
    * revert
    
    * add api start up..
    add alert send try catch
    
    * update dao info level
    
    * fix bug: task cannot submit when recovery failover
    
    * fix bug: task cannot submit when recovery failover
    
    * merge from dev-db
    
    * revert
    
    * revert
    
    * fix bug: get process definition list failed.
    
    * fix bug: process instance interval is error
    
    * revert
    
    * revert
    
    * update
    
    * support stop submit success tasks
    
    * update kill process
    
    * update for stop process
    
    * update for stop process
    
    * add some logs for stop process
    
    * update for small bug.
    
    * add check strategy before submit task
    
    * revert
    
    * update
    
    * update
    
    * revert
    
    * wait task instance exists if null.
    
    * revert
    
    * update
    
    * change desc to description.
    
    * add check user and definitions function when delete tenant
    
    * update
    
    * change desc to description.
    
    * change desc to description.
    
    * change desc to description.
    
    * remove check resources when delete tenant
    
    * change desc to description.
    
    * change mybatisplus version to 3.2.0
    
    * update
    
    * change the notice to apache.
    
    * update
    
    * update postgre sql
    
    * fix bug: phone can be empty.
    
    * fix bug: postgre test error.
    
    * update create table for postgre quartz
    
    * fix some bugs about postgre.
    
    * update create table for postgre quartz
    
    * add postgre db performance monitor
    
    * add postgre performance monitor
    
    * update performance monitor
    
    * revert
    
    * revert
    
    * fix bug: tasks queue length error
    
    * remove datasource.properties
    
    * change chinese sql to english.
    
    * change chinese sql to english.
    
    * remove unused code.
    
    * remove unused code.
    
    * add some notes
    
    * update some notes
    
    * update some notes
    
    * update mbatisplus version
    
    * update lombok version
    
    * update lombok version
    
    * revert
    
    * merge from dev-db
    
    * remove version
    
    * update npm install pom
    
    * add front assembly
    
    * add front module
    
    * change verison to 1.2.0-release-SNAPSHOT
    
    * add name in pom and remove compile
    
    * add name in pom
    
    * add licenses in assemble
    
    * change version to 1.2.0-RC1-SNAPSHOT
    
    * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
    
    # Conflicts:
    #	dolphinscheduler-alert/pom.xml
    #	dolphinscheduler-api/pom.xml
    #	dolphinscheduler-common/pom.xml
    #	dolphinscheduler-dao/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
    #	dolphinscheduler-dist/pom.xml
    #	dolphinscheduler-rpc/pom.xml
    #	dolphinscheduler-server/pom.xml
    #	dolphinscheduler-ui/pom.xml
    #	pom.xml
    change assembly id
    
    * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
    
    # Conflicts:
    #	dolphinscheduler-alert/pom.xml
    #	dolphinscheduler-api/pom.xml
    #	dolphinscheduler-common/pom.xml
    #	dolphinscheduler-dao/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
    #	dolphinscheduler-dist/pom.xml
    #	dolphinscheduler-rpc/pom.xml
    #	dolphinscheduler-server/pom.xml
    #	dolphinscheduler-ui/pom.xml
    #	pom.xml
    add DISCLAIMER
    
    * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
    
    # Conflicts:
    #	dolphinscheduler-alert/pom.xml
    #	dolphinscheduler-api/pom.xml
    #	dolphinscheduler-common/pom.xml
    #	dolphinscheduler-dao/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
    #	dolphinscheduler-dist/pom.xml
    #	dolphinscheduler-rpc/pom.xml
    #	dolphinscheduler-server/pom.xml
    #	dolphinscheduler-ui/pom.xml
    #	pom.xml
    add license in xml and properties
    
    * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
    
    # Conflicts:
    #	dolphinscheduler-alert/pom.xml
    #	dolphinscheduler-api/pom.xml
    #	dolphinscheduler-common/pom.xml
    #	dolphinscheduler-dao/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
    #	dolphinscheduler-dist/pom.xml
    #	dolphinscheduler-rpc/pom.xml
    #	dolphinscheduler-server/pom.xml
    #	dolphinscheduler-ui/pom.xml
    #	pom.xml
    add license in dockerfile
    
    * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
    
    # Conflicts:
    #	dolphinscheduler-alert/pom.xml
    #	dolphinscheduler-api/pom.xml
    #	dolphinscheduler-common/pom.xml
    #	dolphinscheduler-dao/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
    #	dolphinscheduler-dist/pom.xml
    #	dolphinscheduler-rpc/pom.xml
    #	dolphinscheduler-server/pom.xml
    #	dolphinscheduler-ui/pom.xml
    #	pom.xml
    add license in script and sql
    
    * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
    
    # Conflicts:
    #	dolphinscheduler-alert/pom.xml
    #	dolphinscheduler-api/pom.xml
    #	dolphinscheduler-common/pom.xml
    #	dolphinscheduler-dao/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
    #	dolphinscheduler-dist/pom.xml
    #	dolphinscheduler-rpc/pom.xml
    #	dolphinscheduler-server/pom.xml
    #	dolphinscheduler-ui/pom.xml
    #	pom.xml
    add license in script and sql
    
    * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
    
    # Conflicts:
    #	dolphinscheduler-alert/pom.xml
    #	dolphinscheduler-api/pom.xml
    #	dolphinscheduler-common/pom.xml
    #	dolphinscheduler-dao/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
    #	dolphinscheduler-dist/pom.xml
    #	dolphinscheduler-rpc/pom.xml
    #	dolphinscheduler-server/pom.xml
    #	dolphinscheduler-ui/pom.xml
    #	pom.xml
    add license in ci
    
    * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
    
    # Conflicts:
    #	dolphinscheduler-alert/pom.xml
    #	dolphinscheduler-api/pom.xml
    #	dolphinscheduler-common/pom.xml
    #	dolphinscheduler-dao/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
    #	dolphinscheduler-dist/pom.xml
    #	dolphinscheduler-rpc/pom.xml
    #	dolphinscheduler-server/pom.xml
    #	dolphinscheduler-ui/pom.xml
    #	pom.xml
    change version to 1.2.0-SNAPSHOT
    
    * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
    
    # Conflicts:
    #	dolphinscheduler-alert/pom.xml
    #	dolphinscheduler-api/pom.xml
    #	dolphinscheduler-common/pom.xml
    #	dolphinscheduler-dao/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
    #	dolphinscheduler-dist/pom.xml
    #	dolphinscheduler-rpc/pom.xml
    #	dolphinscheduler-server/pom.xml
    #	dolphinscheduler-ui/pom.xml
    #	pom.xml
    set defalut db type postgresql
    
    * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
    
    # Conflicts:
    #	dolphinscheduler-alert/pom.xml
    #	dolphinscheduler-api/pom.xml
    #	dolphinscheduler-common/pom.xml
    #	dolphinscheduler-dao/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
    #	dolphinscheduler-dist/pom.xml
    #	dolphinscheduler-rpc/pom.xml
    #	dolphinscheduler-server/pom.xml
    #	dolphinscheduler-ui/pom.xml
    #	pom.xml
    set defalut db type postgresql
    
    * change org.quartz.jobStore.driverDelegateClass
    
    * Add comments in method params
    
    * update readme from branch dev
    
    * update content in how to contribute
    
    * change postgresql default port
    
    * change version 1.2.0-SNAPSHOT
    
    * remove antrun plugin
    
    * add how to build
    
    * add how to build
    
    * remove dir format in assembly
    
    * Remove the judgment of whether it is admin
    
    * reset version to 1.2.0-SNAPSHOT
    
    * Remove the judgment of whether it is admin
    
    * Fix bug when the administrator authorizes the project to ordinary users (#1309)
    
    * rename from DatasourceUserMapper to DataSourceUserMapper
    
    * add unit test in UserMapper and WorkerGroupMapper
    
    * change cn.escheduler to org.apache.dolphinscheduler
    
    * add unit test in UdfFuncMapperTest
    
    * add unit test in UdfFuncMapperTest
    
    * remove DatabaseConfiguration
    
    * add ConnectionFactoryTest
    
    * cal duration in processInstancesList
    
    * change desc to description
    
    * change table name in mysql ddl
    
    * change table name in mysql ddl
    
    * change escheduler to dolphinscheduler
    
    * change escheduler to dolphinscheduler
    
    * change escheduler to dolphinscheduler
    
    * remove log4j-1.2-api and modify AlertMapperTest
    
    * remove log4j-1.2-api
    
    * Add alertDao to spring management
    
    * Add alertDao to spring management
    
    * get SqlSessionFactory from MybatisSqlSessionFactoryBean
    
    * get processDao by DaoFactory
    
    * read druid properties in ConneciontFactory
    
    * read druid properties in ConneciontFactory
    
    * change get alertDao by spring to DaoFactory
    
    * add log4j to resolve #967
    
    * resole verify udf name error and delete udf error
    
    * Determine if principal is empty
    
    * Determine whether the logon user has the right to delete the project
    
    * Fixed an issue that produced attatch file named such as ATT00002.bin
    
    * fix too many connection in upgrade or create
    
    * fix NEED_FAULT_TOLERANCE and WAITTING_THREAD count fail
    
    * Added a judgment on whether the currently login user is an administrator
    
    * fix update udf database not change and create time is changed
    
    * add enterprise.wechat.enable to decide whether to send enterprise WeChat
    
    * change method check
    
    * Remove the administrator's judgment on query access token list
    
    * only admin can create worker group
    
    * delete alert group need delete the relation of user and alert group
    
    * add timeout in proxy when upload large resource
    
    * add gets scheduled times by expect fire times
    
    * add gets scheduled times by expect fire times
    
    * Increase the judgment of whether it is admin
    
    * Increase the judgment of whether it is admin
    
    * when delete access token add whether login user has perm to delete
    
    * change mysql-connector-java scope to test
    
    * update scm test
    
    * add profile test
    
    * add profile test
    
    * add maven.deploy.skip true
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * add dependency
    
    * add javadoc
    
    * add antrun
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * reset pgsql (#1178)
    
    + 1
    
    * add javadoc
    
    * add javadoc
    
    * [maven-release-plugin] rollback the release of 1.2.0
    
    * add javadoc
    
    * Ans UI upgrade to version 0.1.0 (#1181)
    
    + 1
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * Administrators group prohibit deletion (#1182)
    
    * Ans UI upgrade to version 0.1.0
    
    * Administrators group prohibit deletion
    
    * add javadoc
    
    * add ui pom
    
    * fix master server shutdown error (#1177)
    
    * move updateTaskState into try/catch block in case of exception
    
    * fix NPE
    
    * using conf.getInt instead of getString
    
    * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
    for AlertDao, correct the spelling.
    
    * duplicate
    
    * refactor getTaskWorkerGroupId
    
    * add friendly log
    
    * update hearbeat thread num = 1
    
    * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
    
    * 1. move verifyTaskInstanceIsNull after taskInstance
    2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
    
    * fix the message
    
    * delete before check to avoid KeeperException$NoNodeException
    
    * fix the message
    
    * check processInstance state before delete tenant
    
    * check processInstance state before delete worker group
    
    * refactor
    
    * merge api constants into common constatns
    
    * update the resource perm
    
    * update the dataSource perm
    
    * fix CheckUtils.checkUserParams method
    
    * update AlertGroupService, extends from BaseService, remove duplicate methods
    
    * refactor
    
    * modify method name
    
    * add hasProjectAndPerm method
    
    * using checkProject instead of getResultStatus
    
    * delete checkAuth method, using hasProjectAndPerm instead.
    
    * correct spelling
    
    * add transactional for deleteWorkerGroupById
    
    * add Transactional for deleteProcessInstanceById method
    
    * change sqlSessionTemplate singleton
    
    * change sqlSessionTemplate singleton and reformat code
    
    * fix unsuitable error message
    
    * update shutdownhook methods
    
    * fix worker log bug
    
    * fix api server debug mode bug
    
    * upgrade zk version
    
    * delete this line ,for zkClient.close() will do the whole thing
    
    * fix master server shutdown error
    
    * degrade zk version and add FourLetterWordMain class (#1183)
    
    * move updateTaskState into try/catch block in case of exception
    
    * fix NPE
    
    * using conf.getInt instead of getString
    
    * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
    for AlertDao, correct the spelling.
    
    * duplicate
    
    * refactor getTaskWorkerGroupId
    
    * add friendly log
    
    * update hearbeat thread num = 1
    
    * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
    
    * 1. move verifyTaskInstanceIsNull after taskInstance
    2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
    
    * fix the message
    
    * delete before check to avoid KeeperException$NoNodeException
    
    * fix the message
    
    * check processInstance state before delete tenant
    
    * check processInstance state before delete worker group
    
    * refactor
    
    * merge api constants into common constatns
    
    * update the resource perm
    
    * update the dataSource perm
    
    * fix CheckUtils.checkUserParams method
    
    * update AlertGroupService, extends from BaseService, remove duplicate methods
    
    * refactor
    
    * modify method name
    
    * add hasProjectAndPerm method
    
    * using checkProject instead of getResultStatus
    
    * delete checkAuth method, using hasProjectAndPerm instead.
    
    * correct spelling
    
    * add transactional for deleteWorkerGroupById
    
    * add Transactional for deleteProcessInstanceById method
    
    * change sqlSessionTemplate singleton
    
    * change sqlSessionTemplate singleton and reformat code
    
    * fix unsuitable error message
    
    * update shutdownhook methods
    
    * fix worker log bug
    
    * fix api server debug mode bug
    
    * upgrade zk version
    
    * delete this line ,for zkClient.close() will do the whole thing
    
    * fix master server shutdown error
    
    * degrade zk version and add FourLetterWordMain class
    
    * add ui pom
    
    * add src pom and assembly
    
    * fix ZKWorkerClient not close PathChildrenCache (#1185)
    
    * move updateTaskState into try/catch block in case of exception
    
    * fix NPE
    
    * using conf.getInt instead of getString
    
    * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
    for AlertDao, correct the spelling.
    
    * duplicate
    
    * refactor getTaskWorkerGroupId
    
    * add friendly log
    
    * update hearbeat thread num = 1
    
    * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
    
    * 1. move verifyTaskInstanceIsNull after taskInstance
    2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
    
    * fix the message
    
    * delete before check to avoid KeeperException$NoNodeException
    
    * fix the message
    
    * check processInstance state before delete tenant
    
    * check processInstance state before delete worker group
    
    * refactor
    
    * merge api constants into common constatns
    
    * update the resource perm
    
    * update the dataSource perm
    
    * fix CheckUtils.checkUserParams method
    
    * update AlertGroupService, extends from BaseService, remove duplicate methods
    
    * refactor
    
    * modify method name
    
    * add hasProjectAndPerm method
    
    * using checkProject instead of getResultStatus
    
    * delete checkAuth method, using hasProjectAndPerm instead.
    
    * correct spelling
    
    * add transactional for deleteWorkerGroupById
    
    * add Transactional for deleteProcessInstanceById method
    
    * change sqlSessionTemplate singleton
    
    * change sqlSessionTemplate singleton and reformat code
    
    * fix unsuitable error message
    
    * update shutdownhook methods
    
    * fix worker log bug
    
    * fix api server debug mode bug
    
    * upgrade zk version
    
    * delete this line ,for zkClient.close() will do the whole thing
    
    * fix master server shutdown error
    
    * degrade zk version and add FourLetterWordMain class
    
    * fix PathChildrenCache not close
    
    * add Transactional for createSession method (#1186)
    
    * move updateTaskState into try/catch block in case of exception
    
    * fix NPE
    
    * using conf.getInt instead of getString
    
    * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
    for AlertDao, correct the spelling.
    
    * duplicate
    
    * refactor getTaskWorkerGroupId
    
    * add friendly log
    
    * update hearbeat thread num = 1
    
    * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
    
    * 1. move verifyTaskInstanceIsNull after taskInstance
    2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
    
    * fix the message
    
    * delete before check to avoid KeeperException$NoNodeException
    
    * fix the message
    
    * check processInstance state before delete tenant
    
    * check processInstance state before delete worker group
    
    * refactor
    
    * merge api constants into common constatns
    
    * update the resource perm
    
    * update the dataSource perm
    
    * fix CheckUtils.checkUserParams method
    
    * update AlertGroupService, extends from BaseService, remove duplicate methods
    
    * refactor
    
    * modify method name
    
    * add hasProjectAndPerm method
    
    * using checkProject instead of getResultStatus
    
    * delete checkAuth method, using hasProjectAndPerm instead.
    
    * correct spelling
    
    * add transactional for deleteWorkerGroupById
    
    * add Transactional for deleteProcessInstanceById method
    
    * change sqlSessionTemplate singleton
    
    * change sqlSessionTemplate singleton and reformat code
    
    * fix unsuitable error message
    
    * update shutdownhook methods
    
    * fix worker log bug
    
    * fix api server debug mode bug
    
    * upgrade zk version
    
    * delete this line ,for zkClient.close() will do the whole thing
    
    * fix master server shutdown error
    
    * degrade zk version and add FourLetterWordMain class
    
    * fix PathChildrenCache not close
    
    * add Transactional for createSession method
    
    * add src pom and assembly
    
    * add src pom and assembly
    
    * add src pom and assembly
    
    * add src pom and assembly
    
    * dockerfile dao application.properties ,install.sh modify and application.properties modify (#1187)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * add src pom and assembly
    
    * add src pom and assembly
    
    * dockerfile startup.sh modify (#1189)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs (#1191)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs
    
    * nginx conf modify
    
    * dockerfile application.properties modify
    
    * dockerfile conf modify (#1192)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs
    
    * nginx conf modify
    
    * dockerfile application.properties modify
    
    * dockerfile conf modify (#1193)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs
    
    * nginx conf modify
    
    * dockerfile application.properties modify
    
    * dockerfile email address change (#1194)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs
    
    * nginx conf modify
    
    * dockerfile application.properties modify
    
    * dockerfile email address change
    
    * the alert module is modified in english (#1195)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs
    
    * nginx conf modify
    
    * dockerfile application.properties modify
    
    * dockerfile email address change
    
    * the alert module is modified in English.
    
    * alert server comment and chinese modify
    
    * api server useless code and chinese modify (#1198)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs
    
    * nginx conf modify
    
    * dockerfile application.properties modify
    
    * dockerfile email address change
    
    * the alert module is modified in English.
    
    * alert server comment and chinese modify
    
    * api server useless code and chinese modify
    
    * common,dao,server useless code and chinese modify (#1199)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs
    
    * nginx conf modify
    
    * dockerfile application.properties modify
    
    * dockerfile email address change
    
    * the alert module is modified in English.
    
    * alert server comment and chinese modify
    
    * api server useless code and chinese modify
    
    * common,dao,server useless code and chinese modify
    
    * change chinese sql to english. (#1200)
    
    * update english documents
    
    * refactor zk client
    
    * update documents
    
    * update zkclient
    
    * update zkclient
    
    * update documents
    
    * add architecture-design
    
    * change i18n
    
    * update i18n
    
    * update english documents
    
    * add architecture-design
    
    * update english documents
    
    * update en-US documents
    
    * add architecture-design
    
    * update demo site
    
    * add mybatis plus model
    
    * modify mybatisplus
    
    * modify mybatisplus
    
    * change interface by mybatisplus
    
    * add unit test
    
    * refactor dao interface.
    
    * add unit test for dao...
    
    * add unit test for dao...
    
    * add unit test for dao...
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
    
    * update some dao bugs
    
    * update for some bugs
    
    * update some bugs
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
    
    * update
    
    * update
    
    * add multiply settings for application.yml
    
    * add multiply settings for application.yml
    
    * revert
    
    * update configuration settings in task record dao...
    
    * change application_master to application-master
    
    * change application_master to application-master
    
    * update application.yml to application.properties
    
    * revert
    
    * revert
    
    * add properties
    
    * add properties
    
    * revert
    
    * revert
    
    * add api start up..
    add alert send try catch
    
    * update dao info level
    
    * fix bug: task cannot submit when recovery failover
    
    * fix bug: task cannot submit when recovery failover
    
    * merge from dev-db
    
    * revert
    
    * revert
    
    * fix bug: get process definition list failed.
    
    * fix bug: process instance interval is error
    
    * revert
    
    * revert
    
    * update
    
    * support stop submit success tasks
    
    * update kill process
    
    * update for stop process
    
    * update for stop process
    
    * add some logs for stop process
    
    * update for small bug.
    
    * add check strategy before submit task
    
    * revert
    
    * update
    
    * update
    
    * revert
    
    * wait task instance exists if null.
    
    * revert
    
    * update
    
    * change desc to description.
    
    * add check user and definitions function when delete tenant
    
    * update
    
    * change desc to description.
    
    * change desc to description.
    
    * change desc to description.
    
    * remove check resources when delete tenant
    
    * change desc to description.
    
    * change mybatisplus version to 3.2.0
    
    * update
    
    * change the notice to apache.
    
    * update
    
    * update postgre sql
    
    * fix bug: phone can be empty.
    
    * fix bug: postgre test error.
    
    * update create table for postgre quartz
    
    * fix some bugs about postgre.
    
    * update create table for postgre quartz
    
    * add postgre db performance monitor
    
    * add postgre performance monitor
    
    * update performance monitor
    
    * revert
    
    * revert
    
    * fix bug: tasks queue length error
    
    * remove datasource.properties
    
    * change chinese sql to english.
    
    * change chinese sql to english.
    
    * change chinese to english (#1202)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs
    
    * nginx conf modify
    
    * dockerfile application.properties modify
    
    * dockerfile email address change
    
    * the alert module is modified in English.
    
    * alert server comment and chinese modify
    
    * api server useless code and chinese modify
    
    * common,dao,server useless code and chinese modify
    
    * change chinese to english
    
    * remove unused code (#1204)
    
    * update english documents
    
    * refactor zk client
    
    * update documents
    
    * update zkclient
    
    * update zkclient
    
    * update documents
    
    * add architecture-design
    
    * change i18n
    
    * update i18n
    
    * update english documents
    
    * add architecture-design
    
    * update english documents
    
    * update en-US documents
    
    * add architecture-design
    
    * update demo site
    
    * add mybatis plus model
    
    * modify mybatisplus
    
    * modify mybatisplus
    
    * change interface by mybatisplus
    
    * add unit test
    
    * refactor dao interface.
    
    * add unit test for dao...
    
    * add unit test for dao...
    
    * add unit test for dao...
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
    
    * update some dao bugs
    
    * update for some bugs
    
    * update some bugs
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
    
    * update
    
    * update
    
    * add multiply settings for application.yml
    
    * add multiply settings for application.yml
    
    * revert
    
    * update configuration settings in task record dao...
    
    * change application_master to application-master
    
    * change application_master to application-master
    
    * update application.yml to application.properties
    
    * revert
    
    * revert
    
    * add properties
    
    * add properties
    
    * revert
    
    * revert
    
    * add api start up..
    add alert send try catch
    
    * update dao info level
    
    * fix bug: task cannot submit when recovery failover
    
    * fix bug: task cannot submit when recovery failover
    
    * merge from dev-db
    
    * revert
    
    * revert
    
    * fix bug: get process definition list failed.
    
    * fix bug: process instance interval is error
    
    * revert
    
    * revert
    
    * update
    
    * support stop submit success tasks
    
    * update kill process
    
    * update for stop process
    
    * update for stop process
    
    * add some logs for stop process
    
    * update for small bug.
    
    * add check strategy before submit task
    
    * revert
    
    * update
    
    * update
    
    * revert
    
    * wait task instance exists if null.
    
    * revert
    
    * update
    
    * change desc to description.
    
    * add check user and definitions function when delete tenant
    
    * update
    
    * change desc to description.
    
    * change desc to description.
    
    * change desc to description.
    
    * remove check resources when delete tenant
    
    * change desc to description.
    
    * change mybatisplus version to 3.2.0
    
    * update
    
    * change the notice to apache.
    
    * update
    
    * update postgre sql
    
    * fix bug: phone can be empty.
    
    * fix bug: postgre test error.
    
    * update create table for postgre quartz
    
    * fix some bugs about postgre.
    
    * update create table for postgre quartz
    
    * add postgre db performance monitor
    
    * add postgre performance monitor
    
    * update performance monitor
    
    * revert
    
    * revert
    
    * fix bug: tasks queue length error
    
    * remove datasource.properties
    
    * change chinese sql to english.
    
    * change chinese sql to english.
    
    * remove unused code.
    
    * remove unused code.
    
    * Modify webpack configuration (#1206)
    
    * add more message for java-doc (#1209)
    
    * move updateTaskState into try/catch block in case of exception
    
    * fix NPE
    
    * using conf.getInt instead of getString
    
    * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
    for AlertDao, correct the spelling.
    
    * duplicate
    
    * refactor getTaskWorkerGroupId
    
    * add friendly log
    
    * update hearbeat thread num = 1
    
    * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
    
    * 1. move verifyTaskInstanceIsNull after taskInstance
    2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
    
    * fix the message
    
    * delete before check to avoid KeeperException$NoNodeException
    
    * fix the message
    
    * check processInstance state before delete tenant
    
    * check processInstance state before delete worker group
    
    * refactor
    
    * merge api constants into common constatns
    
    * update the resource perm
    
    * update the dataSource perm
    
    * fix CheckUtils.checkUserParams method
    
    * update AlertGroupService, extends from BaseService, remove duplicate methods
    
    * refactor
    
    * modify method name
    
    * add hasProjectAndPerm method
    
    * using checkProject instead of getResultStatus
    
    * delete checkAuth method, using hasProjectAndPerm instead.
    
    * correct spelling
    
    * add transactional for deleteWorkerGroupById
    
    * add Transactional for deleteProcessInstanceById method
    
    * change sqlSessionTemplate singleton
    
    * change sqlSessionTemplate singleton and reformat code
    
    * fix unsuitable error message
    
    * update shutdownhook methods
    
    * fix worker log bug
    
    * fix api server debug mode bug
    
    * upgrade zk version
    
    * delete this line ,for zkClient.close() will do the whole thing
    
    * fix master server shutdown error
    
    * degrade zk version and add FourLetterWordMain class
    
    * fix PathChildrenCache not close
    
    * add Transactional for createSession method
    
    * add more message for java-doc
    
    * add java doc for common module (#1213)
    
    * dao method comments and useless code modify (#1214)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs
    
    * nginx conf modify
    
    * dockerfile application.properties modify
    
    * dockerfile email address change
    
    * the alert module is modified in English.
    
    * alert server comment and chinese modify
    
    * api server useless code and chinese modify
    
    * common,dao,server useless code and chinese modify
    
    * change chinese to english
    
    * dao method comments and useless code modify
    
    * Change all Chinese names to English (#1207)
    
    * Modify webpack configuration
    
    * Change all Chinese names to English
    
    * add progress-bar-webpack-plugin (#1215)
    
    * Modify webpack configuration
    
    * Change all Chinese names to English
    
    * add progress-bar-webpack-plugin
    
    * Add method and parameters comments (#1220)
    
    * rename from DatasourceUserMapper to DataSourceUserMapper
    
    * add unit test in UserMapper and WorkerGroupMapper
    
    * change cn.escheduler to org.apache.dolphinscheduler
    
    * add unit test in UdfFuncMapperTest
    
    * add unit test in UdfFuncMapperTest
    
    * remove DatabaseConfiguration
    
    * add ConnectionFactoryTest
    
    * cal duration in processInstancesList
    
    * change desc to description
    
    * change table name in mysql ddl
    
    * change table name in mysql ddl
    
    * change escheduler to dolphinscheduler
    
    * change escheduler to dolphinscheduler
    
    * change escheduler to dolphinscheduler
    
    * remove log4j-1.2-api and modify AlertMapperTest
    
    * remove log4j-1.2-api
    
    * Add alertDao to spring management
    
    * Add alertDao to spring management
    
    * get SqlSessionFactory from MybatisSqlSessionFactoryBean
    
    * get processDao by DaoFactory
    
    * read druid properties in ConneciontFactory
    
    * read druid properties in ConneciontFactory
    
    * change get alertDao by spring to DaoFactory
    
    * add log4j to resolve #967
    
    * resole verify udf name error and delete udf error
    
    * Determine if principal is empty
    
    * Determine whether the logon user has the right to delete the project
    
    * Fixed an issue that produced attatch file named such as ATT00002.bin
    
    * fix too many connection in upgrade or create
    
    * fix NEED_FAULT_TOLERANCE and WAITTING_THREAD count fail
    
    * Added a judgment on whether the currently login user is an administrator
    
    * fix update udf database not change and create time is changed
    
    * add enterprise.wechat.enable to decide whether to send enterprise WeChat
    
    * change method check
    
    * Remove the administrator's judgment on query access token list
    
    * only admin can create worker group
    
    * delete alert group need delete the relation of user and alert group
    
    * add timeout in proxy when upload large resource
    
    * add gets scheduled times by expect fire times
    
    * add gets scheduled times by expect fire times
    
    * Increase the judgment of whether it is admin
    
    * Increase the judgment of whether it is admin
    
    * when delete access token add whether login user has perm to delete
    
    * change mysql-connector-java scope to test
    
    * update scm test
    
    * add profile test
    
    * Add method and parameters comments
    
    * roll back
    
    * add some notes (#1221)
    
    * update english documents
    
    * refactor zk client
    
    * update documents
    
    * update zkclient
    
    * update zkclient
    
    * update documents
    
    * add architecture-design
    
    * change i18n
    
    * update i18n
    
    * update english documents
    
    * add architecture-design
    
    * update english documents
    
    * update en-US documents
    
    * add architecture-design
    
    * update demo site
    
    * add mybatis plus model
    
    * modify mybatisplus
    
    * modify mybatisplus
    
    * change interface by mybatisplus
    
    * add unit test
    
    * refactor dao interface.
    
    * add unit test for dao...
    
    * add unit test for dao...
    
    * add unit test for dao...
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
    
    * update some dao bugs
    
    * update for some bugs
    
    * update some bugs
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
    
    * update
    
    * update
    
    * add multiply settings for application.yml
    
    * add multiply settings for application.yml
    
    * revert
    
    * update configuration settings in task record dao...
    
    * change application_master to application-master
    
    * change application_master to application-master
    
    * update application.yml to application.properties
    
    * revert
    
    * revert
    
    * add properties
    
    * add properties
    
    * revert
    
    * revert
    
    * add api start up..
    add alert send try catch
    
    * update dao info level
    
    * fix bug: task cannot submit when recovery failover
    
    * fix bug: task cannot submit when recovery failover
    
    * merge from dev-db
    
    * revert
    
    * revert
    
    * fix bug: get process definition list failed.
    
    * fix bug: process instance interval is error
    
    * revert
    
    * revert
    
    * update
    
    * support stop submit success tasks
    
    * update kill process
    
    * update for stop process
    
    * update for stop process
    
    * add some logs for stop process
    
    * update for small bug.
    
    * add check strategy before submit task
    
    * revert
    
    * update
    
    * update
    
    * revert
    
    * wait task instance exists if null.
    
    * revert
    
    * update
    
    * change desc to description.
    
    * add check user and definitions function when delete tenant
    
    * update
    
    * change desc to description.
    
    * change desc to description.
    
    * change desc to description.
    
    * remove check resources when delete tenant
    
    * change desc to description.
    
    * change mybatisplus version to 3.2.0
    
    * update
    
    * change the notice to apache.
    
    * update
    
    * update postgre sql
    
    * fix bug: phone can be empty.
    
    * fix bug: postgre test error.
    
    * update create table for postgre quartz
    
    * fix some bugs about postgre.
    
    * update create table for postgre quartz
    
    * add postgre db performance monitor
    
    * add postgre performance monitor
    
    * update performance monitor
    
    * revert
    
    * revert
    
    * fix bug: tasks queue length error
    
    * remove datasource.properties
    
    * change chinese sql to english.
    
    * change chinese sql to english.
    
    * remove unused code.
    
    * remove unused code.
    
    * add some notes
    
    * update some notes
    
    * update some notes
    
    * update mbatisplus version
    
    * update lombok version
    
    * update lombok version
    
    * revert
    
    * merge from dev-db
    
    * remove version
    
    * update npm install pom
    
    * add front assembly
    
    * add front module
    
    * change verison to 1.2.0-release-SNAPSHOT
    
    * add name in pom and remove compile
    
    * add name in pom
    
    * add licenses in assemble
    
    * change version to 1.2.0-RC1-SNAPSHOT
    
    * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
    
    # Conflicts:
    #	dolphinscheduler-alert/pom.xml
    #	dolphinscheduler-api/pom.xml
    #	dolphinscheduler-common/pom.xml
    #	dolphinscheduler-dao/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
    #	dolphinscheduler-dist/pom.xml
    #	dolphinscheduler-rpc/pom.xml
    #	dolphinscheduler-server/pom.xml
    #	dolphinscheduler-ui/pom.xml
    #	pom.xml
    change assembly id
    
    * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
    
    # Conflicts:
    #	dolphinscheduler-alert/pom.xml
    #	dolphinscheduler-api/pom.xml
    #	dolphinscheduler-common/pom.xml
    #	dolphinscheduler-dao/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
    #	dolphinscheduler-dist/pom.xml
    #	dolphinscheduler-rpc/pom.xml
    #	dolphinscheduler-server/pom.xml
    #	dolphinscheduler-ui/pom.xml
    #	pom.xml
    add DISCLAIMER
    
    * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
    
    # Conflicts:
    #	dolphinscheduler-alert/pom.xml
    #	dolphinscheduler-api/pom.xml
    #	dolphinscheduler-common/pom.xml
    #	dolphinscheduler-dao/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
    #	dolphinscheduler-dist/pom.xml
    #	dolphinscheduler-rpc/pom.xml
    #	dolphinscheduler-server/pom.xml
    #	dolphinscheduler-ui/pom.xml
    #	pom.xml
    add license in xml and properties
    
    * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
    
    # Conflicts:
    #	dolphinscheduler-alert/pom.xml
    #	dolphinscheduler-api/pom.xml
    #	dolphinscheduler-common/pom.xml
    #	dolphinscheduler-dao/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
    #	dolphinscheduler-dist/pom.xml
    #	dolphinscheduler-rpc/pom.xml
    #	dolphinscheduler-server/pom.xml
    #	dolphinscheduler-ui/pom.xml
    #	pom.xml
    add license in dockerfile
    
    * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
    
    # Conflicts:
    #	dolphinscheduler-alert/pom.xml
    #	dolphinscheduler-api/pom.xml
    #	dolphinscheduler-common/pom.xml
    #	dolphinscheduler-dao/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
    #	dolphinscheduler-dist/pom.xml
    #	dolphinscheduler-rpc/pom.xml
    #	dolphinscheduler-server/pom.xml
    #	dolphinscheduler-ui/pom.xml
    #	pom.xml
    add license in script and sql
    
    * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
    
    # Conflicts:
    #	dolphinscheduler-alert/pom.xml
    #	dolphinscheduler-api/pom.xml
    #	dolphinscheduler-common/pom.xml
    #	dolphinscheduler-dao/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
    #	dolphinscheduler-dist/pom.xml
    #	dolphinscheduler-rpc/pom.xml
    #	dolphinscheduler-server/pom.xml
    #	dolphinscheduler-ui/pom.xml
    #	pom.xml
    add license in script and sql
    
    * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
    
    # Conflicts:
    #	dolphinscheduler-alert/pom.xml
    #	dolphinscheduler-api/pom.xml
    #	dolphinscheduler-common/pom.xml
    #	dolphinscheduler-dao/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
    #	dolphinscheduler-dist/pom.xml
    #	dolphinscheduler-rpc/pom.xml
    #	dolphinscheduler-server/pom.xml
    #	dolphinscheduler-ui/pom.xml
    #	pom.xml
    add license in ci
    
    * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
    
    # Conflicts:
    #	dolphinscheduler-alert/pom.xml
    #	dolphinscheduler-api/pom.xml
    #	dolphinscheduler-common/pom.xml
    #	dolphinscheduler-dao/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
    #	dolphinscheduler-dist/pom.xml
    #	dolphinscheduler-rpc/pom.xml
    #	dolphinscheduler-server/pom.xml
    #	dolphinscheduler-ui/pom.xml
    #	pom.xml
    change version to 1.2.0-SNAPSHOT
    
    * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
    
    # Conflicts:
    #	dolphinscheduler-alert/pom.xml
    #	dolphinscheduler-api/pom.xml
    #	dolphinscheduler-common/pom.xml
    #	dolphinscheduler-dao/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
    #	dolphinscheduler-dist/pom.xml
    #	dolphinscheduler-rpc/pom.xml
    #	dolphinscheduler-server/pom.xml
    #	dolphinscheduler-ui/pom.xml
    #	pom.xml
    set defalut db type postgresql
    
    * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
    
    # Conflicts:
    #	dolphinscheduler-alert/pom.xml
    #	dolphinscheduler-api/pom.xml
    #	dolphinscheduler-common/pom.xml
    #	dolphinscheduler-dao/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
    #	dolphinscheduler-dist/pom.xml
    #	dolphinscheduler-rpc/pom.xml
    #	dolphinscheduler-server/pom.xml
    #	dolphinscheduler-ui/pom.xml
    #	pom.xml
    set defalut db type postgresql
    
    * change org.quartz.jobStore.driverDelegateClass
    
    * Add comments in method params
    
    * update readme from branch dev
    
    * update content in how to contribute
    
    * change postgresql default port
    
    * change version 1.2.0-SNAPSHOT
    
    * remove antrun plugin
    
    * add how to build
    
    * add how to build
    
    * remove dir format in assembly
    
    * Remove the judgment of whether it is admin
    
    * reset version to 1.2.0-SNAPSHOT
    
    * Remove the judgment of whether it is admin
    
    * Fix bug the administrator authorizes the project to ordinary users,but ordinary users cannot see the process definition created by the administrator
    
    * [maven-release-plugin] prepare release 1.2.0
    
    * [maven-release-plugin] prepare for next development iteration
    
    * Postgresql import primary key exception BUG fix (#1313)
    
    * reset pgsql (#1178)
    
    + 1
    
    * Ans UI upgrade to version 0.1.0 (#1181)
    
    + 1
    
    * Administrators group prohibit deletion (#1182)
    
    * Ans UI upgrade to version 0.1.0
    
    * Administrators group prohibit deletion
    
    * fix master server shutdown error (#1177)
    
    * move updateTaskState into try/catch block in case of exception
    
    * fix NPE
    
    * using conf.getInt instead of getString
    
    * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
    for AlertDao, correct the spelling.
    
    * duplicate
    
    * refactor getTaskWorkerGroupId
    
    * add friendly log
    
    * update hearbeat thread num = 1
    
    * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
    
    * 1. move verifyTaskInstanceIsNull after taskInstance
    2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
    
    * fix the message
    
    * delete before check to avoid KeeperException$NoNodeException
    
    * fix the message
    
    * check processInstance state before delete tenant
    
    * check processInstance state before delete worker group
    
    * refactor
    
    * merge api constants into common constatns
    
    * update the resource perm
    
    * update the dataSource perm
    
    * fix CheckUtils.checkUserParams method
    
    * update AlertGroupService, extends from BaseService, remove duplicate methods
    
    * refactor
    
    * modify method name
    
    * add hasProjectAndPerm method
    
    * using checkProject instead of getResultStatus
    
    * delete checkAuth method, using hasProjectAndPerm instead.
    
    * correct spelling
    
    * add transactional for deleteWorkerGroupById
    
    * add Transactional for deleteProcessInstanceById method
    
    * change sqlSessionTemplate singleton
    
    * change sqlSessionTemplate singleton and reformat code
    
    * fix unsuitable error message
    
    * update shutdownhook methods
    
    * fix worker log bug
    
    * fix api server debug mode bug
    
    * upgrade zk version
    
    * delete this line ,for zkClient.close() will do the whole thing
    
    * fix master server shutdown error
    
    * degrade zk version and add FourLetterWordMain class (#1183)
    
    * move updateTaskState into try/catch block in case of exception
    
    * fix NPE
    
    * using conf.getInt instead of getString
    
    * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
    for AlertDao, correct the spelling.
    
    * duplicate
    
    * refactor getTaskWorkerGroupId
    
    * add friendly log
    
    * update hearbeat thread num = 1
    
    * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
    
    * 1. move verifyTaskInstanceIsNull after taskInstance
    2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
    
    * fix the message
    
    * delete before check to avoid KeeperException$NoNodeException
    
    * fix the message
    
    * check processInstance state before delete tenant
    
    * check processInstance state before delete worker group
    
    * refactor
    
    * merge api constants into common constatns
    
    * update the resource perm
    
    * update the dataSource perm
    
    * fix CheckUtils.checkUserParams method
    
    * update AlertGroupService, extends from BaseService, remove duplicate methods
    
    * refactor
    
    * modify method name
    
    * add hasProjectAndPerm method
    
    * using checkProject instead of getResultStatus
    
    * delete checkAuth method, using hasProjectAndPerm instead.
    
    * correct spelling
    
    * add transactional for deleteWorkerGroupById
    
    * add Transactional for deleteProcessInstanceById method
    
    * change sqlSessionTemplate singleton
    
    * change sqlSessionTemplate singleton and reformat code
    
    * fix unsuitable error message
    
    * update shutdownhook methods
    
    * fix worker log bug
    
    * fix api server debug mode bug
    
    * upgrade zk version
    
    * delete this line ,for zkClient.close() will do the whole thing
    
    * fix master server shutdown error
    
    * degrade zk version and add FourLetterWordMain class
    
    * fix ZKWorkerClient not close PathChildrenCache (#1185)
    
    * move updateTaskState into try/catch block in case of exception
    
    * fix NPE
    
    * using conf.getInt instead of getString
    
    * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
    for AlertDao, correct the spelling.
    
    * duplicate
    
    * refactor getTaskWorkerGroupId
    
    * add friendly log
    
    * update hearbeat thread num = 1
    
    * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
    
    * 1. move verifyTaskInstanceIsNull after taskInstance
    2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
    
    * fix the message
    
    * delete before check to avoid KeeperException$NoNodeException
    
    * fix the message
    
    * check processInstance state before delete tenant
    
    * check processInstance state before delete worker group
    
    * refactor
    
    * merge api constants into common constatns
    
    * update the resource perm
    
    * update the dataSource perm
    
    * fix CheckUtils.checkUserParams method
    
    * update AlertGroupService, extends from BaseService, remove duplicate methods
    
    * refactor
    
    * modify method name
    
    * add hasProjectAndPerm method
    
    * using checkProject instead of getResultStatus
    
    * delete checkAuth method, using hasProjectAndPerm instead.
    
    * correct spelling
    
    * add transactional for deleteWorkerGroupById
    
    * add Transactional for deleteProcessInstanceById method
    
    * change sqlSessionTemplate singleton
    
    * change sqlSessionTemplate singleton and reformat code
    
    * fix unsuitable error message
    
    * update shutdownhook methods
    
    * fix worker log bug
    
    * fix api server debug mode bug
    
    * upgrade zk version
    
    * delete this line ,for zkClient.close() will do the whole thing
    
    * fix master server shutdown error
    
    * degrade zk version and add FourLetterWordMain class
    
    * fix PathChildrenCache not close
    
    * add Transactional for createSession method (#1186)
    
    * move updateTaskState into try/catch block in case of exception
    
    * fix NPE
    
    * using conf.getInt instead of getString
    
    * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
    for AlertDao, correct the spelling.
    
    * duplicate
    
    * refactor getTaskWorkerGroupId
    
    * add friendly log
    
    * update hearbeat thread num = 1
    
    * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
    
    * 1. move verifyTaskInstanceIsNull after taskInstance
    2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
    
    * fix the message
    
    * delete before check to avoid KeeperException$NoNodeException
    
    * fix the message
    
    * check processInstance state before delete tenant
    
    * check processInstance state before delete worker group
    
    * refactor
    
    * merge api constants into common constatns
    
    * update the resource perm
    
    * update the dataSource perm
    
    * fix CheckUtils.checkUserParams method
    
    * update AlertGroupService, extends from BaseService, remove duplicate methods
    
    * refactor
    
    * modify method name
    
    * add hasProjectAndPerm method
    
    * using checkProject instead of getResultStatus
    
    * delete checkAuth method, using hasProjectAndPerm instead.
    
    * correct spelling
    
    * add transactional for deleteWorkerGroupById
    
    * add Transactional for deleteProcessInstanceById method
    
    * change sqlSessionTemplate singleton
    
    * change sqlSessionTemplate singleton and reformat code
    
    * fix unsuitable error message
    
    * update shutdownhook methods
    
    * fix worker log bug
    
    * fix api server debug mode bug
    
    * upgrade zk version
    
    * delete this line ,for zkClient.close() will do the whole thing
    
    * fix master server shutdown error
    
    * degrade zk version and add FourLetterWordMain class
    
    * fix PathChildrenCache not close
    
    * add Transactional for createSession method
    
    * dockerfile dao application.properties ,install.sh modify and application.properties modify (#1187)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify (#1189)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs (#1191)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs
    
    * nginx conf modify
    
    * dockerfile application.properties modify
    
    * dockerfile conf modify (#1192)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs
    
    * nginx conf modify
    
    * dockerfile application.properties modify
    
    * dockerfile conf modify (#1193)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs
    
    * nginx conf modify
    
    * dockerfile application.properties modify
    
    * dockerfile email address change (#1194)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs
    
    * nginx conf modify
    
    * dockerfile application.properties modify
    
    * dockerfile email address change
    
    * the alert module is modified in english (#1195)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs
    
    * nginx conf modify
    
    * dockerfile application.properties modify
    
    * dockerfile email address change
    
    * the alert module is modified in English.
    
    * alert server comment and chinese modify
    
    * api server useless code and chinese modify (#1198)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs
    
    * nginx conf modify
    
    * dockerfile application.properties modify
    
    * dockerfile email address change
    
    * the alert module is modified in English.
    
    * alert server comment and chinese modify
    
    * api server useless code and chinese modify
    
    * common,dao,server useless code and chinese modify (#1199)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs
    
    * nginx conf modify
    
    * dockerfile application.properties modify
    
    * dockerfile email address change
    
    * the alert module is modified in English.
    
    * alert server comment and chinese modify
    
    * api server useless code and chinese modify
    
    * common,dao,server useless code and chinese modify
    
    * change chinese sql to english. (#1200)
    
    * update english documents
    
    * refactor zk client
    
    * update documents
    
    * update zkclient
    
    * update zkclient
    
    * update documents
    
    * add architecture-design
    
    * change i18n
    
    * update i18n
    
    * update english documents
    
    * add architecture-design
    
    * update english documents
    
    * update en-US documents
    
    * add architecture-design
    
    * update demo site
    
    * add mybatis plus model
    
    * modify mybatisplus
    
    * modify mybatisplus
    
    * change interface by mybatisplus
    
    * add unit test
    
    * refactor dao interface.
    
    * add unit test for dao...
    
    * add unit test for dao...
    
    * add unit test for dao...
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
    
    * update some dao bugs
    
    * update for some bugs
    
    * update some bugs
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
    
    * update
    
    * update
    
    * add multiply settings for application.yml
    
    * add multiply settings for application.yml
    
    * revert
    
    * update configuration settings in task record dao...
    
    * change application_master to application-master
    
    * change application_master to application-master
    
    * update application.yml to application.properties
    
    * revert
    
    * revert
    
    * add properties
    
    * add properties
    
    * revert
    
    * revert
    
    * add api start up..
    add alert send try catch
    
    * update dao info level
    
    * fix bug: task cannot submit when recovery failover
    
    * fix bug: task cannot submit when recovery failover
    
    * merge from dev-db
    
    * revert
    
    * revert
    
    * fix bug: get process definition list failed.
    
    * fix bug: process instance interval is error
    
    * revert
    
    * revert
    
    * update
    
    * support stop submit success tasks
    
    * update kill process
    
    * update for stop process
    
    * update for stop process
    
    * add some logs for stop process
    
    * update for small bug.
    
    * add check strategy before submit task
    
    * revert
    
    * update
    
    * update
    
    * revert
    
    * wait task instance exists if null.
    
    * revert
    
    * update
    
    * change desc to description.
    
    * add check user and definitions function when delete tenant
    
    * update
    
    * change desc to description.
    
    * change desc to description.
    
    * change desc to description.
    
    * remove check resources when delete tenant
    
    * change desc to description.
    
    * change mybatisplus version to 3.2.0
    
    * update
    
    * change the notice to apache.
    
    * update
    
    * update postgre sql
    
    * fix bug: phone can be empty.
    
    * fix bug: postgre test error.
    
    * update create table for postgre quartz
    
    * fix some bugs about postgre.
    
    * update create table for postgre quartz
    
    * add postgre db performance monitor
    
    * add postgre performance monitor
    
    * update performance monitor
    
    * revert
    
    * revert
    
    * fix bug: tasks queue length error
    
    * remove datasource.properties
    
    * change chinese sql to english.
    
    * change chinese sql to english.
    
    * change chinese to english (#1202)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs
    
    * nginx conf modify
    
    * dockerfile application.properties modify
    
    * dockerfile email address change
    
    * the alert module is modified in English.
    
    * alert server comment and chinese modify
    
    * api server useless code and chinese modify
    
    * common,dao,server useless code and chinese modify
    
    * change chinese to english
    
    * remove unused code (#1204)
    
    * update english documents
    
    * refactor zk client
    
    * update documents
    
    * update zkclient
    
    * update zkclient
    
    * update documents
    
    * add architecture-design
    
    * change i18n
    
    * update i18n
    
    * update english documents
    
    * add architecture-design
    
    * update english documents
    
    * update en-US documents
    
    * add architecture-design
    
    * update demo site
    
    * add mybatis plus model
    
    * modify mybatisplus
    
    * modify mybatisplus
    
    * change interface by mybatisplus
    
    * add unit test
    
    * refactor dao interface.
    
    * add unit test for dao...
    
    * add unit test for dao...
    
    * add unit test for dao...
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
    
    * update some dao bugs
    
    * update for some bugs
    
    * update some bugs
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
    
    * update
    
    * update
    
    * add multiply settings for application.yml
    
    * add multiply settings for application.yml
    
    * revert
    
    * update configuration settings in task record dao...
    
    * change application_master to application-master
    
    * change application_master to application-master
    
    * update application.yml to application.properties
    
    * revert
    
    * revert
    
    * add properties
    
    * add properties
    
    * revert
    
    * revert
    
    * add api start up..
    add alert send try catch
    
    * update dao info level
    
    * fix bug: task cannot submit when recovery failover
    
    * fix bug: task cannot submit when recovery failover
    
    * merge from dev-db
    
    * revert
    
    * revert
    
    * fix bug: get process definition list failed.
    
    * fix bug: process instance interval is error
    
    * revert
    
    * revert
    
    * update
    
    * support stop submit success tasks
    
    * update kill process
    
    * update for stop process
    
    * update for stop process
    
    * add some logs for stop process
    
    * update for small bug.
    
    * add check strategy before submit task
    
    * revert
    
    * update
    
    * update
    
    * revert
    
    * wait task instance exists if null.
    
    * revert
    
    * update
    
    * change desc to description.
    
    * add check user and definitions function when delete tenant
    
    * update
    
    * change desc to description.
    
    * change desc to description.
    
    * change desc to description.
    
    * remove check resources when delete tenant
    
    * change desc to description.
    
    * change mybatisplus version to 3.2.0
    
    * update
    
    * change the notice to apache.
    
    * update
    
    * update postgre sql
    
    * fix bug: phone can be empty.
    
    * fix bug: postgre test error.
    
    * update create table for postgre quartz
    
    * fix some bugs about postgre.
    
    * update create table for postgre quartz
    
    * add postgre db performance monitor
    
    * add postgre performance monitor
    
    * update performance monitor
    
    * revert
    
    * revert
    
    * fix bug: tasks queue length error
    
    * remove datasource.properties
    
    * change chinese sql to english.
    
    * change chinese sql to english.
    
    * remove unused code.
    
    * remove unused code.
    
    * Modify webpack configuration (#1206)
    
    * add more message for java-doc (#1209)
    
    * move updateTaskState into try/catch block in case of exception
    
    * fix NPE
    
    * using conf.getInt instead of getString
    
    * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
    for AlertDao, correct the spelling.
    
    * duplicate
    
    * refactor getTaskWorkerGroupId
    
    * add friendly log
    
    * update hearbeat thread num = 1
    
    * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
    
    * 1. move verifyTaskInstanceIsNull after taskInstance
    2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
    
    * fix the message
    
    * delete before check to avoid KeeperException$NoNodeException
    
    * fix the message
    
    * check processInstance state before delete tenant
    
    * check processInstance state before delete worker group
    
    * refactor
    
    * merge api constants into common constatns
    
    * update the resource perm
    
    * update the dataSource perm
    
    * fix CheckUtils.checkUserParams method
    
    * update AlertGroupService, extends from BaseService, remove duplicate methods
    
    * refactor
    
    * modify method name
    
    * add hasProjectAndPerm method
    
    * using checkProject instead of getResultStatus
    
    * delete checkAuth method, using hasProjectAndPerm instead.
    
    * correct spelling
    
    * add transactional for deleteWorkerGroupById
    
    * add Transactional for deleteProcessInstanceById method
    
    * change sqlSessionTemplate singleton
    
    * change sqlSessionTemplate singleton and reformat code
    
    * fix unsuitable error message
    
    * update shutdownhook methods
    
    * fix worker log bug
    
    * fix api server debug mode bug
    
    * upgrade zk version
    
    * delete this line ,for zkClient.close() will do the whole thing
    
    * fix master server shutdown error
    
    * degrade zk version and add FourLetterWordMain class
    
    * fix PathChildrenCache not close
    
    * add Transactional for createSession method
    
    * add more message for java-doc
    
    * add java doc for common module (#1213)
    
    * dao method comments and useless code modify (#1214)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs
    
    * nginx conf modify
    
    * dockerfile application.properties modify
    
    * dockerfile email address change
    
    * the alert module is modified in English.
    
    * alert server comment and chinese modify
    
    * api server useless code and chinese modify
    
    * common,dao,server useless code and chinese modify
    
    * change chinese to english
    
    * dao method comments and useless code modify
    
    * Change all Chinese names to English (#1207)
    
    * Modify webpack configuration
    
    * Change all Chinese names to English
    
    * add progress-bar-webpack-plugin (#1215)
    
    * Modify webpack configuration
    
    * Change all Chinese names to English
    
    * add progress-bar-webpack-plugin
    
    * Add method and parameters comments (#1220)
    
    * rename from DatasourceUserMapper to DataSourceUserMapper
    
    * add unit test in UserMapper and WorkerGroupMapper
    
    * change cn.escheduler to org.apache.dolphinscheduler
    
    * add unit test in UdfFuncMapperTest
    
    * add unit test in UdfFuncMapperTest
    
    * remove DatabaseConfiguration
    
    * add ConnectionFactoryTest
    
    * cal duration in processInstancesList
    
    * change desc to description
    
    * change table name in mysql ddl
    
    * change table name in mysql ddl
    
    * change escheduler to dolphinscheduler
    
    * change escheduler to dolphinscheduler
    
    * change escheduler to dolphinscheduler
    
    * remove log4j-1.2-api and modify AlertMapperTest
    
    * remove log4j-1.2-api
    
    * Add alertDao to spring management
    
    * Add alertDao to spring management
    
    * get SqlSessionFactory from MybatisSqlSessionFactoryBean
    
    * get processDao by DaoFactory
    
    * read druid properties in ConneciontFactory
    
    * read druid properties in ConneciontFactory
    
    * change get alertDao by spring to DaoFactory
    
    * add log4j to resolve #967
    
    * resole verify udf name error and delete udf error
    
    * Determine if principal is empty
    
    * Determine whether the logon user has the right to delete the project
    
    * Fixed an issue that produced attatch file named such as ATT00002.bin
    
    * fix too many connection in upgrade or create
    
    * fix NEED_FAULT_TOLERANCE and WAITTING_THREAD count fail
    
    * Added a judgment on whether the currently login user is an administrator
    
    * fix update udf database not change and create time is changed
    
    * add enterprise.wechat.enable to decide whether to send enterprise WeChat
    
    * change method check
    
    * Remove the administrator's judgment on query access token list
    
    * only admin can create worker group
    
    * delete alert group need delete the relation of user and alert group
    
    * add timeout in proxy when upload large resource
    
    * add gets scheduled times by expect fire times
    
    * add gets scheduled times by expect fire times
    
    * Increase the judgment of whether it is admin
    
    * Increase the judgment of whether it is admin
    
    * when delete access token add whether login user has perm to delete
    
    * change mysql-connector-java scope to test
    
    * update scm test
    
    * add profile test
    
    * Add method and parameters comments
    
    * roll back
    
    * add some notes (#1221)
    
    * update english documents
    
    * refactor zk client
    
    * update documents
    
    * update zkclient
    
    * update zkclient
    
    * update documents
    
    * add architecture-design
    
    * change i18n
    
    * update i18n
    
    * update english documents
    
    * add architecture-design
    
    * update english documents
    
    * update en-US documents
    
    * add architecture-design
    
    * update demo site
    
    * add mybatis plus model
    
    * modify mybatisplus
    
    * modify mybatisplus
    
    * change interface by mybatisplus
    
    * add unit test
    
    * refactor dao interface.
    
    * add unit test for dao...
    
    * add unit test for dao...
    
    * add unit test for dao...
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
    
    * update some dao bugs
    
    * update for some bugs
    
    * update some bugs
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
    
    * update
    
    * update
    
    * add multiply settings for application.yml
    
    * add multiply settings for application.yml
    
    * revert
    
    * update configuration settings in task record dao...
    
    * change application_master to application-master
    
    * change application_master to application-master
    
    * update application.yml to application.properties
    
    * revert
    
    * revert
    
    * add properties
    
    * add properties
    
    * revert
    
    * revert
    
    * add api start up..
    add alert send try catch
    
    * update dao info level
    
    * fix bug: task cannot submit when recovery failover
    
    * fix bug: task cannot submit when recovery failover
    
    * merge from dev-db
    
    * revert
    
    * revert
    
    * fix bug: get process definition list failed.
    
    * fix bug: process instance interval is error
    
    * revert
    
    * revert
    
    * update
    
    * support stop submit success tasks
    
    * update kill process
    
    * update for stop process
    
    * update for stop process
    
    * add some logs for stop process
    
    * update for small bug.
    
    * add check strategy before submit task
    
    * revert
    
    * update
    
    * update
    
    * revert
    
    * wait task instance exists if null.
    
    * revert
    
    * update
    
    * change desc to description.
    
    * add check user and definitions function when delete tenant
    
    * update
    
    * change desc to description.
    
    * change desc to description.
    
    * change desc to description.
    
    * remove check resources when delete tenant
    
    * change desc to description.
    
    * change mybatisplus version to 3.2.0
    
    * update
    
    * change the notice to apache.
    
    * update
    
    * update postgre sql
    
    * fix bug: phone can be empty.
    
    * fix bug: postgre test error.
    
    * update create table for postgre quartz
    
    * fix some bugs about postgre.
    
    * update create table for postgre quartz
    
    * add postgre db performance monitor
    
    * add postgre performance monitor
    
    * update performance monitor
    
    * revert
    
    * revert
    
    * fix bug: tasks queue length error
    
    * remove datasource.properties
    
    * change chinese sql to english.
    
    * change chinese sql to english.
    
    * remove unused code.
    
    * remove unused code.
    
    * add some notes
    
    * update some notes
    
    * update some notes
    
    * update mbatisplus version
    
    * update lombok version
    
    * update lombok version
    
    * revert
    
    * master startup error bug fix (#1229)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs
    
    * nginx conf modify
    
    * dockerfile application.properties modify
    
    * dockerfile email address change
    
    * the alert module is modified in English.
    
    * alert server comment and chinese modify
    
    * api server useless code and chinese modify
    
    * common,dao,server useless code and chinese modify
    
    * change chinese to english
    
    * dao method comments and useless code modify
    
    * master startup error bug fix
    
    * delete class App, let spring manage connectionFactory (#1233)
    
    * move updateTaskState into try/catch block in case of exception
    
    * fix NPE
    
    * using conf.getInt instead of getString
    
    * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
    for AlertDao, correct the spelling.
    
    * duplicate
    
    * refactor getTaskWorkerGroupId
    
    * add friendly log
    
    * update hearbeat thread num = 1
    
    * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
    
    * 1. move verifyTaskInstanceIsNull after taskInstance
    2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
    
    * fix the message
    
    * delete before check to avoid KeeperException$NoNodeException
    
    * fix the message
    
    * check processInstance state before delete tenant
    
    * check processInstance state before delete worker group
    
    * refactor
    
    * merge api constants into common constatns
    
    * update the resource perm
    
    * update the dataSource perm
    
    * fix CheckUtils.checkUserParams method
    
    * update AlertGroupService, extends from BaseService, remove duplicate methods
    
    * refactor
    
    * modify method name
    
    * add hasProjectAndPerm method
    
    * using checkProject instead of getResultStatus
    
    * delete checkAuth method, using hasProjectAndPerm instead.
    
    * correct spelling
    
    * add transactional for deleteWorkerGroupById
    
    * add Transactional for deleteProcessInstanceById method
    
    * change sqlSessionTemplate singleton
    
    * change sqlSessionTemplate singleton and reformat code
    
    * fix unsuitable error message
    
    * update shutdownhook methods
    
    * fix worker log bug
    
    * fix api server debug mode bug
    
    * upgrade zk version
    
    * delete this line ,for zkClient.close() will do the whole thing
    
    * fix master server shutdown error
    
    * degrade zk version and add FourLetterWordMain class
    
    * fix PathChildrenCache not close
    
    * add Transactional for createSession method
    
    * add more message for java-doc
    
    * delete App, let spring manage connectionFactory
    
    * add license
    
    * add class Application for test support
    
    * refactor masterServer and workerServer (#1244)
    
    * move updateTaskState into try/catch block in case of exception
    
    * fix NPE
    
    * using conf.getInt instead of getString
    
    * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
    for AlertDao, correct the spelling.
    
    * duplicate
    
    * refactor getTaskWorkerGroupId
    
    * add friendly log
    
    * update hearbeat thread num = 1
    
    * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
    
    * 1. move verifyTaskInstanceIsNull after taskInstance
    2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
    
    * fix the message
    
    * delete before check to avoid KeeperException$NoNodeException
    
    * fix the message
    
    * check processInstance state before delete tenant
    
    * check processInstance state before delete worker group
    
    * refactor
    
    * merge api constants into common constatns
    
    * update the resource perm
    
    * update the dataSource perm
    
    * fix CheckUtils.checkUserParams method
    
    * update AlertGroupService, extends from BaseService, remove duplicate methods
    
    * refactor
    
    * modify method name
    
    * add hasProjectAndPerm method
    
    * using checkProject instead of getResultStatus
    
    * delete checkAuth method, using hasProjectAndPerm instead.
    
    * correct spelling
    
    * add transactional for deleteWorkerGroupById
    
    * add Transactional for deleteProcessInstanceById method
    
    * change sqlSessionTemplate singleton
    
    * change sqlSessionTemplate singleton and reformat code
    
    * fix unsuitable error message
    
    * update shutdownhook methods
    
    * fix worker log bug
    
    * fix api server debug mode bug
    
    * upgrade zk version
    
    * delete this line ,for zkClient.close() will do the whole thing
    
    * fix master server shutdown error
    
    * degrade zk version and add FourLetterWordMain class
    
    * fix PathChildrenCache not close
    
    * add Transactional for createSession method
    
    * add more message for java-doc
    
    * delete App, let spring manage connectionFactory
    
    * add license
    
    * add class Application for test support
    
    * refactor masterServer and workerServer
    
    * add args
    
    * ConnectionFactory add paging intercepter
    
    * ConnectionFactory add paging intercepter (#1250)
    
    * remove spotbugs-annotations.jar LGPL protocol
    
    * remove spotbugs-annotations.jar LGPL protocol (#1251)
    
    * ConnectionFactory add paging intercepter
    
    * remove spotbugs-annotations.jar LGPL protocol
    
    * fix #1245, make scanCommand transactional (#1246)
    
    * fix the spring transaction not worker bug  (#1252)
    
    * move updateTaskState into try/catch block in case of exception
    
    * fix NPE
    
    * using conf.getInt instead of getString
    
    * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
    for AlertDao, correct the spelling.
    
    * duplicate
    
    * refactor getTaskWorkerGroupId
    
    * add friendly log
    
    * update hearbeat thread num = 1
    
    * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
    
    * 1. move verifyTaskInstanceIsNull after taskInstance
    2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
    
    * fix the message
    
    * delete before check to avoid KeeperException$NoNodeException
    
    * fix the message
    
    * check processInstance state before delete tenant
    
    * check processInstance state before delete worker group
    
    * refactor
    
    * merge api constants into common constatns
    
    * update the resource perm
    
    * update the dataSource perm
    
    * fix CheckUtils.checkUserParams method
    
    * update AlertGroupService, extends from BaseService, remove duplicate methods
    
    * refactor
    
    * modify method name
    
    * add hasProjectAndPerm method
    
    * using checkProject instead of getResultStatus
    
    * delete checkAuth method, using hasProjectAndPerm instead.
    
    * correct spelling
    
    * add transactional for deleteWorkerGroupById
    
    * add Transactional for deleteProcessInstanceById method
    
    * change sqlSessionTemplate singleton
    
    * change sqlSessionTemplate singleton and reformat code
    
    * fix unsuitable error message
    
    * update shutdownhook methods
    
    * fix worker log bug
    
    * fix api server debug mode bug
    
    * upgrade zk version
    
    * delete this line ,for zkClient.close() will do the whole thing
    
    * fix master server shutdown error
    
    * degrade zk version and add FourLetterWordMain class
    
    * fix PathChildrenCache not close
    
    * add Transactional for createSession method
    
    * add more message for java-doc
    
    * delete App, let spring manage connectionFactory
    
    * add license
    
    * add class Application for test support
    
    * refactor masterServer and workerServer
    
    * add args
    
    * fix the spring transaction not work bug
    
    * remove author
    
    * delete @Bean annotation
    
    * rename application.properties to application-dao.properties
    
    * delete class MybatisPlusConfig (#1254)
    
    * move updateTaskState into try/catch block in case of exception
    
    * fix NPE
    
    * using conf.getInt instead of getString
    
    * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
    for AlertDao, correct the spelling.
    
    * duplicate
    
    * refactor getTaskWorkerGroupId
    
    * add friendly log
    
    * update hearbeat thread num = 1
    
    * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
    
    * 1. move verifyTaskInstanceIsNull after taskInstance
    2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
    
    * fix the message
    
    * delete before check to avoid KeeperException$NoNodeException
    
    * fix the message
    
    * check processInstance state before delete tenant
    
    * check processInstance state before delete worker group
    
    * refactor
    
    * merge api constants into common constatns
    
    * update the resource perm
    
    * update the dataSource perm
    
    * fix CheckUtils.checkUserParams method
    
    * update AlertGroupService, extends from BaseService, remove duplicate methods
    
    * refactor
    
    * modify method name
    
    * add hasProjectAndPerm method
    
    * using checkProject instead of getResultStatus
    
    * delete checkAuth method, using hasProjectAndPerm instead.
    
    * correct spelling
    
    * add transactional for deleteWorkerGroupById
    
    * add Transactional for deleteProcessInstanceById method
    
    * change sqlSessionTemplate singleton
    
    * change sqlSessionTemplate singleton and reformat code
    
    * fix unsuitable error message
    
    * update shutdownhook methods
    
    * fix worker log bug
    
    * fix api server debug m…
    
    * Added description of bug fixes and reset version  (#1322)
    
    * rename from DatasourceUserMapper to DataSourceUserMapper
    
    * add unit test in UserMapper and WorkerGroupMapper
    
    * change cn.escheduler to org.apache.dolphinscheduler
    
    * add unit test in UdfFuncMapperTest
    
    * add unit test in UdfFuncMapperTest
    
    * remove DatabaseConfiguration
    
    * add ConnectionFactoryTest
    
    * cal duration in processInstancesList
    
    * change desc to description
    
    * change table name in mysql ddl
    
    * change table name in mysql ddl
    
    * change escheduler to dolphinscheduler
    
    * change escheduler to dolphinscheduler
    
    * change escheduler to dolphinscheduler
    
    * remove log4j-1.2-api and modify AlertMapperTest
    
    * remove log4j-1.2-api
    
    * Add alertDao to spring management
    
    * Add alertDao to spring management
    
    * get SqlSessionFactory from MybatisSqlSessionFactoryBean
    
    * get processDao by DaoFactory
    
    * read druid properties in ConneciontFactory
    
    * read druid properties in ConneciontFactory
    
    * change get alertDao by spring to DaoFactory
    
    * add log4j to resolve #967
    
    * resole verify udf name error and delete udf error
    
    * Determine if principal is empty
    
    * Determine whether the logon user has the right to delete the project
    
    * Fixed an issue that produced attatch file named such as ATT00002.bin
    
    * fix too many connection in upgrade or create
    
    * fix NEED_FAULT_TOLERANCE and WAITTING_THREAD count fail
    
    * Added a judgment on whether the currently login user is an administrator
    
    * fix update udf database not change and create time is changed
    
    * add enterprise.wechat.enable to decide whether to send enterprise WeChat
    
    * change method check
    
    * Remove the administrator's judgment on query access token list
    
    * only admin can create worker group
    
    * delete alert group need delete the relation of user and alert group
    
    * add timeout in proxy when upload large resource
    
    * add gets scheduled times by expect fire times
    
    * add gets scheduled times by expect fire times
    
    * Increase the judgment of whether it is admin
    
    * Increase the judgment of whether it is admin
    
    * when delete access token add whether login user has perm to delete
    
    * change mysql-connector-java scope to test
    
    * update scm test
    
    * add profile test
    
    * add profile test
    
    * add maven.deploy.skip true
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * add dependency
    
    * add javadoc
    
    * add antrun
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * reset pgsql (#1178)
    
    + 1
    
    * add javadoc
    
    * add javadoc
    
    * [maven-release-plugin] rollback the release of 1.2.0
    
    * add javadoc
    
    * Ans UI upgrade to version 0.1.0 (#1181)
    
    + 1
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * Administrators group prohibit deletion (#1182)
    
    * Ans UI upgrade to version 0.1.0
    
    * Administrators group prohibit deletion
    
    * add javadoc
    
    * add ui pom
    
    * fix master server shutdown error (#1177)
    
    * move updateTaskState into try/catch block in case of exception
    
    * fix NPE
    
    * using conf.getInt instead of getString
    
    * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
    for AlertDao, correct the spelling.
    
    * duplicate
    
    * refactor getTaskWorkerGroupId
    
    * add friendly log
    
    * update hearbeat thread num = 1
    
    * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
    
    * 1. move verifyTaskInstanceIsNull after taskInstance
    2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
    
    * fix the message
    
    * delete before check to avoid KeeperException$NoNodeException
    
    * fix the message
    
    * check processInstance state before delete tenant
    
    * check processInstance state before delete worker group
    
    * refactor
    
    * merge api constants into common constatns
    
    * update the resource perm
    
    * update the dataSource perm
    
    * fix CheckUtils.checkUserParams method
    
    * update AlertGroupService, extends from BaseService, remove duplicate methods
    
    * refactor
    
    * modify method name
    
    * add hasProjectAndPerm method
    
    * using checkProject instead of getResultStatus
    
    * delete checkAuth method, using hasProjectAndPerm instead.
    
    * correct spelling
    
    * add transactional for deleteWorkerGroupById
    
    * add Transactional for deleteProcessInstanceById method
    
    * change sqlSessionTemplate singleton
    
    * change sqlSessionTemplate singleton and reformat code
    
    * fix unsuitable error message
    
    * update shutdownhook methods
    
    * fix worker log bug
    
    * fix api server debug mode bug
    
    * upgrade zk version
    
    * delete this line ,for zkClient.close() will do the whole thing
    
    * fix master server shutdown error
    
    * degrade zk version and add FourLetterWordMain class (#1183)
    
    * move updateTaskState into try/catch block in case of exception
    
    * fix NPE
    
    * using conf.getInt instead of getString
    
    * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
    for AlertDao, correct the spelling.
    
    * duplicate
    
    * refactor getTaskWorkerGroupId
    
    * add friendly log
    
    * update hearbeat thread num = 1
    
    * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
    
    * 1. move verifyTaskInstanceIsNull after taskInstance
    2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
    
    * fix the message
    
    * delete before check to avoid KeeperException$NoNodeException
    
    * fix the message
    
    * check processInstance state before delete tenant
    
    * check processInstance state before delete worker group
    
    * refactor
    
    * merge api constants into common constatns
    
    * update the resource perm
    
    * update the dataSource perm
    
    * fix CheckUtils.checkUserParams method
    
    * update AlertGroupService, extends from BaseService, remove duplicate methods
    
    * refactor
    
    * modify method name
    
    * add hasProjectAndPerm method
    
    * using checkProject instead of getResultStatus
    
    * delete checkAuth method, using hasProjectAndPerm instead.
    
    * correct spelling
    
    * add transactional for deleteWorkerGroupById
    
    * add Transactional for deleteProcessInstanceById method
    
    * change sqlSessionTemplate singleton
    
    * change sqlSessionTemplate singleton and reformat code
    
    * fix unsuitable error message
    
    * update shutdownhook methods
    
    * fix worker log bug
    
    * fix api server debug mode bug
    
    * upgrade zk version
    
    * delete this line ,for zkClient.close() will do the whole thing
    
    * fix master server shutdown error
    
    * degrade zk version and add FourLetterWordMain class
    
    * add ui pom
    
    * add src pom and assembly
    
    * fix ZKWorkerClient not close PathChildrenCache (#1185)
    
    * move updateTaskState into try/catch block in case of exception
    
    * fix NPE
    
    * using conf.getInt instead of getString
    
    * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
    for AlertDao, correct the spelling.
    
    * duplicate
    
    * refactor getTaskWorkerGroupId
    
    * add friendly log
    
    * update hearbeat thread num = 1
    
    * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
    
    * 1. move verifyTaskInstanceIsNull after taskInstance
    2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
    
    * fix the message
    
    * delete before check to avoid KeeperException$NoNodeException
    
    * fix the message
    
    * check processInstance state before delete tenant
    
    * check processInstance state before delete worker group
    
    * refactor
    
    * merge api constants into common constatns
    
    * update the resource perm
    
    * update the dataSource perm
    
    * fix CheckUtils.checkUserParams method
    
    * update AlertGroupService, extends from BaseService, remove duplicate methods
    
    * refactor
    
    * modify method name
    
    * add hasProjectAndPerm method
    
    * using checkProject instead of getResultStatus
    
    * delete checkAuth method, using hasProjectAndPerm instead.
    
    * correct spelling
    
    * add transactional for deleteWorkerGroupById
    
    * add Transactional for deleteProcessInstanceById method
    
    * change sqlSessionTemplate singleton
    
    * change sqlSessionTemplate singleton and reformat code
    
    * fix unsuitable error message
    
    * update shutdownhook methods
    
    * fix worker log bug
    
    * fix api server debug mode bug
    
    * upgrade zk version
    
    * delete this line ,for zkClient.close() will do the whole thing
    
    * fix master server shutdown error
    
    * degrade zk version and add FourLetterWordMain class
    
    * fix PathChildrenCache not close
    
    * add Transactional for createSession method (#1186)
    
    * move updateTaskState into try/catch block in case of exception
    
    * fix NPE
    
    * using conf.getInt instead of getString
    
    * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
    for AlertDao, correct the spelling.
    
    * duplicate
    
    * refactor getTaskWorkerGroupId
    
    * add friendly log
    
    * update hearbeat thread num = 1
    
    * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
    
    * 1. move verifyTaskInstanceIsNull after taskInstance
    2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
    
    * fix the message
    
    * delete before check to avoid KeeperException$NoNodeException
    
    * fix the message
    
    * check processInstance state before delete tenant
    
    * check processInstance state before delete worker group
    
    * refactor
    
    * merge api constants into common constatns
    
    * update the resource perm
    
    * update the dataSource perm
    
    * fix CheckUtils.checkUserParams method
    
    * update AlertGroupService, extends from BaseService, remove duplicate methods
    
    * refactor
    
    * modify method name
    
    * add hasProjectAndPerm method
    
    * using checkProject instead of getResultStatus
    
    * delete checkAuth method, using hasProjectAndPerm instead.
    
    * correct spelling
    
    * add transactional for deleteWorkerGroupById
    
    * add Transactional for deleteProcessInstanceById method
    
    * change sqlSessionTemplate singleton
    
    * change sqlSessionTemplate singleton and reformat code
    
    * fix unsuitable error message
    
    * update shutdownhook methods
    
    * fix worker log bug
    
    * fix api server debug mode bug
    
    * upgrade zk version
    
    * delete this line ,for zkClient.close() will do the whole thing
    
    * fix master server shutdown error
    
    * degrade zk version and add FourLetterWordMain class
    
    * fix PathChildrenCache not close
    
    * add Transactional for createSession method
    
    * add src pom and assembly
    
    * add src pom and assembly
    
    * add src pom and assembly
    
    * add src pom and assembly
    
    * dockerfile dao application.properties ,install.sh modify and application.properties modify (#1187)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * add src pom and assembly
    
    * add src pom and assembly
    
    * dockerfile startup.sh modify (#1189)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs (#1191)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs
    
    * nginx conf modify
    
    * dockerfile application.properties modify
    
    * dockerfile conf modify (#1192)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs
    
    * nginx conf modify
    
    * dockerfile application.properties modify
    
    * dockerfile conf modify (#1193)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs
    
    * nginx conf modify
    
    * dockerfile application.properties modify
    
    * dockerfile email address change (#1194)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs
    
    * nginx conf modify
    
    * dockerfile application.properties modify
    
    * dockerfile email address change
    
    * the alert module is modified in english (#1195)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs
    
    * nginx conf modify
    
    * dockerfile application.properties modify
    
    * dockerfile email address change
    
    * the alert module is modified in English.
    
    * alert server comment and chinese modify
    
    * api server useless code and chinese modify (#1198)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs
    
    * nginx conf modify
    
    * dockerfile application.properties modify
    
    * dockerfile email address change
    
    * the alert module is modified in English.
    
    * alert server comment and chinese modify
    
    * api server useless code and chinese modify
    
    * common,dao,server useless code and chinese modify (#1199)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs
    
    * nginx conf modify
    
    * dockerfile application.properties modify
    
    * dockerfile email address change
    
    * the alert module is modified in English.
    
    * alert server comment and chinese modify
    
    * api server useless code and chinese modify
    
    * common,dao,server useless code and chinese modify
    
    * change chinese sql to english. (#1200)
    
    * update english documents
    
    * refactor zk client
    
    * update documents
    
    * update zkclient
    
    * update zkclient
    
    * update documents
    
    * add architecture-design
    
    * change i18n
    
    * update i18n
    
    * update english documents
    
    * add architecture-design
    
    * update english documents
    
    * update en-US documents
    
    * add architecture-design
    
    * update demo site
    
    * add mybatis plus model
    
    * modify mybatisplus
    
    * modify mybatisplus
    
    * change interface by mybatisplus
    
    * add unit test
    
    * refactor dao interface.
    
    * add unit test for dao...
    
    * add unit test for dao...
    
    * add unit test for dao...
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
    
    * update some dao bugs
    
    * update for some bugs
    
    * update some bugs
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
    
    * update
    
    * update
    
    * add multiply settings for application.yml
    
    * add multiply settings for application.yml
    
    * revert
    
    * update configuration settings in task record dao...
    
    * change application_master to application-master
    
    * change application_master to application-master
    
    * update application.yml to application.properties
    
    * revert
    
    * revert
    
    * add properties
    
    * add properties
    
    * revert
    
    * revert
    
    * add api start up..
    add alert send try catch
    
    * update dao info level
    
    * fix bug: task cannot submit when recovery failover
    
    * fix bug: task cannot submit when recovery failover
    
    * merge from dev-db
    
    * revert
    
    * revert
    
    * fix bug: get process definition list failed.
    
    * fix bug: process instance interval is error
    
    * revert
    
    * revert
    
    * update
    
    * support stop submit success tasks
    
    * update kill process
    
    * update for stop process
    
    * update for stop process
    
    * add some logs for stop process
    
    * update for small bug.
    
    * add check strategy before submit task
    
    * revert
    
    * update
    
    * update
    
    * revert
    
    * wait task instance exists if null.
    
    * revert
    
    * update
    
    * change desc to description.
    
    * add check user and definitions function when delete tenant
    
    * update
    
    * change desc to description.
    
    * change desc to description.
    
    * change desc to description.
    
    * remove check resources when delete tenant
    
    * change desc to description.
    
    * change mybatisplus version to 3.2.0
    
    * update
    
    * change the notice to apache.
    
    * update
    
    * update postgre sql
    
    * fix bug: phone can be empty.
    
    * fix bug: postgre test error.
    
    * update create table for postgre quartz
    
    * fix some bugs about postgre.
    
    * update create table for postgre quartz
    
    * add postgre db performance monitor
    
    * add postgre performance monitor
    
    * update performance monitor
    
    * revert
    
    * revert
    
    * fix bug: tasks queue length error
    
    * remove datasource.properties
    
    * change chinese sql to english.
    
    * change chinese sql to english.
    
    * change chinese to english (#1202)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs
    
    * nginx conf modify
    
    * dockerfile application.properties modify
    
    * dockerfile email address change
    
    * the alert module is modified in English.
    
    * alert server comment and chinese modify
    
    * api server useless code and chinese modify
    
    * common,dao,server useless code and chinese modify
    
    * change chinese to english
    
    * remove unused code (#1204)
    
    * update english documents
    
    * refactor zk client
    
    * update documents
    
    * update zkclient
    
    * update zkclient
    
    * update documents
    
    * add architecture-design
    
    * change i18n
    
    * update i18n
    
    * update english documents
    
    * add architecture-design
    
    * update english documents
    
    * update en-US documents
    
    * add architecture-design
    
    * update demo site
    
    * add mybatis plus model
    
    * modify mybatisplus
    
    * modify mybatisplus
    
    * change interface by mybatisplus
    
    * add unit test
    
    * refactor dao interface.
    
    * add unit test for dao...
    
    * add unit test for dao...
    
    * add unit test for dao...
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
    
    * update some dao bugs
    
    * update for some bugs
    
    * update some bugs
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
    
    * update
    
    * update
    
    * add multiply settings for application.yml
    
    * add multiply settings for application.yml
    
    * revert
    
    * update configuration settings in task record dao...
    
    * change application_master to application-master
    
    * change application_master to application-master
    
    * update application.yml to application.properties
    
    * revert
    
    * revert
    
    * add properties
    
    * add properties
    
    * revert
    
    * revert
    
    * add api start up..
    add alert send try catch
    
    * update dao info level
    
    * fix bug: task cannot submit when recovery failover
    
    * fix bug: task cannot submit when recovery failover
    
    * merge from dev-db
    
    * revert
    
    * revert
    
    * fix bug: get process definition list failed.
    
    * fix bug: process instance interval is error
    
    * revert
    
    * revert
    
    * update
    
    * support stop submit success tasks
    
    * update kill process
    
    * update for stop process
    
    * update for stop process
    
    * add some logs for stop process
    
    * update for small bug.
    
    * add check strategy before submit task
    
    * revert
    
    * update
    
    * update
    
    * revert
    
    * wait task instance exists if null.
    
    * revert
    
    * update
    
    * change desc to description.
    
    * add check user and definitions function when delete tenant
    
    * update
    
    * change desc to description.
    
    * change desc to description.
    
    * change desc to description.
    
    * remove check resources when delete tenant
    
    * change desc to description.
    
    * change mybatisplus version to 3.2.0
    
    * update
    
    * change the notice to apache.
    
    * update
    
    * update postgre sql
    
    * fix bug: phone can be empty.
    
    * fix bug: postgre test error.
    
    * update create table for postgre quartz
    
    * fix some bugs about postgre.
    
    * update create table for postgre quartz
    
    * add postgre db performance monitor
    
    * add postgre performance monitor
    
    * update performance monitor
    
    * revert
    
    * revert
    
    * fix bug: tasks queue length error
    
    * remove datasource.properties
    
    * change chinese sql to english.
    
    * change chinese sql to english.
    
    * remove unused code.
    
    * remove unused code.
    
    * Modify webpack configuration (#1206)
    
    * add more message for java-doc (#1209)
    
    * move updateTaskState into try/catch block in case of exception
    
    * fix NPE
    
    * using conf.getInt instead of getString
    
    * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
    for AlertDao, correct the spelling.
    
    * duplicate
    
    * refactor getTaskWorkerGroupId
    
    * add friendly log
    
    * update hearbeat thread num = 1
    
    * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
    
    * 1. move verifyTaskInstanceIsNull after taskInstance
    2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
    
    * fix the message
    
    * delete before check to avoid KeeperException$NoNodeException
    
    * fix the message
    
    * check processInstance state before delete tenant
    
    * check processInstance state before delete worker group
    
    * refactor
    
    * merge api constants into common constatns
    
    * update the resource perm
    
    * update the dataSource perm
    
    * fix CheckUtils.checkUserParams method
    
    * update AlertGroupService, extends from BaseService, remove duplicate methods
    
    * refactor
    
    * modify method name
    
    * add hasProjectAndPerm method
    
    * using checkProject instead of getResultStatus
    
    * delete checkAuth method, using hasProjectAndPerm instead.
    
    * correct spelling
    
    * add transactional for deleteWorkerGroupById
    
    * add Transactional for deleteProcessInstanceById method
    
    * change sqlSessionTemplate singleton
    
    * change sqlSessionTemplate singleton and reformat code
    
    * fix unsuitable error message
    
    * update shutdownhook methods
    
    * fix worker log bug
    
    * fix api server debug mode bug
    
    * upgrade zk version
    
    * delete this line ,for zkClient.close() will do the whole thing
    
    * fix master server shutdown error
    
    * degrade zk version and add FourLetterWordMain class
    
    * fix PathChildrenCache not close
    
    * add Transactional for createSession method
    
    * add more message for java-doc
    
    * add java doc for common module (#1213)
    
    * dao method comments and useless code modify (#1214)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs
    
    * nginx conf modify
    
    * dockerfile application.properties modify
    
    * dockerfile email address change
    
    * the alert module is modified in English.
    
    * alert server comment and chinese modify
    
    * api server useless code and chinese modify
    
    * common,dao,server useless code and chinese modify
    
    * change chinese to english
    
    * dao method comments and useless code modify
    
    * Change all Chinese names to English (#1207)
    
    * Modify webpack configuration
    
    * Change all Chinese names to English
    
    * add progress-bar-webpack-plugin (#1215)
    
    * Modify webpack configuration
    
    * Change all Chinese names to English
    
    * add progress-bar-webpack-plugin
    
    * Add method and parameters comments (#1220)
    
    * rename from DatasourceUserMapper to DataSourceUserMapper
    
    * add unit test in UserMapper and WorkerGroupMapper
    
    * change cn.escheduler to org.apache.dolphinscheduler
    
    * add unit test in UdfFuncMapperTest
    
    * add unit test in UdfFuncMapperTest
    
    * remove DatabaseConfiguration
    
    * add ConnectionFactoryTest
    
    * cal duration in processInstancesList
    
    * change desc to description
    
    * change table name in mysql ddl
    
    * change table name in mysql ddl
    
    * change escheduler to dolphinscheduler
    
    * change escheduler to dolphinscheduler
    
    * change escheduler to dolphinscheduler
    
    * remove log4j-1.2-api and modify AlertMapperTest
    
    * remove log4j-1.2-api
    
    * Add alertDao to spring management
    
    * Add alertDao to spring management
    
    * get SqlSessionFactory from MybatisSqlSessionFactoryBean
    
    * get processDao by DaoFactory
    
    * read druid properties in ConneciontFactory
    
    * read druid properties in ConneciontFactory
    
    * change get alertDao by spring to DaoFactory
    
    * add log4j to resolve #967
    
    * resole verify udf name error and delete udf error
    
    * Determine if principal is empty
    
    * Determine whether the logon user has the right to delete the project
    
    * Fixed an issue that produced attatch file named such as ATT00002.bin
    
    * fix too many connection in upgrade or create
    
    * fix NEED_FAULT_TOLERANCE and WAITTING_THREAD count fail
    
    * Added a judgment on whether the currently login user is an administrator
    
    * fix update udf database not change and create time is changed
    
    * add enterprise.wechat.enable to decide whether to send enterprise WeChat
    
    * change method check
    
    * Remove the administrator's judgment on query access token list
    
    * only admin can create worker group
    
    * delete alert group need delete the relation of user and alert group
    
    * add timeout in proxy when upload large resource
    
    * add gets scheduled times by expect fire times
    
    * add gets scheduled times by expect fire times
    
    * Increase the judgment of whether it is admin
    
    * Increase the judgment of whether it is admin
    
    * when delete access token add whether login user has perm to delete
    
    * change mysql-connector-java scope to test
    
    * update scm test
    
    * add profile test
    
    * Add method and parameters comments
    
    * roll back
    
    * add some notes (#1221)
    
    * update english documents
    
    * refactor zk client
    
    * update documents
    
    * update zkclient
    
    * update zkclient
    
    * update documents
    
    * add architecture-design
    
    * change i18n
    
    * update i18n
    
    * update english documents
    
    * add architecture-design
    
    * update english documents
    
    * update en-US documents
    
    * add architecture-design
    
    * update demo site
    
    * add mybatis plus model
    
    * modify mybatisplus
    
    * modify mybatisplus
    
    * change interface by mybatisplus
    
    * add unit test
    
    * refactor dao interface.
    
    * add unit test for dao...
    
    * add unit test for dao...
    
    * add unit test for dao...
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
    
    * update some dao bugs
    
    * update for some bugs
    
    * update some bugs
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
    
    * update
    
    * update
    
    * add multiply settings for application.yml
    
    * add multiply settings for application.yml
    
    * revert
    
    * update configuration settings in task record dao...
    
    * change application_master to application-master
    
    * change application_master to application-master
    
    * update application.yml to application.properties
    
    * revert
    
    * revert
    
    * add properties
    
    * add properties
    
    * revert
    
    * revert
    
    * add api start up..
    add alert send try catch
    
    * update dao info level
    
    * fix bug: task cannot submit when recovery failover
    
    * fix bug: task cannot submit when recovery failover
    
    * merge from dev-db
    
    * revert
    
    * revert
    
    * fix bug: get process definition list failed.
    
    * fix bug: process instance interval is error
    
    * revert
    
    * revert
    
    * update
    
    * support stop submit success tasks
    
    * update kill process
    
    * update for stop process
    
    * update for stop process
    
    * add some logs for stop process
    
    * update for small bug.
    
    * add check strategy before submit task
    
    * revert
    
    * update
    
    * update
    
    * revert
    
    * wait task instance exists if null.
    
    * revert
    
    * update
    
    * change desc to description.
    
    * add check user and definitions function when delete tenant
    
    * update
    
    * change desc to description.
    
    * change desc to description.
    
    * change desc to description.
    
    * remove check resources when delete tenant
    
    * change desc to description.
    
    * change mybatisplus version to 3.2.0
    
    * update
    
    * change the notice to apache.
    
    * update
    
    * update postgre sql
    
    * fix bug: phone can be empty.
    
    * fix bug: postgre test error.
    
    * update create table for postgre quartz
    
    * fix some bugs about postgre.
    
    * update create table for postgre quartz
    
    * add postgre db performance monitor
    
    * add postgre performance monitor
    
    * update performance monitor
    
    * revert
    
    * revert
    
    * fix bug: tasks queue length error
    
    * remove datasource.properties
    
    * change chinese sql to english.
    
    * change chinese sql to english.
    
    * remove unused code.
    
    * remove unused code.
    
    * add some notes
    
    * update some notes
    
    * update some notes
    
    * update mbatisplus version
    
    * update lombok version
    
    * update lombok version
    
    * revert
    
    * merge from dev-db
    
    * remove version
    
    * update npm install pom
    
    * add front assembly
    
    * add front module
    
    * change verison to 1.2.0-release-SNAPSHOT
    
    * add name in pom and remove compile
    
    * add name in pom
    
    * add licenses in assemble
    
    * change version to 1.2.0-RC1-SNAPSHOT
    
    * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
    
    # Conflicts:
    #	dolphinscheduler-alert/pom.xml
    #	dolphinscheduler-api/pom.xml
    #	dolphinscheduler-common/pom.xml
    #	dolphinscheduler-dao/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
    #	dolphinscheduler-dist/pom.xml
    #	dolphinscheduler-rpc/pom.xml
    #	dolphinscheduler-server/pom.xml
    #	dolphinscheduler-ui/pom.xml
    #	pom.xml
    change assembly id
    
    * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
    
    # Conflicts:
    #	dolphinscheduler-alert/pom.xml
    #	dolphinscheduler-api/pom.xml
    #	dolphinscheduler-common/pom.xml
    #	dolphinscheduler-dao/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
    #	dolphinscheduler-dist/pom.xml
    #	dolphinscheduler-rpc/pom.xml
    #	dolphinscheduler-server/pom.xml
    #	dolphinscheduler-ui/pom.xml
    #	pom.xml
    add DISCLAIMER
    
    * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
    
    # Conflicts:
    #	dolphinscheduler-alert/pom.xml
    #	dolphinscheduler-api/pom.xml
    #	dolphinscheduler-common/pom.xml
    #	dolphinscheduler-dao/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
    #	dolphinscheduler-dist/pom.xml
    #	dolphinscheduler-rpc/pom.xml
    #	dolphinscheduler-server/pom.xml
    #	dolphinscheduler-ui/pom.xml
    #	pom.xml
    add license in xml and properties
    
    * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
    
    # Conflicts:
    #	dolphinscheduler-alert/pom.xml
    #	dolphinscheduler-api/pom.xml
    #	dolphinscheduler-common/pom.xml
    #	dolphinscheduler-dao/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
    #	dolphinscheduler-dist/pom.xml
    #	dolphinscheduler-rpc/pom.xml
    #	dolphinscheduler-server/pom.xml
    #	dolphinscheduler-ui/pom.xml
    #	pom.xml
    add license in dockerfile
    
    * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
    
    # Conflicts:
    #	dolphinscheduler-alert/pom.xml
    #	dolphinscheduler-api/pom.xml
    #	dolphinscheduler-common/pom.xml
    #	dolphinscheduler-dao/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
    #	dolphinscheduler-dist/pom.xml
    #	dolphinscheduler-rpc/pom.xml
    #	dolphinscheduler-server/pom.xml
    #	dolphinscheduler-ui/pom.xml
    #	pom.xml
    add license in script and sql
    
    * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
    
    # Conflicts:
    #	dolphinscheduler-alert/pom.xml
    #	dolphinscheduler-api/pom.xml
    #	dolphinscheduler-common/pom.xml
    #	dolphinscheduler-dao/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
    #	dolphinscheduler-dist/pom.xml
    #	dolphinscheduler-rpc/pom.xml
    #	dolphinscheduler-server/pom.xml
    #	dolphinscheduler-ui/pom.xml
    #	pom.xml
    add license in script and sql
    
    * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
    
    # Conflicts:
    #	dolphinscheduler-alert/pom.xml
    #	dolphinscheduler-api/pom.xml
    #	dolphinscheduler-common/pom.xml
    #	dolphinscheduler-dao/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
    #	dolphinscheduler-dist/pom.xml
    #	dolphinscheduler-rpc/pom.xml
    #	dolphinscheduler-server/pom.xml
    #	dolphinscheduler-ui/pom.xml
    #	pom.xml
    add license in ci
    
    * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
    
    # Conflicts:
    #	dolphinscheduler-alert/pom.xml
    #	dolphinscheduler-api/pom.xml
    #	dolphinscheduler-common/pom.xml
    #	dolphinscheduler-dao/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
    #	dolphinscheduler-dist/pom.xml
    #	dolphinscheduler-rpc/pom.xml
    #	dolphinscheduler-server/pom.xml
    #	dolphinscheduler-ui/pom.xml
    #	pom.xml
    change version to 1.2.0-SNAPSHOT
    
    * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
    
    # Conflicts:
    #	dolphinscheduler-alert/pom.xml
    #	dolphinscheduler-api/pom.xml
    #	dolphinscheduler-common/pom.xml
    #	dolphinscheduler-dao/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
    #	dolphinscheduler-dist/pom.xml
    #	dolphinscheduler-rpc/pom.xml
    #	dolphinscheduler-server/pom.xml
    #	dolphinscheduler-ui/pom.xml
    #	pom.xml
    set defalut db type postgresql
    
    * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
    
    # Conflicts:
    #	dolphinscheduler-alert/pom.xml
    #	dolphinscheduler-api/pom.xml
    #	dolphinscheduler-common/pom.xml
    #	dolphinscheduler-dao/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
    #	dolphinscheduler-dist/pom.xml
    #	dolphinscheduler-rpc/pom.xml
    #	dolphinscheduler-server/pom.xml
    #	dolphinscheduler-ui/pom.xml
    #	pom.xml
    set defalut db type postgresql
    
    * change org.quartz.jobStore.driverDelegateClass
    
    * Add comments in method params
    
    * update readme from branch dev
    
    * update content in how to contribute
    
    * change postgresql default port
    
    * change version 1.2.0-SNAPSHOT
    
    * remove antrun plugin
    
    * add how to build
    
    * add how to build
    
    * remove dir format in assembly
    
    * Remove the judgment of whether it is admin
    
    * reset version to 1.2.0-SNAPSHOT
    
    * Remove the judgment of whether it is admin
    
    * Fix bug the administrator authorizes the project to ordinary users,but ordinary users cannot see the process definition created by the administrator
    
    * Added description of bug fixes about create dolphinscheduler sql failed
    
    * reset version to 1.2.0-SNAPSHOT
    
    * [maven-release-plugin] prepare release 1.2.0
    
    * [maven-release-plugin] prepare for next development iteration
    
    * update dml when init queue table (#1323)
    
    * rename from DatasourceUserMapper to DataSourceUserMapper
    
    * add unit test in UserMapper and WorkerGroupMapper
    
    * change cn.escheduler to org.apache.dolphinscheduler
    
    * add unit test in UdfFuncMapperTest
    
    * add unit test in UdfFuncMapperTest
    
    * remove DatabaseConfiguration
    
    * add ConnectionFactoryTest
    
    * cal duration in processInstancesList
    
    * change desc to description
    
    * change table name in mysql ddl
    
    * change table name in mysql ddl
    
    * change escheduler to dolphinscheduler
    
    * change escheduler to dolphinscheduler
    
    * change escheduler to dolphinscheduler
    
    * remove log4j-1.2-api and modify AlertMapperTest
    
    * remove log4j-1.2-api
    
    * Add alertDao to spring management
    
    * Add alertDao to spring management
    
    * get SqlSessionFactory from MybatisSqlSessionFactoryBean
    
    * get processDao by DaoFactory
    
    * read druid properties in ConneciontFactory
    
    * read druid properties in ConneciontFactory
    
    * change get alertDao by spring to DaoFactory
    
    * add log4j to resolve #967
    
    * resole verify udf name error and delete udf error
    
    * Determine if principal is empty
    
    * Determine whether the logon user has the right to delete the project
    
    * Fixed an issue that produced attatch file named such as ATT00002.bin
    
    * fix too many connection in upgrade or create
    
    * fix NEED_FAULT_TOLERANCE and WAITTING_THREAD count fail
    
    * Added a judgment on whether the currently login user is an administrator
    
    * fix update udf database not change and create time is changed
    
    * add enterprise.wechat.enable to decide whether to send enterprise WeChat
    
    * change method check
    
    * Remove the administrator's judgment on query access token list
    
    * only admin can create worker group
    
    * delete alert group need delete the relation of user and alert group
    
    * add timeout in proxy when upload large resource
    
    * add gets scheduled times by expect fire times
    
    * add gets scheduled times by expect fire times
    
    * Increase the judgment of whether it is admin
    
    * Increase the judgment of whether it is admin
    
    * when delete access token add whether login user has perm to delete
    
    * change mysql-connector-java scope to test
    
    * update scm test
    
    * add profile test
    
    * add profile test
    
    * add maven.deploy.skip true
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * add dependency
    
    * add javadoc
    
    * add antrun
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * reset pgsql (#1178)
    
    + 1
    
    * add javadoc
    
    * add javadoc
    
    * [maven-release-plugin] rollback the release of 1.2.0
    
    * add javadoc
    
    * Ans UI upgrade to version 0.1.0 (#1181)
    
    + 1
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * Administrators group prohibit deletion (#1182)
    
    * Ans UI upgrade to version 0.1.0
    
    * Administrators group prohibit deletion
    
    * add javadoc
    
    * add ui pom
    
    * fix master server shutdown error (#1177)
    
    * move updateTaskState into try/catch block in case of exception
    
    * fix NPE
    
    * using conf.getInt instead of getString
    
    * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
    for AlertDao, correct the spelling.
    
    * duplicate
    
    * refactor getTaskWorkerGroupId
    
    * add friendly log
    
    * update hearbeat thread num = 1
    
    * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
    
    * 1. move verifyTaskInstanceIsNull after taskInstance
    2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
    
    * fix the message
    
    * delete before check to avoid KeeperException$NoNodeException
    
    * fix the message
    
    * check processInstance state before delete tenant
    
    * check processInstance state before delete worker group
    
    * refactor
    
    * merge api constants into common constatns
    
    * update the resource perm
    
    * update the dataSource perm
    
    * fix CheckUtils.checkUserParams method
    
    * update AlertGroupService, extends from BaseService, remove duplicate methods
    
    * refactor
    
    * modify method name
    
    * add hasProjectAndPerm method
    
    * using checkProject instead of getResultStatus
    
    * delete checkAuth method, using hasProjectAndPerm instead.
    
    * correct spelling
    
    * add transactional for deleteWorkerGroupById
    
    * add Transactional for deleteProcessInstanceById method
    
    * change sqlSessionTemplate singleton
    
    * change sqlSessionTemplate singleton and reformat code
    
    * fix unsuitable error message
    
    * update shutdownhook methods
    
    * fix worker log bug
    
    * fix api server debug mode bug
    
    * upgrade zk version
    
    * delete this line ,for zkClient.close() will do the whole thing
    
    * fix master server shutdown error
    
    * degrade zk version and add FourLetterWordMain class (#1183)
    
    * move updateTaskState into try/catch block in case of exception
    
    * fix NPE
    
    * using conf.getInt instead of getString
    
    * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
    for AlertDao, correct the spelling.
    
    * duplicate
    
    * refactor getTaskWorkerGroupId
    
    * add friendly log
    
    * update hearbeat thread num = 1
    
    * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
    
    * 1. move verifyTaskInstanceIsNull after taskInstance
    2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
    
    * fix the message
    
    * delete before check to avoid KeeperException$NoNodeException
    
    * fix the message
    
    * check processInstance state before delete tenant
    
    * check processInstance state before delete worker group
    
    * refactor
    
    * merge api constants into common constatns
    
    * update the resource perm
    
    * update the dataSource perm
    
    * fix CheckUtils.checkUserParams method
    
    * update AlertGroupService, extends from BaseService, remove duplicate methods
    
    * refactor
    
    * modify method name
    
    * add hasProjectAndPerm method
    
    * using checkProject instead of getResultStatus
    
    * delete checkAuth method, using hasProjectAndPerm instead.
    
    * correct spelling
    
    * add transactional for deleteWorkerGroupById
    
    * add Transactional for deleteProcessInstanceById method
    
    * change sqlSessionTemplate singleton
    
    * change sqlSessionTemplate singleton and reformat code
    
    * fix unsuitable error message
    
    * update shutdownhook methods
    
    * fix worker log bug
    
    * fix api server debug mode bug
    
    * upgrade zk version
    
    * delete this line ,for zkClient.close() will do the whole thing
    
    * fix master server shutdown error
    
    * degrade zk version and add FourLetterWordMain class
    
    * add ui pom
    
    * add src pom and assembly
    
    * fix ZKWorkerClient not close PathChildrenCache (#1185)
    
    * move updateTaskState into try/catch block in case of exception
    
    * fix NPE
    
    * using conf.getInt instead of getString
    
    * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
    for AlertDao, correct the spelling.
    
    * duplicate
    
    * refactor getTaskWorkerGroupId
    
    * add friendly log
    
    * update hearbeat thread num = 1
    
    * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
    
    * 1. move verifyTaskInstanceIsNull after taskInstance
    2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
    
    * fix the message
    
    * delete before check to avoid KeeperException$NoNodeException
    
    * fix the message
    
    * check processInstance state before delete tenant
    
    * check processInstance state before delete worker group
    
    * refactor
    
    * merge api constants into common constatns
    
    * update the resource perm
    
    * update the dataSource perm
    
    * fix CheckUtils.checkUserParams method
    
    * update AlertGroupService, extends from BaseService, remove duplicate methods
    
    * refactor
    
    * modify method name
    
    * add hasProjectAndPerm method
    
    * using checkProject instead of getResultStatus
    
    * delete checkAuth method, using hasProjectAndPerm instead.
    
    * correct spelling
    
    * add transactional for deleteWorkerGroupById
    
    * add Transactional for deleteProcessInstanceById method
    
    * change sqlSessionTemplate singleton
    
    * change sqlSessionTemplate singleton and reformat code
    
    * fix unsuitable error message
    
    * update shutdownhook methods
    
    * fix worker log bug
    
    * fix api server debug mode bug
    
    * upgrade zk version
    
    * delete this line ,for zkClient.close() will do the whole thing
    
    * fix master server shutdown error
    
    * degrade zk version and add FourLetterWordMain class
    
    * fix PathChildrenCache not close
    
    * add Transactional for createSession method (#1186)
    
    * move updateTaskState into try/catch block in case of exception
    
    * fix NPE
    
    * using conf.getInt instead of getString
    
    * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
    for AlertDao, correct the spelling.
    
    * duplicate
    
    * refactor getTaskWorkerGroupId
    
    * add friendly log
    
    * update hearbeat thread num = 1
    
    * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
    
    * 1. move verifyTaskInstanceIsNull after taskInstance
    2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
    
    * fix the message
    
    * delete before check to avoid KeeperException$NoNodeException
    
    * fix the message
    
    * check processInstance state before delete tenant
    
    * check processInstance state before delete worker group
    
    * refactor
    
    * merge api constants into common constatns
    
    * update the resource perm
    
    * update the dataSource perm
    
    * fix CheckUtils.checkUserParams method
    
    * update AlertGroupService, extends from BaseService, remove duplicate methods
    
    * refactor
    
    * modify method name
    
    * add hasProjectAndPerm method
    
    * using checkProject instead of getResultStatus
    
    * delete checkAuth method, using hasProjectAndPerm instead.
    
    * correct spelling
    
    * add transactional for deleteWorkerGroupById
    
    * add Transactional for deleteProcessInstanceById method
    
    * change sqlSessionTemplate singleton
    
    * change sqlSessionTemplate singleton and reformat code
    
    * fix unsuitable error message
    
    * update shutdownhook methods
    
    * fix worker log bug
    
    * fix api server debug mode bug
    
    * upgrade zk version
    
    * delete this line ,for zkClient.close() will do the whole thing
    
    * fix master server shutdown error
    
    * degrade zk version and add FourLetterWordMain class
    
    * fix PathChildrenCache not close
    
    * add Transactional for createSession method
    
    * add src pom and assembly
    
    * add src pom and assembly
    
    * add src pom and assembly
    
    * add src pom and assembly
    
    * dockerfile dao application.properties ,install.sh modify and application.properties modify (#1187)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * add src pom and assembly
    
    * add src pom and assembly
    
    * dockerfile startup.sh modify (#1189)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs (#1191)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs
    
    * nginx conf modify
    
    * dockerfile application.properties modify
    
    * dockerfile conf modify (#1192)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs
    
    * nginx conf modify
    
    * dockerfile application.properties modify
    
    * dockerfile conf modify (#1193)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs
    
    * nginx conf modify
    
    * dockerfile application.properties modify
    
    * dockerfile email address change (#1194)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs
    
    * nginx conf modify
    
    * dockerfile application.properties modify
    
    * dockerfile email address change
    
    * the alert module is modified in english (#1195)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs
    
    * nginx conf modify
    
    * dockerfile application.properties modify
    
    * dockerfile email address change
    
    * the alert module is modified in English.
    
    * alert server comment and chinese modify
    
    * api server useless code and chinese modify (#1198)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs
    
    * nginx conf modify
    
    * dockerfile application.properties modify
    
    * dockerfile email address change
    
    * the alert module is modified in English.
    
    * alert server comment and chinese modify
    
    * api server useless code and chinese modify
    
    * common,dao,server useless code and chinese modify (#1199)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs
    
    * nginx conf modify
    
    * dockerfile application.properties modify
    
    * dockerfile email address change
    
    * the alert module is modified in English.
    
    * alert server comment and chinese modify
    
    * api server useless code and chinese modify
    
    * common,dao,server useless code and chinese modify
    
    * change chinese sql to english. (#1200)
    
    * update english documents
    
    * refactor zk client
    
    * update documents
    
    * update zkclient
    
    * update zkclient
    
    * update documents
    
    * add architecture-design
    
    * change i18n
    
    * update i18n
    
    * update english documents
    
    * add architecture-design
    
    * update english documents
    
    * update en-US documents
    
    * add architecture-design
    
    * update demo site
    
    * add mybatis plus model
    
    * modify mybatisplus
    
    * modify mybatisplus
    
    * change interface by mybatisplus
    
    * add unit test
    
    * refactor dao interface.
    
    * add unit test for dao...
    
    * add unit test for dao...
    
    * add unit test for dao...
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
    
    * update some dao bugs
    
    * update for some bugs
    
    * update some bugs
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
    
    * update
    
    * update
    
    * add multiply settings for application.yml
    
    * add multiply settings for application.yml
    
    * revert
    
    * update configuration settings in task record dao...
    
    * change application_master to application-master
    
    * change application_master to application-master
    
    * update application.yml to application.properties
    
    * revert
    
    * revert
    
    * add properties
    
    * add properties
    
    * revert
    
    * revert
    
    * add api start up..
    add alert send try catch
    
    * update dao info level
    
    * fix bug: task cannot submit when recovery failover
    
    * fix bug: task cannot submit when recovery failover
    
    * merge from dev-db
    
    * revert
    
    * revert
    
    * fix bug: get process definition list failed.
    
    * fix bug: process instance interval is error
    
    * revert
    
    * revert
    
    * update
    
    * support stop submit success tasks
    
    * update kill process
    
    * update for stop process
    
    * update for stop process
    
    * add some logs for stop process
    
    * update for small bug.
    
    * add check strategy before submit task
    
    * revert
    
    * update
    
    * update
    
    * revert
    
    * wait task instance exists if null.
    
    * revert
    
    * update
    
    * change desc to description.
    
    * add check user and definitions function when delete tenant
    
    * update
    
    * change desc to description.
    
    * change desc to description.
    
    * change desc to description.
    
    * remove check resources when delete tenant
    
    * change desc to description.
    
    * change mybatisplus version to 3.2.0
    
    * update
    
    * change the notice to apache.
    
    * update
    
    * update postgre sql
    
    * fix bug: phone can be empty.
    
    * fix bug: postgre test error.
    
    * update create table for postgre quartz
    
    * fix some bugs about postgre.
    
    * update create table for postgre quartz
    
    * add postgre db performance monitor
    
    * add postgre performance monitor
    
    * update performance monitor
    
    * revert
    
    * revert
    
    * fix bug: tasks queue length error
    
    * remove datasource.properties
    
    * change chinese sql to english.
    
    * change chinese sql to english.
    
    * change chinese to english (#1202)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs
    
    * nginx conf modify
    
    * dockerfile application.properties modify
    
    * dockerfile email address change
    
    * the alert module is modified in English.
    
    * alert server comment and chinese modify
    
    * api server useless code and chinese modify
    
    * common,dao,server useless code and chinese modify
    
    * change chinese to english
    
    * remove unused code (#1204)
    
    * update english documents
    
    * refactor zk client
    
    * update documents
    
    * update zkclient
    
    * update zkclient
    
    * update documents
    
    * add architecture-design
    
    * change i18n
    
    * update i18n
    
    * update english documents
    
    * add architecture-design
    
    * update english documents
    
    * update en-US documents
    
    * add architecture-design
    
    * update demo site
    
    * add mybatis plus model
    
    * modify mybatisplus
    
    * modify mybatisplus
    
    * change interface by mybatisplus
    
    * add unit test
    
    * refactor dao interface.
    
    * add unit test for dao...
    
    * add unit test for dao...
    
    * add unit test for dao...
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
    
    * update some dao bugs
    
    * update for some bugs
    
    * update some bugs
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
    
    * update
    
    * update
    
    * add multiply settings for application.yml
    
    * add multiply settings for application.yml
    
    * revert
    
    * update configuration settings in task record dao...
    
    * change application_master to application-master
    
    * change application_master to application-master
    
    * update application.yml to application.properties
    
    * revert
    
    * revert
    
    * add properties
    
    * add properties
    
    * revert
    
    * revert
    
    * add api start up..
    add alert send try catch
    
    * update dao info level
    
    * fix bug: task cannot submit when recovery failover
    
    * fix bug: task cannot submit when recovery failover
    
    * merge from dev-db
    
    * revert
    
    * revert
    
    * fix bug: get process definition list failed.
    
    * fix bug: process instance interval is error
    
    * revert
    
    * revert
    
    * update
    
    * support stop submit success tasks
    
    * update kill process
    
    * update for stop process
    
    * update for stop process
    
    * add some logs for stop process
    
    * update for small bug.
    
    * add check strategy before submit task
    
    * revert
    
    * update
    
    * update
    
    * revert
    
    * wait task instance exists if null.
    
    * revert
    
    * update
    
    * change desc to description.
    
    * add check user and definitions function when delete tenant
    
    * update
    
    * change desc to description.
    
    * change desc to description.
    
    * change desc to description.
    
    * remove check resources when delete tenant
    
    * change desc to description.
    
    * change mybatisplus version to 3.2.0
    
    * update
    
    * change the notice to apache.
    
    * update
    
    * update postgre sql
    
    * fix bug: phone can be empty.
    
    * fix bug: postgre test error.
    
    * update create table for postgre quartz
    
    * fix some bugs about postgre.
    
    * update create table for postgre quartz
    
    * add postgre db performance monitor
    
    * add postgre performance monitor
    
    * update performance monitor
    
    * revert
    
    * revert
    
    * fix bug: tasks queue length error
    
    * remove datasource.properties
    
    * change chinese sql to english.
    
    * change chinese sql to english.
    
    * remove unused code.
    
    * remove unused code.
    
    * Modify webpack configuration (#1206)
    
    * add more message for java-doc (#1209)
    
    * move updateTaskState into try/catch block in case of exception
    
    * fix NPE
    
    * using conf.getInt instead of getString
    
    * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
    for AlertDao, correct the spelling.
    
    * duplicate
    
    * refactor getTaskWorkerGroupId
    
    * add friendly log
    
    * update hearbeat thread num = 1
    
    * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
    
    * 1. move verifyTaskInstanceIsNull after taskInstance
    2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
    
    * fix the message
    
    * delete before check to avoid KeeperException$NoNodeException
    
    * fix the message
    
    * check processInstance state before delete tenant
    
    * check processInstance state before delete worker group
    
    * refactor
    
    * merge api constants into common constatns
    
    * update the resource perm
    
    * update the dataSource perm
    
    * fix CheckUtils.checkUserParams method
    
    * update AlertGroupService, extends from BaseService, remove duplicate methods
    
    * refactor
    
    * modify method name
    
    * add hasProjectAndPerm method
    
    * using checkProject instead of getResultStatus
    
    * delete checkAuth method, using hasProjectAndPerm instead.
    
    * correct spelling
    
    * add transactional for deleteWorkerGroupById
    
    * add Transactional for deleteProcessInstanceById method
    
    * change sqlSessionTemplate singleton
    
    * change sqlSessionTemplate singleton and reformat code
    
    * fix unsuitable error message
    
    * update shutdownhook methods
    
    * fix worker log bug
    
    * fix api server debug mode bug
    
    * upgrade zk version
    
    * delete this line ,for zkClient.close() will do the whole thing
    
    * fix master server shutdown error
    
    * degrade zk version and add FourLetterWordMain class
    
    * fix PathChildrenCache not close
    
    * add Transactional for createSession method
    
    * add more message for java-doc
    
    * add java doc for common module (#1213)
    
    * dao method comments and useless code modify (#1214)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs
    
    * nginx conf modify
    
    * dockerfile application.properties modify
    
    * dockerfile email address change
    
    * the alert module is modified in English.
    
    * alert server comment and chinese modify
    
    * api server useless code and chinese modify
    
    * common,dao,server useless code and chinese modify
    
    * change chinese to english
    
    * dao method comments and useless code modify
    
    * Change all Chinese names to English (#1207)
    
    * Modify webpack configuration
    
    * Change all Chinese names to English
    
    * add progress-bar-webpack-plugin (#1215)
    
    * Modify webpack configuration
    
    * Change all Chinese names to English
    
    * add progress-bar-webpack-plugin
    
    * Add method and parameters comments (#1220)
    
    * rename from DatasourceUserMapper to DataSourceUserMapper
    
    * add unit test in UserMapper and WorkerGroupMapper
    
    * change cn.escheduler to org.apache.dolphinscheduler
    
    * add unit test in UdfFuncMapperTest
    
    * add unit test in UdfFuncMapperTest
    
    * remove DatabaseConfiguration
    
    * add ConnectionFactoryTest
    
    * cal duration in processInstancesList
    
    * change desc to description
    
    * change table name in mysql ddl
    
    * change table name in mysql ddl
    
    * change escheduler to dolphinscheduler
    
    * change escheduler to dolphinscheduler
    
    * change escheduler to dolphinscheduler
    
    * remove log4j-1.2-api and modify AlertMapperTest
    
    * remove log4j-1.2-api
    
    * Add alertDao to spring management
    
    * Add alertDao to spring management
    
    * get SqlSessionFactory from MybatisSqlSessionFactoryBean
    
    * get processDao by DaoFactory
    
    * read druid properties in ConneciontFactory
    
    * read druid properties in ConneciontFactory
    
    * change get alertDao by spring to DaoFactory
    
    * add log4j to resolve #967
    
    * resole verify udf name error and delete udf error
    
    * Determine if principal is empty
    
    * Determine whether the logon user has the right to delete the project
    
    * Fixed an issue that produced attatch file named such as ATT00002.bin
    
    * fix too many connection in upgrade or create
    
    * fix NEED_FAULT_TOLERANCE and WAITTING_THREAD count fail
    
    * Added a judgment on whether the currently login user is an administrator
    
    * fix update udf database not change and create time is changed
    
    * add enterprise.wechat.enable to decide whether to send enterprise WeChat
    
    * change method check
    
    * Remove the administrator's judgment on query access token list
    
    * only admin can create worker group
    
    * delete alert group need delete the relation of user and alert group
    
    * add timeout in proxy when upload large resource
    
    * add gets scheduled times by expect fire times
    
    * add gets scheduled times by expect fire times
    
    * Increase the judgment of whether it is admin
    
    * Increase the judgment of whether it is admin
    
    * when delete access token add whether login user has perm to delete
    
    * change mysql-connector-java scope to test
    
    * update scm test
    
    * add profile test
    
    * Add method and parameters comments
    
    * roll back
    
    * add some notes (#1221)
    
    * update english documents
    
    * refactor zk client
    
    * update documents
    
    * update zkclient
    
    * update zkclient
    
    * update documents
    
    * add architecture-design
    
    * change i18n
    
    * update i18n
    
    * update english documents
    
    * add architecture-design
    
    * update english documents
    
    * update en-US documents
    
    * add architecture-design
    
    * update demo site
    
    * add mybatis plus model
    
    * modify mybatisplus
    
    * modify mybatisplus
    
    * change interface by mybatisplus
    
    * add unit test
    
    * refactor dao interface.
    
    * add unit test for dao...
    
    * add unit test for dao...
    
    * add unit test for dao...
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
    
    * update some dao bugs
    
    * update for some bugs
    
    * update some bugs
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
    
    * update
    
    * update
    
    * add multiply settings for application.yml
    
    * add multiply settings for application.yml
    
    * revert
    
    * update configuration settings in task record dao...
    
    * change application_master to application-master
    
    * change application_master to application-master
    
    * update application.yml to application.properties
    
    * revert
    
    * revert
    
    * add properties
    
    * add properties
    
    * revert
    
    * revert
    
    * add api start up..
    add alert send try catch
    
    * update dao info level
    
    * fix bug: task cannot submit when recovery failover
    
    * fix bug: task cannot submit when recovery failover
    
    * merge from dev-db
    
    * revert
    
    * revert
    
    * fix bug: get process definition list failed.
    
    * fix bug: process instance interval is error
    
    * revert
    
    * revert
    
    * update
    
    * support stop submit success tasks
    
    * update kill process
    
    * update for stop process
    
    * update for stop process
    
    * add some logs for stop process
    
    * update for small bug.
    
    * add check strategy before submit task
    
    * revert
    
    * update
    
    * update
    
    * revert
    
    * wait task instance exists if null.
    
    * revert
    
    * update
    
    * change desc to description.
    
    * add check user and definitions function when delete tenant
    
    * update
    
    * change desc to description.
    
    * change desc to description.
    
    * change desc to description.
    
    * remove check resources when delete tenant
    
    * change desc to description.
    
    * change mybatisplus version to 3.2.0
    
    * update
    
    * change the notice to apache.
    
    * update
    
    * update postgre sql
    
    * fix bug: phone can be empty.
    
    * fix bug: postgre test error.
    
    * update create table for postgre quartz
    
    * fix some bugs about postgre.
    
    * update create table for postgre quartz
    
    * add postgre db performance monitor
    
    * add postgre performance monitor
    
    * update performance monitor
    
    * revert
    
    * revert
    
    * fix bug: tasks queue length error
    
    * remove datasource.properties
    
    * change chinese sql to english.
    
    * change chinese sql to english.
    
    * remove unused code.
    
    * remove unused code.
    
    * add some notes
    
    * update some notes
    
    * update some notes
    
    * update mbatisplus version
    
    * update lombok version
    
    * update lombok version
    
    * revert
    
    * merge from dev-db
    
    * remove version
    
    * update npm install pom
    
    * add front assembly
    
    * add front module
    
    * change verison to 1.2.0-release-SNAPSHOT
    
    * add name in pom and remove compile
    
    * add name in pom
    
    * add licenses in assemble
    
    * change version to 1.2.0-RC1-SNAPSHOT
    
    * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
    
    # Conflicts:
    #	dolphinscheduler-alert/pom.xml
    #	dolphinscheduler-api/pom.xml
    #	dolphinscheduler-common/pom.xml
    #	dolphinscheduler-dao/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
    #	dolphinscheduler-dist/pom.xml
    #	dolphinscheduler-rpc/pom.xml
    #	dolphinscheduler-server/pom.xml
    #	dolphinscheduler-ui/pom.xml
    #	pom.xml
    change assembly id
    
    * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
    
    # Conflicts:
    #	dolphinscheduler-alert/pom.xml
    #	dolphinscheduler-api/pom.xml
    #	dolphinscheduler-common/pom.xml
    #	dolphinscheduler-dao/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
    #	dolphinscheduler-dist/pom.xml
    #	dolphinscheduler-rpc/pom.xml
    #	dolphinscheduler-server/pom.xml
    #	dolphinscheduler-ui/pom.xml
    #	pom.xml
    add DISCLAIMER
    
    * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
    
    # Conflicts:
    #	dolphinscheduler-alert/pom.xml
    #	dolphinscheduler-api/pom.xml
    #	dolphinscheduler-common/pom.xml
    #	dolphinscheduler-dao/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
    #	dolphinscheduler-dist/pom.xml
    #	dolphinscheduler-rpc/pom.xml
    #	dolphinscheduler-server/pom.xml
    #	dolphinscheduler-ui/pom.xml
    #	pom.xml
    add license in xml and properties
    
    * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
    
    # Conflicts:
    #	dolphinscheduler-alert/pom.xml
    #	dolphinscheduler-api/pom.xml
    #	dolphinscheduler-common/pom.xml
    #	dolphinscheduler-dao/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
    #	dolphinscheduler-dist/pom.xml
    #	dolphinscheduler-rpc/pom.xml
    #	dolphinscheduler-server/pom.xml
    #	dolphinscheduler-ui/pom.xml
    #	pom.xml
    add license in dockerfile
    
    * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
    
    # Conflicts:
    #	dolphinscheduler-alert/pom.xml
    #	dolphinscheduler-api/pom.xml
    #	dolphinscheduler-common/pom.xml
    #	dolphinscheduler-dao/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
    #	dolphinscheduler-dist/pom.xml
    #	dolphinscheduler-rpc/pom.xml
    #	dolphinscheduler-server/pom.xml
    #	dolphinscheduler-ui/pom.xml
    #	pom.xml
    add license in script and sql
    
    * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
    
    # Conflicts:
    #	dolphinscheduler-alert/pom.xml
    #	dolphinscheduler-api/pom.xml
    #	dolphinscheduler-common/pom.xml
    #	dolphinscheduler-dao/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
    #	dolphinscheduler-dist/pom.xml
    #	dolphinscheduler-rpc/pom.xml
    #	dolphinscheduler-server/pom.xml
    #	dolphinscheduler-ui/pom.xml
    #	pom.xml
    add license in script and sql
    
    * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
    
    # Conflicts:
    #	dolphinscheduler-alert/pom.xml
    #	dolphinscheduler-api/pom.xml
    #	dolphinscheduler-common/pom.xml
    #	dolphinscheduler-dao/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
    #	dolphinscheduler-dist/pom.xml
    #	dolphinscheduler-rpc/pom.xml
    #	dolphinscheduler-server/pom.xml
    #	dolphinscheduler-ui/pom.xml
    #	pom.xml
    add license in ci
    
    * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
    
    # Conflicts:
    #	dolphinscheduler-alert/pom.xml
    #	dolphinscheduler-api/pom.xml
    #	dolphinscheduler-common/pom.xml
    #	dolphinscheduler-dao/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
    #	dolphinscheduler-dist/pom.xml
    #	dolphinscheduler-rpc/pom.xml
    #	dolphinscheduler-server/pom.xml
    #	dolphinscheduler-ui/pom.xml
    #	pom.xml
    change version to 1.2.0-SNAPSHOT
    
    * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
    
    # Conflicts:
    #	dolphinscheduler-alert/pom.xml
    #	dolphinscheduler-api/pom.xml
    #	dolphinscheduler-common/pom.xml
    #	dolphinscheduler-dao/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
    #	dolphinscheduler-dist/pom.xml
    #	dolphinscheduler-rpc/pom.xml
    #	dolphinscheduler-server/pom.xml
    #	dolphinscheduler-ui/pom.xml
    #	pom.xml
    set defalut db type postgresql
    
    * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
    
    # Conflicts:
    #	dolphinscheduler-alert/pom.xml
    #	dolphinscheduler-api/pom.xml
    #	dolphinscheduler-common/pom.xml
    #	dolphinscheduler-dao/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
    #	dolphinscheduler-dist/pom.xml
    #	dolphinscheduler-rpc/pom.xml
    #	dolphinscheduler-server/pom.xml
    #	dolphinscheduler-ui/pom.xml
    #	pom.xml
    set defalut db type postgresql
    
    * change org.quartz.jobStore.driverDelegateClass
    
    * Add comments in method params
    
    * update readme from branch dev
    
    * update content in how to contribute
    
    * change postgresql default port
    
    * change version 1.2.0-SNAPSHOT
    
    * remove antrun plugin
    
    * add how to build
    
    * add how to build
    
    * remove dir format in assembly
    
    * Remove the judgment of whether it is admin
    
    * reset version to 1.2.0-SNAPSHOT
    
    * Remove the judgment of whether it is admin
    
    * Fix bug the administrator authorizes the project to ordinary users,but ordinary users cannot see the process definition created by the administrator
    
    * Added description of bug fixes about create dolphinscheduler sql failed
    
    * reset version to 1.2.0-SNAPSHOT
    
    * update dml when init queue table
    
    * reset version to 1.2.0-SNAPSHOT
    
    * [maven-release-plugin] prepare release 1.2.0
    
    * [maven-release-plugin] prepare for next development iteration
    
    * Add whether the administrator's judgment (#1325)
    
    * rename from DatasourceUserMapper to DataSourceUserMapper
    
    * add unit test in UserMapper and WorkerGroupMapper
    
    * change cn.escheduler to org.apache.dolphinscheduler
    
    * add unit test in UdfFuncMapperTest
    
    * add unit test in UdfFuncMapperTest
    
    * remove DatabaseConfiguration
    
    * add ConnectionFactoryTest
    
    * cal duration in processInstancesList
    
    * change desc to description
    
    * change table name in mysql ddl
    
    * change table name in mysql ddl
    
    * change escheduler to dolphinscheduler
    
    * change escheduler to dolphinscheduler
    
    * change escheduler to dolphinscheduler
    
    * remove log4j-1.2-api and modify AlertMapperTest
    
    * remove log4j-1.2-api
    
    * Add alertDao to spring management
    
    * Add alertDao to spring management
    
    * get SqlSessionFactory from MybatisSqlSessionFactoryBean
    
    * get processDao by DaoFactory
    
    * read druid properties in ConneciontFactory
    
    * read druid properties in ConneciontFactory
    
    * change get alertDao by spring to DaoFactory
    
    * add log4j to resolve #967
    
    * resole verify udf name error and delete udf error
    
    * Determine if principal is empty
    
    * Determine whether the logon user has the right to delete the project
    
    * Fixed an issue that produced attatch file named such as ATT00002.bin
    
    * fix too many connection in upgrade or create
    
    * fix NEED_FAULT_TOLERANCE and WAITTING_THREAD count fail
    
    * Added a judgment on whether the currently login user is an administrator
    
    * fix update udf database not change and create time is changed
    
    * add enterprise.wechat.enable to decide whether to send enterprise WeChat
    
    * change method check
    
    * Remove the administrator's judgment on query access token list
    
    * only admin can create worker group
    
    * delete alert group need delete the relation of user and alert group
    
    * add timeout in proxy when upload large resource
    
    * add gets scheduled times by expect fire times
    
    * add gets scheduled times by expect fire times
    
    * Increase the judgment of whether it is admin
    
    * Increase the judgment of whether it is admin
    
    * when delete access token add whether login user has perm to delete
    
    * change mysql-connector-java scope to test
    
    * update scm test
    
    * add profile test
    
    * add profile test
    
    * add maven.deploy.skip true
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * add dependency
    
    * add javadoc
    
    * add antrun
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * reset pgsql (#1178)
    
    + 1
    
    * add javadoc
    
    * add javadoc
    
    * [maven-release-plugin] rollback the release of 1.2.0
    
    * add javadoc
    
    * Ans UI upgrade to version 0.1.0 (#1181)
    
    + 1
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * Administrators group prohibit deletion (#1182)
    
    * Ans UI upgrade to version 0.1.0
    
    * Administrators group prohibit deletion
    
    * add javadoc
    
    * add ui pom
    
    * fix master server shutdown error (#1177)
    
    * move updateTaskState into try/catch block in case of exception
    
    * fix NPE
    
    * using conf.getInt instead of getString
    
    * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
    for AlertDao, correct the spelling.
    
    * duplicate
    
    * refactor getTaskWorkerGroupId
    
    * add friendly log
    
    * update hearbeat thread num = 1
    
    * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
    
    * 1. move verifyTaskInstanceIsNull after taskInstance
    2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
    
    * fix the message
    
    * delete before check to avoid KeeperException$NoNodeException
    
    * fix the message
    
    * check processInstance state before delete tenant
    
    * check processInstance state before delete worker group
    
    * refactor
    
    * merge api constants into common constatns
    
    * update the resource perm
    
    * update the dataSource perm
    
    * fix CheckUtils.checkUserParams method
    
    * update AlertGroupService, extends from BaseService, remove duplicate methods
    
    * refactor
    
    * modify method name
    
    * add hasProjectAndPerm method
    
    * using checkProject instead of getResultStatus
    
    * delete checkAuth method, using hasProjectAndPerm instead.
    
    * correct spelling
    
    * add transactional for deleteWorkerGroupById
    
    * add Transactional for deleteProcessInstanceById method
    
    * change sqlSessionTemplate singleton
    
    * change sqlSessionTemplate singleton and reformat code
    
    * fix unsuitable error message
    
    * update shutdownhook methods
    
    * fix worker log bug
    
    * fix api server debug mode bug
    
    * upgrade zk version
    
    * delete this line ,for zkClient.close() will do the whole thing
    
    * fix master server shutdown error
    
    * degrade zk version and add FourLetterWordMain class (#1183)
    
    * move updateTaskState into try/catch block in case of exception
    
    * fix NPE
    
    * using conf.getInt instead of getString
    
    * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
    for AlertDao, correct the spelling.
    
    * duplicate
    
    * refactor getTaskWorkerGroupId
    
    * add friendly log
    
    * update hearbeat thread num = 1
    
    * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
    
    * 1. move verifyTaskInstanceIsNull after taskInstance
    2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
    
    * fix the message
    
    * delete before check to avoid KeeperException$NoNodeException
    
    * fix the message
    
    * check processInstance state before delete tenant
    
    * check processInstance state before delete worker group
    
    * refactor
    
    * merge api constants into common constatns
    
    * update the resource perm
    
    * update the dataSource perm
    
    * fix CheckUtils.checkUserParams method
    
    * update AlertGroupService, extends from BaseService, remove duplicate methods
    
    * refactor
    
    * modify method name
    
    * add hasProjectAndPerm method
    
    * using checkProject instead of getResultStatus
    
    * delete checkAuth method, using hasProjectAndPerm instead.
    
    * correct spelling
    
    * add transactional for deleteWorkerGroupById
    
    * add Transactional for deleteProcessInstanceById method
    
    * change sqlSessionTemplate singleton
    
    * change sqlSessionTemplate singleton and reformat code
    
    * fix unsuitable error message
    
    * update shutdownhook methods
    
    * fix worker log bug
    
    * fix api server debug mode bug
    
    * upgrade zk version
    
    * delete this line ,for zkClient.close() will do the whole thing
    
    * fix master server shutdown error
    
    * degrade zk version and add FourLetterWordMain class
    
    * add ui pom
    
    * add src pom and assembly
    
    * fix ZKWorkerClient not close PathChildrenCache (#1185)
    
    * move updateTaskState into try/catch block in case of exception
    
    * fix NPE
    
    * using conf.getInt instead of getString
    
    * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
    for AlertDao, correct the spelling.
    
    * duplicate
    
    * refactor getTaskWorkerGroupId
    
    * add friendly log
    
    * update hearbeat thread num = 1
    
    * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
    
    * 1. move verifyTaskInstanceIsNull after taskInstance
    2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
    
    * fix the message
    
    * delete before check to avoid KeeperException$NoNodeException
    
    * fix the message
    
    * check processInstance state before delete tenant
    
    * check processInstance state before delete worker group
    
    * refactor
    
    * merge api constants into common constatns
    
    * update the resource perm
    
    * update the dataSource perm
    
    * fix CheckUtils.checkUserParams method
    
    * update AlertGroupService, extends from BaseService, remove duplicate methods
    
    * refactor
    
    * modify method name
    
    * add hasProjectAndPerm method
    
    * using checkProject instead of getResultStatus
    
    * delete checkAuth method, using hasProjectAndPerm instead.
    
    * correct spelling
    
    * add transactional for deleteWorkerGroupById
    
    * add Transactional for deleteProcessInstanceById method
    
    * change sqlSessionTemplate singleton
    
    * change sqlSessionTemplate singleton and reformat code
    
    * fix unsuitable error message
    
    * update shutdownhook methods
    
    * fix worker log bug
    
    * fix api server debug mode bug
    
    * upgrade zk version
    
    * delete this line ,for zkClient.close() will do the whole thing
    
    * fix master server shutdown error
    
    * degrade zk version and add FourLetterWordMain class
    
    * fix PathChildrenCache not close
    
    * add Transactional for createSession method (#1186)
    
    * move updateTaskState into try/catch block in case of exception
    
    * fix NPE
    
    * using conf.getInt instead of getString
    
    * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
    for AlertDao, correct the spelling.
    
    * duplicate
    
    * refactor getTaskWorkerGroupId
    
    * add friendly log
    
    * update hearbeat thread num = 1
    
    * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
    
    * 1. move verifyTaskInstanceIsNull after taskInstance
    2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
    
    * fix the message
    
    * delete before check to avoid KeeperException$NoNodeException
    
    * fix the message
    
    * check processInstance state before delete tenant
    
    * check processInstance state before delete worker group
    
    * refactor
    
    * merge api constants into common constatns
    
    * update the resource perm
    
    * update the dataSource perm
    
    * fix CheckUtils.checkUserParams method
    
    * update AlertGroupService, extends from BaseService, remove duplicate methods
    
    * refactor
    
    * modify method name
    
    * add hasProjectAndPerm method
    
    * using checkProject instead of getResultStatus
    
    * delete checkAuth method, using hasProjectAndPerm instead.
    
    * correct spelling
    
    * add transactional for deleteWorkerGroupById
    
    * add Transactional for deleteProcessInstanceById method
    
    * change sqlSessionTemplate singleton
    
    * change sqlSessionTemplate singleton and reformat code
    
    * fix unsuitable error message
    
    * update shutdownhook methods
    
    * fix worker log bug
    
    * fix api server debug mode bug
    
    * upgrade zk version
    
    * delete this line ,for zkClient.close() will do the whole thing
    
    * fix master server shutdown error
    
    * degrade zk version and add FourLetterWordMain class
    
    * fix PathChildrenCache not close
    
    * add Transactional for createSession method
    
    * add src pom and assembly
    
    * add src pom and assembly
    
    * add src pom and assembly
    
    * add src pom and assembly
    
    * dockerfile dao application.properties ,install.sh modify and application.properties modify (#1187)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * add src pom and assembly
    
    * add src pom and assembly
    
    * dockerfile startup.sh modify (#1189)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs (#1191)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs
    
    * nginx conf modify
    
    * dockerfile application.properties modify
    
    * dockerfile conf modify (#1192)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs
    
    * nginx conf modify
    
    * dockerfile application.properties modify
    
    * dockerfile conf modify (#1193)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs
    
    * nginx conf modify
    
    * dockerfile application.properties modify
    
    * dockerfile email address change (#1194)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs
    
    * nginx conf modify
    
    * dockerfile application.properties modify
    
    * dockerfile email address change
    
    * the alert module is modified in english (#1195)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs
    
    * nginx conf modify
    
    * dockerfile application.properties modify
    
    * dockerfile email address change
    
    * the alert module is modified in English.
    
    * alert server comment and chinese modify
    
    * api server useless code and chinese modify (#1198)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs
    
    * nginx conf modify
    
    * dockerfile application.properties modify
    
    * dockerfile email address change
    
    * the alert module is modified in English.
    
    * alert server comment and chinese modify
    
    * api server useless code and chinese modify
    
    * common,dao,server useless code and chinese modify (#1199)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs
    
    * nginx conf modify
    
    * dockerfile application.properties modify
    
    * dockerfile email address change
    
    * the alert module is modified in English.
    
    * alert server comment and chinese modify
    
    * api server useless code and chinese modify
    
    * common,dao,server useless code and chinese modify
    
    * change chinese sql to english. (#1200)
    
    * update english documents
    
    * refactor zk client
    
    * update documents
    
    * update zkclient
    
    * update zkclient
    
    * update documents
    
    * add architecture-design
    
    * change i18n
    
    * update i18n
    
    * update english documents
    
    * add architecture-design
    
    * update english documents
    
    * update en-US documents
    
    * add architecture-design
    
    * update demo site
    
    * add mybatis plus model
    
    * modify mybatisplus
    
    * modify mybatisplus
    
    * change interface by mybatisplus
    
    * add unit test
    
    * refactor dao interface.
    
    * add unit test for dao...
    
    * add unit test for dao...
    
    * add unit test for dao...
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
    
    * update some dao bugs
    
    * update for some bugs
    
    * update some bugs
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
    
    * update
    
    * update
    
    * add multiply settings for application.yml
    
    * add multiply settings for application.yml
    
    * revert
    
    * update configuration settings in task record dao...
    
    * change application_master to application-master
    
    * change application_master to application-master
    
    * update application.yml to application.properties
    
    * revert
    
    * revert
    
    * add properties
    
    * add properties
    
    * revert
    
    * revert
    
    * add api start up..
    add alert send try catch
    
    * update dao info level
    
    * fix bug: task cannot submit when recovery failover
    
    * fix bug: task cannot submit when recovery failover
    
    * merge from dev-db
    
    * revert
    
    * revert
    
    * fix bug: get process definition list failed.
    
    * fix bug: process instance interval is error
    
    * revert
    
    * revert
    
    * update
    
    * support stop submit success tasks
    
    * update kill process
    
    * update for stop process
    
    * update for stop process
    
    * add some logs for stop process
    
    * update for small bug.
    
    * add check strategy before submit task
    
    * revert
    
    * update
    
    * update
    
    * revert
    
    * wait task instance exists if null.
    
    * revert
    
    * update
    
    * change desc to description.
    
    * add check user and definitions function when delete tenant
    
    * update
    
    * change desc to description.
    
    * change desc to description.
    
    * change desc to description.
    
    * remove check resources when delete tenant
    
    * change desc to description.
    
    * change mybatisplus version to 3.2.0
    
    * update
    
    * change the notice to apache.
    
    * update
    
    * update postgre sql
    
    * fix bug: phone can be empty.
    
    * fix bug: postgre test error.
    
    * update create table for postgre quartz
    
    * fix some bugs about postgre.
    
    * update create table for postgre quartz
    
    * add postgre db performance monitor
    
    * add postgre performance monitor
    
    * update performance monitor
    
    * revert
    
    * revert
    
    * fix bug: tasks queue length error
    
    * remove datasource.properties
    
    * change chinese sql to english.
    
    * change chinese sql to english.
    
    * change chinese to english (#1202)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs
    
    * nginx conf modify
    
    * dockerfile application.properties modify
    
    * dockerfile email address change
    
    * the alert module is modified in English.
    
    * alert server comment and chinese modify
    
    * api server useless code and chinese modify
    
    * common,dao,server useless code and chinese modify
    
    * change chinese to english
    
    * remove unused code (#1204)
    
    * update english documents
    
    * refactor zk client
    
    * update documents
    
    * update zkclient
    
    * update zkclient
    
    * update documents
    
    * add architecture-design
    
    * change i18n
    
    * update i18n
    
    * update english documents
    
    * add architecture-design
    
    * update english documents
    
    * update en-US documents
    
    * add architecture-design
    
    * update demo site
    
    * add mybatis plus model
    
    * modify mybatisplus
    
    * modify mybatisplus
    
    * change interface by mybatisplus
    
    * add unit test
    
    * refactor dao interface.
    
    * add unit test for dao...
    
    * add unit test for dao...
    
    * add unit test for dao...
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
    
    * update some dao bugs
    
    * update for some bugs
    
    * update some bugs
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
    
    * update
    
    * update
    
    * add multiply settings for application.yml
    
    * add multiply settings for application.yml
    
    * revert
    
    * update configuration settings in task record dao...
    
    * change application_master to application-master
    
    * change application_master to application-master
    
    * update application.yml to application.properties
    
    * revert
    
    * revert
    
    * add properties
    
    * add properties
    
    * revert
    
    * revert
    
    * add api start up..
    add alert send try catch
    
    * update dao info level
    
    * fix bug: task cannot submit when recovery failover
    
    * fix bug: task cannot submit when recovery failover
    
    * merge from dev-db
    
    * revert
    
    * revert
    
    * fix bug: get process definition list failed.
    
    * fix bug: process instance interval is error
    
    * revert
    
    * revert
    
    * update
    
    * support stop submit success tasks
    
    * update kill process
    
    * update for stop process
    
    * update for stop process
    
    * add some logs for stop process
    
    * update for small bug.
    
    * add check strategy before submit task
    
    * revert
    
    * update
    
    * update
    
    * revert
    
    * wait task instance exists if null.
    
    * revert
    
    * update
    
    * change desc to description.
    
    * add check user and definitions function when delete tenant
    
    * update
    
    * change desc to description.
    
    * change desc to description.
    
    * change desc to description.
    
    * remove check resources when delete tenant
    
    * change desc to description.
    
    * change mybatisplus version to 3.2.0
    
    * update
    
    * change the notice to apache.
    
    * update
    
    * update postgre sql
    
    * fix bug: phone can be empty.
    
    * fix bug: postgre test error.
    
    * update create table for postgre quartz
    
    * fix some bugs about postgre.
    
    * update create table for postgre quartz
    
    * add postgre db performance monitor
    
    * add postgre performance monitor
    
    * update performance monitor
    
    * revert
    
    * revert
    
    * fix bug: tasks queue length error
    
    * remove datasource.properties
    
    * change chinese sql to english.
    
    * change chinese sql to english.
    
    * remove unused code.
    
    * remove unused code.
    
    * Modify webpack configuration (#1206)
    
    * add more message for java-doc (#1209)
    
    * move updateTaskState into try/catch block in case of exception
    
    * fix NPE
    
    * using conf.getInt instead of getString
    
    * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
    for AlertDao, correct the spelling.
    
    * duplicate
    
    * refactor getTaskWorkerGroupId
    
    * add friendly log
    
    * update hearbeat thread num = 1
    
    * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
    
    * 1. move verifyTaskInstanceIsNull after taskInstance
    2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
    
    * fix the message
    
    * delete before check to avoid KeeperException$NoNodeException
    
    * fix the message
    
    * check processInstance state before delete tenant
    
    * check processInstance state before delete worker group
    
    * refactor
    
    * merge api constants into common constatns
    
    * update the resource perm
    
    * update the dataSource perm
    
    * fix CheckUtils.checkUserParams method
    
    * update AlertGroupService, extends from BaseService, remove duplicate methods
    
    * refactor
    
    * modify method name
    
    * add hasProjectAndPerm method
    
    * using checkProject instead of getResultStatus
    
    * delete checkAuth method, using hasProjectAndPerm instead.
    
    * correct spelling
    
    * add transactional for deleteWorkerGroupById
    
    * add Transactional for deleteProcessInstanceById method
    
    * change sqlSessionTemplate singleton
    
    * change sqlSessionTemplate singleton and reformat code
    
    * fix unsuitable error message
    
    * update shutdownhook methods
    
    * fix worker log bug
    
    * fix api server debug mode bug
    
    * upgrade zk version
    
    * delete this line ,for zkClient.close() will do the whole thing
    
    * fix master server shutdown error
    
    * degrade zk version and add FourLetterWordMain class
    
    * fix PathChildrenCache not close
    
    * add Transactional for createSession method
    
    * add more message for java-doc
    
    * add java doc for common module (#1213)
    
    * dao method comments and useless code modify (#1214)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs
    
    * nginx conf modify
    
    * dockerfile application.properties modify
    
    * dockerfile email address change
    
    * the alert module is modified in English.
    
    * alert server comment and chinese modify
    
    * api server useless code and chinese modify
    
    * common,dao,server useless code and chinese modify
    
    * change chinese to english
    
    * dao method comments and useless code modify
    
    * Change all Chinese names to English (#1207)
    
    * Modify webpack configuration
    
    * Change all Chinese names to English
    
    * add progress-bar-webpack-plugin (#1215)
    
    * Modify webpack configuration
    
    * Change all Chinese names to English
    
    * add progress-bar-webpack-plugin
    
    * Add method and parameters comments (#1220)
    
    * rename from DatasourceUserMapper to DataSourceUserMapper
    
    * add unit test in UserMapper and WorkerGroupMapper
    
    * change cn.escheduler to org.apache.dolphinscheduler
    
    * add unit test in UdfFuncMapperTest
    
    * add unit test in UdfFuncMapperTest
    
    * remove DatabaseConfiguration
    
    * add ConnectionFactoryTest
    
    * cal duration in processInstancesList
    
    * change desc to description
    
    * change table name in mysql ddl
    
    * change table name in mysql ddl
    
    * change escheduler to dolphinscheduler
    
    * change escheduler to dolphinscheduler
    
    * change escheduler to dolphinscheduler
    
    * remove log4j-1.2-api and modify AlertMapperTest
    
    * remove log4j-1.2-api
    
    * Add alertDao to spring management
    
    * Add alertDao to spring management
    
    * get SqlSessionFactory from MybatisSqlSessionFactoryBean
    
    * get processDao by DaoFactory
    
    * read druid properties in ConneciontFactory
    
    * read druid properties in ConneciontFactory
    
    * change get alertDao by spring to DaoFactory
    
    * add log4j to resolve #967
    
    * resole verify udf name error and delete udf error
    
    * Determine if principal is empty
    
    * Determine whether the logon user has the right to delete the project
    
    * Fixed an issue that produced attatch file named such as ATT00002.bin
    
    * fix too many connection in upgrade or create
    
    * fix NEED_FAULT_TOLERANCE and WAITTING_THREAD count fail
    
    * Added a judgment on whether the currently login user is an administrator
    
    * fix update udf database not change and create time is changed
    
    * add enterprise.wechat.enable to decide whether to send enterprise WeChat
    
    * change method check
    
    * Remove the administrator's judgment on query access token list
    
    * only admin can create worker group
    
    * delete alert group need delete the relation of user and alert group
    
    * add timeout in proxy when upload large resource
    
    * add gets scheduled times by expect fire times
    
    * add gets scheduled times by expect fire times
    
    * Increase the judgment of whether it is admin
    
    * Increase the judgment of whether it is admin
    
    * when delete access token add whether login user has perm to delete
    
    * change mysql-connector-java scope to test
    
    * update scm test
    
    * add profile test
    
    * Add method and parameters comments
    
    * roll back
    
    * add some notes (#1221)
    
    * update english documents
    
    * refactor zk client
    
    * update documents
    
    * update zkclient
    
    * update zkclient
    
    * update documents
    
    * add architecture-design
    
    * change i18n
    
    * update i18n
    
    * update english documents
    
    * add architecture-design
    
    * update english documents
    
    * update en-US documents
    
    * add architecture-design
    
    * update demo site
    
    * add mybatis plus model
    
    * modify mybatisplus
    
    * modify mybatisplus
    
    * change interface by mybatisplus
    
    * add unit test
    
    * refactor dao interface.
    
    * add unit test for dao...
    
    * add unit test for dao...
    
    * add unit test for dao...
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
    
    * update some dao bugs
    
    * update for some bugs
    
    * update some bugs
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
    
    * update
    
    * update
    
    * add multiply settings for application.yml
    
    * add multiply settings for application.yml
    
    * revert
    
    * update configuration settings in task record dao...
    
    * change application_master to application-master
    
    * change application_master to application-master
    
    * update application.yml to application.properties
    
    * revert
    
    * revert
    
    * add properties
    
    * add properties
    
    * revert
    
    * revert
    
    * add api start up..
    add alert send try catch
    
    * update dao info level
    
    * fix bug: task cannot submit when recovery failover
    
    * fix bug: task cannot submit when recovery failover
    
    * merge from dev-db
    
    * revert
    
    * revert
    
    * fix bug: get process definition list failed.
    
    * fix bug: process instance interval is error
    
    * revert
    
    * revert
    
    * update
    
    * support stop submit success tasks
    
    * update kill process
    
    * update for stop process
    
    * update for stop process
    
    * add some logs for stop process
    
    * update for small bug.
    
    * add check strategy before submit task
    
    * revert
    
    * update
    
    * update
    
    * revert
    
    * wait task instance exists if null.
    
    * revert
    
    * update
    
    * change desc to description.
    
    * add check user and definitions function when delete tenant
    
    * update
    
    * change desc to description.
    
    * change desc to description.
    
    * change desc to description.
    
    * remove check resources when delete tenant
    
    * change desc to description.
    
    * change mybatisplus version to 3.2.0
    
    * update
    
    * change the notice to apache.
    
    * update
    
    * update postgre sql
    
    * fix bug: phone can be empty.
    
    * fix bug: postgre test error.
    
    * update create table for postgre quartz
    
    * fix some bugs about postgre.
    
    * update create table for postgre quartz
    
    * add postgre db performance monitor
    
    * add postgre performance monitor
    
    * update performance monitor
    
    * revert
    
    * revert
    
    * fix bug: tasks queue length error
    
    * remove datasource.properties
    
    * change chinese sql to english.
    
    * change chinese sql to english.
    
    * remove unused code.
    
    * remove unused code.
    
    * add some notes
    
    * update some notes
    
    * update some notes
    
    * update mbatisplus version
    
    * update lombok version
    
    * update lombok version
    
    * revert
    
    * merge from dev-db
    
    * remove version
    
    * update npm install pom
    
    * add front assembly
    
    * add front module
    
    * change verison to 1.2.0-release-SNAPSHOT
    
    * add name in pom and remove compile
    
    * add name in pom
    
    * add licenses in assemble
    
    * change version to 1.2.0-RC1-SNAPSHOT
    
    * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
    
    # Conflicts:
    #	dolphinscheduler-alert/pom.xml
    #	dolphinscheduler-api/pom.xml
    #	dolphinscheduler-common/pom.xml
    #	dolphinscheduler-dao/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
    #	dolphinscheduler-dist/pom.xml
    #	dolphinscheduler-rpc/pom.xml
    #	dolphinscheduler-server/pom.xml
    #	dolphinscheduler-ui/pom.xml
    #	pom.xml
    change assembly id
    
    * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
    
    # Conflicts:
    #	dolphinscheduler-alert/pom.xml
    #	dolphinscheduler-api/pom.xml
    #	dolphinscheduler-common/pom.xml
    #	dolphinscheduler-dao/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
    #	dolphinscheduler-dist/pom.xml
    #	dolphinscheduler-rpc/pom.xml
    #	dolphinscheduler-server/pom.xml
    #	dolphinscheduler-ui/pom.xml
    #	pom.xml
    add DISCLAIMER
    
    * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
    
    # Conflicts:
    #	dolphinscheduler-alert/pom.xml
    #	dolphinscheduler-api/pom.xml
    #	dolphinscheduler-common/pom.xml
    #	dolphinscheduler-dao/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
    #	dolphinscheduler-dist/pom.xml
    #	dolphinscheduler-rpc/pom.xml
    #	dolphinscheduler-server/pom.xml
    #	dolphinscheduler-ui/pom.xml
    #	pom.xml
    add license in xml and properties
    
    * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
    
    # Conflicts:
    #	dolphinscheduler-alert/pom.xml
    #	dolphinscheduler-api/pom.xml
    #	dolphinscheduler-common/pom.xml
    #	dolphinscheduler-dao/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
    #	dolphinscheduler-dist/pom.xml
    #	dolphinscheduler-rpc/pom.xml
    #	dolphinscheduler-server/pom.xml
    #	dolphinscheduler-ui/pom.xml
    #	pom.xml
    add license in dockerfile
    
    * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
    
    # Conflicts:
    #	dolphinscheduler-alert/pom.xml
    #	dolphinscheduler-api/pom.xml
    #	dolphinscheduler-common/pom.xml
    #	dolphinscheduler-dao/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
    #	dolphinscheduler-dist/pom.xml
    #	dolphinscheduler-rpc/pom.xml
    #	dolphinscheduler-server/pom.xml
    #	dolphinscheduler-ui/pom.xml
    #	pom.xml
    add license in script and sql
    
    * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
    
    # Conflicts:
    #	dolphinscheduler-alert/pom.xml
    #	dolphinscheduler-api/pom.xml
    #	dolphinscheduler-common/pom.xml
    #	dolphinscheduler-dao/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
    #	dolphinscheduler-dist/pom.xml
    #	dolphinscheduler-rpc/pom.xml
    #	dolphinscheduler-server/pom.xml
    #	dolphinscheduler-ui/pom.xml
    #	pom.xml
    add license in script and sql
    
    * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
    
    # Conflicts:
    #	dolphinscheduler-alert/pom.xml
    #	dolphinscheduler-api/pom.xml
    #	dolphinscheduler-common/pom.xml
    #	dolphinscheduler-dao/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
    #	dolphinscheduler-dist/pom.xml
    #	dolphinscheduler-rpc/pom.xml
    #	dolphinscheduler-server/pom.xml
    #	dolphinscheduler-ui/pom.xml
    #	pom.xml
    add license in ci
    
    * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
    
    # Conflicts:
    #	dolphinscheduler-alert/pom.xml
    #	dolphinscheduler-api/pom.xml
    #	dolphinscheduler-common/pom.xml
    #	dolphinscheduler-dao/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
    #	dolphinscheduler-dist/pom.xml
    #	dolphinscheduler-rpc/pom.xml
    #	dolphinscheduler-server/pom.xml
    #	dolphinscheduler-ui/pom.xml
    #	pom.xml
    change version to 1.2.0-SNAPSHOT
    
    * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
    
    # Conflicts:
    #	dolphinscheduler-alert/pom.xml
    #	dolphinscheduler-api/pom.xml
    #	dolphinscheduler-common/pom.xml
    #	dolphinscheduler-dao/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
    #	dolphinscheduler-dist/pom.xml
    #	dolphinscheduler-rpc/pom.xml
    #	dolphinscheduler-server/pom.xml
    #	dolphinscheduler-ui/pom.xml
    #	pom.xml
    set defalut db type postgresql
    
    * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
    
    # Conflicts:
    #	dolphinscheduler-alert/pom.xml
    #	dolphinscheduler-api/pom.xml
    #	dolphinscheduler-common/pom.xml
    #	dolphinscheduler-dao/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
    #	dolphinscheduler-dist/pom.xml
    #	dolphinscheduler-rpc/pom.xml
    #	dolphinscheduler-server/pom.xml
    #	dolphinscheduler-ui/pom.xml
    #	pom.xml
    set defalut db type postgresql
    
    * change org.quartz.jobStore.driverDelegateClass
    
    * Add comments in method params
    
    * update readme from branch dev
    
    * update content in how to contribute
    
    * change postgresql default port
    
    * change version 1.2.0-SNAPSHOT
    
    * remove antrun plugin
    
    * add how to build
    
    * add how to build
    
    * remove dir format in assembly
    
    * Remove the judgment of whether it is admin
    
    * reset version to 1.2.0-SNAPSHOT
    
    * Remove the judgment of whether it is admin
    
    * Fix bug the administrator authorizes the project to ordinary users,but ordinary users cannot see the process definition created by the administrator
    
    * Added description of bug fixes about create dolphinscheduler sql failed
    
    * reset version to 1.2.0-SNAPSHOT
    
    * update dml when init queue table
    
    * reset version to 1.2.0-SNAPSHOT
    
    * Add whether the administrator's judgment
    
    * Add method comments
    
    * Modify field name (#1327)
    
    * reset version to 1.2.0-SNAPSHOT (#1328)
    
    * rename from DatasourceUserMapper to DataSourceUserMapper
    
    * add unit test in UserMapper and WorkerGroupMapper
    
    * change cn.escheduler to org.apache.dolphinscheduler
    
    * add unit test in UdfFuncMapperTest
    
    * add unit test in UdfFuncMapperTest
    
    * remove DatabaseConfiguration
    
    * add ConnectionFactoryTest
    
    * cal duration in processInstancesList
    
    * change desc to description
    
    * change table name in mysql ddl
    
    * change table name in mysql ddl
    
    * change escheduler to dolphinscheduler
    
    * change escheduler to dolphinscheduler
    
    * change escheduler to dolphinscheduler
    
    * remove log4j-1.2-api and modify AlertMapperTest
    
    * remove log4j-1.2-api
    
    * Add alertDao to spring management
    
    * Add alertDao to spring management
    
    * get SqlSessionFactory from MybatisSqlSessionFactoryBean
    
    * get processDao by DaoFactory
    
    * read druid properties in ConneciontFactory
    
    * read druid properties in ConneciontFactory
    
    * change get alertDao by spring to DaoFactory
    
    * add log4j to resolve #967
    
    * resole verify udf name error and delete udf error
    
    * Determine if principal is empty
    
    * Determine whether the logon user has the right to delete the project
    
    * Fixed an issue that produced attatch file named such as ATT00002.bin
    
    * fix too many connection in upgrade or create
    
    * fix NEED_FAULT_TOLERANCE and WAITTING_THREAD count fail
    
    * Added a judgment on whether the currently login user is an administrator
    
    * fix update udf database not change and create time is changed
    
    * add enterprise.wechat.enable to decide whether to send enterprise WeChat
    
    * change method check
    
    * Remove the administrator's judgment on query access token list
    
    * only admin can create worker group
    
    * delete alert group need delete the relation of user and alert group
    
    * add timeout in proxy when upload large resource
    
    * add gets scheduled times by expect fire times
    
    * add gets scheduled times by expect fire times
    
    * Increase the judgment of whether it is admin
    
    * Increase the judgment of whether it is admin
    
    * when delete access token add whether login user has perm to delete
    
    * change mysql-connector-java scope to test
    
    * update scm test
    
    * add profile test
    
    * add profile test
    
    * add maven.deploy.skip true
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * add dependency
    
    * add javadoc
    
    * add antrun
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * reset pgsql (#1178)
    
    + 1
    
    * add javadoc
    
    * add javadoc
    
    * [maven-release-plugin] rollback the release of 1.2.0
    
    * add javadoc
    
    * Ans UI upgrade to version 0.1.0 (#1181)
    
    + 1
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * Administrators group prohibit deletion (#1182)
    
    * Ans UI upgrade to version 0.1.0
    
    * Administrators group prohibit deletion
    
    * add javadoc
    
    * add ui pom
    
    * fix master server shutdown error (#1177)
    
    * move updateTaskState into try/catch block in case of exception
    
    * fix NPE
    
    * using conf.getInt instead of getString
    
    * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
    for AlertDao, correct the spelling.
    
    * duplicate
    
    * refactor getTaskWorkerGroupId
    
    * add friendly log
    
    * update hearbeat thread num = 1
    
    * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
    
    * 1. move verifyTaskInstanceIsNull after taskInstance
    2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
    
    * fix the message
    
    * delete before check to avoid KeeperException$NoNodeException
    
    * fix the message
    
    * check processInstance state before delete tenant
    
    * check processInstance state before delete worker group
    
    * refactor
    
    * merge api constants into common constatns
    
    * update the resource perm
    
    * update the dataSource perm
    
    * fix CheckUtils.checkUserParams method
    
    * update AlertGroupService, extends from BaseService, remove duplicate methods
    
    * refactor
    
    * modify method name
    
    * add hasProjectAndPerm method
    
    * using checkProject instead of getResultStatus
    
    * delete checkAuth method, using hasProjectAndPerm instead.
    
    * correct spelling
    
    * add transactional for deleteWorkerGroupById
    
    * add Transactional for deleteProcessInstanceById method
    
    * change sqlSessionTemplate singleton
    
    * change sqlSessionTemplate singleton and reformat code
    
    * fix unsuitable error message
    
    * update shutdownhook methods
    
    * fix worker log bug
    
    * fix api server debug mode bug
    
    * upgrade zk version
    
    * delete this line ,for zkClient.close() will do the whole thing
    
    * fix master server shutdown error
    
    * degrade zk version and add FourLetterWordMain class (#1183)
    
    * move updateTaskState into try/catch block in case of exception
    
    * fix NPE
    
    * using conf.getInt instead of getString
    
    * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
    for AlertDao, correct the spelling.
    
    * duplicate
    
    * refactor getTaskWorkerGroupId
    
    * add friendly log
    
    * update hearbeat thread num = 1
    
    * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
    
    * 1. move verifyTaskInstanceIsNull after taskInstance
    2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
    
    * fix the message
    
    * delete before check to avoid KeeperException$NoNodeException
    
    * fix the message
    
    * check processInstance state before delete tenant
    
    * check processInstance state before delete worker group
    
    * refactor
    
    * merge api constants into common constatns
    
    * update the resource perm
    
    * update the dataSource perm
    
    * fix CheckUtils.checkUserParams method
    
    * update AlertGroupService, extends from BaseService, remove duplicate methods
    
    * refactor
    
    * modify method name
    
    * add hasProjectAndPerm method
    
    * using checkProject instead of getResultStatus
    
    * delete checkAuth method, using hasProjectAndPerm instead.
    
    * correct spelling
    
    * add transactional for deleteWorkerGroupById
    
    * add Transactional for deleteProcessInstanceById method
    
    * change sqlSessionTemplate singleton
    
    * change sqlSessionTemplate singleton and reformat code
    
    * fix unsuitable error message
    
    * update shutdownhook methods
    
    * fix worker log bug
    
    * fix api server debug mode bug
    
    * upgrade zk version
    
    * delete this line ,for zkClient.close() will do the whole thing
    
    * fix master server shutdown error
    
    * degrade zk version and add FourLetterWordMain class
    
    * add ui pom
    
    * add src pom and assembly
    
    * fix ZKWorkerClient not close PathChildrenCache (#1185)
    
    * move updateTaskState into try/catch block in case of exception
    
    * fix NPE
    
    * using conf.getInt instead of getString
    
    * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
    for AlertDao, correct the spelling.
    
    * duplicate
    
    * refactor getTaskWorkerGroupId
    
    * add friendly log
    
    * update hearbeat thread num = 1
    
    * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
    
    * 1. move verifyTaskInstanceIsNull after taskInstance
    2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
    
    * fix the message
    
    * delete before check to avoid KeeperException$NoNodeException
    
    * fix the message
    
    * check processInstance state before delete tenant
    
    * check processInstance state before delete worker group
    
    * refactor
    
    * merge api constants into common constatns
    
    * update the resource perm
    
    * update the dataSource perm
    
    * fix CheckUtils.checkUserParams method
    
    * update AlertGroupService, extends from BaseService, remove duplicate methods
    
    * refactor
    
    * modify method name
    
    * add hasProjectAndPerm method
    
    * using checkProject instead of getResultStatus
    
    * delete checkAuth method, using hasProjectAndPerm instead.
    
    * correct spelling
    
    * add transactional for deleteWorkerGroupById
    
    * add Transactional for deleteProcessInstanceById method
    
    * change sqlSessionTemplate singleton
    
    * change sqlSessionTemplate singleton and reformat code
    
    * fix unsuitable error message
    
    * update shutdownhook methods
    
    * fix worker log bug
    
    * fix api server debug mode bug
    
    * upgrade zk version
    
    * delete this line ,for zkClient.close() will do the whole thing
    
    * fix master server shutdown error
    
    * degrade zk version and add FourLetterWordMain class
    
    * fix PathChildrenCache not close
    
    * add Transactional for createSession method (#1186)
    
    * move updateTaskState into try/catch block in case of exception
    
    * fix NPE
    
    * using conf.getInt instead of getString
    
    * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
    for AlertDao, correct the spelling.
    
    * duplicate
    
    * refactor getTaskWorkerGroupId
    
    * add friendly log
    
    * update hearbeat thread num = 1
    
    * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
    
    * 1. move verifyTaskInstanceIsNull after taskInstance
    2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
    
    * fix the message
    
    * delete before check to avoid KeeperException$NoNodeException
    
    * fix the message
    
    * check processInstance state before delete tenant
    
    * check processInstance state before delete worker group
    
    * refactor
    
    * merge api constants into common constatns
    
    * update the resource perm
    
    * update the dataSource perm
    
    * fix CheckUtils.checkUserParams method
    
    * update AlertGroupService, extends from BaseService, remove duplicate methods
    
    * refactor
    
    * modify method name
    
    * add hasProjectAndPerm method
    
    * using checkProject instead of getResultStatus
    
    * delete checkAuth method, using hasProjectAndPerm instead.
    
    * correct spelling
    
    * add transactional for deleteWorkerGroupById
    
    * add Transactional for deleteProcessInstanceById method
    
    * change sqlSessionTemplate singleton
    
    * change sqlSessionTemplate singleton and reformat code
    
    * fix unsuitable error message
    
    * update shutdownhook methods
    
    * fix worker log bug
    
    * fix api server debug mode bug
    
    * upgrade zk version
    
    * delete this line ,for zkClient.close() will do the whole thing
    
    * fix master server shutdown error
    
    * degrade zk version and add FourLetterWordMain class
    
    * fix PathChildrenCache not close
    
    * add Transactional for createSession method
    
    * add src pom and assembly
    
    * add src pom and assembly
    
    * add src pom and assembly
    
    * add src pom and assembly
    
    * dockerfile dao application.properties ,install.sh modify and application.properties modify (#1187)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * add src pom and assembly
    
    * add src pom and assembly
    
    * dockerfile startup.sh modify (#1189)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs (#1191)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs
    
    * nginx conf modify
    
    * dockerfile application.properties modify
    
    * dockerfile conf modify (#1192)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs
    
    * nginx conf modify
    
    * dockerfile application.properties modify
    
    * dockerfile conf modify (#1193)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs
    
    * nginx conf modify
    
    * dockerfile application.properties modify
    
    * dockerfile email address change (#1194)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs
    
    * nginx conf modify
    
    * dockerfile application.properties modify
    
    * dockerfile email address change
    
    * the alert module is modified in english (#1195)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs
    
    * nginx conf modify
    
    * dockerfile application.properties modify
    
    * dockerfile email address change
    
    * the alert module is modified in English.
    
    * alert server comment and chinese modify
    
    * api server useless code and chinese modify (#1198)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs
    
    * nginx conf modify
    
    * dockerfile application.properties modify
    
    * dockerfile email address change
    
    * the alert module is modified in English.
    
    * alert server comment and chinese modify
    
    * api server useless code and chinese modify
    
    * common,dao,server useless code and chinese modify (#1199)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs
    
    * nginx conf modify
    
    * dockerfile application.properties modify
    
    * dockerfile email address change
    
    * the alert module is modified in English.
    
    * alert server comment and chinese modify
    
    * api server useless code and chinese modify
    
    * common,dao,server useless code and chinese modify
    
    * change chinese sql to english. (#1200)
    
    * update english documents
    
    * refactor zk client
    
    * update documents
    
    * update zkclient
    
    * update zkclient
    
    * update documents
    
    * add architecture-design
    
    * change i18n
    
    * update i18n
    
    * update english documents
    
    * add architecture-design
    
    * update english documents
    
    * update en-US documents
    
    * add architecture-design
    
    * update demo site
    
    * add mybatis plus model
    
    * modify mybatisplus
    
    * modify mybatisplus
    
    * change interface by mybatisplus
    
    * add unit test
    
    * refactor dao interface.
    
    * add unit test for dao...
    
    * add unit test for dao...
    
    * add unit test for dao...
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
    
    * update some dao bugs
    
    * update for some bugs
    
    * update some bugs
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
    
    * update
    
    * update
    
    * add multiply settings for application.yml
    
    * add multiply settings for application.yml
    
    * revert
    
    * update configuration settings in task record dao...
    
    * change application_master to application-master
    
    * change application_master to application-master
    
    * update application.yml to application.properties
    
    * revert
    
    * revert
    
    * add properties
    
    * add properties
    
    * revert
    
    * revert
    
    * add api start up..
    add alert send try catch
    
    * update dao info level
    
    * fix bug: task cannot submit when recovery failover
    
    * fix bug: task cannot submit when recovery failover
    
    * merge from dev-db
    
    * revert
    
    * revert
    
    * fix bug: get process definition list failed.
    
    * fix bug: process instance interval is error
    
    * revert
    
    * revert
    
    * update
    
    * support stop submit success tasks
    
    * update kill process
    
    * update for stop process
    
    * update for stop process
    
    * add some logs for stop process
    
    * update for small bug.
    
    * add check strategy before submit task
    
    * revert
    
    * update
    
    * update
    
    * revert
    
    * wait task instance exists if null.
    
    * revert
    
    * update
    
    * change desc to description.
    
    * add check user and definitions function when delete tenant
    
    * update
    
    * change desc to description.
    
    * change desc to description.
    
    * change desc to description.
    
    * remove check resources when delete tenant
    
    * change desc to description.
    
    * change mybatisplus version to 3.2.0
    
    * update
    
    * change the notice to apache.
    
    * update
    
    * update postgre sql
    
    * fix bug: phone can be empty.
    
    * fix bug: postgre test error.
    
    * update create table for postgre quartz
    
    * fix some bugs about postgre.
    
    * update create table for postgre quartz
    
    * add postgre db performance monitor
    
    * add postgre performance monitor
    
    * update performance monitor
    
    * revert
    
    * revert
    
    * fix bug: tasks queue length error
    
    * remove datasource.properties
    
    * change chinese sql to english.
    
    * change chinese sql to english.
    
    * change chinese to english (#1202)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs
    
    * nginx conf modify
    
    * dockerfile application.properties modify
    
    * dockerfile email address change
    
    * the alert module is modified in English.
    
    * alert server comment and chinese modify
    
    * api server useless code and chinese modify
    
    * common,dao,server useless code and chinese modify
    
    * change chinese to english
    
    * remove unused code (#1204)
    
    * update english documents
    
    * refactor zk client
    
    * update documents
    
    * update zkclient
    
    * update zkclient
    
    * update documents
    
    * add architecture-design
    
    * change i18n
    
    * update i18n
    
    * update english documents
    
    * add architecture-design
    
    * update english documents
    
    * update en-US documents
    
    * add architecture-design
    
    * update demo site
    
    * add mybatis plus model
    
    * modify mybatisplus
    
    * modify mybatisplus
    
    * change interface by mybatisplus
    
    * add unit test
    
    * refactor dao interface.
    
    * add unit test for dao...
    
    * add unit test for dao...
    
    * add unit test for dao...
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
    
    * update some dao bugs
    
    * update for some bugs
    
    * update some bugs
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
    
    * update
    
    * update
    
    * add multiply settings for application.yml
    
    * add multiply settings for application.yml
    
    * revert
    
    * update configuration settings in task record dao...
    
    * change application_master to application-master
    
    * change application_master to application-master
    
    * update application.yml to application.properties
    
    * revert
    
    * revert
    
    * add properties
    
    * add properties
    
    * revert
    
    * revert
    
    * add api start up..
    add alert send try catch
    
    * update dao info level
    
    * fix bug: task cannot submit when recovery failover
    
    * fix bug: task cannot submit when recovery failover
    
    * merge from dev-db
    
    * revert
    
    * revert
    
    * fix bug: get process definition list failed.
    
    * fix bug: process instance interval is error
    
    * revert
    
    * revert
    
    * update
    
    * support stop submit success tasks
    
    * update kill process
    
    * update for stop process
    
    * update for stop process
    
    * add some logs for stop process
    
    * update for small bug.
    
    * add check strategy before submit task
    
    * revert
    
    * update
    
    * update
    
    * revert
    
    * wait task instance exists if null.
    
    * revert
    
    * update
    
    * change desc to description.
    
    * add check user and definitions function when delete tenant
    
    * update
    
    * change desc to description.
    
    * change desc to description.
    
    * change desc to description.
    
    * remove check resources when delete tenant
    
    * change desc to description.
    
    * change mybatisplus version to 3.2.0
    
    * update
    
    * change the notice to apache.
    
    * update
    
    * update postgre sql
    
    * fix bug: phone can be empty.
    
    * fix bug: postgre test error.
    
    * update create table for postgre quartz
    
    * fix some bugs about postgre.
    
    * update create table for postgre quartz
    
    * add postgre db performance monitor
    
    * add postgre performance monitor
    
    * update performance monitor
    
    * revert
    
    * revert
    
    * fix bug: tasks queue length error
    
    * remove datasource.properties
    
    * change chinese sql to english.
    
    * change chinese sql to english.
    
    * remove unused code.
    
    * remove unused code.
    
    * Modify webpack configuration (#1206)
    
    * add more message for java-doc (#1209)
    
    * move updateTaskState into try/catch block in case of exception
    
    * fix NPE
    
    * using conf.getInt instead of getString
    
    * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
    for AlertDao, correct the spelling.
    
    * duplicate
    
    * refactor getTaskWorkerGroupId
    
    * add friendly log
    
    * update hearbeat thread num = 1
    
    * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
    
    * 1. move verifyTaskInstanceIsNull after taskInstance
    2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
    
    * fix the message
    
    * delete before check to avoid KeeperException$NoNodeException
    
    * fix the message
    
    * check processInstance state before delete tenant
    
    * check processInstance state before delete worker group
    
    * refactor
    
    * merge api constants into common constatns
    
    * update the resource perm
    
    * update the dataSource perm
    
    * fix CheckUtils.checkUserParams method
    
    * update AlertGroupService, extends from BaseService, remove duplicate methods
    
    * refactor
    
    * modify method name
    
    * add hasProjectAndPerm method
    
    * using checkProject instead of getResultStatus
    
    * delete checkAuth method, using hasProjectAndPerm instead.
    
    * correct spelling
    
    * add transactional for deleteWorkerGroupById
    
    * add Transactional for deleteProcessInstanceById method
    
    * change sqlSessionTemplate singleton
    
    * change sqlSessionTemplate singleton and reformat code
    
    * fix unsuitable error message
    
    * update shutdownhook methods
    
    * fix worker log bug
    
    * fix api server debug mode bug
    
    * upgrade zk version
    
    * delete this line ,for zkClient.close() will do the whole thing
    
    * fix master server shutdown error
    
    * degrade zk version and add FourLetterWordMain class
    
    * fix PathChildrenCache not close
    
    * add Transactional for createSession method
    
    * add more message for java-doc
    
    * add java doc for common module (#1213)
    
    * dao method comments and useless code modify (#1214)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs
    
    * nginx conf modify
    
    * dockerfile application.properties modify
    
    * dockerfile email address change
    
    * the alert module is modified in English.
    
    * alert server comment and chinese modify
    
    * api server useless code and chinese modify
    
    * common,dao,server useless code and chinese modify
    
    * change chinese to english
    
    * dao method comments and useless code modify
    
    * Change all Chinese names to English (#1207)
    
    * Modify webpack configuration
    
    * Change all Chinese names to English
    
    * add progress-bar-webpack-plugin (#1215)
    
    * Modify webpack configuration
    
    * Change all Chinese names to English
    
    * add progress-bar-webpack-plugin
    
    * Add method and parameters comments (#1220)
    
    * rename from DatasourceUserMapper to DataSourceUserMapper
    
    * add unit test in UserMapper and WorkerGroupMapper
    
    * change cn.escheduler to org.apache.dolphinscheduler
    
    * add unit test in UdfFuncMapperTest
    
    * add unit test in UdfFuncMapperTest
    
    * remove DatabaseConfiguration
    
    * add ConnectionFactoryTest
    
    * cal duration in processInstancesList
    
    * change desc to description
    
    * change table name in mysql ddl
    
    * change table name in mysql ddl
    
    * change escheduler to dolphinscheduler
    
    * change escheduler to dolphinscheduler
    
    * change escheduler to dolphinscheduler
    
    * remove log4j-1.2-api and modify AlertMapperTest
    
    * remove log4j-1.2-api
    
    * Add alertDao to spring management
    
    * Add alertDao to spring management
    
    * get SqlSessionFactory from MybatisSqlSessionFactoryBean
    
    * get processDao by DaoFactory
    
    * read druid properties in ConneciontFactory
    
    * read druid properties in ConneciontFactory
    
    * change get alertDao by spring to DaoFactory
    
    * add log4j to resolve #967
    
    * resole verify udf name error and delete udf error
    
    * Determine if principal is empty
    
    * Determine whether the logon user has the right to delete the project
    
    * Fixed an issue that produced attatch file named such as ATT00002.bin
    
    * fix too many connection in upgrade or create
    
    * fix NEED_FAULT_TOLERANCE and WAITTING_THREAD count fail
    
    * Added a judgment on whether the currently login user is an administrator
    
    * fix update udf database not change and create time is changed
    
    * add enterprise.wechat.enable to decide whether to send enterprise WeChat
    
    * change method check
    
    * Remove the administrator's judgment on query access token list
    
    * only admin can create worker group
    
    * delete alert group need delete the relation of user and alert group
    
    * add timeout in proxy when upload large resource
    
    * add gets scheduled times by expect fire times
    
    * add gets scheduled times by expect fire times
    
    * Increase the judgment of whether it is admin
    
    * Increase the judgment of whether it is admin
    
    * when delete access token add whether login user has perm to delete
    
    * change mysql-connector-java scope to test
    
    * update scm test
    
    * add profile test
    
    * Add method and parameters comments
    
    * roll back
    
    * add some notes (#1221)
    
    * update english documents
    
    * refactor zk client
    
    * update documents
    
    * update zkclient
    
    * update zkclient
    
    * update documents
    
    * add architecture-design
    
    * change i18n
    
    * update i18n
    
    * update english documents
    
    * add architecture-design
    
    * update english documents
    
    * update en-US documents
    
    * add architecture-design
    
    * update demo site
    
    * add mybatis plus model
    
    * modify mybatisplus
    
    * modify mybatisplus
    
    * change interface by mybatisplus
    
    * add unit test
    
    * refactor dao interface.
    
    * add unit test for dao...
    
    * add unit test for dao...
    
    * add unit test for dao...
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
    
    * update some dao bugs
    
    * update for some bugs
    
    * update some bugs
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
    
    * update
    
    * update
    
    * add multiply settings for application.yml
    
    * add multiply settings for application.yml
    
    * revert
    
    * update configuration settings in task record dao...
    
    * change application_master to application-master
    
    * change application_master to application-master
    
    * update application.yml to application.properties
    
    * revert
    
    * revert
    
    * add properties
    
    * add properties
    
    * revert
    
    * revert
    
    * add api start up..
    add alert send try catch
    
    * update dao info level
    
    * fix bug: task cannot submit when recovery failover
    
    * fix bug: task cannot submit when recovery failover
    
    * merge from dev-db
    
    * revert
    
    * revert
    
    * fix bug: get process definition list failed.
    
    * fix bug: process instance interval is error
    
    * revert
    
    * revert
    
    * update
    
    * support stop submit success tasks
    
    * update kill process
    
    * update for stop process
    
    * update for stop process
    
    * add some logs for stop process
    
    * update for small bug.
    
    * add check strategy before submit task
    
    * revert
    
    * update
    
    * update
    
    * revert
    
    * wait task instance exists if null.
    
    * revert
    
    * update
    
    * change desc to description.
    
    * add check user and definitions function when delete tenant
    
    * update
    
    * change desc to description.
    
    * change desc to description.
    
    * change desc to description.
    
    * remove check resources when delete tenant
    
    * change desc to description.
    
    * change mybatisplus version to 3.2.0
    
    * update
    
    * change the notice to apache.
    
    * update
    
    * update postgre sql
    
    * fix bug: phone can be empty.
    
    * fix bug: postgre test error.
    
    * update create table for postgre quartz
    
    * fix some bugs about postgre.
    
    * update create table for postgre quartz
    
    * add postgre db performance monitor
    
    * add postgre performance monitor
    
    * update performance monitor
    
    * revert
    
    * revert
    
    * fix bug: tasks queue length error
    
    * remove datasource.properties
    
    * change chinese sql to english.
    
    * change chinese sql to english.
    
    * remove unused code.
    
    * remove unused code.
    
    * add some notes
    
    * update some notes
    
    * update some notes
    
    * update mbatisplus version
    
    * update lombok version
    
    * update lombok version
    
    * revert
    
    * merge from dev-db
    
    * remove version
    
    * update npm install pom
    
    * add front assembly
    
    * add front module
    
    * change verison to 1.2.0-release-SNAPSHOT
    
    * add name in pom and remove compile
    
    * add name in pom
    
    * add licenses in assemble
    
    * change version to 1.2.0-RC1-SNAPSHOT
    
    * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
    
    # Conflicts:
    #	dolphinscheduler-alert/pom.xml
    #	dolphinscheduler-api/pom.xml
    #	dolphinscheduler-common/pom.xml
    #	dolphinscheduler-dao/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
    #	dolphinscheduler-dist/pom.xml
    #	dolphinscheduler-rpc/pom.xml
    #	dolphinscheduler-server/pom.xml
    #	dolphinscheduler-ui/pom.xml
    #	pom.xml
    change assembly id
    
    * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
    
    # Conflicts:
    #	dolphinscheduler-alert/pom.xml
    #	dolphinscheduler-api/pom.xml
    #	dolphinscheduler-common/pom.xml
    #	dolphinscheduler-dao/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
    #	dolphinscheduler-dist/pom.xml
    #	dolphinscheduler-rpc/pom.xml
    #	dolphinscheduler-server/pom.xml
    #	dolphinscheduler-ui/pom.xml
    #	pom.xml
    add DISCLAIMER
    
    * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
    
    # Conflicts:
    #	dolphinscheduler-alert/pom.xml
    #	dolphinscheduler-api/pom.xml
    #	dolphinscheduler-common/pom.xml
    #	dolphinscheduler-dao/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
    #	dolphinscheduler-dist/pom.xml
    #	dolphinscheduler-rpc/pom.xml
    #	dolphinscheduler-server/pom.xml
    #	dolphinscheduler-ui/pom.xml
    #	pom.xml
    add license in xml and properties
    
    * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
    
    # Conflicts:
    #	dolphinscheduler-alert/pom.xml
    #	dolphinscheduler-api/pom.xml
    #	dolphinscheduler-common/pom.xml
    #	dolphinscheduler-dao/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
    #	dolphinscheduler-dist/pom.xml
    #	dolphinscheduler-rpc/pom.xml
    #	dolphinscheduler-server/pom.xml
    #	dolphinscheduler-ui/pom.xml
    #	pom.xml
    add license in dockerfile
    
    * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
    
    # Conflicts:
    #	dolphinscheduler-alert/pom.xml
    #	dolphinscheduler-api/pom.xml
    #	dolphinscheduler-common/pom.xml
    #	dolphinscheduler-dao/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
    #	dolphinscheduler-dist/pom.xml
    #	dolphinscheduler-rpc/pom.xml
    #	dolphinscheduler-server/pom.xml
    #	dolphinscheduler-ui/pom.xml
    #	pom.xml
    add license in script and sql
    
    * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
    
    # Conflicts:
    #	dolphinscheduler-alert/pom.xml
    #	dolphinscheduler-api/pom.xml
    #	dolphinscheduler-common/pom.xml
    #	dolphinscheduler-dao/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
    #	dolphinscheduler-dist/pom.xml
    #	dolphinscheduler-rpc/pom.xml
    #	dolphinscheduler-server/pom.xml
    #	dolphinscheduler-ui/pom.xml
    #	pom.xml
    add license in script and sql
    
    * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
    
    # Conflicts:
    #	dolphinscheduler-alert/pom.xml
    #	dolphinscheduler-api/pom.xml
    #	dolphinscheduler-common/pom.xml
    #	dolphinscheduler-dao/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
    #	dolphinscheduler-dist/pom.xml
    #	dolphinscheduler-rpc/pom.xml
    #	dolphinscheduler-server/pom.xml
    #	dolphinscheduler-ui/pom.xml
    #	pom.xml
    add license in ci
    
    * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
    
    # Conflicts:
    #	dolphinscheduler-alert/pom.xml
    #	dolphinscheduler-api/pom.xml
    #	dolphinscheduler-common/pom.xml
    #	dolphinscheduler-dao/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
    #	dolphinscheduler-dist/pom.xml
    #	dolphinscheduler-rpc/pom.xml
    #	dolphinscheduler-server/pom.xml
    #	dolphinscheduler-ui/pom.xml
    #	pom.xml
    change version to 1.2.0-SNAPSHOT
    
    * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
    
    # Conflicts:
    #	dolphinscheduler-alert/pom.xml
    #	dolphinscheduler-api/pom.xml
    #	dolphinscheduler-common/pom.xml
    #	dolphinscheduler-dao/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
    #	dolphinscheduler-dist/pom.xml
    #	dolphinscheduler-rpc/pom.xml
    #	dolphinscheduler-server/pom.xml
    #	dolphinscheduler-ui/pom.xml
    #	pom.xml
    set defalut db type postgresql
    
    * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
    
    # Conflicts:
    #	dolphinscheduler-alert/pom.xml
    #	dolphinscheduler-api/pom.xml
    #	dolphinscheduler-common/pom.xml
    #	dolphinscheduler-dao/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
    #	dolphinscheduler-dist/pom.xml
    #	dolphinscheduler-rpc/pom.xml
    #	dolphinscheduler-server/pom.xml
    #	dolphinscheduler-ui/pom.xml
    #	pom.xml
    set defalut db type postgresql
    
    * change org.quartz.jobStore.driverDelegateClass
    
    * Add comments in method params
    
    * update readme from branch dev
    
    * update content in how to contribute
    
    * change postgresql default port
    
    * change version 1.2.0-SNAPSHOT
    
    * remove antrun plugin
    
    * add how to build
    
    * add how to build
    
    * remove dir format in assembly
    
    * Remove the judgment of whether it is admin
    
    * reset version to 1.2.0-SNAPSHOT
    
    * Remove the judgment of whether it is admin
    
    * Fix bug the administrator authorizes the project to ordinary users,but ordinary users cannot see the process definition created by the administrator
    
    * Added description of bug fixes about create dolphinscheduler sql failed
    
    * reset version to 1.2.0-SNAPSHOT
    
    * update dml when init queue table
    
    * reset version to 1.2.0-SNAPSHOT
    
    * Add whether the administrator's judgment
    
    * Add method comments
    
    * reset version to 1.2.0-SNAPSHOT
    
    * [maven-release-plugin] prepare release 1.2.0
    
    * [maven-release-plugin] prepare for next development iteration
    
    * Comment parameter name and database name (#1329)
    
    * Modify field name
    
    * Comment parameter name and database name
    
    * Determines whether the s database is empty (#1330)
    
    * rename from DatasourceUserMapper to DataSourceUserMapper
    
    * add unit test in UserMapper and WorkerGroupMapper
    
    * change cn.escheduler to org.apache.dolphinscheduler
    
    * add unit test in UdfFuncMapperTest
    
    * add unit test in UdfFuncMapperTest
    
    * remove DatabaseConfiguration
    
    * add ConnectionFactoryTest
    
    * cal duration in processInstancesList
    
    * change desc to description
    
    * change table name in mysql ddl
    
    * change table name in mysql ddl
    
    * change escheduler to dolphinscheduler
    
    * change escheduler to dolphinscheduler
    
    * change escheduler to dolphinscheduler
    
    * remove log4j-1.2-api and modify AlertMapperTest
    
    * remove log4j-1.2-api
    
    * Add alertDao to spring management
    
    * Add alertDao to spring management
    
    * get SqlSessionFactory from MybatisSqlSessionFactoryBean
    
    * get processDao by DaoFactory
    
    * read druid properties in ConneciontFactory
    
    * read druid properties in ConneciontFactory
    
    * change get alertDao by spring to DaoFactory
    
    * add log4j to resolve #967
    
    * resole verify udf name error and delete udf error
    
    * Determine if principal is empty
    
    * Determine whether the logon user has the right to delete the project
    
    * Fixed an issue that produced attatch file named such as ATT00002.bin
    
    * fix too many connection in upgrade or create
    
    * fix NEED_FAULT_TOLERANCE and WAITTING_THREAD count fail
    
    * Added a judgment on whether the currently login user is an administrator
    
    * fix update udf database not change and create time is changed
    
    * add enterprise.wechat.enable to decide whether to send enterprise WeChat
    
    * change method check
    
    * Remove the administrator's judgment on query access token list
    
    * only admin can create worker group
    
    * delete alert group need delete the relation of user and alert group
    
    * add timeout in proxy when upload large resource
    
    * add gets scheduled times by expect fire times
    
    * add gets scheduled times by expect fire times
    
    * Increase the judgment of whether it is admin
    
    * Increase the judgment of whether it is admin
    
    * when delete access token add whether login user has perm to delete
    
    * change mysql-connector-java scope to test
    
    * update scm test
    
    * add profile test
    
    * add profile test
    
    * add maven.deploy.skip true
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * add dependency
    
    * add javadoc
    
    * add antrun
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * reset pgsql (#1178)
    
    + 1
    
    * add javadoc
    
    * add javadoc
    
    * [maven-release-plugin] rollback the release of 1.2.0
    
    * add javadoc
    
    * Ans UI upgrade to version 0.1.0 (#1181)
    
    + 1
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * Administrators group prohibit deletion (#1182)
    
    * Ans UI upgrade to version 0.1.0
    
    * Administrators group prohibit deletion
    
    * add javadoc
    
    * add ui pom
    
    * fix master server shutdown error (#1177)
    
    * move updateTaskState into try/catch block in case of exception
    
    * fix NPE
    
    * using conf.getInt instead of getString
    
    * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
    for AlertDao, correct the spelling.
    
    * duplicate
    
    * refactor getTaskWorkerGroupId
    
    * add friendly log
    
    * update hearbeat thread num = 1
    
    * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
    
    * 1. move verifyTaskInstanceIsNull after taskInstance
    2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
    
    * fix the message
    
    * delete before check to avoid KeeperException$NoNodeException
    
    * fix the message
    
    * check processInstance state before delete tenant
    
    * check processInstance state before delete worker group
    
    * refactor
    
    * merge api constants into common constatns
    
    * update the resource perm
    
    * update the dataSource perm
    
    * fix CheckUtils.checkUserParams method
    
    * update AlertGroupService, extends from BaseService, remove duplicate methods
    
    * refactor
    
    * modify method name
    
    * add hasProjectAndPerm method
    
    * using checkProject instead of getResultStatus
    
    * delete checkAuth method, using hasProjectAndPerm instead.
    
    * correct spelling
    
    * add transactional for deleteWorkerGroupById
    
    * add Transactional for deleteProcessInstanceById method
    
    * change sqlSessionTemplate singleton
    
    * change sqlSessionTemplate singleton and reformat code
    
    * fix unsuitable error message
    
    * update shutdownhook methods
    
    * fix worker log bug
    
    * fix api server debug mode bug
    
    * upgrade zk version
    
    * delete this line ,for zkClient.close() will do the whole thing
    
    * fix master server shutdown error
    
    * degrade zk version and add FourLetterWordMain class (#1183)
    
    * move updateTaskState into try/catch block in case of exception
    
    * fix NPE
    
    * using conf.getInt instead of getString
    
    * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
    for AlertDao, correct the spelling.
    
    * duplicate
    
    * refactor getTaskWorkerGroupId
    
    * add friendly log
    
    * update hearbeat thread num = 1
    
    * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
    
    * 1. move verifyTaskInstanceIsNull after taskInstance
    2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
    
    * fix the message
    
    * delete before check to avoid KeeperException$NoNodeException
    
    * fix the message
    
    * check processInstance state before delete tenant
    
    * check processInstance state before delete worker group
    
    * refactor
    
    * merge api constants into common constatns
    
    * update the resource perm
    
    * update the dataSource perm
    
    * fix CheckUtils.checkUserParams method
    
    * update AlertGroupService, extends from BaseService, remove duplicate methods
    
    * refactor
    
    * modify method name
    
    * add hasProjectAndPerm method
    
    * using checkProject instead of getResultStatus
    
    * delete checkAuth method, using hasProjectAndPerm instead.
    
    * correct spelling
    
    * add transactional for deleteWorkerGroupById
    
    * add Transactional for deleteProcessInstanceById method
    
    * change sqlSessionTemplate singleton
    
    * change sqlSessionTemplate singleton and reformat code
    
    * fix unsuitable error message
    
    * update shutdownhook methods
    
    * fix worker log bug
    
    * fix api server debug mode bug
    
    * upgrade zk version
    
    * delete this line ,for zkClient.close() will do the whole thing
    
    * fix master server shutdown error
    
    * degrade zk version and add FourLetterWordMain class
    
    * add ui pom
    
    * add src pom and assembly
    
    * fix ZKWorkerClient not close PathChildrenCache (#1185)
    
    * move updateTaskState into try/catch block in case of exception
    
    * fix NPE
    
    * using conf.getInt instead of getString
    
    * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
    for AlertDao, correct the spelling.
    
    * duplicate
    
    * refactor getTaskWorkerGroupId
    
    * add friendly log
    
    * update hearbeat thread num = 1
    
    * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
    
    * 1. move verifyTaskInstanceIsNull after taskInstance
    2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
    
    * fix the message
    
    * delete before check to avoid KeeperException$NoNodeException
    
    * fix the message
    
    * check processInstance state before delete tenant
    
    * check processInstance state before delete worker group
    
    * refactor
    
    * merge api constants into common constatns
    
    * update the resource perm
    
    * update the dataSource perm
    
    * fix CheckUtils.checkUserParams method
    
    * update AlertGroupService, extends from BaseService, remove duplicate methods
    
    * refactor
    
    * modify method name
    
    * add hasProjectAndPerm method
    
    * using checkProject instead of getResultStatus
    
    * delete checkAuth method, using hasProjectAndPerm instead.
    
    * correct spelling
    
    * add transactional for deleteWorkerGroupById
    
    * add Transactional for deleteProcessInstanceById method
    
    * change sqlSessionTemplate singleton
    
    * change sqlSessionTemplate singleton and reformat code
    
    * fix unsuitable error message
    
    * update shutdownhook methods
    
    * fix worker log bug
    
    * fix api server debug mode bug
    
    * upgrade zk version
    
    * delete this line ,for zkClient.close() will do the whole thing
    
    * fix master server shutdown error
    
    * degrade zk version and add FourLetterWordMain class
    
    * fix PathChildrenCache not close
    
    * add Transactional for createSession method (#1186)
    
    * move updateTaskState into try/catch block in case of exception
    
    * fix NPE
    
    * using conf.getInt instead of getString
    
    * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
    for AlertDao, correct the spelling.
    
    * duplicate
    
    * refactor getTaskWorkerGroupId
    
    * add friendly log
    
    * update hearbeat thread num = 1
    
    * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
    
    * 1. move verifyTaskInstanceIsNull after taskInstance
    2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
    
    * fix the message
    
    * delete before check to avoid KeeperException$NoNodeException
    
    * fix the message
    
    * check processInstance state before delete tenant
    
    * check processInstance state before delete worker group
    
    * refactor
    
    * merge api constants into common constatns
    
    * update the resource perm
    
    * update the dataSource perm
    
    * fix CheckUtils.checkUserParams method
    
    * update AlertGroupService, extends from BaseService, remove duplicate methods
    
    * refactor
    
    * modify method name
    
    * add hasProjectAndPerm method
    
    * using checkProject instead of getResultStatus
    
    * delete checkAuth method, using hasProjectAndPerm instead.
    
    * correct spelling
    
    * add transactional for deleteWorkerGroupById
    
    * add Transactional for deleteProcessInstanceById method
    
    * change sqlSessionTemplate singleton
    
    * change sqlSessionTemplate singleton and reformat code
    
    * fix unsuitable error message
    
    * update shutdownhook methods
    
    * fix worker log bug
    
    * fix api server debug mode bug
    
    * upgrade zk version
    
    * delete this line ,for zkClient.close() will do the whole thing
    
    * fix master server shutdown error
    
    * degrade zk version and add FourLetterWordMain class
    
    * fix PathChildrenCache not close
    
    * add Transactional for createSession method
    
    * add src pom and assembly
    
    * add src pom and assembly
    
    * add src pom and assembly
    
    * add src pom and assembly
    
    * dockerfile dao application.properties ,install.sh modify and application.properties modify (#1187)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * add src pom and assembly
    
    * add src pom and assembly
    
    * dockerfile startup.sh modify (#1189)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs (#1191)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs
    
    * nginx conf modify
    
    * dockerfile application.properties modify
    
    * dockerfile conf modify (#1192)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs
    
    * nginx conf modify
    
    * dockerfile application.properties modify
    
    * dockerfile conf modify (#1193)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs
    
    * nginx conf modify
    
    * dockerfile application.properties modify
    
    * dockerfile email address change (#1194)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs
    
    * nginx conf modify
    
    * dockerfile application.properties modify
    
    * dockerfile email address change
    
    * the alert module is modified in english (#1195)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs
    
    * nginx conf modify
    
    * dockerfile application.properties modify
    
    * dockerfile email address change
    
    * the alert module is modified in English.
    
    * alert server comment and chinese modify
    
    * api server useless code and chinese modify (#1198)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs
    
    * nginx conf modify
    
    * dockerfile application.properties modify
    
    * dockerfile email address change
    
    * the alert module is modified in English.
    
    * alert server comment and chinese modify
    
    * api server useless code and chinese modify
    
    * common,dao,server useless code and chinese modify (#1199)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs
    
    * nginx conf modify
    
    * dockerfile application.properties modify
    
    * dockerfile email address change
    
    * the alert module is modified in English.
    
    * alert server comment and chinese modify
    
    * api server useless code and chinese modify
    
    * common,dao,server useless code and chinese modify
    
    * change chinese sql to english. (#1200)
    
    * update english documents
    
    * refactor zk client
    
    * update documents
    
    * update zkclient
    
    * update zkclient
    
    * update documents
    
    * add architecture-design
    
    * change i18n
    
    * update i18n
    
    * update english documents
    
    * add architecture-design
    
    * update english documents
    
    * update en-US documents
    
    * add architecture-design
    
    * update demo site
    
    * add mybatis plus model
    
    * modify mybatisplus
    
    * modify mybatisplus
    
    * change interface by mybatisplus
    
    * add unit test
    
    * refactor dao interface.
    
    * add unit test for dao...
    
    * add unit test for dao...
    
    * add unit test for dao...
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
    
    * update some dao bugs
    
    * update for some bugs
    
    * update some bugs
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
    
    * update
    
    * update
    
    * add multiply settings for application.yml
    
    * add multiply settings for application.yml
    
    * revert
    
    * update configuration settings in task record dao...
    
    * change application_master to application-master
    
    * change application_master to application-master
    
    * update application.yml to application.properties
    
    * revert
    
    * revert
    
    * add properties
    
    * add properties
    
    * revert
    
    * revert
    
    * add api start up..
    add alert send try catch
    
    * update dao info level
    
    * fix bug: task cannot submit when recovery failover
    
    * fix bug: task cannot submit when recovery failover
    
    * merge from dev-db
    
    * revert
    
    * revert
    
    * fix bug: get process definition list failed.
    
    * fix bug: process instance interval is error
    
    * revert
    
    * revert
    
    * update
    
    * support stop submit success tasks
    
    * update kill process
    
    * update for stop process
    
    * update for stop process
    
    * add some logs for stop process
    
    * update for small bug.
    
    * add check strategy before submit task
    
    * revert
    
    * update
    
    * update
    
    * revert
    
    * wait task instance exists if null.
    
    * revert
    
    * update
    
    * change desc to description.
    
    * add check user and definitions function when delete tenant
    
    * update
    
    * change desc to description.
    
    * change desc to description.
    
    * change desc to description.
    
    * remove check resources when delete tenant
    
    * change desc to description.
    
    * change mybatisplus version to 3.2.0
    
    * update
    
    * change the notice to apache.
    
    * update
    
    * update postgre sql
    
    * fix bug: phone can be empty.
    
    * fix bug: postgre test error.
    
    * update create table for postgre quartz
    
    * fix some bugs about postgre.
    
    * update create table for postgre quartz
    
    * add postgre db performance monitor
    
    * add postgre performance monitor
    
    * update performance monitor
    
    * revert
    
    * revert
    
    * fix bug: tasks queue length error
    
    * remove datasource.properties
    
    * change chinese sql to english.
    
    * change chinese sql to english.
    
    * change chinese to english (#1202)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs
    
    * nginx conf modify
    
    * dockerfile application.properties modify
    
    * dockerfile email address change
    
    * the alert module is modified in English.
    
    * alert server comment and chinese modify
    
    * api server useless code and chinese modify
    
    * common,dao,server useless code and chinese modify
    
    * change chinese to english
    
    * remove unused code (#1204)
    
    * update english documents
    
    * refactor zk client
    
    * update documents
    
    * update zkclient
    
    * update zkclient
    
    * update documents
    
    * add architecture-design
    
    * change i18n
    
    * update i18n
    
    * update english documents
    
    * add architecture-design
    
    * update english documents
    
    * update en-US documents
    
    * add architecture-design
    
    * update demo site
    
    * add mybatis plus model
    
    * modify mybatisplus
    
    * modify mybatisplus
    
    * change interface by mybatisplus
    
    * add unit test
    
    * refactor dao interface.
    
    * add unit test for dao...
    
    * add unit test for dao...
    
    * add unit test for dao...
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
    
    * update some dao bugs
    
    * update for some bugs
    
    * update some bugs
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
    
    * update
    
    * update
    
    * add multiply settings for application.yml
    
    * add multiply settings for application.yml
    
    * revert
    
    * update configuration settings in task record dao...
    
    * change application_master to application-master
    
    * change application_master to application-master
    
    * update application.yml to application.properties
    
    * revert
    
    * revert
    
    * add properties
    
    * add properties
    
    * revert
    
    * revert
    
    * add api start up..
    add alert send try catch
    
    * update dao info level
    
    * fix bug: task cannot submit when recovery failover
    
    * fix bug: task cannot submit when recovery failover
    
    * merge from dev-db
    
    * revert
    
    * revert
    
    * fix bug: get process definition list failed.
    
    * fix bug: process instance interval is error
    
    * revert
    
    * revert
    
    * update
    
    * support stop submit success tasks
    
    * update kill process
    
    * update for stop process
    
    * update for stop process
    
    * add some logs for stop process
    
    * update for small bug.
    
    * add check strategy before submit task
    
    * revert
    
    * update
    
    * update
    
    * revert
    
    * wait task instance exists if null.
    
    * revert
    
    * update
    
    * change desc to description.
    
    * add check user and definitions function when delete tenant
    
    * update
    
    * change desc to description.
    
    * change desc to description.
    
    * change desc to description.
    
    * remove check resources when delete tenant
    
    * change desc to description.
    
    * change mybatisplus version to 3.2.0
    
    * update
    
    * change the notice to apache.
    
    * update
    
    * update postgre sql
    
    * fix bug: phone can be empty.
    
    * fix bug: postgre test error.
    
    * update create table for postgre quartz
    
    * fix some bugs about postgre.
    
    * update create table for postgre quartz
    
    * add postgre db performance monitor
    
    * add postgre performance monitor
    
    * update performance monitor
    
    * revert
    
    * revert
    
    * fix bug: tasks queue length error
    
    * remove datasource.properties
    
    * change chinese sql to english.
    
    * change chinese sql to english.
    
    * remove unused code.
    
    * remove unused code.
    
    * Modify webpack configuration (#1206)
    
    * add more message for java-doc (#1209)
    
    * move updateTaskState into try/catch block in case of exception
    
    * fix NPE
    
    * using conf.getInt instead of getString
    
    * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
    for AlertDao, correct the spelling.
    
    * duplicate
    
    * refactor getTaskWorkerGroupId
    
    * add friendly log
    
    * update hearbeat thread num = 1
    
    * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
    
    * 1. move verifyTaskInstanceIsNull after taskInstance
    2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
    
    * fix the message
    
    * delete before check to avoid KeeperException$NoNodeException
    
    * fix the message
    
    * check processInstance state before delete tenant
    
    * check processInstance state before delete worker group
    
    * refactor
    
    * merge api constants into common constatns
    
    * update the resource perm
    
    * update the dataSource perm
    
    * fix CheckUtils.checkUserParams method
    
    * update AlertGroupService, extends from BaseService, remove duplicate methods
    
    * refactor
    
    * modify method name
    
    * add hasProjectAndPerm method
    
    * using checkProject instead of getResultStatus
    
    * delete checkAuth method, using hasProjectAndPerm instead.
    
    * correct spelling
    
    * add transactional for deleteWorkerGroupById
    
    * add Transactional for deleteProcessInstanceById method
    
    * change sqlSessionTemplate singleton
    
    * change sqlSessionTemplate singleton and reformat code
    
    * fix unsuitable error message
    
    * update shutdownhook methods
    
    * fix worker log bug
    
    * fix api server debug mode bug
    
    * upgrade zk version
    
    * delete this line ,for zkClient.close() will do the whole thing
    
    * fix master server shutdown error
    
    * degrade zk version and add FourLetterWordMain class
    
    * fix PathChildrenCache not close
    
    * add Transactional for createSession method
    
    * add more message for java-doc
    
    * add java doc for common module (#1213)
    
    * dao method comments and useless code modify (#1214)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs
    
    * nginx conf modify
    
    * dockerfile application.properties modify
    
    * dockerfile email address change
    
    * the alert module is modified in English.
    
    * alert server comment and chinese modify
    
    * api server useless code and chinese modify
    
    * common,dao,server useless code and chinese modify
    
    * change chinese to english
    
    * dao method comments and useless code modify
    
    * Change all Chinese names to English (#1207)
    
    * Modify webpack configuration
    
    * Change all Chinese names to English
    
    * add progress-bar-webpack-plugin (#1215)
    
    * Modify webpack configuration
    
    * Change all Chinese names to English
    
    * add progress-bar-webpack-plugin
    
    * Add method and parameters comments (#1220)
    
    * rename from DatasourceUserMapper to DataSourceUserMapper
    
    * add unit test in UserMapper and WorkerGroupMapper
    
    * change cn.escheduler to org.apache.dolphinscheduler
    
    * add unit test in UdfFuncMapperTest
    
    * add unit test in UdfFuncMapperTest
    
    * remove DatabaseConfiguration
    
    * add ConnectionFactoryTest
    
    * cal duration in processInstancesList
    
    * change desc to description
    
    * change table name in mysql ddl
    
    * change table name in mysql ddl
    
    * change escheduler to dolphinscheduler
    
    * change escheduler to dolphinscheduler
    
    * change escheduler to dolphinscheduler
    
    * remove log4j-1.2-api and modify AlertMapperTest
    
    * remove log4j-1.2-api
    
    * Add alertDao to spring management
    
    * Add alertDao to spring management
    
    * get SqlSessionFactory from MybatisSqlSessionFactoryBean
    
    * get processDao by DaoFactory
    
    * read druid properties in ConneciontFactory
    
    * read druid properties in ConneciontFactory
    
    * change get alertDao by spring to DaoFactory
    
    * add log4j to resolve #967
    
    * resole verify udf name error and delete udf error
    
    * Determine if principal is empty
    
    * Determine whether the logon user has the right to delete the project
    
    * Fixed an issue that produced attatch file named such as ATT00002.bin
    
    * fix too many connection in upgrade or create
    
    * fix NEED_FAULT_TOLERANCE and WAITTING_THREAD count fail
    
    * Added a judgment on whether the currently login user is an administrator
    
    * fix update udf database not change and create time is changed
    
    * add enterprise.wechat.enable to decide whether to send enterprise WeChat
    
    * change method check
    
    * Remove the administrator's judgment on query access token list
    
    * only admin can create worker group
    
    * delete alert group need delete the relation of user and alert group
    
    * add timeout in proxy when upload large resource
    
    * add gets scheduled times by expect fire times
    
    * add gets scheduled times by expect fire times
    
    * Increase the judgment of whether it is admin
    
    * Increase the judgment of whether it is admin
    
    * when delete access token add whether login user has perm to delete
    
    * change mysql-connector-java scope to test
    
    * update scm test
    
    * add profile test
    
    * Add method and parameters comments
    
    * roll back
    
    * add some notes (#1221)
    
    * update english documents
    
    * refactor zk client
    
    * update documents
    
    * update zkclient
    
    * update zkclient
    
    * update documents
    
    * add architecture-design
    
    * change i18n
    
    * update i18n
    
    * update english documents
    
    * add architecture-design
    
    * update english documents
    
    * update en-US documents
    
    * add architecture-design
    
    * update demo site
    
    * add mybatis plus model
    
    * modify mybatisplus
    
    * modify mybatisplus
    
    * change interface by mybatisplus
    
    * add unit test
    
    * refactor dao interface.
    
    * add unit test for dao...
    
    * add unit test for dao...
    
    * add unit test for dao...
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
    
    * update some dao bugs
    
    * update for some bugs
    
    * update some bugs
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
    
    * update
    
    * update
    
    * add multiply settings for application.yml
    
    * add multiply settings for application.yml
    
    * revert
    
    * update configuration settings in task record dao...
    
    * change application_master to application-master
    
    * change application_master to application-master
    
    * update application.yml to application.properties
    
    * revert
    
    * revert
    
    * add properties
    
    * add properties
    
    * revert
    
    * revert
    
    * add api start up..
    add alert send try catch
    
    * update dao info level
    
    * fix bug: task cannot submit when recovery failover
    
    * fix bug: task cannot submit when recovery failover
    
    * merge from dev-db
    
    * revert
    
    * revert
    
    * fix bug: get process definition list failed.
    
    * fix bug: process instance interval is error
    
    * revert
    
    * revert
    
    * update
    
    * support stop submit success tasks
    
    * update kill process
    
    * update for stop process
    
    * update for stop process
    
    * add some logs for stop process
    
    * update for small bug.
    
    * add check strategy before submit task
    
    * revert
    
    * update
    
    * update
    
    * revert
    
    * wait task instance exists if null.
    
    * revert
    
    * update
    
    * change desc to description.
    
    * add check user and definitions function when delete tenant
    
    * update
    
    * change desc to description.
    
    * change desc to description.
    
    * change desc to description.
    
    * remove check resources when delete tenant
    
    * change desc to description.
    
    * change mybatisplus version to 3.2.0
    
    * update
    
    * change the notice to apache.
    
    * update
    
    * update postgre sql
    
    * fix bug: phone can be empty.
    
    * fix bug: postgre test error.
    
    * update create table for postgre quartz
    
    * fix some bugs about postgre.
    
    * update create table for postgre quartz
    
    * add postgre db performance monitor
    
    * add postgre performance monitor
    
    * update performance monitor
    
    * revert
    
    * revert
    
    * fix bug: tasks queue length error
    
    * remove datasource.properties
    
    * change chinese sql to english.
    
    * change chinese sql to english.
    
    * remove unused code.
    
    * remove unused code.
    
    * add some notes
    
    * update some notes
    
    * update some notes
    
    * update mbatisplus version
    
    * update lombok version
    
    * update lombok version
    
    * revert
    
    * merge from dev-db
    
    * remove version
    
    * update npm install pom
    
    * add front assembly
    
    * add front module
    
    * change verison to 1.2.0-release-SNAPSHOT
    
    * add name in pom and remove compile
    
    * add name in pom
    
    * add licenses in assemble
    
    * change version to 1.2.0-RC1-SNAPSHOT
    
    * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
    
    # Conflicts:
    #	dolphinscheduler-alert/pom.xml
    #	dolphinscheduler-api/pom.xml
    #	dolphinscheduler-common/pom.xml
    #	dolphinscheduler-dao/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
    #	dolphinscheduler-dist/pom.xml
    #	dolphinscheduler-rpc/pom.xml
    #	dolphinscheduler-server/pom.xml
    #	dolphinscheduler-ui/pom.xml
    #	pom.xml
    change assembly id
    
    * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
    
    # Conflicts:
    #	dolphinscheduler-alert/pom.xml
    #	dolphinscheduler-api/pom.xml
    #	dolphinscheduler-common/pom.xml
    #	dolphinscheduler-dao/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
    #	dolphinscheduler-dist/pom.xml
    #	dolphinscheduler-rpc/pom.xml
    #	dolphinscheduler-server/pom.xml
    #	dolphinscheduler-ui/pom.xml
    #	pom.xml
    add DISCLAIMER
    
    * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
    
    # Conflicts:
    #	dolphinscheduler-alert/pom.xml
    #	dolphinscheduler-api/pom.xml
    #	dolphinscheduler-common/pom.xml
    #	dolphinscheduler-dao/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
    #	dolphinscheduler-dist/pom.xml
    #	dolphinscheduler-rpc/pom.xml
    #	dolphinscheduler-server/pom.xml
    #	dolphinscheduler-ui/pom.xml
    #	pom.xml
    add license in xml and properties
    
    * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
    
    # Conflicts:
    #	dolphinscheduler-alert/pom.xml
    #	dolphinscheduler-api/pom.xml
    #	dolphinscheduler-common/pom.xml
    #	dolphinscheduler-dao/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
    #	dolphinscheduler-dist/pom.xml
    #	dolphinscheduler-rpc/pom.xml
    #	dolphinscheduler-server/pom.xml
    #	dolphinscheduler-ui/pom.xml
    #	pom.xml
    add license in dockerfile
    
    * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
    
    # Conflicts:
    #	dolphinscheduler-alert/pom.xml
    #	dolphinscheduler-api/pom.xml
    #	dolphinscheduler-common/pom.xml
    #	dolphinscheduler-dao/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
    #	dolphinscheduler-dist/pom.xml
    #	dolphinscheduler-rpc/pom.xml
    #	dolphinscheduler-server/pom.xml
    #	dolphinscheduler-ui/pom.xml
    #	pom.xml
    add license in script and sql
    
    * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
    
    # Conflicts:
    #	dolphinscheduler-alert/pom.xml
    #	dolphinscheduler-api/pom.xml
    #	dolphinscheduler-common/pom.xml
    #	dolphinscheduler-dao/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
    #	dolphinscheduler-dist/pom.xml
    #	dolphinscheduler-rpc/pom.xml
    #	dolphinscheduler-server/pom.xml
    #	dolphinscheduler-ui/pom.xml
    #	pom.xml
    add license in script and sql
    
    * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
    
    # Conflicts:
    #	dolphinscheduler-alert/pom.xml
    #	dolphinscheduler-api/pom.xml
    #	dolphinscheduler-common/pom.xml
    #	dolphinscheduler-dao/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
    #	dolphinscheduler-dist/pom.xml
    #	dolphinscheduler-rpc/pom.xml
    #	dolphinscheduler-server/pom.xml
    #	dolphinscheduler-ui/pom.xml
    #	pom.xml
    add license in ci
    
    * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
    
    # Conflicts:
    #	dolphinscheduler-alert/pom.xml
    #	dolphinscheduler-api/pom.xml
    #	dolphinscheduler-common/pom.xml
    #	dolphinscheduler-dao/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
    #	dolphinscheduler-dist/pom.xml
    #	dolphinscheduler-rpc/pom.xml
    #	dolphinscheduler-server/pom.xml
    #	dolphinscheduler-ui/pom.xml
    #	pom.xml
    change version to 1.2.0-SNAPSHOT
    
    * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
    
    # Conflicts:
    #	dolphinscheduler-alert/pom.xml
    #	dolphinscheduler-api/pom.xml
    #	dolphinscheduler-common/pom.xml
    #	dolphinscheduler-dao/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
    #	dolphinscheduler-dist/pom.xml
    #	dolphinscheduler-rpc/pom.xml
    #	dolphinscheduler-server/pom.xml
    #	dolphinscheduler-ui/pom.xml
    #	pom.xml
    set defalut db type postgresql
    
    * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
    
    # Conflicts:
    #	dolphinscheduler-alert/pom.xml
    #	dolphinscheduler-api/pom.xml
    #	dolphinscheduler-common/pom.xml
    #	dolphinscheduler-dao/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
    #	dolphinscheduler-dist/pom.xml
    #	dolphinscheduler-rpc/pom.xml
    #	dolphinscheduler-server/pom.xml
    #	dolphinscheduler-ui/pom.xml
    #	pom.xml
    set defalut db type postgresql
    
    * change org.quartz.jobStore.driverDelegateClass
    
    * Add comments in method params
    
    * update readme from branch dev
    
    * update content in how to contribute
    
    * change postgresql default port
    
    * change version 1.2.0-SNAPSHOT
    
    * remove antrun plugin
    
    * add how to build
    
    * add how to build
    
    * remove dir format in assembly
    
    * Remove the judgment of whether it is admin
    
    * reset version to 1.2.0-SNAPSHOT
    
    * Remove the judgment of whether it is admin
    
    * Fix bug the administrator authorizes the project to ordinary users,but ordinary users cannot see the process definition created by the administrator
    
    * Added description of bug fixes about create dolphinscheduler sql failed
    
    * reset version to 1.2.0-SNAPSHOT
    
    * update dml when init queue table
    
    * reset version to 1.2.0-SNAPSHOT
    
    * Add whether the administrator's judgment
    
    * Add method comments
    
    * reset version to 1.2.0-SNAPSHOT
    
    * Determines whether the s database is empty
    
    * Determines whether the s database is empty
    
    * add selectUdfById (#1331)
    
    * change cn.escheduler to org.apache.dolphinscheduler
    
    * add unit test in UdfFuncMapperTest
    
    * add unit test in UdfFuncMapperTest
    
    * remove DatabaseConfiguration
    
    * add ConnectionFactoryTest
    
    * cal duration in processInstancesList
    
    * change desc to description
    
    * change table name in mysql ddl
    
    * change table name in mysql ddl
    
    * change escheduler to dolphinscheduler
    
    * change escheduler to dolphinscheduler
    
    * change escheduler to dolphinscheduler
    
    * remove log4j-1.2-api and modify AlertMapperTest
    
    * remove log4j-1.2-api
    
    * Add alertDao to spring management
    
    * Add alertDao to spring management
    
    * get SqlSessionFactory from MybatisSqlSessionFactoryBean
    
    * get processDao by DaoFactory
    
    * read druid properties in ConneciontFactory
    
    * read druid properties in ConneciontFactory
    
    * change get alertDao by spring to DaoFactory
    
    * add log4j to resolve #967
    
    * resole verify udf name error and delete udf error
    
    * Determine if principal is empty
    
    * Determine whether the logon user has the right to delete the project
    
    * Fixed an issue that produced attatch file named such as ATT00002.bin
    
    * fix too many connection in upgrade or create
    
    * fix NEED_FAULT_TOLERANCE and WAITTING_THREAD count fail
    
    * Added a judgment on whether the currently login user is an administrator
    
    * fix update udf database not change and create time is changed
    
    * add enterprise.wechat.enable to decide whether to send enterprise WeChat
    
    * change method check
    
    * Remove the administrator's judgment on query access token list
    
    * only admin can create worker group
    
    * delete alert group need delete the relation of user and alert group
    
    * add timeout in proxy when upload large resource
    
    * add gets scheduled times by expect fire times
    
    * add gets scheduled times by expect fire times
    
    * Increase the judgment of whether it is admin
    
    * Increase the judgment of whether it is admin
    
    * when delete access token add whether login user has perm to delete
    
    * change mysql-connector-java scope to test
    
    * update scm test
    
    * add profile test
    
    * add profile test
    
    * add maven.deploy.skip true
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * add dependency
    
    * add javadoc
    
    * add antrun
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * reset pgsql (#1178)
    
    + 1
    
    * add javadoc
    
    * add javadoc
    
    * [maven-release-plugin] rollback the release of 1.2.0
    
    * add javadoc
    
    * Ans UI upgrade to version 0.1.0 (#1181)
    
    + 1
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * Administrators group prohibit deletion (#1182)
    
    * Ans UI upgrade to version 0.1.0
    
    * Administrators group prohibit deletion
    
    * add javadoc
    
    * add ui pom
    
    * fix master server shutdown error (#1177)
    
    * move updateTaskState into try/catch block in case of exception
    
    * fix NPE
    
    * using conf.getInt instead of getString
    
    * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
    for AlertDao, correct the spelling.
    
    * duplicate
    
    * refactor getTaskWorkerGroupId
    
    * add friendly log
    
    * update hearbeat thread num = 1
    
    * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
    
    * 1. move verifyTaskInstanceIsNull after taskInstance
    2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
    
    * fix the message
    
    * delete before check to avoid KeeperException$NoNodeException
    
    * fix the message
    
    * check processInstance state before delete tenant
    
    * check processInstance state before delete worker group
    
    * refactor
    
    * merge api constants into common constatns
    
    * update the resource perm
    
    * update the dataSource perm
    
    * fix CheckUtils.checkUserParams method
    
    * update AlertGroupService, extends from BaseService, remove duplicate methods
    
    * refactor
    
    * modify method name
    
    * add hasProjectAndPerm method
    
    * using checkProject instead of getResultStatus
    
    * delete checkAuth method, using hasProjectAndPerm instead.
    
    * correct spelling
    
    * add transactional for deleteWorkerGroupById
    
    * add Transactional for deleteProcessInstanceById method
    
    * change sqlSessionTemplate singleton
    
    * change sqlSessionTemplate singleton and reformat code
    
    * fix unsuitable error message
    
    * update shutdownhook methods
    
    * fix worker log bug
    
    * fix api server debug mode bug
    
    * upgrade zk version
    
    * delete this line ,for zkClient.close() will do the whole thing
    
    * fix master server shutdown error
    
    * degrade zk version and add FourLetterWordMain class (#1183)
    
    * move updateTaskState into try/catch block in case of exception
    
    * fix NPE
    
    * using conf.getInt instead of getString
    
    * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
    for AlertDao, correct the spelling.
    
    * duplicate
    
    * refactor getTaskWorkerGroupId
    
    * add friendly log
    
    * update hearbeat thread num = 1
    
    * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
    
    * 1. move verifyTaskInstanceIsNull after taskInstance
    2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
    
    * fix the message
    
    * delete before check to avoid KeeperException$NoNodeException
    
    * fix the message
    
    * check processInstance state before delete tenant
    
    * check processInstance state before delete worker group
    
    * refactor
    
    * merge api constants into common constatns
    
    * update the resource perm
    
    * update the dataSource perm
    
    * fix CheckUtils.checkUserParams method
    
    * update AlertGroupService, extends from BaseService, remove duplicate methods
    
    * refactor
    
    * modify method name
    
    * add hasProjectAndPerm method
    
    * using checkProject instead of getResultStatus
    
    * delete checkAuth method, using hasProjectAndPerm instead.
    
    * correct spelling
    
    * add transactional for deleteWorkerGroupById
    
    * add Transactional for deleteProcessInstanceById method
    
    * change sqlSessionTemplate singleton
    
    * change sqlSessionTemplate singleton and reformat code
    
    * fix unsuitable error message
    
    * update shutdownhook methods
    
    * fix worker log bug
    
    * fix api server debug mode bug
    
    * upgrade zk version
    
    * delete this line ,for zkClient.close() will do the whole thing
    
    * fix master server shutdown error
    
    * degrade zk version and add FourLetterWordMain class
    
    * add ui pom
    
    * add src pom and assembly
    
    * fix ZKWorkerClient not close PathChildrenCache (#1185)
    
    * move updateTaskState into try/catch block in case of exception
    
    * fix NPE
    
    * using conf.getInt instead of getString
    
    * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
    for AlertDao, correct the spelling.
    
    * duplicate
    
    * refactor getTaskWorkerGroupId
    
    * add friendly log
    
    * update hearbeat thread num = 1
    
    * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
    
    * 1. move verifyTaskInstanceIsNull after taskInstance
    2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
    
    * fix the message
    
    * delete before check to avoid KeeperException$NoNodeException
    
    * fix the message
    
    * check processInstance state before delete tenant
    
    * check processInstance state before delete worker group
    
    * refactor
    
    * merge api constants into common constatns
    
    * update the resource perm
    
    * update the dataSource perm
    
    * fix CheckUtils.checkUserParams method
    
    * update AlertGroupService, extends from BaseService, remove duplicate methods
    
    * refactor
    
    * modify method name
    
    * add hasProjectAndPerm method
    
    * using checkProject instead of getResultStatus
    
    * delete checkAuth method, using hasProjectAndPerm instead.
    
    * correct spelling
    
    * add transactional for deleteWorkerGroupById
    
    * add Transactional for deleteProcessInstanceById method
    
    * change sqlSessionTemplate singleton
    
    * change sqlSessionTemplate singleton and reformat code
    
    * fix unsuitable error message
    
    * update shutdownhook methods
    
    * fix worker log bug
    
    * fix api server debug mode bug
    
    * upgrade zk version
    
    * delete this line ,for zkClient.close() will do the whole thing
    
    * fix master server shutdown error
    
    * degrade zk version and add FourLetterWordMain class
    
    * fix PathChildrenCache not close
    
    * add Transactional for createSession method (#1186)
    
    * move updateTaskState into try/catch block in case of exception
    
    * fix NPE
    
    * using conf.getInt instead of getString
    
    * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
    for AlertDao, correct the spelling.
    
    * duplicate
    
    * refactor getTaskWorkerGroupId
    
    * add friendly log
    
    * update hearbeat thread num = 1
    
    * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
    
    * 1. move verifyTaskInstanceIsNull after taskInstance
    2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
    
    * fix the message
    
    * delete before check to avoid KeeperException$NoNodeException
    
    * fix the message
    
    * check processInstance state before delete tenant
    
    * check processInstance state before delete worker group
    
    * refactor
    
    * merge api constants into common constatns
    
    * update the resource perm
    
    * update the dataSource perm
    
    * fix CheckUtils.checkUserParams method
    
    * update AlertGroupService, extends from BaseService, remove duplicate methods
    
    * refactor
    
    * modify method name
    
    * add hasProjectAndPerm method
    
    * using checkProject instead of getResultStatus
    
    * delete checkAuth method, using hasProjectAndPerm instead.
    
    * correct spelling
    
    * add transactional for deleteWorkerGroupById
    
    * add Transactional for deleteProcessInstanceById method
    
    * change sqlSessionTemplate singleton
    
    * change sqlSessionTemplate singleton and reformat code
    
    * fix unsuitable error message
    
    * update shutdownhook methods
    
    * fix worker log bug
    
    * fix api server debug mode bug
    
    * upgrade zk version
    
    * delete this line ,for zkClient.close() will do the whole thing
    
    * fix master server shutdown error
    
    * degrade zk version and add FourLetterWordMain class
    
    * fix PathChildrenCache not close
    
    * add Transactional for createSession method
    
    * add src pom and assembly
    
    * add src pom and assembly
    
    * add src pom and assembly
    
    * add src pom and assembly
    
    * dockerfile dao application.properties ,install.sh modify and application.properties modify (#1187)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * add src pom and assembly
    
    * add src pom and assembly
    
    * dockerfile startup.sh modify (#1189)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs (#1191)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs
    
    * nginx conf modify
    
    * dockerfile application.properties modify
    
    * dockerfile conf modify (#1192)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs
    
    * nginx conf modify
    
    * dockerfile application.properties modify
    
    * dockerfile conf modify (#1193)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs
    
    * nginx conf modify
    
    * dockerfile application.properties modify
    
    * dockerfile email address change (#1194)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs
    
    * nginx conf modify
    
    * dockerfile application.properties modify
    
    * dockerfile email address change
    
    * the alert module is modified in english (#1195)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs
    
    * nginx conf modify
    
    * dockerfile application.properties modify
    
    * dockerfile email address change
    
    * the alert module is modified in English.
    
    * alert server comment and chinese modify
    
    * api server useless code and chinese modify (#1198)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs
    
    * nginx conf modify
    
    * dockerfile application.properties modify
    
    * dockerfile email address change
    
    * the alert module is modified in English.
    
    * alert server comment and chinese modify
    
    * api server useless code and chinese modify
    
    * common,dao,server useless code and chinese modify (#1199)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs
    
    * nginx conf modify
    
    * dockerfile application.properties modify
    
    * dockerfile email address change
    
    * the alert module is modified in English.
    
    * alert server comment and chinese modify
    
    * api server useless code and chinese modify
    
    * common,dao,server useless code and chinese modify
    
    * change chinese sql to english. (#1200)
    
    * update english documents
    
    * refactor zk client
    
    * update documents
    
    * update zkclient
    
    * update zkclient
    
    * update documents
    
    * add architecture-design
    
    * change i18n
    
    * update i18n
    
    * update english documents
    
    * add architecture-design
    
    * update english documents
    
    * update en-US documents
    
    * add architecture-design
    
    * update demo site
    
    * add mybatis plus model
    
    * modify mybatisplus
    
    * modify mybatisplus
    
    * change interface by mybatisplus
    
    * add unit test
    
    * refactor dao interface.
    
    * add unit test for dao...
    
    * add unit test for dao...
    
    * add unit test for dao...
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
    
    * update some dao bugs
    
    * update for some bugs
    
    * update some bugs
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
    
    * update
    
    * update
    
    * add multiply settings for application.yml
    
    * add multiply settings for application.yml
    
    * revert
    
    * update configuration settings in task record dao...
    
    * change application_master to application-master
    
    * change application_master to application-master
    
    * update application.yml to application.properties
    
    * revert
    
    * revert
    
    * add properties
    
    * add properties
    
    * revert
    
    * revert
    
    * add api start up..
    add alert send try catch
    
    * update dao info level
    
    * fix bug: task cannot submit when recovery failover
    
    * fix bug: task cannot submit when recovery failover
    
    * merge from dev-db
    
    * revert
    
    * revert
    
    * fix bug: get process definition list failed.
    
    * fix bug: process instance interval is error
    
    * revert
    
    * revert
    
    * update
    
    * support stop submit success tasks
    
    * update kill process
    
    * update for stop process
    
    * update for stop process
    
    * add some logs for stop process
    
    * update for small bug.
    
    * add check strategy before submit task
    
    * revert
    
    * update
    
    * update
    
    * revert
    
    * wait task instance exists if null.
    
    * revert
    
    * update
    
    * change desc to description.
    
    * add check user and definitions function when delete tenant
    
    * update
    
    * change desc to description.
    
    * change desc to description.
    
    * change desc to description.
    
    * remove check resources when delete tenant
    
    * change desc to description.
    
    * change mybatisplus version to 3.2.0
    
    * update
    
    * change the notice to apache.
    
    * update
    
    * update postgre sql
    
    * fix bug: phone can be empty.
    
    * fix bug: postgre test error.
    
    * update create table for postgre quartz
    
    * fix some bugs about postgre.
    
    * update create table for postgre quartz
    
    * add postgre db performance monitor
    
    * add postgre performance monitor
    
    * update performance monitor
    
    * revert
    
    * revert
    
    * fix bug: tasks queue length error
    
    * remove datasource.properties
    
    * change chinese sql to english.
    
    * change chinese sql to english.
    
    * change chinese to english (#1202)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs
    
    * nginx conf modify
    
    * dockerfile application.properties modify
    
    * dockerfile email address change
    
    * the alert module is modified in English.
    
    * alert server comment and chinese modify
    
    * api server useless code and chinese modify
    
    * common,dao,server useless code and chinese modify
    
    * change chinese to english
    
    * remove unused code (#1204)
    
    * update english documents
    
    * refactor zk client
    
    * update documents
    
    * update zkclient
    
    * update zkclient
    
    * update documents
    
    * add architecture-design
    
    * change i18n
    
    * update i18n
    
    * update english documents
    
    * add architecture-design
    
    * update english documents
    
    * update en-US documents
    
    * add architecture-design
    
    * update demo site
    
    * add mybatis plus model
    
    * modify mybatisplus
    
    * modify mybatisplus
    
    * change interface by mybatisplus
    
    * add unit test
    
    * refactor dao interface.
    
    * add unit test for dao...
    
    * add unit test for dao...
    
    * add unit test for dao...
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
    
    * update some dao bugs
    
    * update for some bugs
    
    * update some bugs
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
    
    * update
    
    * update
    
    * add multiply settings for application.yml
    
    * add multiply settings for application.yml
    
    * revert
    
    * update configuration settings in task record dao...
    
    * change application_master to application-master
    
    * change application_master to application-master
    
    * update application.yml to application.properties
    
    * revert
    
    * revert
    
    * add properties
    
    * add properties
    
    * revert
    
    * revert
    
    * add api start up..
    add alert send try catch
    
    * update dao info level
    
    * fix bug: task cannot submit when recovery failover
    
    * fix bug: task cannot submit when recovery failover
    
    * merge from dev-db
    
    * revert
    
    * revert
    
    * fix bug: get process definition list failed.
    
    * fix bug: process instance interval is error
    
    * revert
    
    * revert
    
    * update
    
    * support stop submit success tasks
    
    * update kill process
    
    * update for stop process
    
    * update for stop process
    
    * add some logs for stop process
    
    * update for small bug.
    
    * add check strategy before submit task
    
    * revert
    
    * update
    
    * update
    
    * revert
    
    * wait task instance exists if null.
    
    * revert
    
    * update
    
    * change desc to description.
    
    * add check user and definitions function when delete tenant
    
    * update
    
    * change desc to description.
    
    * change desc to description.
    
    * change desc to description.
    
    * remove check resources when delete tenant
    
    * change desc to description.
    
    * change mybatisplus version to 3.2.0
    
    * update
    
    * change the notice to apache.
    
    * update
    
    * update postgre sql
    
    * fix bug: phone can be empty.
    
    * fix bug: postgre test error.
    
    * update create table for postgre quartz
    
    * fix some bugs about postgre.
    
    * update create table for postgre quartz
    
    * add postgre db performance monitor
    
    * add postgre performance monitor
    
    * update performance monitor
    
    * revert
    
    * revert
    
    * fix bug: tasks queue length error
    
    * remove datasource.properties
    
    * change chinese sql to english.
    
    * change chinese sql to english.
    
    * remove unused code.
    
    * remove unused code.
    
    * Modify webpack configuration (#1206)
    
    * add more message for java-doc (#1209)
    
    * move updateTaskState into try/catch block in case of exception
    
    * fix NPE
    
    * using conf.getInt instead of getString
    
    * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
    for AlertDao, correct the spelling.
    
    * duplicate
    
    * refactor getTaskWorkerGroupId
    
    * add friendly log
    
    * update hearbeat thread num = 1
    
    * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
    
    * 1. move verifyTaskInstanceIsNull after taskInstance
    2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
    
    * fix the message
    
    * delete before check to avoid KeeperException$NoNodeException
    
    * fix the message
    
    * check processInstance state before delete tenant
    
    * check processInstance state before delete worker group
    
    * refactor
    
    * merge api constants into common constatns
    
    * update the resource perm
    
    * update the dataSource perm
    
    * fix CheckUtils.checkUserParams method
    
    * update AlertGroupService, extends from BaseService, remove duplicate methods
    
    * refactor
    
    * modify method name
    
    * add hasProjectAndPerm method
    
    * using checkProject instead of getResultStatus
    
    * delete checkAuth method, using hasProjectAndPerm instead.
    
    * correct spelling
    
    * add transactional for deleteWorkerGroupById
    
    * add Transactional for deleteProcessInstanceById method
    
    * change sqlSessionTemplate singleton
    
    * change sqlSessionTemplate singleton and reformat code
    
    * fix unsuitable error message
    
    * update shutdownhook methods
    
    * fix worker log bug
    
    * fix api server debug mode bug
    
    * upgrade zk version
    
    * delete this line ,for zkClient.close() will do the whole thing
    
    * fix master server shutdown error
    
    * degrade zk version and add FourLetterWordMain class
    
    * fix PathChildrenCache not close
    
    * add Transactional for createSession method
    
    * add more message for java-doc
    
    * add java doc for common module (#1213)
    
    * dao method comments and useless code modify (#1214)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs
    
    * nginx conf modify
    
    * dockerfile application.properties modify
    
    * dockerfile email address change
    
    * the alert module is modified in English.
    
    * alert server comment and chinese modify
    
    * api server useless code and chinese modify
    
    * common,dao,server useless code and chinese modify
    
    * change chinese to english
    
    * dao method comments and useless code modify
    
    * Change all Chinese names to English (#1207)
    
    * Modify webpack configuration
    
    * Change all Chinese names to English
    
    * add progress-bar-webpack-plugin (#1215)
    
    * Modify webpack configuration
    
    * Change all Chinese names to English
    
    * add progress-bar-webpack-plugin
    
    * Add method and parameters comments (#1220)
    
    * rename from DatasourceUserMapper to DataSourceUserMapper
    
    * add unit test in UserMapper and WorkerGroupMapper
    
    * change cn.escheduler to org.apache.dolphinscheduler
    
    * add unit test in UdfFuncMapperTest
    
    * add unit test in UdfFuncMapperTest
    
    * remove DatabaseConfiguration
    
    * add ConnectionFactoryTest
    
    * cal duration in processInstancesList
    
    * change desc to description
    
    * change table name in mysql ddl
    
    * change table name in mysql ddl
    
    * change escheduler to dolphinscheduler
    
    * change escheduler to dolphinscheduler
    
    * change escheduler to dolphinscheduler
    
    * remove log4j-1.2-api and modify AlertMapperTest
    
    * remove log4j-1.2-api
    
    * Add alertDao to spring management
    
    * Add alertDao to spring management
    
    * get SqlSessionFactory from MybatisSqlSessionFactoryBean
    
    * get processDao by DaoFactory
    
    * read druid properties in ConneciontFactory
    
    * read druid properties in ConneciontFactory
    
    * change get alertDao by spring to DaoFactory
    
    * add log4j to resolve #967
    
    * resole verify udf name error and delete udf error
    
    * Determine if principal is empty
    
    * Determine whether the logon user has the right to delete the project
    
    * Fixed an issue that produced attatch file named such as ATT00002.bin
    
    * fix too many connection in upgrade or create
    
    * fix NEED_FAULT_TOLERANCE and WAITTING_THREAD count fail
    
    * Added a judgment on whether the currently login user is an administrator
    
    * fix update udf database not change and create time is changed
    
    * add enterprise.wechat.enable to decide whether to send enterprise WeChat
    
    * change method check
    
    * Remove the administrator's judgment on query access token list
    
    * only admin can create worker group
    
    * delete alert group need delete the relation of user and alert group
    
    * add timeout in proxy when upload large resource
    
    * add gets scheduled times by expect fire times
    
    * add gets scheduled times by expect fire times
    
    * Increase the judgment of whether it is admin
    
    * Increase the judgment of whether it is admin
    
    * when delete access token add whether login user has perm to delete
    
    * change mysql-connector-java scope to test
    
    * update scm test
    
    * add profile test
    
    * Add method and parameters comments
    
    * roll back
    
    * add some notes (#1221)
    
    * update english documents
    
    * refactor zk client
    
    * update documents
    
    * update zkclient
    
    * update zkclient
    
    * update documents
    
    * add architecture-design
    
    * change i18n
    
    * update i18n
    
    * update english documents
    
    * add architecture-design
    
    * update english documents
    
    * update en-US documents
    
    * add architecture-design
    
    * update demo site
    
    * add mybatis plus model
    
    * modify mybatisplus
    
    * modify mybatisplus
    
    * change interface by mybatisplus
    
    * add unit test
    
    * refactor dao interface.
    
    * add unit test for dao...
    
    * add unit test for dao...
    
    * add unit test for dao...
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
    #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
    #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
    
    * update some dao bugs
    
    * update for some bugs
    
    * update some bugs
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
    #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
    
    * update
    
    * update
    
    * add multiply settings for application.yml
    
    * add multiply settings for application.yml
    
    * revert
    
    * update configuration settings in task record dao...
    
    * change application_master to application-master
    
    * change application_master to application-master
    
    * update application.yml to application.properties
    
    * revert
    
    * revert
    
    * add properties
    
    * add properties
    
    * revert
    
    * revert
    
    * add api start up..
    add alert send try catch
    
    * update dao info level
    
    * fix bug: task cannot submit when recovery failover
    
    * fix bug: task cannot submit when recovery failover
    
    * merge from dev-db
    
    * revert
    
    * revert
    
    * fix bug: get process definition list failed.
    
    * fix bug: process instance interval is error
    
    * revert
    
    * revert
    
    * update
    
    * support stop submit success tasks
    
    * update kill process
    
    * update for stop process
    
    * update for stop process
    
    * add some logs for stop process
    
    * update for small bug.
    
    * add check strategy before submit task
    
    * revert
    
    * update
    
    * update
    
    * revert
    
    * wait task instance exists if null.
    
    * revert
    
    * update
    
    * change desc to description.
    
    * add check user and definitions function when delete tenant
    
    * update
    
    * change desc to description.
    
    * change desc to description.
    
    * change desc to description.
    
    * remove check resources when delete tenant
    
    * change desc to description.
    
    * change mybatisplus version to 3.2.0
    
    * update
    
    * change the notice to apache.
    
    * update
    
    * update postgre sql
    
    * fix bug: phone can be empty.
    
    * fix bug: postgre test error.
    
    * update create table for postgre quartz
    
    * fix some bugs about postgre.
    
    * update create table for postgre quartz
    
    * add postgre db performance monitor
    
    * add postgre performance monitor
    
    * update performance monitor
    
    * revert
    
    * revert
    
    * fix bug: tasks queue length error
    
    * remove datasource.properties
    
    * change chinese sql to english.
    
    * change chinese sql to english.
    
    * remove unused code.
    
    * remove unused code.
    
    * add some notes
    
    * update some notes
    
    * update some notes
    
    * update mbatisplus version
    
    * update lombok version
    
    * update lombok version
    
    * revert
    
    * merge from dev-db
    
    * remove version
    
    * update npm install pom
    
    * add front assembly
    
    * add front module
    
    * change verison to 1.2.0-release-SNAPSHOT
    
    * add name in pom and remove compile
    
    * add name in pom
    
    * add licenses in assemble
    
    * change version to 1.2.0-RC1-SNAPSHOT
    
    * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
    
    # Conflicts:
    #	dolphinscheduler-alert/pom.xml
    #	dolphinscheduler-api/pom.xml
    #	dolphinscheduler-common/pom.xml
    #	dolphinscheduler-dao/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
    #	dolphinscheduler-dist/pom.xml
    #	dolphinscheduler-rpc/pom.xml
    #	dolphinscheduler-server/pom.xml
    #	dolphinscheduler-ui/pom.xml
    #	pom.xml
    change assembly id
    
    * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
    
    # Conflicts:
    #	dolphinscheduler-alert/pom.xml
    #	dolphinscheduler-api/pom.xml
    #	dolphinscheduler-common/pom.xml
    #	dolphinscheduler-dao/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
    #	dolphinscheduler-dist/pom.xml
    #	dolphinscheduler-rpc/pom.xml
    #	dolphinscheduler-server/pom.xml
    #	dolphinscheduler-ui/pom.xml
    #	pom.xml
    add DISCLAIMER
    
    * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
    
    # Conflicts:
    #	dolphinscheduler-alert/pom.xml
    #	dolphinscheduler-api/pom.xml
    #	dolphinscheduler-common/pom.xml
    #	dolphinscheduler-dao/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
    #	dolphinscheduler-dist/pom.xml
    #	dolphinscheduler-rpc/pom.xml
    #	dolphinscheduler-server/pom.xml
    #	dolphinscheduler-ui/pom.xml
    #	pom.xml
    add license in xml and properties
    
    * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
    
    # Conflicts:
    #	dolphinscheduler-alert/pom.xml
    #	dolphinscheduler-api/pom.xml
    #	dolphinscheduler-common/pom.xml
    #	dolphinscheduler-dao/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
    #	dolphinscheduler-dist/pom.xml
    #	dolphinscheduler-rpc/pom.xml
    #	dolphinscheduler-server/pom.xml
    #	dolphinscheduler-ui/pom.xml
    #	pom.xml
    add license in dockerfile
    
    * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
    
    # Conflicts:
    #	dolphinscheduler-alert/pom.xml
    #	dolphinscheduler-api/pom.xml
    #	dolphinscheduler-common/pom.xml
    #	dolphinscheduler-dao/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
    #	dolphinscheduler-dist/pom.xml
    #	dolphinscheduler-rpc/pom.xml
    #	dolphinscheduler-server/pom.xml
    #	dolphinscheduler-ui/pom.xml
    #	pom.xml
    add license in script and sql
    
    * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
    
    # Conflicts:
    #	dolphinscheduler-alert/pom.xml
    #	dolphinscheduler-api/pom.xml
    #	dolphinscheduler-common/pom.xml
    #	dolphinscheduler-dao/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
    #	dolphinscheduler-dist/pom.xml
    #	dolphinscheduler-rpc/pom.xml
    #	dolphinscheduler-server/pom.xml
    #	dolphinscheduler-ui/pom.xml
    #	pom.xml
    add license in script and sql
    
    * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
    
    # Conflicts:
    #	dolphinscheduler-alert/pom.xml
    #	dolphinscheduler-api/pom.xml
    #	dolphinscheduler-common/pom.xml
    #	dolphinscheduler-dao/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
    #	dolphinscheduler-dist/pom.xml
    #	dolphinscheduler-rpc/pom.xml
    #	dolphinscheduler-server/pom.xml
    #	dolphinscheduler-ui/pom.xml
    #	pom.xml
    add license in ci
    
    * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
    
    # Conflicts:
    #	dolphinscheduler-alert/pom.xml
    #	dolphinscheduler-api/pom.xml
    #	dolphinscheduler-common/pom.xml
    #	dolphinscheduler-dao/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
    #	dolphinscheduler-dist/pom.xml
    #	dolphinscheduler-rpc/pom.xml
    #	dolphinscheduler-server/pom.xml
    #	dolphinscheduler-ui/pom.xml
    #	pom.xml
    change version to 1.2.0-SNAPSHOT
    
    * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
    
    # Conflicts:
    #	dolphinscheduler-alert/pom.xml
    #	dolphinscheduler-api/pom.xml
    #	dolphinscheduler-common/pom.xml
    #	dolphinscheduler-dao/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
    #	dolphinscheduler-dist/pom.xml
    #	dolphinscheduler-rpc/pom.xml
    #	dolphinscheduler-server/pom.xml
    #	dolphinscheduler-ui/pom.xml
    #	pom.xml
    set defalut db type postgresql
    
    * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
    
    # Conflicts:
    #	dolphinscheduler-alert/pom.xml
    #	dolphinscheduler-api/pom.xml
    #	dolphinscheduler-common/pom.xml
    #	dolphinscheduler-dao/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
    #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
    #	dolphinscheduler-dist/pom.xml
    #	dolphinscheduler-rpc/pom.xml
    #	dolphinscheduler-server/pom.xml
    #	dolphinscheduler-ui/pom.xml
    #	pom.xml
    set defalut db type postgresql
    
    * change org.quartz.jobStore.driverDelegateClass
    
    * Add comments in method params
    
    * update readme from branch dev
    
    * update content in how to contribute
    
    * change postgresql default port
    
    * change version 1.2.0-SNAPSHOT
    
    * remove antrun plugin
    
    * add how to build
    
    * add how to build
    
    * remove dir format in assembly
    
    * Remove the judgment of whether it is admin
    
    * reset version to 1.2.0-SNAPSHOT
    
    * Remove the judgment of whether it is admin
    
    * Fix bug the administrator authorizes the project to ordinary users,but ordinary users cannot see the process definition created by the administrator
    
    * Added description of bug fixes about create dolphinscheduler sql failed
    
    * reset version to 1.2.0-SNAPSHOT
    
    * update dml when init queue table
    
    * reset version to 1.2.0-SNAPSHOT
    
    * Add whether the administrator's judgment
    
    * Add method comments
    
    * reset version to 1.2.0-SNAPSHOT
    
    * Determines whether the s database is empty
    
    * Determines whether the s database is empty
    
    * reset version to 1.2.0-SNAPSHOT
    
    * add selectUdfById
    
    * [maven-release-plugin] prepare release 1.2.0
    
    * [maven-release-plugin] prepare for next development iteration
    
    * add mysql for quartz in install.sh (#1332)
    
    * [maven-release-plugin] prepare release 1.2.1-release
    
    * [maven-release-plugin] prepare for next development iteration
    
    * update
    
    * [maven-release-plugin] prepare release 1.2.0-release
    
    * [maven-release-plugin] prepare for next development iteration
    
    * [maven-release-plugin] prepare release 1.2.1-release
    
    * [maven-release-plugin] prepare for next development iteration
    
    * revert
    
    * [maven-release-plugin] prepare release 1.2.0-release
    
    * [maven-release-plugin] prepare for next development iteration
    
    * add sql files for postgre/mysql
    
    * add sql files
    
    * fix bug: postgre cannot support between.
    
    * fix bug: remove 'between' in sql search.
    
    * add release note
    
    * add release note
    
    * fix bug: list resource user a error interface.
    
    * Fix spelling mistakes
    
    * revert version to 1.2.0
    
    * add milliseconds in start time and end time for dependent task.
    
    * fix bug: add user failed first time on postgre.
    
    * fix bug: add user failed first time.
    
    * update
    
    * update
    
    * update
    
    * add mysql for quartz in install.sh
    
    * [maven-release-plugin] prepare release 1.2.0
    
    * [maven-release-plugin] prepare for next development iteration
    a55537f1
dolphinscheduler_mysql.sql 34.5 KB