Browse Source

update

pull/2/head
lenboo 5 years ago
parent
commit
1a09f56d50
  1. 6
      escheduler-dao/src/main/resources/dao/data_source.properties
  2. 3
      escheduler-server/src/test/java/cn/escheduler/server/master/MasterCommandTest.java

6
escheduler-dao/src/main/resources/dao/data_source.properties

@ -1,9 +1,9 @@
# base spring data source configuration
spring.datasource.type=com.alibaba.druid.pool.DruidDataSource
spring.datasource.driver-class-name=com.mysql.jdbc.Driver
spring.datasource.url=jdbc:mysql://192.168.xx.xx:3306/escheduler?characterEncoding=UTF-8
spring.datasource.username=xx
spring.datasource.password=xx
spring.datasource.url=jdbc:mysql://192.168.220.188:3306/escheduler_new?characterEncoding=UTF-8
spring.datasource.username=root
spring.datasource.password=root@123
# connection configuration
spring.datasource.initialSize=5

3
escheduler-server/src/test/java/cn/escheduler/server/master/MasterCommandTest.java

@ -30,7 +30,6 @@ import cn.escheduler.dao.mapper.ProcessDefinitionMapper;
import cn.escheduler.dao.model.Command;
import cn.escheduler.dao.model.ProcessDefinition;
import cn.escheduler.dao.utils.DagHelper;
import org.codehaus.jackson.SerializableString;
import org.junit.Before;
import org.junit.Test;
import org.slf4j.Logger;
@ -132,7 +131,7 @@ public class MasterCommandTest {
new ArrayList<>(), new ArrayList<>(), TaskDependType.TASK_POST);
DAG<String,TaskNode,TaskNodeRelation> dag = DagHelper.buildDagGraph(processDag);
Collection<String> start = DagHelper.getStartVertex("1", dag);
Collection<String> start = DagHelper.getStartVertex("1", dag, null);
System.out.println(start.toString());

Loading…
Cancel
Save