Commit a83b3833 authored by baoliang's avatar baoliang
Browse files

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

parents b3f46ef1 c9022540

escheduler-alert/pom.xml

+1 −1
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ 
    <parent>

        <groupId>cn.analysys</groupId>

        <artifactId>escheduler</artifactId>

        <version>1.0.0-SNAPSHOT</version>

        <version>1.0.1-SNAPSHOT</version>

    </parent>

    <artifactId>escheduler-alert</artifactId>

    <packaging>jar</packaging>

escheduler-api/pom.xml

+1 −1
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ 
  <parent>

    <groupId>cn.analysys</groupId>

    <artifactId>escheduler</artifactId>

    <version>1.0.0-SNAPSHOT</version>

    <version>1.0.1-SNAPSHOT</version>

  </parent>

  <artifactId>escheduler-api</artifactId>

  <packaging>jar</packaging>

escheduler-api/src/main/java/cn/escheduler/api/quartz/ProcessScheduleJob.java

+1 −1
Original line number Diff line number Diff line
@@ -125,7 +125,7 @@ public class ProcessScheduleJob implements Job { 
        }



        Command command = new Command();

        command.setCommandType(CommandType.START_PROCESS);

        command.setCommandType(CommandType.SCHEDULER);

        command.setExecutorId(schedule.getUserId());

        command.setFailureStrategy(schedule.getFailureStrategy());

        command.setProcessDefinitionId(schedule.getProcessDefinitionId());

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

+5 −2
Original line number Diff line number Diff line
@@ -509,7 +509,7 @@ public class ProcessInstanceService extends BaseDAGService { 
        }



        // local params

        Map<String, List<Property>> localUserDefParams = new HashMap<>();

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

        for (TaskNode taskNode : taskNodeList) {

            String parameter = taskNode.getParams();

            Map<String, String> map = JSONUtils.toMap(parameter);
@@ -517,8 +517,11 @@ public class ProcessInstanceService extends BaseDAGService { 
            if (localParams != null && !localParams.isEmpty()) {

                localParams = ParameterUtils.convertParameterPlaceholders(localParams, timeParams);

                List<Property> localParamsList = JSON.parseArray(localParams, Property.class);

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

                localParamsMap.put("taskType",taskNode.getType());

                localParamsMap.put("localParamsList",localParamsList);

                if (localParamsList.size() > 0) {

                    localUserDefParams.put(taskNode.getName(), localParamsList);

                    localUserDefParams.put(taskNode.getName(), localParamsMap);

                }

            }

escheduler-common/pom.xml

+1 −1
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ 
	<parent>

		<artifactId>escheduler</artifactId>

		<groupId>cn.analysys</groupId>

		<version>1.0.0-SNAPSHOT</version>

		<version>1.0.1-SNAPSHOT</version>

	</parent>

	<artifactId>escheduler-common</artifactId>

	<name>escheduler-common</name>