Commit d037ca49 authored by gongzijian's avatar gongzijian
Browse files

Merge remote-tracking branch 'upstream/dev' into dev

parents 3a724185 00d63c40

.gitignore

+5 −0
Original line number Diff line number Diff line
@@ -7,6 +7,11 @@ 
.idea

.idea/

.idea/*

.target

.target/

target/*

*/target

*/target/*

.settings

.nbproject

.classpath

escheduler-dao/src/main/java/cn/escheduler/dao/ProcessDao.java

+1 −0
Original line number Diff line number Diff line
@@ -606,6 +606,7 @@ public class ProcessDao extends AbstractBaseDao { 
                    updateTaskInstance(taskInstance);

                }

                processInstance.setStartTime(new Date());

                processInstance.setEndTime(null);

                processInstance.setRunTimes(runTime +1);

                initComplementDataParam(processDefinition, processInstance, cmdParam);

                break;

escheduler-server/src/main/resources/worker.properties

+1 −1
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ worker.exec.threads=100 
worker.heartbeat.interval=10



# submit the number of tasks at a time

worker.fetch.task.num = 10

worker.fetch.task.num = 3





# only less than cpu avg load, worker server can work. default value : the number of cpu cores * 2

escheduler-ui/.env

+1 −3
Original line number Diff line number Diff line 


# 后端接口地址

#API_BASE = http://192.168.220.154:12345



API_BASE = http://192.168.221.188:12345

API_BASE = http://192.168.220.154:12345



# 本地开发如需ip访问项目把"#"号去掉

#DEV_HOST = 192.168.xx.xx