Commit a0665a49 authored by qiaozhanwei's avatar qiaozhanwei
Browse files

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

20190409
parents a3952ea6 a84a16f8

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

+1 −1
Original line number Diff line number Diff line
@@ -127,7 +127,7 @@ public class ProcessDefinitionController extends BaseController{ 
            logger.info("login user {}, update process define, project name: {}, process define name: {}, " +

                            "process_definition_json: {}, desc: {}, locations:{}, connects:{}",

                    loginUser.getUserName(), projectName, name, processDefinitionJson,desc, locations, connects);

            Map<String, Object> result = processDefinitionService.updateProccessDefinition(loginUser, projectName, id, name,

            Map<String, Object> result = processDefinitionService.updateProcessDefinition(loginUser, projectName, id, name,

                    processDefinitionJson, desc, locations, connects);

            return returnDataList(result);

        }catch (Exception e){

escheduler-api/src/main/java/cn/escheduler/api/service/ProcessDefinitionService.java

+3 −4
Original line number Diff line number Diff line
@@ -247,9 +247,9 @@ public class ProcessDefinitionService extends BaseDAGService { 
     * @param connects

     * @return

     */

    public Map<String, Object> updateProccessDefinition(User loginUser, String projectName, int id, String name,

    public Map<String, Object> updateProcessDefinition(User loginUser, String projectName, int id, String name,

                                                       String processDefinitionJson, String desc,

                                                        String locations, String connects) throws JsonProcessingException {

                                                       String locations, String connects) {

        Map<String, Object> result = new HashMap<>(5);



        Project project = projectMapper.queryByName(projectName);
@@ -284,7 +284,6 @@ public class ProcessDefinitionService extends BaseDAGService { 
        processDefine.setName(name);

        processDefine.setReleaseState(ReleaseState.OFFLINE);

        processDefine.setProjectId(project.getId());

        processDefine.setUserId(loginUser.getId());

        processDefine.setProcessDefinitionJson(processDefinitionJson);

        processDefine.setDesc(desc);

        processDefine.setLocations(locations);

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

+1 −1
Original line number Diff line number Diff line
@@ -1272,7 +1272,7 @@ public class ProcessDao extends AbstractBaseDao { 
        return scheduleMapper.queryById(id);

    }



    public List<ProcessInstance> queryNeddFailoverProcessInstances(String host){

    public List<ProcessInstance> queryNeedFailoverProcessInstances(String host){

        return processInstanceMapper.queryByHostAndStatus(host, stateArray);

    }

escheduler-server/src/main/java/cn/escheduler/server/zk/ZKMasterClient.java

+1 −1
Original line number Diff line number Diff line
@@ -256,7 +256,7 @@ public class ZKMasterClient extends AbstractZKClient { 


								logger.info("start master failover ...");



								List<ProcessInstance> needFailoverProcessInstanceList = processDao.queryNeddFailoverProcessInstances(masterHost);

								List<ProcessInstance> needFailoverProcessInstanceList = processDao.queryNeedFailoverProcessInstances(masterHost);



								//updateProcessInstance host is null and insert into command

								for(ProcessInstance processInstance : needFailoverProcessInstanceList){

escheduler-ui/.env

+1 −1
Original line number Diff line number Diff line 


# 后端接口地址

API_BASE = http://192.168.xx.xx:12345

API_BASE = http://192.168.220.154:12345



# 本地开发如需ip访问项目把"#"号去掉

#DEV_HOST = 192.168.xx.xx