From df1ba0b85d5d68c180c6d2b6b1ec92cf79ed6532 Mon Sep 17 00:00:00 2001 From: baoliang Date: Fri, 12 Apr 2019 11:55:16 +0800 Subject: [PATCH] Merge remote-tracking branch 'upstream/dev' into dev MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit # Conflicts: # docs/zh_CN/前端部署文档.md --- .gitignore | 5 +++++ .../src/main/java/cn/escheduler/dao/ProcessDao.java | 1 + escheduler-ui/.env | 4 +--- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 284a33d8fa..45e306b205 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 c6164c4523..38dce40f81 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 752791a092..d4dcd9f473 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