Unverified Commit 00d63c40 authored by bao liang's avatar bao liang Committed by GitHub
Browse files

Merge pull request #43 from lenboo/dev 

fix bug the running time is negative when repeat running
parents c999410e df1ba0b8

.gitignore

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

.idea

.idea/

.idea/

.idea/*

.idea/*

.target

.target/

target/*

*/target

*/target/*

.settings

.settings

.nbproject

.nbproject

.classpath

.classpath

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

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

                    updateTaskInstance(taskInstance);

                }

                }

                processInstance.setStartTime(new Date());

                processInstance.setStartTime(new Date());

                processInstance.setEndTime(null);

                processInstance.setRunTimes(runTime +1);

                processInstance.setRunTimes(runTime +1);

                initComplementDataParam(processDefinition, processInstance, cmdParam);

                initComplementDataParam(processDefinition, processInstance, cmdParam);

                break;

                break;

escheduler-ui/.env

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




# 后端接口地址

# 后端接口地址

#API_BASE = http://192.168.220.154:12345

API_BASE = http://192.168.220.154:12345



API_BASE = http://192.168.221.188:12345





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

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

#DEV_HOST = 192.168.xx.xx
 
#DEV_HOST = 192.168.xx.xx