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

pom.xml

@@ -157,16 +157,16 @@
             <artifactId>commons-lang3</artifactId>
             <version>3.5</version>
         </dependency>
-        <dependency>
-            <groupId>com.thoughtworks.xstream</groupId>
-            <artifactId>xstream</artifactId>
-            <version>1.4.10</version>
-        </dependency>
-        <dependency>
-            <groupId>com.thoughtworks.xstream</groupId>
-            <artifactId>xstream</artifactId>
-            <version>1.4.10</version>
-        </dependency>
+<!--        <dependency>-->
+<!--            <groupId>com.thoughtworks.xstream</groupId>-->
+<!--            <artifactId>xstream</artifactId>-->
+<!--            <version>1.4.10</version>-->
+<!--        </dependency>-->
+<!--        <dependency>-->
+<!--            <groupId>com.thoughtworks.xstream</groupId>-->
+<!--            <artifactId>xstream</artifactId>-->
+<!--            <version>1.4.10</version>-->
+<!--        </dependency>-->
     </dependencies>
 
     <build>

src/main/java/com/zjty/adaptationmaster/adaptor/entity/Report.java

@@ -8,9 +8,8 @@ import lombok.Data;
 import lombok.NoArgsConstructor;
 
 import javax.persistence.*;
-import java.nio.file.Path;
-import java.time.LocalDateTime;
 import java.util.List;
+import java.util.Map;
 
 @Data
 @NoArgsConstructor
@@ -24,6 +23,7 @@ public class Report {
     private int fileNum;
     private long lineNum;
     private List<PomDependency> dependencies;
+
     @Transient
     private ProjectPom projectPom;
 

src/main/java/com/zjty/adaptationmaster/adaptor/entity/pomEntity/SecondFloor/PomDependency.java

@@ -20,6 +20,7 @@ public class PomDependency {
     private String artifactId;
     private String version;
     private Integer reportId;
+
     /*依赖类型，默认类型是jar。它通常表示依赖的文件的扩展名，但也有例外。一个类型可以被映射成另外一个扩展
     名或分类器。类型经常和使用的打包方式对应，尽管这也有例外。一些类型的例子：jar，war，ejb-client和test-jar。
     如果设置extensions为 true，就可以在plugin里定义新的类型。所以前面的类型的例子不完整

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

@@ -81,6 +81,7 @@ public class AdaptationServiceImpl implements AdaptationService {
         //project1.setCodeUrl(Const.UPLOAD_LOCATION+File.separator+project1.getProjectName());
         project1.setCodeUrl(Const.UPLOAD_LOCATION+project1.getProjectName());
         try {
+            FileUtils.cleanDirectory(new File(project1.getCodeUrl()));
             FileZip.unzip(new File(path),project1.getCodeUrl());
             project1.setStage(project.getStage());
             if(project.getStage() == 1){