runsuccess mcj

39804980 · wyl · 7e35fb5d · c4be94ed · 39804980 · 39804980
--- a/src/main/java/com/zjty/adaptationmaster/adaptor/entity/Project.java
+++ b/src/main/java/com/zjty/adaptationmaster/adaptor/entity/Project.java
@@ -57,7 +57,7 @@ public class Project {

    private boolean compileSuccess = false;
    @OneToOne
-    private Report report;
+    private ReportEntity report;

    private boolean deploySuccess = false;


--- a/src/main/java/com/zjty/adaptationmaster/adaptor/entity/Report.java
+++ b/src/main/java/com/zjty/adaptationmaster/adaptor/entity/Report.java
@@ -12,7 +12,6 @@ import javax.persistence.*;
 import java.nio.file.Path;
 import java.util.List;

-@Entity
 @Data
 @NoArgsConstructor
 @AllArgsConstructor

--- a/src/main/java/com/zjty/adaptationmaster/adaptor/entity/ReportEntity.java
+++ b/src/main/java/com/zjty/adaptationmaster/adaptor/entity/ReportEntity.java
@@ -6,10 +6,7 @@ import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;

-import javax.persistence.ElementCollection;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
+import javax.persistence.*;
 import java.util.List;

 /**
@@ -30,6 +27,7 @@ public class ReportEntity {
    private Report.DatabaseType databaseType;//数据库类型
    private int fileNum;
    private long lineNum;
+    @Column(columnDefinition = "text")
    private String dependence;
    private Report.Separate isSeparate;//前后端是否分离
    private String compileFilePath;//项目编译文件，如果是maven项目，用maven编译，那么就是pom.xml

--- a/src/main/java/com/zjty/adaptationmaster/adaptor/entity/pomEntity/SecondFloor/Dependency.java
+++ b/src/main/java/com/zjty/adaptationmaster/adaptor/entity/pomEntity/SecondFloor/Dependency.java
@@ -21,12 +21,12 @@ public class Dependency {
    名或分类器。类型经常和使用的打包方式对应，尽管这也有例外。一些类型的例子：jar，war，ejb-client和test-jar。
    如果设置extensions为 true，就可以在plugin里定义新的类型。所以前面的类型的例子不完整
    */
-    private String type;
+    //private String type;
    /*依赖的分类器。分类器可以区分属于同一个POM，但不同构建方式的构件。分类器名被附加到文件名的版本号后面。例如，
      如果你想要构建两个单独的构件成JAR，一个使用Java 1.4编译器，另一个使用Java 6编译器，你就可以使用分类器来生
      成两个单独的JAR构件
     */
-    private String classifier;
+    //private String classifier;
    /*
    依赖范围。在项目发布过程中，帮助决定哪些构件被包括进来。欲知详情请参考依赖机制。
                - compile ：默认范围，用于编译
@@ -38,12 +38,12 @@ public class Dependency {
                - optional: 当项目自身被依赖时，标注依赖是否传递。用于连续依赖时使用

     */
-    private String scope;
+    //private String scope;
    /*
    仅供system范围使用。注意，不鼓励使用这个元素，并且在新的版本中该元素可能被覆盖掉。该元素为依赖规定了文件
                 系统上的路径。需要绝对路径而不是相对路径。推荐使用属性匹配绝对路径，例如${java.home}
     */
-    private String systemPath;
+    //private String systemPath;
    /*
    当计算传递依赖时， 从依赖构件列表里，列出被排除的依赖构件集。即告诉maven你只依赖指定的项目，不依赖项目的
                 依赖。此元素主要用于解决版本冲突问题
@@ -53,7 +53,7 @@ public class Dependency {
    可选依赖，如果你在项目B中把C依赖声明为可选，你就需要在依赖于B的项目（例如项目A）中显式的引用对C的依赖。
                 可选依赖阻断依赖的传递性
     */
-    private String optional;
+    //private String optional;

 //    private class Exclusion{
 //        private String artifactId;
@@ -62,5 +62,5 @@ public class Dependency {


    //private List<Dependency> parentDependencies;//
-    private int reportId;
+    //private int reportId;
 }
--- a/src/main/java/com/zjty/adaptationmaster/adaptor/service/Impl/InspectServiceImpl.java
+++ b/src/main/java/com/zjty/adaptationmaster/adaptor/service/Impl/InspectServiceImpl.java
@@ -69,7 +69,7 @@ public class InspectServiceImpl implements InspectService {
            }
            Project one = projectDao.getOne(project.getId());
            ReportEntity reportEntitySave = reportDao.save(reportEntity);
-            one.setReport(report);
+            one.setReport(reportEntitySave);
            report.setId(reportEntitySave.getId());
            return ServerResponse.success(report);
        }else{

--- a/src/main/java/com/zjty/adaptationmaster/utils/AnalysisPom.java
+++ b/src/main/java/com/zjty/adaptationmaster/utils/AnalysisPom.java
 package com.zjty.adaptationmaster.utils;

 import com.zjty.adaptationmaster.adaptor.entity.pomEntity.ProjectPom;
+import com.zjty.adaptationmaster.adaptor.entity.pomEntity.SecondFloor.Dependency;

 import java.nio.file.Path;
+import java.util.ArrayList;
+import java.util.List;

 public class AnalysisPom {
    public static ProjectPom analysis(Path pomPath){
-        return null;
+        List<Dependency> dependencies = new ArrayList<>();
+        Dependency dependency = new Dependency();
+        dependency.setGroupId("aaa.bbb");
+        dependency.setArtifactId("ccc.ddd");
+        dependency.setVersion("1.0.0");
+        dependencies.add(dependency);
+        ProjectPom projectPom = new ProjectPom();
+        projectPom.setDependencies(dependencies);
+        return projectPom;
    }
 }
--- a/src/main/java/com/zjty/adaptationmaster/utils/Inspector.java
+++ b/src/main/java/com/zjty/adaptationmaster/utils/Inspector.java
@@ -4,6 +4,7 @@ import com.zjty.adaptationmaster.adaptor.entity.Project;
 import com.zjty.adaptationmaster.adaptor.entity.Report;
 import com.zjty.adaptationmaster.adaptor.entity.Rule;
 import com.zjty.adaptationmaster.adaptor.entity.pomEntity.ProjectPom;
+import com.zjty.adaptationmaster.adaptor.entity.pomEntity.SecondFloor.Dependency;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
@@ -77,9 +78,9 @@ public class Inspector {
        ruleList.add(new Rule("pdfobject.js","这里用到了pdf文档展示插件"));
        ruleList.add(new Rule(".swf","这里用到了flash流媒体播放插件"));

-        String[] projectSrc = {"D:\\project\\testAccess\\rhasspy-master"};
+        //String[] projectSrc = {"D:\\project\\testAccess\\rhasspy-master"};
        //多个子项目
-        //String[] projectSrc = {"D:\\project\\testAccess\\SpringBoot-Labs-master"/*"D:\\project\\bservice","D:\\project\\debug","D:\\project\\glutton"*/};
+        String[] projectSrc = {"D:\\project\\testAccess\\SpringBoot-Labs-master"/*"D:\\project\\bservice","D:\\project\\debug","D:\\project\\glutton"*/};
        //String[] projectSrc = {"D:\\project\\testAccess\\Telegram-master"};
        for(String s:projectSrc){
            Project project = new Project();
@@ -90,6 +91,7 @@ public class Inspector {
            for(Warn warn:inspect.getWarnList()){
                System.out.println("\t"+warn);
            }
+            //System.out.println(inspect);
        }
        System.out.println(LocalDateTime.now());
    }
@@ -119,7 +121,7 @@ public class Inspector {
         *      先检测是否存在html文件，如果存在，假定为前端项目
         *      然后检测其他条件，如果符合，将假定冲掉
         */
-        //languageMatchMap.put("html",new Counter());
+        languageMatchMap.put("html",new Counter());
        this.configFileTypePathsMapping = new HashMap<>();
        configFileTypePathsMapping.put("xml",new ArrayList<>());
        configFileTypePathsMapping.put("properties",new ArrayList<>());
@@ -237,6 +239,8 @@ public class Inspector {
         * 对于具体的配置文件对应的处理方法
         * 增加要处理的文件类型需要在这里增加相应的处理方法
         */
+        ArrayList<Dependency> dependencies1 = new ArrayList<>();
+
        for(Map.Entry<String,List<Path>> entry:configFileTypePathsMapping.entrySet()){
            //System.out.println(entry.getKey());
            switch (entry.getKey()){
@@ -250,18 +254,14 @@ public class Inspector {
                         * 对于maven工程，可以在maven配置文件中得到一这些信息
                         *      编译方式打包方式和打好的包的路径
                         */
-                        List<File> pomFileList = new ArrayList<>();
                        if(path.getFileName().endsWith("pom.xml")){
-                            pomFileList.add(path.toFile());
                            report.setDependenceManagement(Report.DependenceManagement.MAVEN);
                            report.setCompileFilePath(path.toString());
                            //解析pom文件
                            ProjectPom analysis = AnalysisPom.analysis(path);
                            //设置依赖
-
-                            //List<Dependency> dependencies = analysis.getDependencies();
-                            //report.setDependencies(dependencies);
-
+                            List<Dependency> dependencies = analysis.getDependencies();
+                            dependencies1.addAll(dependencies);

                            SAXReader reader = new SAXReader();
                            Document document = null;
@@ -317,7 +317,7 @@ public class Inspector {
                                        e.printStackTrace();
                                    }
                                } else {
-                                    System.out.println("没有找到active配置文件");
+                                    //System.out.println("没有找到active配置文件");
                                }
                            }
                            if (datasourceDriver != null) {
@@ -404,6 +404,7 @@ public class Inspector {
 //                e.printStackTrace();
 //            }
 //        }
+        report.setDependencies(dependencies1);
        report.setWarnList(warnList);
        return report;
    }