合并分支 'wyl' 到 'master'

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

@@ -69,12 +69,13 @@ public class WebSocketServer {
         this.session.getBasicRemote().sendText(message);
     }
     public static void sendIn(String sessionId,String message) throws IOException {
-        try {
-            map.get(sessionId).sendMessage(message);
-        }catch (Exception e){
-            log.info("向前台发送日志出错");
-            //e.printStackTrace();
-        }
+        System.out.println(message);
+//        try {
+//            map.get(sessionId).sendMessage(message);
+//        }catch (Exception e){
+//            log.info("向前台发送日志出错");
+//            //e.printStackTrace();
+//        }
     }
 
 }

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.sendIn(uuid,TimeUtil.getNowDate()+"内容替换：过滤文件"+project.getProjectName());
+                        WebSocketServer.sendIn(uuid,TimeUtil.getNowDate()+"内容替换：过滤文件"+project.getProjectName()+file.getFileName());
                         //System.out.println();
                         if (attrs.size() > LIMIT) {
                             System.out.println("找到大文件" + file);
@@ -174,9 +174,9 @@ public class Adaptor {
             }
             //originalFileDao.saveAll(originalFiles);
             //adaptationDetailLogEntityDao.saveAll(detailsLogEntities);
-//            Project one = projectDao.getOne(project.getId());
-//            one.setStage(1);
-            Project one = new Project();
+            Project one = projectDao.getOne(project.getId());
+            one.setStage(1);
+            //Project one = new Project();
             return ServerResponse.success("替换成功",one);
         } catch (IOException e) {
             e.printStackTrace();

src/test/java/com/zjty/adaptationmaster/TestDemo.java

+package com.zjty.adaptationmaster;
+
+import com.zjty.adaptationmaster.adaptor.entity.Project;
+import com.zjty.adaptationmaster.adaptor.entity.Rule;
+import com.zjty.adaptationmaster.utils.Adaptor;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class TestDemo {
+    public static void main(String[] args) {
+
+
+
+        Rule rule = new Rule();
+        rule.setPath("*.*");
+        rule.setTarget("OpenDoc\\(\\);");
+        rule.setReplacing("OpenOfd\\(\\);");
+
+        List ruleList = new ArrayList();
+        ruleList.add(rule);
+        Project project = new Project();
+        project.setCodeUrl("C:\\Users\\wyl\\Desktop\\demo");
+        project.setProjectName("aaa");
+        Adaptor adaptor = new Adaptor();
+        adaptor.setRuleList(ruleList);
+        adaptor.setProject(project);
+        adaptor.doAdapt();
+    }
+}