瀏覽代碼

文件监听

huangxingxing 6 月之前
父節點
當前提交
ca75438527

+ 8 - 2
src/main/java/com/miniframe/bisiness/mdo/MDO0039Service.java

@@ -133,12 +133,18 @@ public class MDO0039Service extends MDO0039BaseModel implements ExecProcessFlow
 		LogService.addLog(pid,"求解——————————————————开始");
 		DockerExe.stopDocker(pid);
 		DockerExe.runMdo2(pid);
+		int con=0;
+		final String[] line = {""};
 		CompletableFuture<Void> cf = CompletableFuture.supplyAsync(()-> {try {
 			DockerExe.getDockerLogs(pid,new ResultCallback.Adapter<Frame>() {
 				@Override
 				public void onNext(Frame frame) {
-					String line =new String(frame.getPayload());
-					LogService.addLog(pid,line);
+					if(con <100){
+						line[0]+=new String(frame.getPayload());
+					}else{
+						LogService.addLog(pid, line[0]);
+						line[0]="";
+					}
 					System.out.print(new String(frame.getPayload()));
 					super.onNext(frame);
 				}

+ 5 - 7
src/main/java/com/miniframe/mdo/service/LogService.java

@@ -63,13 +63,11 @@ public class LogService {
         } catch (IOException e) {
             e.printStackTrace();
         }
-//        CompletableFuture<Void> cf = CompletableFuture.supplyAsync(()->{
-//                System.out.println("s消息发送:aid:"+aid+"--log:"+log);
-//        WebsocketEndPoint webs =  (WebsocketEndPoint) UtilTools.getBean("websocketEndPoint");
-//        webs.sendMessageToUser(String.valueOf(pid),log);
-//                System.out.println("d消息发送:aid:"+aid+"--log:"+log);
-//        return null;
-//        });
+        CompletableFuture<Void> cf = CompletableFuture.supplyAsync(()->{
+        WebsocketEndPoint webs =  (WebsocketEndPoint) UtilTools.getBean("websocketEndPoint");
+        webs.sendMessageToUser(String.valueOf(pid),log);
+        return null;
+        });
     }
     /**
      * 文件内容追加

+ 0 - 2
src/main/java/com/miniframe/tools/file/SurromdaoFileListener.java

@@ -61,8 +61,6 @@ public class SurromdaoFileListener extends FileAlterationListenerAdaptor {
 
                         WebsocketEndPoint webs =  (WebsocketEndPoint) UtilTools.getBean("websocketEndPoint");
                         Gson gson = new Gson();
-                        System.out.println(gson.toJson(comval));
-                        webs.sendMessageToUser(String.valueOf(pid),gson.toJson(comval));
 
                     }
                     i++;