调整

ruoyi-admin/src/main/resources/bootstrap-dev.yml

@@ -24,7 +24,7 @@ spring:
         enabled: true
       discovery:
         namespace:
-        server-addr: nacos.xt.wenhq.top:8083
+        server-addr: ${spring.cloud.nacos.config.server-addr}
 
     compatibility-verifier:
       enabled: false

ruoyi-admin/src/main/resources/bootstrap-prod.yml

@@ -11,7 +11,7 @@ spring:
         # 配置中心地址
         server-addr:
         # 配置对应的分组
-        group:
+        group: DEFAULT_GROUP
         # 配置文件后缀
         file-extension: yaml
         prefix: yjzh-sq
@@ -24,7 +24,7 @@ spring:
         enabled: true
       discovery:
         namespace:
-        server-addr:
+        server-addr: ${spring.cloud.nacos.config.server-addr}
 
     compatibility-verifier:
       enabled: false

ruoyi-admin/src/main/resources/bootstrap-test.yml

@@ -24,7 +24,7 @@ spring:
         enabled: true
       discovery:
         namespace:
-        server-addr: 10.11.96.37:8848
+        server-addr: ${spring.cloud.nacos.config.server-addr}
 
     compatibility-verifier:
       enabled: false

ruoyi-zhdd/src/main/java/com/ruoyi/zhdd/domain/Incident.java

@@ -26,7 +26,7 @@ public class Incident implements Serializable {
     /**
      * 主键id
      */
-    @TableId(value = "id", type = IdType.AUTO)
+    @TableId(value = "id", type = IdType.ASSIGN_ID)
     private Long id;
 
     /**

ruoyi-zhdd/src/main/java/com/ruoyi/zhdd/domain/IncidentProcess.java

@@ -26,7 +26,7 @@ public class IncidentProcess implements Serializable {
     /**
      * 主键id
      */
-    @TableId(value = "id", type = IdType.AUTO)
+    @TableId(value = "id", type = IdType.ASSIGN_ID)
     private Long id;
 
     /**

ruoyi-zhdd/src/main/java/com/ruoyi/zhdd/domain/Plan.java

@@ -26,7 +26,7 @@ public class Plan implements Serializable {
     /**
      * 主键id
      */
-    @TableId(value = "id", type = IdType.AUTO)
+    @TableId(value = "id", type = IdType.ASSIGN_ID)
     private Long id;
 
     /**

ruoyi-zhdd/src/main/java/com/ruoyi/zhdd/domain/PlanTask.java

@@ -26,7 +26,7 @@ public class PlanTask implements Serializable {
     /**
      * 任务id
      */
-    @TableId(value = "id", type = IdType.AUTO)
+    @TableId(value = "id", type = IdType.ASSIGN_ID)
     private Long id;
 
     /**