qiaozhanwei 5 лет назад
Родитель
Сommit
692b7acdde

+ 13 - 12
dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/ExecutorService.java

@@ -435,18 +435,19 @@ public class ExecutorService extends BaseService{
 
 
     /**
     /**
      * create command
      * create command
-     *
+     * @param commandType commandType
-     * @param commandType
+     * @param processDefineId processDefineId
-     * @param processDefineId
+     * @param nodeDep nodeDep
-     * @param nodeDep
+     * @param failureStrategy failureStrategy
-     * @param failureStrategy
+     * @param startNodeList startNodeList
-     * @param startNodeList
+     * @param schedule schedule
-     * @param schedule
+     * @param warningType warningType
-     * @param warningType
+     * @param executorId executorId
-     * @param excutorId
+     * @param warningGroupId warningGroupId
-     * @param warningGroupId
+     * @param runMode runMode
-     * @param runMode
+     * @param processInstancePriority processInstancePriority
-     * @return
+     * @param workerGroup workerGroup
+     * @return command id
      * @throws ParseException
      * @throws ParseException
      */
      */
     private int createCommand(CommandType commandType, int processDefineId,
     private int createCommand(CommandType commandType, int processDefineId,

+ 2 - 2
dolphinscheduler-dao/src/main/resources/datasource.properties

@@ -20,8 +20,8 @@
 #spring.datasource.driver-class-name=org.postgresql.Driver
 #spring.datasource.driver-class-name=org.postgresql.Driver
 #spring.datasource.url=jdbc:postgresql://localhost:5432/dolphinscheduler
 #spring.datasource.url=jdbc:postgresql://localhost:5432/dolphinscheduler
 # mysql
 # mysql
-spring.datasource.driver-class-name=com.mysql.jdbc.Driver
+spring.datasource.driver-class-name=org.postgresql.Driver
-spring.datasource.url=jdbc:mysql://localhost:3306/dolphinscheduler?useUnicode=true&characterEncoding=UTF-8
+spring.datasource.url=jdbc:postgresql://localhost:5432/dolphinscheduler
 spring.datasource.username=root
 spring.datasource.username=root
 spring.datasource.password=root@123
 spring.datasource.password=root@123