• Q
    license statistics are re-counted according to release 1.2.0 (#1355) · ad948106
    qiaozhanwei 提交于
    * 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
    
    * upgrade zk version
    
    * delete this line ,for zkClient.close() will do the whole thing
    
    * fix master server shutdown error
    
    * degrade zk version and add FourLetterWordMain class
    
    * fix PathChildrenCache not close
    
    * add Transactional for createSession method
    
    * add more message for java-doc
    
    * delete App, let spring manage connectionFactory
    
    * add license
    
    * add class Application for test support
    
    * refactor masterServer and workerServer
    
    * add args
    
    * fix the spring transaction not work bug
    
    * remove author
    
    * delete @Bean annotation
    
    * rename application.properties to application-dao.properties
    
    * delete this class
    
    * test
    
    * catch exception transaction method does not take effect to modify
    
    * .evn rollback
    
    * DataSourceService rollback
    
    * make combined server works in new dev-db branch (#1257)
    
    * LogViewServiceGrpc rollback
    
    * catch exception transaction method does not take effect to modify (#1258)
    
    * ConnectionFactory add paging intercepter
    
    * remove spotbugs-annotations.jar LGPL protocol
    
    * test
    
    * catch exception transaction method does not take effect to modify
    
    * .evn rollback
    
    * DataSourceService rollback
    
    * LogViewServiceGrpc rollback
    
    * dockerfile add application-api.properties and change application.properties to application-dao.properties
    
    * move batchDelete Process Define/Instance Outside for transactional (#1260)
    
    * dockerfile add application-api.properties and change application.properties to application-dao.properties (#1259)
    
    * ConnectionFactory add paging intercepter
    
    * remove spotbugs-annotations.jar LGPL protocol
    
    * test
    
    * catch exception transaction method does not take effect to modify
    
    * .evn rollback
    
    * DataSourceService rollback
    
    * LogViewServiceGrpc rollback
    
    * dockerfile add application-api.properties and change application.properties to application-dao.properties
    
    * server startup error modify
    
    * server startup error modify (#1263)
    
    * ConnectionFactory add paging intercepter
    
    * remove spotbugs-annotations.jar LGPL protocol
    
    * test
    
    * catch exception transaction method does not take effect to modify
    
    * .evn rollback
    
    * DataSourceService rollback
    
    * LogViewServiceGrpc rollback
    
    * dockerfile add application-api.properties and change application.properties to application-dao.properties
    
    * server startup error modify
    
    * data type convert error ,email send error bug fix
    
    * Checkbox change background color and env to Chinese (#1264)
    
    * data type convert error ,email send error bug fix (#1266)
    
    * ConnectionFactory add paging intercepter
    
    * remove spotbugs-annotations.jar LGPL protocol
    
    * test
    
    * catch exception transaction method does not take effect to modify
    
    * .evn rollback
    
    * DataSourceService rollback
    
    * LogViewServiceGrpc rollback
    
    * dockerfile add application-api.properties and change application.properties to application-dao.properties
    
    * server startup error modify
    
    * data type convert error ,email send error bug fix
    
    * Remove space before and after login user name (#1267)
    
    * Checkbox change background color and env to Chinese
    
    * Remove space before and after login user name
    
    * disable Import on Combined Server to solve API Server not work issue (#1268)
    
    * Modify crontab style (#1274)
    
    * Checkbox change background color and env to Chinese
    
    * Remove space before and after login user name
    
    * Modify crontab style
    
    * Add required limit to SQL (#1275)
    
    * Checkbox change background color and env to Chinese
    
    * Remove space before and after login user name
    
    * Modify crontab style
    
    * Add required limit to SQL
    
    * 1,REGEX_USER_NAME modify,support number and underline
    2,task yarn status judge bug fix
    
    * Parse the applicationId bug fix in the task log,#1298
    
    * dockerfile maven package modify
    
    * postgresql import primary key exception BUG fix
    
    * license statistics are re-counted according to release 1.2.0
    ad948106
LICENSE-hive-metastore.txt 11.1 KB