diff --git a/data/src/main/resources/application-dev-190.yml b/data/src/main/resources/application-dev-190.yml index 742df38e..17d7426a 100644 --- a/data/src/main/resources/application-dev-190.yml +++ b/data/src/main/resources/application-dev-190.yml @@ -156,7 +156,7 @@ xxl: # 执行器应用名称 服务名-job-executor appname: data-job-executor # 执行器注册地址:默认使用address注册,若为null则使用ip:port注册 - address: + address: ${XXL_JOB_EXECUTOR_IP:} # 执行器IP ip: # 执行器端口,为了好记,web服务端口+1000 diff --git a/data/src/main/resources/application-dev-65.yml b/data/src/main/resources/application-dev-65.yml index b328e5df..7742d52e 100644 --- a/data/src/main/resources/application-dev-65.yml +++ b/data/src/main/resources/application-dev-65.yml @@ -156,7 +156,7 @@ xxl: # 执行器应用名称 服务名-job-executor appname: data-job-executor # 执行器注册地址:默认使用address注册,若为null则使用ip:port注册 - address: + address: ${XXL_JOB_EXECUTOR_IP:} # 执行器IP ip: # 执行器端口,为了好记,web服务端口+1000 diff --git a/data/src/main/resources/application-local.yml b/data/src/main/resources/application-local.yml index c0f1cf29..d3451c39 100644 --- a/data/src/main/resources/application-local.yml +++ b/data/src/main/resources/application-local.yml @@ -165,7 +165,7 @@ xxl: # 执行器应用名称 服务名-job-executor appname: data-job-executor # 执行器注册地址:默认使用address注册,若为null则使用ip:port注册 - address: + address: ${XXL_JOB_EXECUTOR_IP:} # 执行器IP ip: # 执行器端口,为了好记,web服务端口+1000 diff --git a/data/src/main/resources/application-lyric.yml b/data/src/main/resources/application-lyric.yml index 5537e89b..89240143 100644 --- a/data/src/main/resources/application-lyric.yml +++ b/data/src/main/resources/application-lyric.yml @@ -155,7 +155,7 @@ xxl: # 执行器应用名称 服务名-job-executor appname: data-job-executor # 执行器注册地址:默认使用address注册,若为null则使用ip:port注册 - address: + address: ${XXL_JOB_EXECUTOR_IP:} # 执行器IP ip: # 执行器端口,为了好记,web服务端口+1000 diff --git a/data/src/test/resources/application-test.yml b/data/src/test/resources/application-test.yml index 1e8a4117..9dcb7e0c 100644 --- a/data/src/test/resources/application-test.yml +++ b/data/src/test/resources/application-test.yml @@ -152,7 +152,7 @@ xxl: # 执行器应用名称 服务名-job-executor appname: data-job-executor # 执行器注册地址:默认使用address注册,若为null则使用ip:port注册 - address: + address: ${XXL_JOB_EXECUTOR_IP:} # 执行器IP ip: # 执行器端口,为了好记,web服务端口+1000 diff --git a/flowable/src/main/java/com/sdm/flowable/delegate/handler/HpcHandler.java b/flowable/src/main/java/com/sdm/flowable/delegate/handler/HpcHandler.java index bdd9d4d7..421b84c1 100644 --- a/flowable/src/main/java/com/sdm/flowable/delegate/handler/HpcHandler.java +++ b/flowable/src/main/java/com/sdm/flowable/delegate/handler/HpcHandler.java @@ -65,8 +65,9 @@ public class HpcHandler implements ExecutionHandler,HPCExecu submitHpcTaskRemoteReq.setSoftwareId(config.getUuid()); String beforeNodeId = config.getBeforeNodeId(); String currentNodeId =execution.getCurrentActivityId(); - String masterFileRegularStr = config.getInputFormat(); - String inputFilesRegularStr = config.getSlaveFormat(); + + String masterFileRegularStr = Objects.isNull(params.get("inputFormat"))?"":params.get("inputFormat").toString(); + String inputFilesRegularStr = Objects.isNull(params.get("slaveFormat"))?"":params.get("slaveFormat").toString(); CoreLogger.info("hpc executeMode:{}",params.get("executeMode")); String executeMode = params.get("executeMode").toString(); @@ -78,6 +79,8 @@ public class HpcHandler implements ExecutionHandler,HPCExecu // 自动才判断正则 if(Objects.equals(executeMode,FlowableConfig.EXECUTE_MODE_AUTO)&& StringUtils.isBlank(masterFileRegularStr)){ + log.info("hpc process excute,主求解文件规则是空,masterFileRegularStr:{},inputFilesRegularStr:{}", + params.get("inputFormat"),params.get("slaveFormat")); throw new RuntimeException("Hpc任务执行失败,主求解文件规则不能是空"); } CoreLogger.info("beforeNodeId:{},currentNodeId:{},masterFileRegularStr:{},inputFilesRegularStr:{}",beforeNodeId,currentNodeId,masterFileRegularStr,inputFilesRegularStr); diff --git a/pbs/src/main/resources/application-dev-190.yml b/pbs/src/main/resources/application-dev-190.yml index b8d89e9d..517a45c1 100644 --- a/pbs/src/main/resources/application-dev-190.yml +++ b/pbs/src/main/resources/application-dev-190.yml @@ -168,9 +168,9 @@ xxl: # 执行器应用名称 appname: pbs-job-executor # 执行器注册地址:默认使用address注册,若为null则使用ip:port注册 - address: + address: ${XXL_JOB_EXECUTOR_IP:} # 执行器IP - ip: + ip: ${XXL_JOB_EXECUTOR_IP:} # 执行器端口,为了好记,web服务端口+1000 port: 8105 # 执行器日志路径 diff --git a/pbs/src/main/resources/application-dev-65.yml b/pbs/src/main/resources/application-dev-65.yml index 25467db8..52e468bb 100644 --- a/pbs/src/main/resources/application-dev-65.yml +++ b/pbs/src/main/resources/application-dev-65.yml @@ -164,7 +164,7 @@ xxl: # 执行器应用名称 appname: pbs-job-executor # 执行器注册地址:默认使用address注册,若为null则使用ip:port注册 - address: + address: ${XXL_JOB_EXECUTOR_IP:} # 执行器IP ip: # 执行器端口,为了好记,web服务端口+1000 diff --git a/pbs/src/main/resources/application-local.yml b/pbs/src/main/resources/application-local.yml index e5e76c2c..f3e2fd3a 100644 --- a/pbs/src/main/resources/application-local.yml +++ b/pbs/src/main/resources/application-local.yml @@ -112,7 +112,7 @@ xxl: # 执行器应用名称 appname: pbs-job-executor # 执行器注册地址:默认使用address注册,若为null则使用ip:port注册 - address: + address: ${XXL_JOB_EXECUTOR_IP:} # 执行器IP ip: # 执行器端口,为了好记,web服务端口+1000 diff --git a/pbs/src/main/resources/application-lyric.yml b/pbs/src/main/resources/application-lyric.yml index 4a74ef95..55cf1403 100644 --- a/pbs/src/main/resources/application-lyric.yml +++ b/pbs/src/main/resources/application-lyric.yml @@ -175,7 +175,7 @@ xxl: # 执行器应用名称 appname: pbs-job-executor # 执行器注册地址:默认使用address注册,若为null则使用ip:port注册 - address: + address: ${XXL_JOB_EXECUTOR_IP:} # 执行器IP ip: # 执行器端口,为了好记,web服务端口+1000 diff --git a/project/src/main/resources/application-dev-190.yml b/project/src/main/resources/application-dev-190.yml index f297c27f..d88b4784 100644 --- a/project/src/main/resources/application-dev-190.yml +++ b/project/src/main/resources/application-dev-190.yml @@ -168,7 +168,7 @@ xxl: # 执行器应用名称 服务名-job-executor appname: project-job-executor # 执行器注册地址:默认使用address注册,若为null则使用ip:port注册 - address: + address: ${XXL_JOB_EXECUTOR_IP:} # 执行器IP ip: # 执行器端口,为了好记,web服务端口+1000 diff --git a/project/src/main/resources/application-dev-65.yml b/project/src/main/resources/application-dev-65.yml index 2c939914..3762dbc8 100644 --- a/project/src/main/resources/application-dev-65.yml +++ b/project/src/main/resources/application-dev-65.yml @@ -168,7 +168,7 @@ xxl: # 执行器应用名称 服务名-job-executor appname: project-job-executor # 执行器注册地址:默认使用address注册,若为null则使用ip:port注册 - address: + address: ${XXL_JOB_EXECUTOR_IP:} # 执行器IP ip: # 执行器端口,为了好记,web服务端口+1000 diff --git a/project/src/main/resources/application-local.yml b/project/src/main/resources/application-local.yml index 07e068ec..17c76fae 100644 --- a/project/src/main/resources/application-local.yml +++ b/project/src/main/resources/application-local.yml @@ -172,7 +172,7 @@ xxl: # 执行器应用名称 服务名-job-executor appname: project-job-executor # 执行器注册地址:默认使用address注册,若为null则使用ip:port注册 - address: + address: ${XXL_JOB_EXECUTOR_IP:} # 执行器IP ip: # 执行器端口,为了好记,web服务端口+1000 diff --git a/project/src/main/resources/application-lyric.yml b/project/src/main/resources/application-lyric.yml index fe3e7134..58e41ab1 100644 --- a/project/src/main/resources/application-lyric.yml +++ b/project/src/main/resources/application-lyric.yml @@ -169,7 +169,7 @@ xxl: # 执行器应用名称 服务名-job-executor appname: project-job-executor # 执行器注册地址:默认使用address注册,若为null则使用ip:port注册 - address: + address: ${XXL_JOB_EXECUTOR_IP:} # 执行器IP ip: # 执行器端口,为了好记,web服务端口+1000