统一日志

src/main/java/com/zjty/adaptationmaster/adaptor/controller/WebSocketServer.java

@@ -68,16 +68,6 @@ public class WebSocketServer {
     public void sendMessage(String message) throws IOException {
         this.session.getBasicRemote().sendText(message);
     }
-
-    public static void sendInfo(String sessionId,String msg,String action,String state,String projectName){
-
-//        try {
-//            //System.out.println(sessionId);
-//            //map.get(sessionId).sendMessage(LocalDateTime.now()+"\t"+projectName+"\t"+action+"\t"+state+"\t"+msg);
-//        } catch (IOException e) {
-//                e.printStackTrace();
-//        }
-    }
     public static void sendIn(String sessionId,String message) throws IOException {
         try {
             map.get(sessionId).sendMessage(message);

src/main/java/com/zjty/adaptationmaster/utils/Adaptor.java

@@ -119,7 +119,7 @@ public class Adaptor {
                         //Files.copy(file,originalPath);
                         Files.move(file, originalPath);
                         //splitedFile.setDeal(true);
-                        WebSocketServer.sendInfo(uuid,"过滤得到符合规则的文件" + file,"替换","过滤文件",project.getProjectName());
+                        WebSocketServer.sendIn(uuid,TimeUtil.getNowDate()+"内容替换：过滤文件"+project.getProjectName());
                         //System.out.println();
                         if (attrs.size() > LIMIT) {
                             System.out.println("找到大文件" + file);

src/main/java/com/zjty/adaptationmaster/utils/ApusicDeployer.java

@@ -83,7 +83,7 @@ public class ApusicDeployer {
             BufferedReader reader = new BufferedReader(new InputStreamReader(exec.getInputStream(),"GBK"));
             String line = null;
             while ((line = reader.readLine()) != null) {
-                WebSocketServer.sendInfo(webSocketName, line, "部署", "running", projectName);
+                WebSocketServer.sendIn(webSocketName, TimeUtil.getNowDate()+"自动部署："+ projectName+line);
             }
         } catch (IOException e) {
             e.printStackTrace();

src/main/java/com/zjty/adaptationmaster/utils/MavenCompiler.java

@@ -34,7 +34,7 @@ public class MavenCompiler {
         invoker.setOutputHandler(new InvocationOutputHandler() {
             @Override
             public void consumeLine(String s) throws IOException {
-                WebSocketServer.sendInfo(webSocketId,s,"编译","running",project.getProjectName());
+                WebSocketServer.sendIn(webSocketId,"自动编译："+project.getProjectName()+s);
                 System.out.println(s);
             }
         });
@@ -46,11 +46,12 @@ public class MavenCompiler {
                     project.setCompileSuccess(true);
                 }
             }else {
-                WebSocketServer.sendInfo(webSocketId,"项目编译出错","编译","error",project.getProjectName());
-                WebSocketServer.sendInfo(webSocketId,executionException.getMessage(),"编译","error",project.getProjectName());
+                WebSocketServer.sendIn(webSocketId,TimeUtil.getNowDate()+"项目编译:出错"+project.getProjectName());
             }
         } catch (MavenInvocationException e) {
             e.printStackTrace();
+        } catch (IOException e) {
+            e.printStackTrace();
         }
     }
 

src/main/java/com/zjty/adaptationmaster/utils/ReadedFileTask.java

@@ -72,7 +72,7 @@ public class ReadedFileTask implements Runnable {
                     bySort.insert(index, content);
                 } else {
                     System.out.println("notbysort");
-                    WebSocketServer.sendInfo(uuid, readedFile.getPath().getFileName() + "", "替换", "正在写出", projectName);
+                    WebSocketServer.sendIn(uuid, TimeUtil.getNowDate()+"内容替换：文件写出"+readedFile.getPath().getFileName());
                     File file = readedFile.getPath().toFile();
                     file.createNewFile();
                     OutputStreamWriter contentWriter = new OutputStreamWriter(new FileOutputStream(file));

src/main/java/com/zjty/adaptationmaster/utils/TimeUtil.java

 package com.zjty.adaptationmaster.utils;
 
+import java.time.LocalDateTime;
 import java.util.Date;
 
 public class TimeUtil {
     public static String getNowDate(){
-        Date date = new Date();
-        return date.getHours() + ":" + date.getMinutes() +  ":" + date.getSeconds();
+        LocalDateTime date = LocalDateTime.now();
+        return date.getHour() + ":" + date.getMinute() +  ":" + date.getSecond();
     }
 }