合并分支 'wyl' 到 'master'

src/main/java/com/zjty/inspect/controller/InspectController.java

@@ -15,6 +15,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.core.io.Resource;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
+import org.springframework.web.client.RestTemplate;
 import org.springframework.web.multipart.MultipartFile;
 import org.springframework.web.multipart.commons.CommonsMultipartFile;
 

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

@@ -29,6 +29,11 @@ public class BrowserDifficulty {
      */
     private double difficulty = 1.1;
 
+    /**
+     * 工作量
+     */
+    private double load = 0.0;
+
     /**
      * 样式
      */

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

@@ -32,6 +32,11 @@ public class DatabaseDifficulty {
      */
     private double difficulty = 1.1;
 
+    /**
+     * 工作量
+     */
+    private double load = 0.0;
+
     /**
      * 依赖
      */

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

@@ -30,6 +30,11 @@ public class FrameDifficulty {
      */
     private double difficulty = 1.1;
 
+    /**
+     * 工作量
+     */
+    private double load = 0.0;
+
     /**
      * 详情 1：混合 2：前后端分离
      */

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

@@ -32,6 +32,11 @@ public class MiddlewareDifficulty {
      */
     private double difficulty = 1.1;
 
+    /**
+     * 工作量
+     */
+    private double load = 0.0;
+
     /**
      * 依赖详情
      */

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

@@ -32,6 +32,11 @@ public class ProgramDifficulty {
      */
     private double difficulty = 1.1;
 
+    /**
+     * 工作量
+     */
+    private double load = 0.0;
+
     /**
      * 依赖详情
      */

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

@@ -144,7 +144,7 @@ public class Reform {
     private Database database;
 
     /**
-     * 迁移策略 1：休息日 2：晚间切换
+     * 迁移策略 1：休息日 2：晚间切换 3:短暂停止
      */
     private Integer strategy;
     /**

src/main/resources/application.properties

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