|
@@ -342,15 +342,16 @@ public class D00008Service extends D00008BaseModel implements ExecProcessFlow {
|
|
|
public void exeWater(Integer aid,Integer jid) throws Exception{
|
|
|
CompletableFuture<Void> cf = CompletableFuture.supplyAsync(()->{
|
|
|
try {
|
|
|
- ProcessBuilder processBuilder = new ProcessBuilder(
|
|
|
- "docker"," run","--name " +
|
|
|
- aid +jid+
|
|
|
- " -it -v /home/disaster/zhty/:/home/disaster/zhty/ " +
|
|
|
- "-v /cephfs/disaster/:/cephfs/disaster/ " +
|
|
|
- "-v " +
|
|
|
- TemplateGenerator.BPATH+"/"+aid+"/"+jid+"/water/runWater.sh" +
|
|
|
- ":/home/disaster/zhty/Water/runWater.sh " +
|
|
|
- " water:1.0");
|
|
|
+ // 构建Docker命令字符串
|
|
|
+ String dockerCommand = "docker run --name " +
|
|
|
+ aid +jid+
|
|
|
+ " -it -v /home/disaster/zhty/:/home/disaster/zhty/ " +
|
|
|
+ "-v /cephfs/disaster/:/cephfs/disaster/ " +
|
|
|
+ "-v " +
|
|
|
+ TemplateGenerator.BPATH+"/"+aid+"/"+jid+"/water/runWater.sh" +
|
|
|
+ ":/home/disaster/zhty/Water/runWater.sh " +
|
|
|
+ " water:1.0";
|
|
|
+ ProcessBuilder processBuilder = new ProcessBuilder(dockerCommand.split(" "));
|
|
|
LogService.addLog(aid,jid,"Water","求解——————————————————开始");
|
|
|
// Runtime runtime = Runtime.getRuntime();
|
|
|
// Process p =null;
|
|
@@ -371,7 +372,7 @@ public class D00008Service extends D00008BaseModel implements ExecProcessFlow {
|
|
|
// InputStreamReader isr = new InputStreamReader(fis);
|
|
|
// BufferedReader br = new BufferedReader(isr);
|
|
|
Process process = processBuilder.start();
|
|
|
-
|
|
|
+ processBuilder.redirectErrorStream(true); // 将错误流合并到标准输出流
|
|
|
// 读取命令的输出
|
|
|
BufferedReader reader = new BufferedReader(new InputStreamReader(process.getInputStream()));
|
|
|
String line = null;
|