瀏覽代碼

water docker 求解

huangxingxing 9 月之前
父節點
當前提交
e8a02f374c
共有 1 個文件被更改,包括 3 次插入3 次删除
  1. 3 3
      src/main/java/com/miniframe/bisiness/system/D00008Service.java

+ 3 - 3
src/main/java/com/miniframe/bisiness/system/D00008Service.java

@@ -339,7 +339,7 @@ public class D00008Service extends D00008BaseModel implements ExecProcessFlow {
 	}
 	}
 	//异步执行
 	//异步执行
 	@SneakyThrows
 	@SneakyThrows
-	public void exeWater(Integer aid,Integer jid) throws Exception{
+	public void exeWater2(Integer aid,Integer jid) throws Exception{
 		CompletableFuture<Void> cf = CompletableFuture.supplyAsync(()->{
 		CompletableFuture<Void> cf = CompletableFuture.supplyAsync(()->{
 			try {
 			try {
 				// 构建Docker命令字符串
 				// 构建Docker命令字符串
@@ -350,7 +350,7 @@ public class D00008Service extends D00008BaseModel implements ExecProcessFlow {
 						"-v " +
 						"-v " +
 						TemplateGenerator.BPATH+"/"+aid+"/"+jid+"/water/runWater.sh" +
 						TemplateGenerator.BPATH+"/"+aid+"/"+jid+"/water/runWater.sh" +
 						":/home/disaster/zhty/Water/runWater.sh " +
 						":/home/disaster/zhty/Water/runWater.sh " +
-						" water:1.0";
+						"water:1.0";
 				ProcessBuilder processBuilder = new ProcessBuilder(dockerCommand.split(" "));
 				ProcessBuilder processBuilder = new ProcessBuilder(dockerCommand.split(" "));
 				LogService.addLog(aid,jid,"Water","求解——————————————————开始");
 				LogService.addLog(aid,jid,"Water","求解——————————————————开始");
 //				Runtime runtime = Runtime.getRuntime();
 //				Runtime runtime = Runtime.getRuntime();
@@ -400,7 +400,7 @@ public class D00008Service extends D00008BaseModel implements ExecProcessFlow {
 	}
 	}
 	//异步执行
 	//异步执行
 	@SneakyThrows
 	@SneakyThrows
-	public void exeWater2(Integer aid,Integer jid) throws Exception{
+	public void exeWater(Integer aid,Integer jid) throws Exception{
 		CompletableFuture<Void> cf = CompletableFuture.supplyAsync(()->{
 		CompletableFuture<Void> cf = CompletableFuture.supplyAsync(()->{
 			try {
 			try {
 				LogService.addLog(aid,jid,"Water","求解——————————————————开始");
 				LogService.addLog(aid,jid,"Water","求解——————————————————开始");