test/DolphinScheduler
1
0
Fork 0
mirror of https://gitee.com/dolphinscheduler/DolphinScheduler.git synced 2024-12-03 20:58:11 +08:00
Code Issues Actions 10 Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
gongzijian 2019-04-19 17:04:12 +08:00
commit d5784cf0fc
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
escheduler-api/src/main/java/cn/escheduler/api/service/ProcessInstanceService.java
View File

@ -509,7 +509,7 @@ public class ProcessInstanceService extends BaseDAGService {
} }
// local params // local params
Map<String, List<Property>> localUserDefParams = new HashMap<>(); Map<String, Map<String,Object>> localUserDefParams = new HashMap<>();
for (TaskNode taskNode : taskNodeList) { for (TaskNode taskNode : taskNodeList) {
String parameter = taskNode.getParams(); String parameter = taskNode.getParams();
Map<String, String> map = JSONUtils.toMap(parameter); Map<String, String> map = JSONUtils.toMap(parameter);
@ -517,8 +517,11 @@ public class ProcessInstanceService extends BaseDAGService {
if (localParams != null && !localParams.isEmpty()) { if (localParams != null && !localParams.isEmpty()) {
localParams = ParameterUtils.convertParameterPlaceholders(localParams, timeParams); localParams = ParameterUtils.convertParameterPlaceholders(localParams, timeParams);
List<Property> localParamsList = JSON.parseArray(localParams, Property.class); 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) { if (localParamsList.size() > 0) {
localUserDefParams.put(taskNode.getName(), localParamsList); localUserDefParams.put(taskNode.getName(), localParamsMap);
} }
} }

2
escheduler-dao/src/main/java/cn/escheduler/dao/mapper/AccessTokenMapperProvider.java
View File

@ -80,7 +80,7 @@ public class AccessTokenMapperProvider {
SET("`expire_time`=#{accessToken.expireTime}"); SET("`expire_time`=#{accessToken.expireTime}");
SET("`update_time`=#{accessToken.updateTime}"); SET("`update_time`=#{accessToken.updateTime}");
WHERE("`id`=#{user.id}"); WHERE("`id`=#{accessToken.id}");
} }
}.toString(); }.toString();
} }