Merge branch 'master' of 192.168.1.249:ty_wyl/adaptation-master1 into wyl

src/main/java/com/zjty/adaptationmaster/adaptor/service/Impl/InspectServiceImpl.java

@@ -98,6 +98,7 @@ public class InspectServiceImpl implements InspectService {
             reportEntity.setLanguage(report.getLanguage());
             reportEntity.setLineNum(report.getLineNum());
             reportEntity.setCreateTime(new Date().getTime());
+            reportEntity.setPackagePath(report.getPackagePath());
 
             List<Inspector.Warn> warnList = report.getWarnList();
             String s1 = JSON.toJSONString(warnList);

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

@@ -23,13 +23,13 @@ public class ApusicDeployer {
     public void deploy(Project project,String webSocketName){
         //String command = ctlPath+" -p "+ Const.CTLPWD +" install "+project.getProjectName()+" "+project.getReport().getPackagePath();
         String command = ctlPath +" install "+project.getProjectName()+" "+project.getReport().getPackagePath();
-        System.out.println(command);
+        //System.out.println(command);
         appctl(command,webSocketName,project.getProjectName());
     }
     public List<ProjectStatueFromMiddleware> list(){
         List<ProjectStatueFromMiddleware> result = new ArrayList<>();
         String command = ctlPath+" list";
-        System.out.println("command：" + command);
+        //System.out.println("command：" + command);
         try {
             Process exec = Runtime.getRuntime().exec(command);
             String password = Const.CTLPWD;

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

@@ -14,6 +14,7 @@ import org.dom4j.Document;
 import org.dom4j.DocumentException;
 import org.dom4j.Element;
 import org.dom4j.io.SAXReader;
+import org.springframework.transaction.annotation.Transactional;
 import org.yaml.snakeyaml.Yaml;
 
 import java.io.File;
@@ -33,8 +34,8 @@ import java.util.*;
  *
  */
 @Data
-@NoArgsConstructor
 @AllArgsConstructor
+@NoArgsConstructor
 public class Inspector {
 
     public static void main(String[] args) {
@@ -229,6 +230,7 @@ public class Inspector {
         return analysis();
     }
 
+    @Transactional
     public Report analysis(){
         try {
             WebSocketServer.sendIn(uuid,TimeUtil.getNowDate() + " 项目评估：" + "开始分析项目文件");
@@ -291,6 +293,7 @@ public class Inspector {
 
                             String projectMavenName = elementProject.elementText("artifactId");
                             String projectMavenVersion = elementProject.elementText("version");
+                            System.out.println("我存了packagePath" + (path.getParent()+"/target/"+projectMavenName+"-"+projectMavenVersion+".war"));
                             report.setPackagePath(path.getParent()+"/target/"+projectMavenName+"-"+projectMavenVersion+".war");
                         }
                     }
@@ -371,9 +374,9 @@ public class Inspector {
                         } catch (FileNotFoundException e) {
                             e.printStackTrace();
                         }
-//                        objects.forEach(o -> {
-//
-//                        });
+                        objects.forEach(o -> {
+
+                        });
                     }
                     break;
             }