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

.gitignore

+.git
+.svn
+.hg
+.zip
+.gz
+.DS_Store
+.idea
+.idea/
+.idea/*
+.target
+.target/
+target/*
+*/target
+*/target/*
+.settings
+.nbproject
+.classpath
+.project
+*.iml
+*.ipr
+*.iws
+*.tgz
+.*.swp
+.vim
+.tmp
+node_modules
+npm-debug.log
+.vscode
+logs/*
+.www
+t.*
+yarn.lock
+package-lock.json
+config.gypi
+test/coverage

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;

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

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

 
 # 后端接口地址
-#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

escheduler-ui/dist/index.html

@@ -4,4 +4,4 @@
 d="M37.3496987939662 -7 L47.3496987939662 -7 L47.3496987939662 7 L37.3496987939662 7 A38 38 0 0 1 31.359972760794346 21.46047782418268 L31.359972760794346 21.46047782418268 L38.431040572659825 28.531545636048154 L28.531545636048154 38.431040572659825 L21.46047782418268 31.359972760794346 A38 38 0 0 1 7.0000000000000036 37.3496987939662 L7.0000000000000036 37.3496987939662 L7.000000000000004 47.3496987939662 L-6.999999999999999 47.3496987939662 L-7 37.3496987939662 A38 38 0 0 1 -21.46047782418268 31.35997276079435 L-21.46047782418268 31.35997276079435 L-28.531545636048154 38.431040572659825 L-38.43104057265982 28.531545636048158 L-31.359972760794346 21.460477824182682 A38 38 0 0 1 -37.3496987939662 7.000000000000007 L-37.3496987939662 7.000000000000007 L-47.3496987939662 7.000000000000008 L-47.3496987939662 -6.9999999999999964 L-37.3496987939662 -6.999999999999997 A38 38 0 0 1 -31.35997276079435 -21.460477824182675 L-31.35997276079435 -21.460477824182675 L-38.431040572659825 -28.531545636048147 L-28.53154563604818 -38.4310405726598 L-21.4604778241827 -31.35997276079433 A38 38 0 0 1 -6.999999999999992 -37.3496987939662 L-6.999999999999992 -37.3496987939662 L-6.999999999999994 -47.3496987939662 L6.999999999999977 -47.3496987939662 L6.999999999999979 -37.3496987939662 A38 38 0 0 1 21.460477824182686 -31.359972760794342 L21.460477824182686 -31.359972760794342 L28.531545636048158 -38.43104057265982 L38.4310405726598 -28.53154563604818 L31.35997276079433 -21.4604778241827 A38 38 0 0 1 37.3496987939662 -6.999999999999995 M0 -23A23 23 0 1 0 0 23 A23 23 0 1 0 0 -23" 
 fill="#0097e0"></path></g></g><g transform="translate(19 19) scale(0.6)"><g transform="rotate(229.634)"><animateTransform attributeName="transform" type="rotate" values="360;0" keyTimes="0;1" dur="1s" begin="-0.0625s" repeatCount="indefinite"></animateTransform><path 
 d="M37.3496987939662 -7 L47.3496987939662 -7 L47.3496987939662 7 L37.3496987939662 7 A38 38 0 0 1 31.359972760794346 21.46047782418268 L31.359972760794346 21.46047782418268 L38.431040572659825 28.531545636048154 L28.531545636048154 38.431040572659825 L21.46047782418268 31.359972760794346 A38 38 0 0 1 7.0000000000000036 37.3496987939662 L7.0000000000000036 37.3496987939662 L7.000000000000004 47.3496987939662 L-6.999999999999999 47.3496987939662 L-7 37.3496987939662 A38 38 0 0 1 -21.46047782418268 31.35997276079435 L-21.46047782418268 31.35997276079435 L-28.531545636048154 38.431040572659825 L-38.43104057265982 28.531545636048158 L-31.359972760794346 21.460477824182682 A38 38 0 0 1 -37.3496987939662 7.000000000000007 L-37.3496987939662 7.000000000000007 L-47.3496987939662 7.000000000000008 L-47.3496987939662 -6.9999999999999964 L-37.3496987939662 -6.999999999999997 A38 38 0 0 1 -31.35997276079435 -21.460477824182675 L-31.35997276079435 -21.460477824182675 L-38.431040572659825 -28.531545636048147 L-28.53154563604818 -38.4310405726598 L-21.4604778241827 -31.35997276079433 A38 38 0 0 1 -6.999999999999992 -37.3496987939662 L-6.999999999999992 -37.3496987939662 L-6.999999999999994 -47.3496987939662 L6.999999999999977 -47.3496987939662 L6.999999999999979 -37.3496987939662 A38 38 0 0 1 21.460477824182686 -31.359972760794342 L21.460477824182686 -31.359972760794342 L28.531545636048158 -38.43104057265982 L38.4310405726598 -28.53154563604818 L31.35997276079433 -21.4604778241827 A38 38 0 0 1 37.3496987939662 -6.999999999999995 M0 -23A23 23 0 1 0 0 23 A23 23 0 1 0 0 -23" 
-fill="#7f8b95"></path></g></g></g></svg> <span class="sp1">Loading ...</span></div></div><script src="/combo/1.0.0/3rd.js?v1.0.0.1"></script><script src="/js/common.3789e85.js"></script><script src="/js/home/index.d5f0640.js"></script></body></html>
\ No newline at end of file
+fill="#7f8b95"></path></g></g></g></svg> <span class="sp1">Loading ...</span></div></div><script src="/combo/1.0.0/3rd.js?v1.0.0.1"></script><script src="/js/common.804ec41.js"></script><script src="/js/home/index.2ed28db.js"></script></body></html>
\ No newline at end of file

escheduler-ui/dist/js/28.3d163df.js → escheduler-ui/dist/js/28.5c6c701.js

-webpackJsonp([28],{1030:function(t,n,e){"use strict";n.__esModule=!0,n.default={name:"process-instance-index",data:function(){return{}},props:{},methods:{},watch:{},created:function(){},mounted:function(){},updated:function(){},beforeDestroy:function(){},destroyed:function(){},computed:{},components:{}}},1122:function(t,n,e){var o=e(1123);"string"==typeof o&&(o=[[t.i,o,""]]),o.locals&&(t.exports=o.locals);e(35)("00d558f4",o,!0,{})},1123:function(t,n,e){(t.exports=e(34)(!1)).push([t.i,"",""])},1124:function(t,n,e){"use strict";var o={render:function(){var t=this.$createElement;return(this._self._c||t)("router-view")},staticRenderFns:[]};n.a=o},610:function(t,n,e){"use strict";Object.defineProperty(n,"__esModule",{value:!0});var o=e(1030),r=e.n(o);for(var u in o)"default"!==u&&function(t){e.d(n,t,function(){return o[t]})}(u);var c=e(1124);var i=function(t){e(1122)},s=e(27)(r.a,c.a,!1,i,null,null);n.default=s.exports}});
-//# sourceMappingURL=28.3d163df.js.map
\ No newline at end of file
+webpackJsonp([28],{1030:function(t,n,e){"use strict";n.__esModule=!0,n.default={name:"process-instance-index",data:function(){return{}},props:{},methods:{},watch:{},created:function(){},mounted:function(){},updated:function(){},beforeDestroy:function(){},destroyed:function(){},computed:{},components:{}}},1120:function(t,n,e){var o=e(1121);"string"==typeof o&&(o=[[t.i,o,""]]),o.locals&&(t.exports=o.locals);e(35)("00d558f4",o,!0,{})},1121:function(t,n,e){(t.exports=e(34)(!1)).push([t.i,"",""])},1122:function(t,n,e){"use strict";var o={render:function(){var t=this.$createElement;return(this._self._c||t)("router-view")},staticRenderFns:[]};n.a=o},610:function(t,n,e){"use strict";Object.defineProperty(n,"__esModule",{value:!0});var o=e(1030),r=e.n(o);for(var u in o)"default"!==u&&function(t){e.d(n,t,function(){return o[t]})}(u);var c=e(1122);var i=function(t){e(1120)},s=e(27)(r.a,c.a,!1,i,null,null);n.default=s.exports}});
+//# sourceMappingURL=28.5c6c701.js.map
\ No newline at end of file

escheduler-ui/dist/js/30.2a033b5.js → escheduler-ui/dist/js/30.887711c.js

-webpackJsonp([30],{1080:function(e,n,t){"use strict";n.__esModule=!0,n.default={name:"user-index"}},1220:function(e,n,t){"use strict";var r={render:function(){var e=this.$createElement;return(this._self._c||e)("router-view")},staticRenderFns:[]};n.a=r},636:function(e,n,t){"use strict";Object.defineProperty(n,"__esModule",{value:!0});var r=t(1080),u=t.n(r);for(var a in r)"default"!==a&&function(e){t.d(n,e,function(){return r[e]})}(a);var i=t(1220),s=t(27)(u.a,i.a,!1,null,null,null);n.default=s.exports}});
-//# sourceMappingURL=30.2a033b5.js.map
\ No newline at end of file
+webpackJsonp([30],{1080:function(e,n,t){"use strict";n.__esModule=!0,n.default={name:"user-index"}},1218:function(e,n,t){"use strict";var r={render:function(){var e=this.$createElement;return(this._self._c||e)("router-view")},staticRenderFns:[]};n.a=r},636:function(e,n,t){"use strict";Object.defineProperty(n,"__esModule",{value:!0});var r=t(1080),u=t.n(r);for(var a in r)"default"!==a&&function(e){t.d(n,e,function(){return r[e]})}(a);var i=t(1218),s=t(27)(u.a,i.a,!1,null,null,null);n.default=s.exports}});
+//# sourceMappingURL=30.887711c.js.map
\ No newline at end of file