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

escheduler-api/src/main/java/cn/escheduler/api/controller/ExecutorController.java

@@ -92,8 +92,8 @@ public class ExecutorController extends BaseController {
             logger.info("login user {}, start process instance, project name: {}, process definition id: {}, schedule time: {}, "
                             + "failure policy: {}, node name: {}, node dep: {}, notify type: {}, "
                             + "notify group id: {},receivers:{},receiversCc:{}, run mode: {},process instance priority:{}, workerGroupId: {}, timeout: {}",
-                    loginUser.getUserName(), projectName, processDefinitionId, scheduleTime, failureStrategy,
-                    taskDependType, warningType, warningGroupId,receivers,receiversCc,runMode,processInstancePriority,
+                    loginUser.getUserName(), projectName, processDefinitionId, scheduleTime,
+                    failureStrategy, startNodeList, taskDependType, warningType, warningGroupId,receivers,receiversCc,runMode,processInstancePriority,
                     workerGroupId, timeout);
 
             if (timeout == null) {

escheduler-common/src/main/java/cn/escheduler/common/zk/AbstractZKClient.java

@@ -344,9 +344,12 @@ public abstract class AbstractZKClient {
 		String parentPath = getZNodeParentPath(zkNodeType);
 
 		List<MasterServer> masterServers = new ArrayList<>();
+		int i = 0;
 		for(String path : masterMap.keySet()){
 			MasterServer masterServer = ResInfo.parseHeartbeatForZKInfo(masterMap.get(path));
 			masterServer.setZkDirectory( parentPath + "/"+ path);
+			masterServer.setId(i);
+			i ++;
 			masterServers.add(masterServer);
 		}
 		return masterServers;

escheduler-ui/src/js/conf/home/pages/resource/pages/file/pages/_source/common.js

@@ -18,6 +18,6 @@
 /**
  * Create file type
  */
-let filtTypeArr = ['txt', 'log', 'sh', 'conf', 'cfg', 'py', 'java', 'sql', 'xml', 'hql']
+let filtTypeArr = ['txt', 'log', 'sh', 'conf', 'cfg', 'py', 'java', 'sql', 'xml', 'hql', 'properties']
 
 export { filtTypeArr }

escheduler-ui/src/js/conf/home/pages/resource/pages/file/pages/details/_source/utils.js

@@ -28,7 +28,8 @@ const handlerSuffix = {
   '.java': 'textile',
   '.sql': 'sql',
   '.hql': 'sql',
-  '.xml': 'xml'
+  '.xml': 'xml',
+  '.properties': 'textile'
 }