diff --git a/dockerfile/conf/escheduler/conf/master_logback.xml b/dockerfile/conf/escheduler/conf/master_logback.xml
index d93878218e05cc19b6de10fffa3fdc5925471c91..cf08b9c8aba32f836fbf29d0866fb967ce2c2310 100644
--- a/dockerfile/conf/escheduler/conf/master_logback.xml
+++ b/dockerfile/conf/escheduler/conf/master_logback.xml
@@ -12,7 +12,7 @@
 
 	<appender name="MASTERLOGFILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
 		<file>${log.base}/escheduler-master.log</file>
-		<filter class="cn.escheduler.server.master.log.MasterLogFilter">
+		<filter class="org.apache.dolphinscheduler.server.master.log.MasterLogFilter">
 			<level>INFO</level>
 		</filter>
 		<rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
diff --git a/dockerfile/conf/escheduler/conf/worker_logback.xml b/dockerfile/conf/escheduler/conf/worker_logback.xml
index f630559da98f775c63b48abce2a29642a4d36f13..f061d01dc0b3dd67d5ca504e1f8d00f8eb64d8c6 100644
--- a/dockerfile/conf/escheduler/conf/worker_logback.xml
+++ b/dockerfile/conf/escheduler/conf/worker_logback.xml
@@ -13,8 +13,8 @@
         <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
             <level>INFO</level>
         </filter>
-        <filter class="cn.escheduler.server.worker.log.TaskLogFilter"></filter>
-        <Discriminator class="cn.escheduler.server.worker.log.TaskLogDiscriminator">
+        <filter class="org.apache.dolphinscheduler.server.worker.log.TaskLogFilter"></filter>
+        <Discriminator class="org.apache.dolphinscheduler.server.worker.log.TaskLogDiscriminator">
             <key>taskAppId</key>
         </Discriminator>
         <sift>
@@ -33,7 +33,7 @@
 
     <appender name="WORKERLOGFILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
         <file>${log.base}/escheduler-worker.log</file>
-        <filter class="cn.escheduler.server.worker.log.WorkerLogFilter">
+        <filter class="org.apache.dolphinscheduler.server.worker.log.WorkerLogFilter">
             <level>INFO</level>
         </filter>
 
diff --git a/dolphinscheduler-alert/src/main/java/org/apache/dolphinscheduler/alert/AlertServer.java b/dolphinscheduler-alert/src/main/java/org/apache/dolphinscheduler/alert/AlertServer.java
index 3eba9fdbc8e036ca3b683409b65dfd11740abef6..cfc8e8a42fc3596d8497be61e74e445a8dbffd59 100644
--- a/dolphinscheduler-alert/src/main/java/org/apache/dolphinscheduler/alert/AlertServer.java
+++ b/dolphinscheduler-alert/src/main/java/org/apache/dolphinscheduler/alert/AlertServer.java
@@ -33,7 +33,7 @@ import java.util.List;
 /**
  * alert of start
  */
-@ComponentScan("cn.escheduler")
+@ComponentScan("org.apache.dolphinscheduler")
 public class AlertServer implements CommandLineRunner {
     private static final Logger logger = LoggerFactory.getLogger(AlertServer.class);
     /**
diff --git a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/ApiApplicationServer.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/ApiApplicationServer.java
index d999f375a0d84c603a4a26ab9bd137ff7d53fbda..ccf787d7064a2900a6cbc8630f45fb2537d07e23 100644
--- a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/ApiApplicationServer.java
+++ b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/ApiApplicationServer.java
@@ -25,7 +25,7 @@ import springfox.documentation.swagger2.annotations.EnableSwagger2;
 
 @SpringBootApplication
 @ServletComponentScan
-@ComponentScan("cn.escheduler")
+@ComponentScan("org.apache.dolphinscheduler")
 @EnableSwagger2
 public class ApiApplicationServer extends SpringBootServletInitializer {
 
diff --git a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/CombinedApplicationServer.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/CombinedApplicationServer.java
index df8c85594902da69cdf86500f63ce566b1ece40f..95e98e78b8ab3ed7906e4cd3d6000989d1263ff6 100644
--- a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/CombinedApplicationServer.java
+++ b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/CombinedApplicationServer.java
@@ -32,7 +32,7 @@ import springfox.documentation.swagger2.annotations.EnableSwagger2;
 
 @SpringBootApplication
 @ServletComponentScan
-@ComponentScan("cn.escheduler")
+@ComponentScan("org.apache.dolphinscheduler")
 @EnableSwagger2
 public class CombinedApplicationServer extends SpringBootServletInitializer {
 
diff --git a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/configuration/SwaggerConfig.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/configuration/SwaggerConfig.java
index 5015438c19cffbadcb534b4b076f68a275e739fa..d4f52e4b067c2c73a1037ab9cc77a273a5b3baab 100644
--- a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/configuration/SwaggerConfig.java
+++ b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/configuration/SwaggerConfig.java
@@ -42,12 +42,12 @@ public class SwaggerConfig implements WebMvcConfigurer {
     @Bean
     public Docket createRestApi() {
         return new Docket(DocumentationType.SWAGGER_2).apiInfo(apiInfo()).select()
-                .apis(RequestHandlerSelectors.basePackage("cn.escheduler.api.controller")).paths(PathSelectors.any())
+                .apis(RequestHandlerSelectors.basePackage("org.apache.dolphinscheduler.api.controller")).paths(PathSelectors.any())
                 .build();
     }
 
     private ApiInfo apiInfo() {
-        return new ApiInfoBuilder().title("Easy Scheduler Api Docs").description("Easy Scheduler Api Docs")
+        return new ApiInfoBuilder().title("Dolphin Scheduler Api Docs").description("Dolphin Scheduler Api Docs")
                 .build();
     }
 
diff --git a/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/ProcessInstanceServiceTest.java b/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/ProcessInstanceServiceTest.java
index b3f7d52a35fd39f04ec775ab12c5335e74031ca5..37f3b1f853153e91ee835a401e4c19db15bbdf58 100644
--- a/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/ProcessInstanceServiceTest.java
+++ b/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/ProcessInstanceServiceTest.java
@@ -57,8 +57,8 @@ public class ProcessInstanceServiceTest {
 
     @Test
     public void testDependResult(){
-        String logString = "[INFO] 2019-03-19 17:11:08.475 cn.escheduler.server.worker.log.TaskLogger:[172] - [taskAppId=TASK_223_10739_452334] dependent item complete :|| 223-ALL-day-last1Day,SUCCESS\n" +
-                "[INFO] 2019-03-19 17:11:08.476 cn.escheduler.server.worker.runner.TaskScheduleThread:[172] - task : 223_10739_452334 exit status code : 0\n" +
+        String logString = "[INFO] 2019-03-19 17:11:08.475 org.apache.dolphinscheduler.server.worker.log.TaskLogger:[172] - [taskAppId=TASK_223_10739_452334] dependent item complete :|| 223-ALL-day-last1Day,SUCCESS\n" +
+                "[INFO] 2019-03-19 17:11:08.476 org.apache.dolphinscheduler.server.worker.runner.TaskScheduleThread:[172] - task : 223_10739_452334 exit status code : 0\n" +
                 "[root@node2 current]# ";
         try {
             Map<String, DependResult> resultMap =
diff --git a/dolphinscheduler-common/src/main/resources/quartz.properties b/dolphinscheduler-common/src/main/resources/quartz.properties
index 1f17801b8df8fa6fad19c8e43cd2479b05a45a79..22529b8e8c5d9b2ac2aa99b5c32b083628ac30b6 100644
--- a/dolphinscheduler-common/src/main/resources/quartz.properties
+++ b/dolphinscheduler-common/src/main/resources/quartz.properties
@@ -1,7 +1,7 @@
 #============================================================================
 # Configure Main Scheduler Properties
 #============================================================================
-org.quartz.scheduler.instanceName = EasyScheduler
+org.quartz.scheduler.instanceName = DolphinScheduler
 org.quartz.scheduler.instanceId = AUTO
 org.quartz.scheduler.makeSchedulerThreadDaemon = true
 org.quartz.jobStore.useProperties = false
@@ -30,9 +30,9 @@ org.quartz.jobStore.dataSource = myDs
 #============================================================================
 # Configure Datasources  
 #============================================================================
-org.quartz.dataSource.myDs.connectionProvider.class = cn.escheduler.server.quartz.DruidConnectionProvider
+org.quartz.dataSource.myDs.connectionProvider.class = org.apache.dolphinscheduler.server.quartz.DruidConnectionProvider
 org.quartz.dataSource.myDs.driver = com.mysql.jdbc.Driver
-org.quartz.dataSource.myDs.URL = jdbc:mysql://192.168.xx.xx:3306/escheduler?characterEncoding=utf8
+org.quartz.dataSource.myDs.URL = jdbc:mysql://192.168.xx.xx:3306/dolphinscheduler?characterEncoding=utf8
 org.quartz.dataSource.myDs.user = xx
 org.quartz.dataSource.myDs.password = xx
 org.quartz.dataSource.myDs.maxConnections = 10
diff --git a/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/AlertDao.java b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/AlertDao.java
index 6ff582d2e9b191e4eb11c4f7a8c6d2ba6903e15f..4a2076cef7afff9374d13886c8c7e3546b0a138e 100644
--- a/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/AlertDao.java
+++ b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/AlertDao.java
@@ -82,7 +82,7 @@ public class AlertDao extends AbstractBaseDao {
      */
     public List<User> queryUserByAlertGroupId(int alerGroupId){
 
-        return userAlertGroupMapper.queryForUser(alerGroupId);
+        return userAlertGroupMapper.listUserByAlertgroupId(alerGroupId);
     }
     /**
      * MasterServer or WorkerServer stoped
diff --git a/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/config/MybatisPlusConfig.java b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/config/MybatisPlusConfig.java
index 340960bb812f4c3e736c173b23bd85c9ef5f3621..b5dff9c6da769c5a2ff395b92e56a49f96ba05f3 100644
--- a/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/config/MybatisPlusConfig.java
+++ b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/config/MybatisPlusConfig.java
@@ -7,7 +7,7 @@ import org.springframework.context.annotation.Configuration;
 
 
 @Configuration
-@MapperScan("cn.escheduler.*.mapper")
+@MapperScan("org.apache.dolphinscheduler.*.mapper")
 public class MybatisPlusConfig {
     @Bean
     public PaginationInterceptor paginationInterceptor() {
diff --git a/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/datasource/ConnectionFactory.java b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/datasource/ConnectionFactory.java
index 6737c172e026a346c13290b4a6c2542dda698642..951827714c23440650f0b53e0adc909c478bf3eb 100644
--- a/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/datasource/ConnectionFactory.java
+++ b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/datasource/ConnectionFactory.java
@@ -74,7 +74,7 @@ public class ConnectionFactory {
 
           Configuration configuration = new Configuration(environment);
           configuration.setLazyLoadingEnabled(true);
-          configuration.addMappers("cn.escheduler.dao.mapper");
+          configuration.addMappers("org.apache.dolphinscheduler.dao.mapper");
 
 
           SqlSessionFactoryBuilder builder = new SqlSessionFactoryBuilder();
diff --git a/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/datasource/DatabaseConfiguration.java b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/datasource/DatabaseConfiguration.java
index 7d843f6f40d5b40bf3a68ead19e50f649b2e2783..bd054be18024896f13666016dd4c0e9c8a50bd65 100644
--- a/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/datasource/DatabaseConfiguration.java
+++ b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/datasource/DatabaseConfiguration.java
@@ -14,7 +14,7 @@
 // * See the License for the specific language governing permissions and
 // * limitations under the License.
 // */
-//package cn.escheduler.dao.datasource;
+//package org.apache.dolphinscheduler.dao.datasource;
 //
 //import com.alibaba.druid.pool.DruidDataSource;
 //import org.apache.ibatis.session.SqlSessionFactory;
@@ -34,7 +34,7 @@
 // */
 //@Configuration
 //@PropertySource({"classpath:application.yml"})
-//@MapperScan(basePackages = "cn.escheduler.dao.mapper", sqlSessionFactoryRef = "SqlSessionFactory")
+//@MapperScan(basePackages = "org.apache.dolphinscheduler.dao.mapper", sqlSessionFactoryRef = "SqlSessionFactory")
 //public class DatabaseConfiguration {
 //
 //  /**
diff --git a/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/UserAlertGroup.java b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/UserAlertGroup.java
index d8fe65610aba919ca5835e7fed18096b753f66d3..a79e250ab0f501ea8bc03154197bd32f398a6acc 100644
--- a/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/UserAlertGroup.java
+++ b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/UserAlertGroup.java
@@ -57,6 +57,7 @@ public class UserAlertGroup {
     /**
      * user name
      */
+    @TableField(exist = false)
     private String userName;
 
     /**
diff --git a/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/mapper/UserAlertGroupMapper.java b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/mapper/UserAlertGroupMapper.java
index 2361c498c748357a74085ac4082e0f3e9ba7e220..50a092049e773dcd8bda129329c330648af9d1a2 100644
--- a/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/mapper/UserAlertGroupMapper.java
+++ b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/mapper/UserAlertGroupMapper.java
@@ -25,8 +25,6 @@ import java.util.List;
 
 public interface UserAlertGroupMapper extends BaseMapper<UserAlertGroup> {
 
-    List<User> queryForUser(@Param("alertgroupId") int alertgroupId);
-
     int deleteByAlertgroupId(@Param("alertgroupId") int alertgroupId);
 
     List<User> listUserByAlertgroupId(@Param("alertgroupId") int alertgroupId);
diff --git a/dolphinscheduler-dao/src/main/resources/application.yml b/dolphinscheduler-dao/src/main/resources/application.yml
index 1b8cd8f794c8c84896a089803b82ac5bb7256ad8..fefffee2d0688bdee5afc760933993a37ca0b719 100644
--- a/dolphinscheduler-dao/src/main/resources/application.yml
+++ b/dolphinscheduler-dao/src/main/resources/application.yml
@@ -5,18 +5,18 @@ spring:
 #    driver-class-name:  com.mysql.jdbc.Driver
     url: jdbc:postgresql://192.168.220.154:5432/escheduler
 #    url: jdbc:mysql://192.168.220.188:3306/escheduler_new?useUnicode=true&characterEncoding=UTF-8
-    username: root
-    password: root@123
+    username: xx
+    password: xx
 #    platform:
     continue-on-error: true
 
 
 #mybatis
 mybatis-plus:
-  mapper-locations: classpath*:/cn.escheduler.dao.mapper/*.xml
-  typeEnumsPackage: cn.escheduler.*.enums
+  mapper-locations: classpath*:/org.apache.dolphinscheduler.dao.mapper/*.xml
+  typeEnumsPackage: org.apache.dolphinscheduler.*.enums
   #实体扫描，多个package用逗号或者分号分隔
-  typeAliasesPackage: cn.escheduler.dao.entity
+  typeAliasesPackage: org.apache.dolphinscheduler.dao.entity
   global-config:
     #数据库相关配置
     db-config:
@@ -40,5 +40,5 @@ mybatis-plus:
 # Logger Config
 logging:
   level:
-    cn.escheduler.dao: debug
+    org.apache.dolphinscheduler.dao: debug
 
diff --git a/dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/AccessTokenMapper.xml b/dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/AccessTokenMapper.xml
similarity index 100%
rename from dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/AccessTokenMapper.xml
rename to dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/AccessTokenMapper.xml
diff --git a/dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/AlertGroupMapper.xml b/dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/AlertGroupMapper.xml
similarity index 100%
rename from dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/AlertGroupMapper.xml
rename to dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/AlertGroupMapper.xml
diff --git a/dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/AlertMapper.xml b/dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/AlertMapper.xml
similarity index 100%
rename from dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/AlertMapper.xml
rename to dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/AlertMapper.xml
diff --git a/dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/CommandMapper.xml b/dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/CommandMapper.xml
similarity index 100%
rename from dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/CommandMapper.xml
rename to dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/CommandMapper.xml
diff --git a/dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/DataSourceMapper.xml b/dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/DataSourceMapper.xml
similarity index 100%
rename from dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/DataSourceMapper.xml
rename to dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/DataSourceMapper.xml
diff --git a/dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/DataSourceUserMapper.xml b/dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/DataSourceUserMapper.xml
similarity index 100%
rename from dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/DataSourceUserMapper.xml
rename to dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/DataSourceUserMapper.xml
diff --git a/dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ErrorCommandMapper.xml b/dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ErrorCommandMapper.xml
similarity index 100%
rename from dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ErrorCommandMapper.xml
rename to dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ErrorCommandMapper.xml
diff --git a/dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessDefinitionMapper.xml b/dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProcessDefinitionMapper.xml
similarity index 100%
rename from dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessDefinitionMapper.xml
rename to dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProcessDefinitionMapper.xml
diff --git a/dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapMapper.xml b/dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProcessInstanceMapMapper.xml
similarity index 100%
rename from dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapMapper.xml
rename to dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProcessInstanceMapMapper.xml
diff --git a/dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml b/dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProcessInstanceMapper.xml
similarity index 100%
rename from dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
rename to dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProcessInstanceMapper.xml
diff --git a/dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml b/dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
similarity index 100%
rename from dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
rename to dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
diff --git a/dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml b/dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectUserMapper.xml
similarity index 100%
rename from dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
rename to dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectUserMapper.xml
diff --git a/dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml b/dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/QueueMapper.xml
similarity index 100%
rename from dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
rename to dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/QueueMapper.xml
diff --git a/dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ResourceMapper.xml b/dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
similarity index 100%
rename from dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ResourceMapper.xml
rename to dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
diff --git a/dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ResourceUserMapper.xml b/dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceUserMapper.xml
similarity index 100%
rename from dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ResourceUserMapper.xml
rename to dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceUserMapper.xml
diff --git a/dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml b/dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ScheduleMapper.xml
similarity index 100%
rename from dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
rename to dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ScheduleMapper.xml
diff --git a/dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/SessionMapper.xml b/dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/SessionMapper.xml
similarity index 100%
rename from dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/SessionMapper.xml
rename to dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/SessionMapper.xml
diff --git a/dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/TaskInstanceMapper.xml b/dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
similarity index 100%
rename from dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/TaskInstanceMapper.xml
rename to dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
diff --git a/dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/TenantMapper.xml b/dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TenantMapper.xml
similarity index 100%
rename from dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/TenantMapper.xml
rename to dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TenantMapper.xml
diff --git a/dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/UDFUserMapper.xml b/dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/UDFUserMapper.xml
similarity index 100%
rename from dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/UDFUserMapper.xml
rename to dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/UDFUserMapper.xml
diff --git a/dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/UdfFuncMapper.xml b/dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/UdfFuncMapper.xml
similarity index 100%
rename from dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/UdfFuncMapper.xml
rename to dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/UdfFuncMapper.xml
diff --git a/dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/UserAlertGroupMapper.xml b/dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/UserAlertGroupMapper.xml
similarity index 69%
rename from dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/UserAlertGroupMapper.xml
rename to dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/UserAlertGroupMapper.xml
index 090388dedf47dc39873c02d99b2784249ba584ff..51835894db4eb0401f555cb986b23a8a445201d9 100644
--- a/dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/UserAlertGroupMapper.xml
+++ b/dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/UserAlertGroupMapper.xml
@@ -5,12 +5,6 @@
         delete from t_escheduler_relation_user_alertgroup
         where `alertgroup_id` = #{alertgroupId}
     </delete>
-    <select id="queryForUser" resultType="org.apache.dolphinscheduler.dao.entity.User">
-           SELECT u.*
-           FROM  t_escheduler_relation_user_alertgroup g_u
-           JOIN t_escheduler_user u on g_u.user_id = u.id
-           WHERE g_u.alertgroup_id = #{alertgroupId}
-    </select>
     <select id="listUserByAlertgroupId" resultType="org.apache.dolphinscheduler.dao.entity.User">
            SELECT u.*
            FROM t_escheduler_relation_user_alertgroup g_u
diff --git a/dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/UserMapper.xml b/dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/UserMapper.xml
similarity index 100%
rename from dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/UserMapper.xml
rename to dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/UserMapper.xml
diff --git a/dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/WorkerGroupMapper.xml b/dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/WorkerGroupMapper.xml
similarity index 100%
rename from dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/WorkerGroupMapper.xml
rename to dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/WorkerGroupMapper.xml
diff --git a/dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler/dao/mapper/UDFUserMapperTest.java b/dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler/dao/mapper/UDFUserMapperTest.java
index 3e9671c10d498799d88bca476fb45b9cab689027..46cc6bfb21c74886123b8605269214e8881e2056 100644
--- a/dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler/dao/mapper/UDFUserMapperTest.java
+++ b/dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler/dao/mapper/UDFUserMapperTest.java
@@ -17,20 +17,158 @@
 package org.apache.dolphinscheduler.dao.mapper;
 
 
+import org.apache.dolphinscheduler.common.enums.UdfType;
+import org.apache.dolphinscheduler.common.enums.UserType;
+import org.apache.dolphinscheduler.dao.entity.UDFUser;
+import org.apache.dolphinscheduler.dao.entity.UdfFunc;
+import org.apache.dolphinscheduler.dao.entity.User;
+import org.junit.Assert;
 import org.junit.Test;
 import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.test.context.junit4.SpringRunner;
 
+import java.util.Date;
+import java.util.List;
+
 @RunWith(SpringRunner.class)
 @SpringBootTest
 public class UDFUserMapperTest {
 
+    @Autowired
+    UDFUserMapper udfUserMapper;
+
+    @Autowired
+    UserMapper userMapper;
+
+    @Autowired
+    UdfFuncMapper udfFuncMapper;
+
+    private UDFUser insertOne(){
+        UDFUser udfUser = new UDFUser();
+        udfUser.setUdfId(1);
+        udfUser.setUserId(1);
+        udfUser.setCreateTime(new Date());
+        udfUser.setUpdateTime(new Date());
+        udfUserMapper.insert(udfUser);
+        return udfUser;
+    }
+
+    private UDFUser insertOne(User user,UdfFunc udfFunc){
+        UDFUser udfUser = new UDFUser();
+        udfUser.setUdfId(udfFunc.getId());
+        udfUser.setUserId(user.getId());
+        udfUser.setCreateTime(new Date());
+        udfUser.setUpdateTime(new Date());
+        udfUserMapper.insert(udfUser);
+        return udfUser;
+    }
+
+
+    /**
+     * insert one user
+     * @return
+     */
+    private User insertOneUser(){
+        User user = new User();
+        user.setUserName("user1");
+        user.setUserPassword("1");
+        user.setEmail("xx@123.com");
+        user.setUserType(UserType.GENERAL_USER);
+        user.setCreateTime(new Date());
+        user.setTenantId(1);
+        user.setQueue("dolphin");
+        user.setUpdateTime(new Date());
+        userMapper.insert(user);
+        return user;
+    }
+
+    /**
+     * insert one udf
+     * @return
+     */
+    private UdfFunc insertOneUdfFunc(){
+        UdfFunc udfFunc = new UdfFunc();
+        udfFunc.setFuncName("dolphin_udf_func");
+        udfFunc.setClassName("org.apache.dolphinscheduler.test.mr");
+        udfFunc.setType(UdfType.HIVE);
+        udfFunc.setResourceId(1);
+        udfFunc.setResourceName("dolphin_resource");
+        udfFunc.setCreateTime(new Date());
+        udfFunc.setUpdateTime(new Date());
+        udfFuncMapper.insert(udfFunc);
+        return udfFunc;
+    }
+
+    @Test
+    public void testUpdate(){
+        //insertOneUser
+        User user = insertOneUser();
+        //insertOneUdfFunc
+        UdfFunc udfFunc = insertOneUdfFunc();
+        //insertOne
+        UDFUser udfUser = insertOne(user, udfFunc);
+        udfUser.setUserId(2);
+        udfUser.setUdfId(2);
+        int update = udfUserMapper.updateById(udfUser);
+        Assert.assertEquals(update, 1);
+        udfUserMapper.deleteById(udfUser.getId());
+        udfFuncMapper.deleteById(udfFunc.getId());
+        userMapper.deleteById(user.getId());
+
+    }
+
+    @Test
+    public void testDelete(){
+        //insertOneUser
+        User user = insertOneUser();
+        //insertOneUdfFunc
+        UdfFunc udfFunc = insertOneUdfFunc();
+        //insertOne
+        UDFUser udfUser = insertOne(user, udfFunc);
+        int delete = udfUserMapper.deleteById(udfUser.getId());
+        Assert.assertEquals(delete, 1);
+        userMapper.deleteById(user.getId());
+        udfFuncMapper.deleteById(udfFunc.getId());
+    }
+
+    @Test
+    public void testQuery(){
+        //insertOne
+        UDFUser udfUser = insertOne();
+        //query
+        List<UDFUser> udfUserList = udfUserMapper.selectList(null);
+        Assert.assertNotEquals(udfUserList.size(), 0);
+        userMapper.deleteById(udfUser.getId());
+    }
+
     @Test
     public void testDeleteByUserId() {
+        //insertOneUser
+        User user = insertOneUser();
+        //insertOneUdfFunc
+        UdfFunc udfFunc = insertOneUdfFunc();
+        //insertOne
+        UDFUser udfUser = insertOne(user, udfFunc);
+        int delete = udfUserMapper.deleteByUserId(user.getId());
+        Assert.assertEquals(delete, 1);
+        userMapper.deleteById(user.getId());
+        udfFuncMapper.deleteById(udfFunc.getId());
+
     }
 
     @Test
     public void testDeleteByUdfFuncId() {
+        //insertOneUser
+        User user = insertOneUser();
+        //insertOneUdfFunc
+        UdfFunc udfFunc = insertOneUdfFunc();
+        //insertOne
+        UDFUser udfUser = insertOne(user, udfFunc);
+        int delete = udfUserMapper.deleteByUdfFuncId(udfFunc.getId());
+        Assert.assertEquals(delete, 1);
+        userMapper.deleteById(user.getId());
+        udfFuncMapper.deleteById(udfFunc.getId());
     }
 }
\ No newline at end of file
diff --git a/dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler/dao/mapper/UserAlertGroupMapperTest.java b/dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler/dao/mapper/UserAlertGroupMapperTest.java
index 3e86eab0e2856108f6aededa558fdb5879432833..5243db0dafa15801f4646c2cf34d4b9ee9243a5e 100644
--- a/dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler/dao/mapper/UserAlertGroupMapperTest.java
+++ b/dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler/dao/mapper/UserAlertGroupMapperTest.java
@@ -17,24 +17,170 @@
 package org.apache.dolphinscheduler.dao.mapper;
 
 
+import org.apache.dolphinscheduler.common.enums.AlertType;
+import org.apache.dolphinscheduler.common.enums.UserType;
+import org.apache.dolphinscheduler.dao.entity.AlertGroup;
+import org.apache.dolphinscheduler.dao.entity.User;
+import org.apache.dolphinscheduler.dao.entity.UserAlertGroup;
+import org.junit.Assert;
 import org.junit.Test;
 import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.test.context.junit4.SpringRunner;
 
+import java.util.Date;
+import java.util.List;
+
 @RunWith(SpringRunner.class)
 @SpringBootTest
 public class UserAlertGroupMapperTest {
 
+    @Autowired
+    private UserMapper userMapper;
+
+    @Autowired
+    AlertGroupMapper alertGroupMapper;
+
+    @Autowired
+    private UserAlertGroupMapper userAlertGroupMapper;
+
+    /**
+     * insert one UserAlertGroup
+     * @param user
+     * @param alertGroup
+     * @return
+     */
+    private UserAlertGroup insertOne(User user,AlertGroup alertGroup){
+        UserAlertGroup userAlertGroup = new UserAlertGroup();
+        userAlertGroup.setAlertgroupName(alertGroup.getGroupName());
+        userAlertGroup.setAlertgroupId(alertGroup.getId());
+        userAlertGroup.setUserId(user.getId());
+        userAlertGroup.setCreateTime(new Date());
+        userAlertGroup.setUpdateTime(new Date());
+        userAlertGroupMapper.insert(userAlertGroup);
+        return userAlertGroup;
+    }
+
+    /**
+     * insert one UserAlertGroup
+     * @return
+     */
+    private UserAlertGroup insertOne(){
+        UserAlertGroup userAlertGroup = new UserAlertGroup();
+        userAlertGroup.setAlertgroupName("dolphin_alert_group");
+        userAlertGroup.setAlertgroupId(10);
+        userAlertGroup.setUserId(4);
+        userAlertGroup.setCreateTime(new Date());
+        userAlertGroup.setUpdateTime(new Date());
+        userAlertGroupMapper.insert(userAlertGroup);
+        return userAlertGroup;
+    }
+
+    /**
+     * insert one user
+     * @return
+     */
+    private User insertOneUser(){
+        User user = new User();
+        user.setUserName("user1");
+        user.setUserPassword("1");
+        user.setEmail("xx@123.com");
+        user.setUserType(UserType.GENERAL_USER);
+        user.setCreateTime(new Date());
+        user.setTenantId(1);
+        user.setQueue("dolphin");
+        user.setUpdateTime(new Date());
+        userMapper.insert(user);
+        return user;
+    }
+
+    /**
+     * insert one AlertGroup
+     * @return
+     */
+    private AlertGroup insertOneAlertGroup(){
+        //insertOne
+        AlertGroup alertGroup = new AlertGroup();
+        alertGroup.setGroupName("alert group 1");
+        alertGroup.setDescription("alert test1");
+        alertGroup.setGroupType(AlertType.EMAIL);
+
+        alertGroup.setCreateTime(new Date());
+        alertGroup.setUpdateTime(new Date());
+        alertGroupMapper.insert(alertGroup);
+        return alertGroup;
+    }
+
+    @Test
+    public void testUpdate(){
+        //insertOneUser
+        User user = insertOneUser();
+        //insertOneAlertGroup
+        AlertGroup alertGroup = insertOneAlertGroup();
+
+        //insertOne
+        UserAlertGroup userAlertGroup = insertOne();
+        //update
+        userAlertGroup.setUserId(user.getId());
+        userAlertGroup.setAlertgroupId(alertGroup.getId());
+        userAlertGroup.setUpdateTime(new Date());
+
+        int update = userAlertGroupMapper.updateById(userAlertGroup);
+        Assert.assertEquals(update, 1);
+        userAlertGroupMapper.deleteById(userAlertGroup.getId());
+        userMapper.deleteById(user.getId());
+        alertGroupMapper.deleteById(alertGroup.getId());
+    }
+
     @Test
-    public void testQueryForUser() {
+    public void testDelete(){
+        //insertOne
+        UserAlertGroup userAlertGroup = insertOne();
+        //delete
+        int delete = userAlertGroupMapper.deleteById(userAlertGroup.getId());
+        Assert.assertEquals(delete, 1);
+    }
+
+    @Test
+    public void testQuery() {
+        //insertOne
+        UserAlertGroup userAlertGroup = insertOne();
+        //query
+        List<UserAlertGroup> userAlertGroupList = userAlertGroupMapper.selectList(null);
+        Assert.assertNotEquals(userAlertGroupList.size(), 0);
+        userAlertGroupMapper.deleteById(userAlertGroup.getId());
     }
 
     @Test
     public void testDeleteByAlertgroupId() {
+        //insertOneUser
+        User user = insertOneUser();
+        //insertOneAlertGroup
+        AlertGroup alertGroup = insertOneAlertGroup();
+
+        //insertOne
+        UserAlertGroup userAlertGroup = insertOne(user,alertGroup);
+        int delete = userAlertGroupMapper.deleteByAlertgroupId(alertGroup.getId());
+        Assert.assertEquals(delete, 1);
+        userMapper.deleteById(user.getId());
+        alertGroupMapper.deleteById(alertGroup.getId());
     }
 
     @Test
     public void testListUserByAlertgroupId() {
+        //insertOneUser
+        User user = insertOneUser();
+        //insertOneAlertGroup
+        AlertGroup alertGroup = insertOneAlertGroup();
+
+        //insertOne
+        UserAlertGroup userAlertGroup = insertOne(user,alertGroup);
+        List<User> userList = userAlertGroupMapper.listUserByAlertgroupId(alertGroup.getId());
+        Assert.assertNotEquals(userList.size(), 0);
+
+        userAlertGroupMapper.deleteByAlertgroupId(alertGroup.getId());
+        userMapper.deleteById(user.getId());
+        alertGroupMapper.deleteById(alertGroup.getId());
     }
 }
\ No newline at end of file
diff --git a/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/AbstractServer.java b/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/AbstractServer.java
index 60948ad1b652bc76c9832a5e6f2793b504f13d18..b5875e191eaf279b4e0942af3cdae509f95680eb 100644
--- a/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/AbstractServer.java
+++ b/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/AbstractServer.java
@@ -26,7 +26,7 @@ import org.springframework.context.annotation.ComponentScan;
 /**
  *   master server
  */
-@ComponentScan("cn.escheduler")
+@ComponentScan("org.apache.dolphinscheduler")
 public abstract class AbstractServer implements CommandLineRunner, IStoppable {
 
     private static final Logger logger = LoggerFactory.getLogger(AbstractServer.class);
diff --git a/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/MasterServer.java b/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/MasterServer.java
index 45ca9f625fb6645bad97e9bbae893ba37e34a198..0940b22016acb0deed232bca9e1952333127486a 100644
--- a/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/MasterServer.java
+++ b/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/MasterServer.java
@@ -43,7 +43,7 @@ import java.util.concurrent.TimeUnit;
 /**
  *   master server
  */
-@ComponentScan("cn.escheduler")
+@ComponentScan("org.apache.dolphinscheduler")
 public class MasterServer extends AbstractServer {
 
     private static final Logger logger = LoggerFactory.getLogger(MasterServer.class);
diff --git a/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/worker/WorkerServer.java b/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/worker/WorkerServer.java
index ed3b2d66d07a617830a7b0a1df8c2414fa1b9598..251ef4da2a91f63e46fbc1d9014cd31ec015bd18 100644
--- a/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/worker/WorkerServer.java
+++ b/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/worker/WorkerServer.java
@@ -50,7 +50,7 @@ import java.util.concurrent.TimeUnit;
 /**
  *  worker server
  */
-@ComponentScan("cn.escheduler")
+@ComponentScan("org.apache.dolphinscheduler")
 public class WorkerServer extends AbstractServer {
 
     private static final Logger logger = LoggerFactory.getLogger(WorkerServer.class);
diff --git a/dolphinscheduler-ui/src/view/docs/zh_CN/_book/pages/deploy-background.html b/dolphinscheduler-ui/src/view/docs/zh_CN/_book/pages/deploy-background.html
index 930836a468a8c2a668276ff7557d6866accacff8..ec8a87fe9544b33492fbd65bb7d801eecf78acbe 100644
--- a/dolphinscheduler-ui/src/view/docs/zh_CN/_book/pages/deploy-background.html
+++ b/dolphinscheduler-ui/src/view/docs/zh_CN/_book/pages/deploy-background.html
@@ -9,46 +9,46 @@
         <meta name="description" content="">
         <meta name="generator" content="GitBook 3.2.3">
         <meta name="author" content="YIGUAN">
-        
-        
-    
+
+
+
     <link rel="stylesheet" href="../gitbook/style.css">
 
-    
-            
-                
+
+
+
                 <link rel="stylesheet" href="../gitbook/gitbook-plugin-expandable-chapters/expandable-chapters.css">
-                
-            
-                
+
+
+
                 <link rel="stylesheet" href="../gitbook/gitbook-plugin-insert-logo-link/plugin.css">
-                
-            
-                
+
+
+
                 <link rel="stylesheet" href="../gitbook/gitbook-plugin-highlight/website.css">
-                
-            
-                
+
+
+
                 <link rel="stylesheet" href="../gitbook/gitbook-plugin-search/search.css">
-                
-            
-                
+
+
+
                 <link rel="stylesheet" href="../gitbook/gitbook-plugin-fontsettings/website.css">
-                
-            
-        
 
-    
 
-    
-        
+
+
+
+
+
+
         <link rel="stylesheet" href="../styles/website.css">
-        
-    
 
-        
-    
-    
+
+
+
+
+
     <meta name="HandheldFriendly" content="true"/>
     <meta name="viewport" content="width=device-width, initial-scale=1, user-scalable=no">
     <meta name="apple-mobile-web-app-capable" content="yes">
@@ -56,784 +56,784 @@
     <link rel="apple-touch-icon-precomposed" sizes="152x152" href="../gitbook/images/apple-touch-icon-precomposed-152.png">
     <link rel="shortcut icon" href="../gitbook/images/favicon.ico" type="image/x-icon">
 
-    
+
     <link rel="next" href="deploy-background.html" />
-    
-    
+
+
     <link rel="prev" href="deploy-foreground.html" />
-    
+
 
     </head>
     <body>
-        
+
 <div class="book">
     <div class="book-summary">
-        
-            
+
+
 <div id="book-search-input" role="search">
     <input type="text" placeholder="输入并搜索" />
 </div>
 
-            
+
                 <nav role="navigation">
-                
+
 
 
 <ul class="summary">
-    
-    
 
-    
 
-    
-        
-        
-    
+
+
+
+
+
+
+
         <li class="chapter " data-level="1.1" data-path="../">
-            
+
                 <a href="../">
-            
-                    
+
+
                     Easyscheduler简介
-            
+
                 </a>
-            
 
-            
+
+
         </li>
-    
+
         <li class="chapter " data-level="1.2" >
-            
+
                 <span>
-            
-                    
+
+
                     导读指南
-            
+
                 </span>
-            
 
-            
+
+
             <ul class="articles">
-                
-    
+
+
         <li class="chapter " data-level="1.2.1" data-path="guide-architecture.html">
-            
+
                 <a href="guide-architecture.html">
-            
-                    
+
+
                     系统架构分析
-            
+
                 </a>
-            
 
-            
+
+
             <ul class="articles">
-                
-    
+
+
         <li class="chapter " data-level="1.2.1.1" data-path="guide-architecture.html">
-            
+
                 <a href="guide-architecture.html#导语">
-            
-                    
+
+
                     导语
-            
+
                 </a>
-            
 
-            
+
+
         </li>
-    
+
         <li class="chapter " data-level="1.2.1.2" data-path="guide-architecture.html">
-            
+
                 <a href="guide-architecture.html#背景">
-            
-                    
+
+
                     背景
-            
+
                 </a>
-            
 
-            
+
+
         </li>
-    
+
         <li class="chapter " data-level="1.2.1.3" data-path="guide-architecture.html">
-            
+
                 <a href="guide-architecture.html#总架构设计">
-            
-                    
+
+
                     总架构设计
-            
+
                 </a>
-            
 
-            
+
+
         </li>
-    
+
         <li class="chapter " data-level="1.2.1.4" data-path="guide-architecture.html">
-            
+
                 <a href="guide-architecture.html#中心化思想">
-            
-                    
+
+
                     中心化思想
-            
+
                 </a>
-            
 
-            
+
+
         </li>
-    
+
         <li class="chapter " data-level="1.2.1.5" data-path="guide-architecture.html">
-            
+
                 <a href="guide-architecture.html#分布式锁实践">
-            
-                    
+
+
                     分布式锁实践
-            
+
                 </a>
-            
 
-            
+
+
         </li>
-    
+
         <li class="chapter " data-level="1.2.1.6" data-path="guide-architecture.html">
-            
+
                 <a href="guide-architecture.html#线程不足循环等待问题">
-            
-                    
+
+
                     线程不足循环等待问题
-            
+
                 </a>
-            
 
-            
+
+
         </li>
-    
+
         <li class="chapter " data-level="1.2.1.7" data-path="guide-architecture.html">
-            
+
                 <a href="guide-architecture.html#容错设计">
-            
-                    
+
+
                     容错设计
-            
+
                 </a>
-            
 
-            
+
+
         </li>
-    
+
         <li class="chapter " data-level="1.2.1.8" data-path="guide-architecture.html">
-            
+
                 <a href="guide-architecture.html#日志访问">
-            
-                    
+
+
                     Logback和gRPC实现日志访问
-            
+
                 </a>
-            
 
-            
+
+
         </li>
-    
+
         <li class="chapter " data-level="1.2.1.9" data-path="guide-architecture.html">
-            
+
                 <a href="guide-architecture.html#总结">
-            
-                    
+
+
                     总结
-            
+
                 </a>
-            
 
-            
+
+
         </li>
-    
+
 
             </ul>
-            
+
         </li>
-    
+
         <li class="chapter " data-level="1.2.2" data-path="guide-manual.html">
-            
+
                 <a href="guide-manual.html">
-            
-                    
+
+
                     使用手册
-            
+
                 </a>
-            
 
-            
+
+
             <ul class="articles">
-                
-    
+
+
         <li class="chapter " data-level="1.2.2.1" data-path="guide-manual.html">
-            
+
                 <a href="guide-manual.html#登录">
-            
-                    
+
+
                     登录
-            
+
                 </a>
-            
 
-            
+
+
         </li>
-    
+
         <li class="chapter " data-level="1.2.2.2" data-path="guide-manual.html">
-            
+
                 <a href="guide-manual.html#安全中心">
-            
-                    
+
+
                     安全中心
-            
+
                 </a>
-            
 
-            
+
+
         </li>
-    
+
         <li class="chapter " data-level="1.2.2.3" data-path="guide-manual.html">
-            
+
                 <a href="guide-manual.html#资源中心">
-            
-                    
+
+
                     资源中心
-            
+
                 </a>
-            
 
-            
+
+
         </li>
-    
+
         <li class="chapter " data-level="1.2.2.4" data-path="guide-manual.html">
-            
+
                 <a href="guide-manual.html#数据源中心">
-            
-                    
+
+
                     数据源中心
-            
+
                 </a>
-            
 
-            
+
+
         </li>
-    
+
         <li class="chapter " data-level="1.2.2.5" data-path="guide-manual.html">
-            
+
                 <a href="guide-manual.html#项目管理">
-            
-                    
+
+
                     项目管理
-            
+
                 </a>
-            
 
-            
+
+
         </li>
-    
+
         <li class="chapter " data-level="1.2.2.6" data-path="guide-manual.html">
-            
+
                 <a href="guide-manual.html#首页">
-            
-                    
+
+
                     站点首页
-            
+
                 </a>
-            
 
-            
+
+
         </li>
-    
+
         <li class="chapter " data-level="1.2.2.7" data-path="guide-manual.html">
-            
+
                 <a href="guide-manual.html#任务依赖">
-            
-                    
+
+
                     任务依赖
-            
+
                 </a>
-            
 
-            
+
+
         </li>
-    
+
         <li class="chapter " data-level="1.2.2.8" data-path="guide-manual.html">
-            
+
                 <a href="guide-manual.html#系统参数">
-            
-                    
+
+
                     系统参数
-            
+
                 </a>
-            
 
-            
+
+
         </li>
-    
+
 
             </ul>
-            
+
         </li>
-    
+
 
             </ul>
-            
+
         </li>
-    
+
         <li class="chapter " data-level="1.3" >
-            
+
                 <span>
-            
-                    
+
+
                     项目部署文档
-            
+
                 </span>
-            
 
-            
+
+
             <ul class="articles">
-                
-    
+
+
         <li class="chapter " data-level="1.3.1" data-path="deploy-foreground.html">
-            
+
                 <a href="deploy-foreground.html">
-            
-                    
+
+
                     前端部署
-            
+
                 </a>
-            
 
-            
+
+
             <ul class="articles">
-                
-    
+
+
         <li class="chapter " data-level="1.3.1.1" data-path="deploy-foreground.html">
-            
+
                 <a href="deploy-foreground.html#前端项目环境构建及编译">
-            
-                    
+
+
                     前端项目环境构建及编译
-            
+
                 </a>
-            
 
-            
+
+
         </li>
-    
+
         <li class="chapter " data-level="1.3.1.2" data-path="deploy-foreground.html">
-            
+
                 <a href="deploy-foreground.html#安装及配置">
-            
-                    
+
+
                     安装及配置
-            
+
                 </a>
-            
 
-            
+
+
         </li>
-    
+
         <li class="chapter " data-level="1.3.1.3" data-path="deploy-foreground.html">
-            
+
                 <a href="deploy-foreground.html#项目生产环境配置">
-            
-                    
+
+
                     项目生产环境Nginx配置
-            
+
                 </a>
-            
 
-            
+
+
         </li>
-    
+
         <li class="chapter " data-level="1.3.1.4" data-path="deploy-foreground.html">
-            
+
                 <a href="deploy-foreground.html#前端项目发布">
-            
-                    
+
+
                     前端项目发布
-            
+
                 </a>
-            
 
-            
+
+
         </li>
-    
+
         <li class="chapter " data-level="1.3.1.5" data-path="deploy-foreground.html">
-            
+
                 <a href="deploy-foreground.html#问题">
-            
-                    
+
+
                     问题
-            
+
                 </a>
-            
 
-            
+
+
         </li>
-    
+
 
             </ul>
-            
+
         </li>
-    
+
         <li class="chapter active" data-level="1.3.2" data-path="deploy-background.html">
-            
+
                 <a href="deploy-background.html">
-            
-                    
+
+
                     后端部署
-            
+
                 </a>
-            
 
-            
+
+
             <ul class="articles">
-                
-    
+
+
         <li class="chapter " data-level="1.3.2.1" data-path="deploy-background.html">
-            
+
                 <a href="deploy-background.html#基础软件安装">
-            
-                    
+
+
                     基础软件安装
-            
+
                 </a>
-            
 
-            
+
+
         </li>
-    
+
         <li class="chapter " data-level="1.3.2.2" data-path="deploy-background.html">
-            
+
                 <a href="deploy-background.html#项目编译">
-            
-                    
+
+
                     项目编译
-            
+
                 </a>
-            
 
-            
+
+
         </li>
-    
+
         <li class="chapter " data-level="1.3.2.3" data-path="deploy-background.html">
-            
+
                 <a href="deploy-background.html#数据库初始化">
-            
-                    
+
+
                     数据库初始化
-            
+
                 </a>
-            
 
-            
+
+
         </li>
-    
+
         <li class="chapter " data-level="1.3.2.4" data-path="deploy-background.html">
-            
+
                 <a href="deploy-background.html#创建部署用户">
-            
-                    
+
+
                     创建部署用户
-            
+
                 </a>
-            
 
-            
+
+
         </li>
-    
+
         <li class="chapter " data-level="1.3.2.5" data-path="deploy-background.html">
-            
+
                 <a href="deploy-background.html#配置文件">
-            
-                    
+
+
                     配置文件
-            
+
                 </a>
-            
 
-            
+
+
             <ul class="articles">
-                
-    
+
+
         <li class="chapter " data-level="1.3.2.5.1" data-path="deploy-background.html">
-            
+
                 <a href="deploy-background.html#escheduler-alert">
-            
-                    
+
+
                     escheduler-alert
-            
+
                 </a>
-            
 
-            
+
+
         </li>
-    
+
         <li class="chapter " data-level="1.3.2.5.2" data-path="deploy-background.html">
-            
+
                 <a href="deploy-background.html#escheduler-common">
-            
-                    
+
+
                     escheduler-common
-            
+
                 </a>
-            
 
-            
+
+
         </li>
-    
+
         <li class="chapter " data-level="1.3.2.5.3" data-path="deploy-background.html">
-            
+
                 <a href="deploy-background.html#escheduler-dao">
-            
-                    
+
+
                     escheduler-dao
-            
+
                 </a>
-            
 
-            
+
+
         </li>
-    
+
         <li class="chapter " data-level="1.3.2.5.4" data-path="deploy-background.html">
-            
+
                 <a href="deploy-background.html#escheduler-server">
-            
-                    
+
+
                     escheduler-server
-            
+
                 </a>
-            
 
-            
+
+
         </li>
-    
+
         <li class="chapter " data-level="1.3.2.5.5" data-path="deploy-background.html">
-            
+
                 <a href="deploy-background.html#escheduler-web">
-            
-                    
+
+
                     escheduler-web
-            
+
                 </a>
-            
 
-            
+
+
         </li>
-    
+
 
             </ul>
-            
+
         </li>
-    
+
         <li class="chapter " data-level="1.3.2.6" data-path="deploy-background.html">
-            
+
                 <a href="deploy-background.html#启动停止命令">
-            
-                    
+
+
                     启动停止命令
-            
+
                 </a>
-            
 
-            
+
+
         </li>
-    
+
         <li class="chapter " data-level="1.3.2.7" data-path="deploy-background.html">
-            
+
                 <a href="deploy-background.html#一键启停脚本">
-            
-                    
+
+
                     一键启停脚本
-            
+
                 </a>
-            
 
-            
+
+
         </li>
-    
+
         <li class="chapter " data-level="1.3.2.8" data-path="deploy-background.html">
-            
+
                 <a href="deploy-background.html#监控服务">
-            
-                    
+
+
                     监控服务
-            
+
                 </a>
-            
 
-            
+
+
         </li>
-    
+
         <li class="chapter " data-level="1.3.2.9" data-path="deploy-background.html">
-            
+
                 <a href="deploy-background.html#日志查看">
-            
-                    
+
+
                     日志查看
-            
+
                 </a>
-            
 
-            
+
+
         </li>
-    
+
 
             </ul>
-            
+
         </li>
-    
+
 
             </ul>
-            
+
         </li>
-    
+
         <li class="chapter " data-level="1.4" >
-            
+
                 <span>
-            
-                    
+
+
                     前端开发文档
-            
+
                 </span>
-            
 
-            
+
+
             <ul class="articles">
-                
-    
+
+
         <li class="chapter " data-level="1.4.1" data-path="deploy-foreground.html">
-            
+
                 <a href="deploy-foreground.html#前端项目环境构建及编译">
-            
-                    
+
+
                     环境搭建
-            
+
                 </a>
-            
 
-            
+
+
         </li>
-    
+
         <li class="chapter " data-level="1.4.2" data-path="development.html">
-            
+
                 <a href="development.html#项目目录结构">
-            
-                    
+
+
                     项目目录结构
-            
+
                 </a>
-            
 
-            
+
+
         </li>
-    
+
         <li class="chapter " data-level="1.4.3" data-path="development.html">
-            
+
                 <a href="development.html#系统功能模块">
-            
-                    
+
+
                     系统功能模块
-            
+
                 </a>
-            
 
-            
+
+
         </li>
-    
+
         <li class="chapter " data-level="1.4.4" data-path="development.html">
-            
+
                 <a href="development.html#路由和状态管理">
-            
-                    
+
+
                     路由和状态管理
-            
+
                 </a>
-            
 
-            
+
+
         </li>
-    
+
         <li class="chapter " data-level="1.4.5" data-path="development.html">
-            
+
                 <a href="development.html#规范">
-            
-                    
+
+
                     规范
-            
+
                 </a>
-            
 
-            
+
+
         </li>
-    
+
         <li class="chapter " data-level="1.4.6" data-path="development.html">
-            
+
                 <a href="development.html#接口列表">
-            
-                    
+
+
                     接口列表
-            
+
                 </a>
-            
 
-            
+
+
         </li>
-    
+
         <li class="chapter " data-level="1.4.7" data-path="development.html">
-            
+
                 <a href="development.html#扩展开发">
-            
-                    
+
+
                     扩展开发
-            
+
                 </a>
-            
 
-            
+
+
         </li>
-    
+
 
             </ul>
-            
+
         </li>
-    
+
         <li class="chapter " data-level="1.5" >
-            
+
                 <span>
-            
-                    
+
+
                     后端开发文档
-            
+
                 </span>
-            
 
-            
+
+
             <ul class="articles">
-                
-    
+
+
         <li class="chapter " data-level="1.5.1" data-path="background-2.html">
-            
+
                 <a href="background-2.html">
-            
-                    
+
+
                     后端说明2
-            
+
                 </a>
-            
 
-            
+
+
         </li>
-    
+
 
             </ul>
-            
+
         </li>
-    
 
-    
+
+
 
     <li class="divider"></li>
 
@@ -846,18 +846,18 @@
 
 
                 </nav>
-            
-        
+
+
     </div>
 
     <div class="book-body">
-        
+
             <div class="body-inner">
-                
-                    
+
+
 
 <div class="book-header" role="navigation">
-    
+
 
     <!-- Title -->
     <h1>
@@ -871,12 +871,12 @@
 
                     <div class="page-wrapper" tabindex="-1" role="main">
                         <div class="page-inner">
-                            
+
 <div id="book-search-results">
     <div class="search-noresults">
-    
+
                                 <section class="normal markdown-section">
-                                
+
                                 <p>&#x200B;</p>
 <h1 id="&#x90E8;&#x7F72;&#x6587;&#x6863;">&#x90E8;&#x7F72;&#x6587;&#x6863;</h1>
 <h2 id="&#x8F6F;&#x4EF6;&#x8981;&#x6C42;">&#x8F6F;&#x4EF6;&#x8981;&#x6C42;</h2>
@@ -1057,7 +1057,7 @@ spring.redis.maxTotal=10000
 data.basedir.path=/xxx/xxx
 
 # directory path for user data download. self configuration, please make sure the directory exists and have read write permissions
-data.download.basedir.path=/xxx/xxx 
+data.download.basedir.path=/xxx/xxx
 
 # process execute directory. self configuration, please make sure the directory exists and have read write permissions
 process.exec.basepath=/xxx/xxx
@@ -1111,7 +1111,7 @@ fs.defaultFS=hdfs://${cluster_ipOrName}:8020
 #resourcemanager ha note this need ips , eg. 192.168.220.188,192.168.220.189
 yarn.resourcemanager.ha.rm.ids=${ip1},${ip2}
 
-# reousrcemanager path 
+# reousrcemanager path
 yarn.application.status.address=http://${ip1}:8088/ws/v1/cluster/apps/%s
 </code></pre><p>&#x5B9A;&#x65F6;&#x5668;&#x914D;&#x7F6E;&#x6587;&#x4EF6;</p>
 <ul>
@@ -1148,7 +1148,7 @@ org.quartz.jobStore.clusterCheckinInterval = 5000
 org.quartz.jobStore.dataSource = myDs
 
 #============================================================================
-# Configure Datasources  
+# Configure Datasources
 #============================================================================
 
 org.quartz.dataSource.myDs.driver = com.mysql.jdbc.Driver
@@ -1274,7 +1274,7 @@ master.reserved.memory=1
 
    &lt;appender name=&quot;MASTERLOGFILE&quot; class=&quot;ch.qos.logback.core.rolling.RollingFileAppender&quot;&gt;
       &lt;file&gt;${log.base}/escheduler-master.log&lt;/file&gt;
-      &lt;filter class=&quot;cn.escheduler.server.master.log.MasterLogFilter&quot;&gt;
+      &lt;filter class=&quot;org.apache.dolphinscheduler.server.master.log.MasterLogFilter&quot;&gt;
          &lt;level&gt;INFO&lt;/level&gt;
       &lt;/filter&gt;
       &lt;rollingPolicy class=&quot;ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy&quot;&gt;
@@ -1329,11 +1329,11 @@ worker.reserved.memory=1
             &lt;charset&gt;UTF-8&lt;/charset&gt;
         &lt;/encoder&gt;
     &lt;/appender&gt;
-    &lt;appender name=&quot;TASKLOGFILE&quot; class=&quot;cn.escheduler.server.worker.log.TaskLogAppender&quot;&gt;
+    &lt;appender name=&quot;TASKLOGFILE&quot; class=&quot;org.apache.dolphinscheduler.server.worker.log.TaskLogAppender&quot;&gt;
         &lt;filter class=&quot;ch.qos.logback.classic.filter.ThresholdFilter&quot;&gt;
             &lt;level&gt;INFO&lt;/level&gt;
         &lt;/filter&gt;
-        &lt;filter class=&quot;cn.escheduler.server.worker.log.TaskLogFilter&quot;&gt;&lt;/filter&gt;
+        &lt;filter class=&quot;org.apache.dolphinscheduler.server.worker.log.TaskLogFilter&quot;&gt;&lt;/filter&gt;
         &lt;file&gt;${log.base}/{processDefinitionId}/{processInstanceId}/{taskInstanceId}.log&lt;/file&gt;
         &lt;encoder&gt;
             &lt;pattern&gt;
@@ -1346,7 +1346,7 @@ worker.reserved.memory=1
 
     &lt;appender name=&quot;WORKERLOGFILE&quot; class=&quot;ch.qos.logback.core.rolling.RollingFileAppender&quot;&gt;
         &lt;file&gt;${log.base}/escheduler-worker.log&lt;/file&gt;
-        &lt;filter class=&quot;cn.escheduler.server.worker.log.WorkerLogFilter&quot;&gt;
+        &lt;filter class=&quot;org.apache.dolphinscheduler.server.worker.log.WorkerLogFilter&quot;&gt;
             &lt;level&gt;INFO&lt;/level&gt;
         &lt;/filter&gt;
 
@@ -1533,43 +1533,43 @@ sh ./bin/escheduler-daemon.sh stop alert-server
     |&#x2014;&#x2014; escheduler-logger-server.log
 </code></pre>
 
-                                
+
                                 </section>
-                            
+
     </div>
     <div class="search-results">
         <div class="has-results">
-            
+
             <h1 class="search-results-title"><span class='search-results-count'></span> results matching "<span class='search-query'></span>"</h1>
             <ul class="search-results-list"></ul>
-            
+
         </div>
         <div class="no-results">
-            
+
             <h1 class="search-results-title">No results matching "<span class='search-query'></span>"</h1>
-            
+
         </div>
     </div>
 </div>
 
                         </div>
                     </div>
-                
+
             </div>
 
-            
-                
+
+
                 <a href="deploy-foreground.html#问题" class="navigation navigation-prev " aria-label="Previous page: 问题">
                     <i class="fa fa-angle-left"></i>
                 </a>
-                
-                
+
+
                 <a href="deploy-background.html#基础软件安装" class="navigation navigation-next " aria-label="Next page: 基础软件安装">
                     <i class="fa fa-angle-right"></i>
                 </a>
-                
-            
-        
+
+
+
     </div>
 
     <script>
@@ -1580,46 +1580,46 @@ sh ./bin/escheduler-daemon.sh stop alert-server
     </script>
 </div>
 
-        
+
     <script src="../gitbook/gitbook.js"></script>
     <script src="../gitbook/theme.js"></script>
-    
-        
+
+
         <script src="../gitbook/gitbook-plugin-expandable-chapters/expandable-chapters.js"></script>
-        
-    
-        
+
+
+
         <script src="../gitbook/gitbook-plugin-insert-logo-link/plugin.js"></script>
-        
-    
-        
+
+
+
         <script src="../gitbook/gitbook-plugin-livereload/plugin.js"></script>
-        
-    
-        
+
+
+
         <script src="../gitbook/gitbook-plugin-search/search-engine.js"></script>
-        
-    
-        
+
+
+
         <script src="../gitbook/gitbook-plugin-search/search.js"></script>
-        
-    
-        
+
+
+
         <script src="../gitbook/gitbook-plugin-lunr/lunr.min.js"></script>
-        
-    
-        
+
+
+
         <script src="../gitbook/gitbook-plugin-lunr/search-lunr.js"></script>
-        
-    
-        
+
+
+
         <script src="../gitbook/gitbook-plugin-sharing/buttons.js"></script>
-        
-    
-        
+
+
+
         <script src="../gitbook/gitbook-plugin-fontsettings/fontsettings.js"></script>
-        
-    
+
+
 
     </body>
 </html>
diff --git a/script/create-dolphinscheduler.sh b/script/create-dolphinscheduler.sh
index ded20a29b3008bb87833c4c3a151bc0e23209db1..1c6c9faf049c323aa4f6b37f07186906a745c6a8 100644
--- a/script/create-dolphinscheduler.sh
+++ b/script/create-dolphinscheduler.sh
@@ -13,7 +13,7 @@ export ESCHEDULER_LIB_JARS=$ESCHEDULER_HOME/lib/*
 export ESCHEDULER_OPTS="-server -Xmx1g -Xms1g -Xss512k -XX:+DisableExplicitGC -XX:+UseConcMarkSweepGC -XX:+CMSParallelRemarkEnabled -XX:LargePageSizeInBytes=128m -XX:+UseFastAccessorMethods -XX:+UseCMSInitiatingOccupancyOnly -XX:CMSInitiatingOccupancyFraction=70"
 export STOP_TIMEOUT=5
 
-CLASS=cn.escheduler.dao.upgrade.shell.CreateDolphinScheduler
+CLASS=org.apache.dolphinscheduler.dao.upgrade.shell.CreateDolphinScheduler
 
 exec_command="$ESCHEDULER_OPTS -classpath $ESCHEDULER_CONF_DIR:$ESCHEDULER_LIB_JARS $CLASS"
 
diff --git a/script/dolphinscheduler-daemon.sh b/script/dolphinscheduler-daemon.sh
index bb075f7aa8fe6594c3147b71472d4bbec87058ca..488fd85996242b8c291107a8b8d556aaa2fe15fb 100644
--- a/script/dolphinscheduler-daemon.sh
+++ b/script/dolphinscheduler-daemon.sh
@@ -42,18 +42,18 @@ cd $ESCHEDULER_HOME
 
 if [ "$command" = "api-server" ]; then
   LOG_FILE="-Dlogging.config=conf/apiserver_logback.xml"
-  CLASS=cn.escheduler.api.ApiApplicationServer
+  CLASS=org.apache.dolphinscheduler.api.ApiApplicationServer
 elif [ "$command" = "master-server" ]; then
   LOG_FILE="-Dspring.config.location=conf/application_master.properties -Ddruid.mysql.usePingMethod=false"
-  CLASS=cn.escheduler.server.master.MasterServer
+  CLASS=org.apache.dolphinscheduler.server.master.MasterServer
 elif [ "$command" = "worker-server" ]; then
   LOG_FILE="-Dspring.config.location=conf/application_worker.properties -Ddruid.mysql.usePingMethod=false"
-  CLASS=cn.escheduler.server.worker.WorkerServer
+  CLASS=org.apache.dolphinscheduler.server.worker.WorkerServer
 elif [ "$command" = "alert-server" ]; then
   LOG_FILE="-Dspring.config.location=conf/application_alert.properties -Ddruid.mysql.usePingMethod=false"
-  CLASS=cn.escheduler.alert.AlertServer
+  CLASS=org.apache.dolphinscheduler.alert.AlertServer
 elif [ "$command" = "logger-server" ]; then
-  CLASS=cn.escheduler.server.rpc.LoggerServer
+  CLASS=org.apache.dolphinscheduler.server.rpc.LoggerServer
 else
   echo "Error: No command named \`$command' was found."
   exit 1
diff --git a/script/upgrade-dolphinscheduler.sh b/script/upgrade-dolphinscheduler.sh
index 453bd611ac92df38fabc68bcac1d8dd377238aa0..2a3d6418b5c696b75f27bcfa23e18ad2a51cf24e 100644
--- a/script/upgrade-dolphinscheduler.sh
+++ b/script/upgrade-dolphinscheduler.sh
@@ -13,7 +13,7 @@ export ESCHEDULER_LIB_JARS=$ESCHEDULER_HOME/lib/*
 export ESCHEDULER_OPTS="-server -Xmx1g -Xms1g -Xss512k -XX:+DisableExplicitGC -XX:+UseConcMarkSweepGC -XX:+CMSParallelRemarkEnabled -XX:LargePageSizeInBytes=128m -XX:+UseFastAccessorMethods -XX:+UseCMSInitiatingOccupancyOnly -XX:CMSInitiatingOccupancyFraction=70"
 export STOP_TIMEOUT=5
 
-CLASS=cn.escheduler.dao.upgrade.shell.UpgradeDolphinScheduler
+CLASS=org.apache.dolphinscheduler.dao.upgrade.shell.UpgradeDolphinScheduler
 
 exec_command="$ESCHEDULER_OPTS -classpath $ESCHEDULER_CONF_DIR:$ESCHEDULER_LIB_JARS $CLASS"