Browse Source

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

# Conflicts:
#	docs/zh_CN/前端部署文档.md
pull/1/MERGE
baoliang 6 years ago
parent
commit
df1ba0b85d
  1. 5
      .gitignore
  2. 1
      escheduler-dao/src/main/java/cn/escheduler/dao/ProcessDao.java
  3. 4
      escheduler-ui/.env

5
.gitignore vendored

@ -7,6 +7,11 @@
.idea .idea
.idea/ .idea/
.idea/* .idea/*
.target
.target/
target/*
*/target
*/target/*
.settings .settings
.nbproject .nbproject
.classpath .classpath

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

@ -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;

4
escheduler-ui/.env

@ -1,8 +1,6 @@
# 后端接口地址 # 后端接口地址
#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

Loading…
Cancel
Save