diff --git a/.gitignore b/.gitignore index 284a33d8fa1c940f9a6f7fb370bbd5b2cc87d6a5..45e306b2055dee7326a0087afc049818eb44dee0 100644 --- a/.gitignore +++ b/.gitignore @@ -7,6 +7,11 @@ .idea .idea/ .idea/* +.target +.target/ +target/* +*/target +*/target/* .settings .nbproject .classpath diff --git a/escheduler-dao/src/main/java/cn/escheduler/dao/ProcessDao.java b/escheduler-dao/src/main/java/cn/escheduler/dao/ProcessDao.java index c6164c4523a9b5fc0aa6f8d4f81506ba5df4632d..38dce40f81b628ba558e10d9a36579db7da4e89e 100644 --- a/escheduler-dao/src/main/java/cn/escheduler/dao/ProcessDao.java +++ b/escheduler-dao/src/main/java/cn/escheduler/dao/ProcessDao.java @@ -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; diff --git a/escheduler-ui/.env b/escheduler-ui/.env index 752791a092e95e790718005b3fc7adc9645e28d9..d4dcd9f473fdce762abfd2c272181c6d88ba0cac 100644 --- a/escheduler-ui/.env +++ b/escheduler-ui/.env @@ -1,8 +1,6 @@ # 后端接口地址 -#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