diff --git a/common/src/main/java/com/sdm/common/entity/flowable/executeConfig/HPCExecuteConfig.java b/common/src/main/java/com/sdm/common/entity/flowable/executeConfig/HPCExecuteConfig.java index 0e5983c5..1bb979a5 100644 --- a/common/src/main/java/com/sdm/common/entity/flowable/executeConfig/HPCExecuteConfig.java +++ b/common/src/main/java/com/sdm/common/entity/flowable/executeConfig/HPCExecuteConfig.java @@ -7,7 +7,7 @@ public class HPCExecuteConfig extends BaseExecuteConfig { private String beforeNodeId; // 先默认写死一个,后面前端配置传递 - private String masterFileRegularStr="^aa\\.xml$"; + private String masterFileRegularStr = "^.*\\.xml$"; // 先默认写死一个,后面前端配置传递 private String inputFilesRegularStr="^.+\\.json$"; 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 e2424f22..c0c8f2dd 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 @@ -158,7 +158,8 @@ public class HpcHandler implements ExecutionHandler,HPCExecu ProcessNodeParam beforeNode = beforeNodeParams.get(0); String beforeNodeJectKey = getNodeObjectKey(beforeNode); // 本地求解文件路径 taskLocalBaseDir - submitHpcTaskRemoteReq.setSimulationFileLocalPath(simulationBaseDir + beforeNodeJectKey); + String simulationFilePath = simulationBaseDir + beforeNodeJectKey; + submitHpcTaskRemoteReq.setSimulationFileLocalPath(simulationFilePath); CoreLogger.info("simulationFileLocalPath :{} ",simulationBaseDir + beforeNodeJectKey); } // 手动上传的 @@ -175,7 +176,9 @@ public class HpcHandler implements ExecutionHandler,HPCExecu // hpc 节点回传路径 ProcessNodeParam currentNode = currentNodeParams.get(0); String currentNodeJectKey = getNodeObjectKey(currentNode); - // hpc 回传文件路径 + // hpc 回传minio文件路径,桶和租户绑定 + submitHpcTaskRemoteReq.setStdoutSpdmMinoFilePath(currentNodeJectKey); + // hpc 回传本地文件路径 submitHpcTaskRemoteReq.setStdoutSpdmNasFilePath(simulationBaseDir + currentNodeJectKey); CoreLogger.info("stdoutSpdmNasFilePath :{} ",simulationBaseDir + currentNodeJectKey); }