Merge branch 'master' of git.yfzx.zjtys.com.cn:912-system/monitor/inspect

src/main/java/com/zjty/inspect/entity/Apply.java

@@ -24,5 +24,5 @@ public class Apply {
     /**
      * 原因
      */
-    private String reason = "***********";
+    private String reason = "";
 }

src/main/java/com/zjty/inspect/entity/DatabaseDifficulty.java

@@ -20,12 +20,12 @@ public class DatabaseDifficulty {
     /**
      * 系统评估
      */
-    private double systemEvaluation = 1.1;
+    //private double systemEvaluation = 1.1;
 
     /**
      * 额外信息
      */
-    private double message = 1.1;
+    //private double message = 1.1;
 
     /**
      * 综合难度

src/main/java/com/zjty/inspect/entity/ProgramDifficulty.java

@@ -20,12 +20,12 @@ public class ProgramDifficulty {
     /**
      * 系统评估
      */
-    private double systemEvaluation = 1.1;
+    //private double systemEvaluation = 1.1;
 
     /**
      * 额外信息
      */
-    private double message = 1.1;
+    //private double message = 1.1;
 
     /**
      * 综合难度

src/main/java/com/zjty/inspect/entity/Warn.java

@@ -43,4 +43,6 @@ public class Warn {
      * 关键字
      */
     private String rule;
+
+    private String categoryId;
 }

src/main/java/com/zjty/inspect/inspect/Inspector.java

@@ -170,6 +170,10 @@ public class Inspector {
                 ruleMap.put(rule.getTarget()+":"+rule.getSuffix(),rule);
             }
         }
+        List<Technology> technologies = technologyDao.findAll();
+        for (Technology technology : technologies) {
+            technologyHashMap.put(technology.getId(), technology);
+        }
         try {
             //以下为计算文件名称匹配正则表达式
             FileSystem aDefault = FileSystems.getDefault();
@@ -584,7 +588,9 @@ public class Inspector {
                 warn.setRuleId(rule.getId());
                 warn.setRule(rule.getTarget());
                 warn.setTechnologyId(rule.getTechnologyId());
-                warn.setTechnologyName(technologyHashMap.get(rule.getTechnologyId()).getTechnologyName());
+                Technology technology = technologyHashMap.get(rule.getTechnologyId());
+                warn.setTechnologyName(technology.getTechnologyName());
+                warn.setCategoryId(technology.getCategory_id());
                 if (technologyHashMap.get(rule.getTechnologyId()).getSupport() == 2) {
                     warns.add(warn);
                     //设置a=0代表当前依赖有问题

src/main/resources/application-dev.properties

@@ -53,7 +53,7 @@ spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
 spring.datasource.url=jdbc:mysql://localhost:3306/adaptation?useSSL=false&serverTimezone=UTC&autoReconnect=true&characterEncoding=utf-8
 #spring.datasource.url=jdbc:mysql://120.55.57.35:3306/adaptation?characterEncoding=utf-8
 spring.datasource.username=root
-spring.datasource.password=123456
+spring.datasource.password=root
 
 maven.home=/usr/share/maven
 maven.command=dependency:tree -DoutputType=txt -DoutputFile=