修改pom文件的名字

epmet-admin/epmet-admin-server/pom.xml

@@ -254,7 +254,7 @@
 
                 <!-- 数据库配置-->
                 <spring.datasource.druid.url>
-                    <![CDATA[jdbc:mysql://10.2.2.44:3306/epmet_admin?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                    <![CDATA[jdbc:mysql://172.16.3.86:3306/epmet_admin?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
                 </spring.datasource.druid.url>
                 <spring.datasource.druid.username>epmet_admin_user</spring.datasource.druid.username>
                 <spring.datasource.druid.password>EpmEt-db-UsEr</spring.datasource.druid.password>
@@ -268,8 +268,8 @@
                 <spring.redis.password>rEdIs@yAntAI_666</spring.redis.password>
                 <!-- nacos -->
                 <nacos.register-enabled>true</nacos.register-enabled>
-                <nacos.server-addr>10.2.2.51:8848</nacos.server-addr>
+                <nacos.server-addr>172.16.3.87</nacos.server-addr>
-                <nacos.discovery.namespace>bd205d23-e696-47be-b995-916313f86e99</nacos.discovery.namespace>
+                <nacos.discovery.namespace>bf153d2b-7aa5-4b6e-ba7b-4977e54eb126</nacos.discovery.namespace>
                 <nacos.config.namespace></nacos.config.namespace>
                 <nacos.config.group></nacos.config.group>
                 <nacos.config-enabled>false</nacos.config-enabled>
@@ -278,11 +278,11 @@
                 <!--是否开启服务列表变更监听-->
                 <nacos.service-list-changed-listening.enable>true</nacos.service-list-changed-listening.enable>
 
-                <spring.flyway.enabled>true</spring.flyway.enabled>
+                <spring.flyway.enabled>false</spring.flyway.enabled>
 
                 <!--rocketmq-->
                 <rocketmq.enable>true</rocketmq.enable>
-                <rocketmq.nameserver>10.2.2.50:9876;10.2.2.51:9876</rocketmq.nameserver>
+                <rocketmq.nameserver>172.16.3.86:9876;172.16.3.87:9876</rocketmq.nameserver>
                 <rocketmq.producer.group>epmet_message</rocketmq.producer.group>
 
                 <!--线程池-->

epmet-admin/epmet-admin-server/src/main/resources/bootstrap.yml

@@ -18,7 +18,21 @@ spring:
   jackson:
     time-zone: GMT+8
     date-format: yyyy-MM-dd HH:mm:ss
+  # redis 单机配置(单机与集群只能开启一个另一个需要注释掉)
   redis:
+    # 地址
+    host: 172.16.3.87
+    # 端口，默认为6379
+    port: 6379
+    # 数据库索引
+    database: @spring.redis.index@
+    # 密码(如没有密码请注释掉)
+    password: @spring.redis.password@
+    # 连接超时时间
+    timeout: 30s
+    # 是否开启ssl
+    ssl: false
+#  redis:
     # 烟台使用cluster模式下使用cluster:配置段
     #    database: @spring.redis.index@
     #    host: @spring.redis.host@
@@ -26,12 +40,12 @@ spring:
     #    password: @spring.redis.password@
     #    timeout: 30s
 
-    database: @spring.redis.index@
+#    database: @spring.redis.index@
-    password: @spring.redis.password@
+#    password: @spring.redis.password@
-    timeout: 30s
+#    timeout: 30s
-    cluster:
+#    cluster:
-      nodes: @spring.redis.cluster.nodes@
+#      nodes: @spring.redis.cluster.nodes@
-      max-redirects: @spring.redis.cluster.max-redirects@
+#      max-redirects: @spring.redis.cluster.max-redirects@
   datasource:
     druid:
       #MySQL

epmet-auth/pom.xml

@@ -384,8 +384,8 @@
                 <spring.redis.password>rEdIs@yAntAI_666</spring.redis.password>
                 <!-- nacos -->
                 <nacos.register-enabled>true</nacos.register-enabled>
-                <nacos.server-addr>10.2.2.51:8848</nacos.server-addr>
+                <nacos.server-addr>172.16.3.87</nacos.server-addr>
-                <nacos.discovery.namespace>bd205d23-e696-47be-b995-916313f86e99</nacos.discovery.namespace>
+                <nacos.discovery.namespace>bf153d2b-7aa5-4b6e-ba7b-4977e54eb126</nacos.discovery.namespace>
                 <nacos.config.namespace></nacos.config.namespace>
                 <nacos.config.group></nacos.config.group>
                 <nacos.config-enabled>false</nacos.config-enabled>

epmet-auth/src/main/resources/bootstrap.yml

@@ -18,20 +18,34 @@ spring:
   jackson:
     time-zone: GMT+8
     date-format: yyyy-MM-dd HH:mm:ss
+  # redis 单机配置(单机与集群只能开启一个另一个需要注释掉)
   redis:
-    # 烟台使用cluster模式下使用cluster:配置段
+    # 地址
-    #    database: @spring.redis.index@
+    host: 172.16.3.87
-    #    host: @spring.redis.host@
+    # 端口，默认为6379
-    #    port: @spring.redis.port@
+    port: 6379
-    #    password: @spring.redis.password@
+    # 数据库索引
-    #    timeout: 30s
-
     database: @spring.redis.index@
+    # 密码(如没有密码请注释掉)
     password: @spring.redis.password@
+    # 连接超时时间
     timeout: 30s
-    cluster:
+    # 是否开启ssl
-      nodes: @spring.redis.cluster.nodes@
+    ssl: false
-      max-redirects: @spring.redis.cluster.max-redirects@
+#  redis:
+#    # 烟台使用cluster模式下使用cluster:配置段
+#    #    database: @spring.redis.index@
+#    #    host: @spring.redis.host@
+#    #    port: @spring.redis.port@
+#    #    password: @spring.redis.password@
+#    #    timeout: 30s
+#
+#    database: @spring.redis.index@
+#    password: @spring.redis.password@
+#    timeout: 30s
+#    cluster:
+#      nodes: @spring.redis.cluster.nodes@
+#      max-redirects: @spring.redis.cluster.max-redirects@
   cloud:
     nacos:
       discovery:

epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/config/RedissonConfig.java

@@ -16,19 +16,19 @@ import org.springframework.context.annotation.Configuration;
  * redisson 配置类
  */
 @Slf4j
-@Configuration
+//@Configuration
 public class RedissonConfig {
 
-    //@Value("${spring.redis.host}")
+    @Value("${spring.redis.host}")
-    //private String host;
+    private String host;
-    //@Value("${spring.redis.port}")
+    @Value("${spring.redis.port}")
-    //private String port;
+    private String port;
     @Value("${spring.redis.password}")
     private String password;
     @Value("${spring.redis.cluster.nodes}")
     private String clusterNodesStr;
-//    @Value("${spring.redis.cluster.max-redirects}")
+    @Value("${spring.redis.cluster.max-redirects}")
-//    private Integer rediTimes;
+    private Integer rediTimes;
 
 
     @Bean
@@ -47,15 +47,15 @@ public class RedissonConfig {
             //redis的部署方式有单节点部署、主从方式部署、哨兵方式部署、集群方式部署
 
             //单机模式
-            //config.useSingleServer().setAddress("redis://".concat(host).concat(StrConstant.COLON).concat(port));
+            config.useSingleServer().setAddress("redis://".concat(host).concat(StrConstant.COLON).concat(port));
-            //config.useSingleServer().setPassword(password);
+            config.useSingleServer().setPassword(password);
-            //config.useSingleServer().setConnectTimeout(NumConstant.ONE_THOUSAND * NumConstant.FIVE);
+            config.useSingleServer().setConnectTimeout(NumConstant.ONE_THOUSAND * NumConstant.FIVE);
-            //config.useSingleServer().setDatabase(NumConstant.TEN);
+            config.useSingleServer().setDatabase(NumConstant.TEN);
 
             //集群模式
-            config.useClusterServers().addNodeAddress(getClusterNodes());
+//            config.useClusterServers().addNodeAddress(getClusterNodes());
-            config.useClusterServers().setPassword(password);
+//            config.useClusterServers().setPassword(password);
-            config.useClusterServers().setConnectTimeout(NumConstant.ONE_THOUSAND * NumConstant.FIVE);
+//            config.useClusterServers().setConnectTimeout(NumConstant.ONE_THOUSAND * NumConstant.FIVE);
 
             return Redisson.create(config);
         } catch (Exception e) {

epmet-gateway/pom.xml

@@ -515,8 +515,8 @@
                 <spring.redis.password>rEdIs@yAntAI_666</spring.redis.password>
                 <!-- nacos -->
                 <nacos.register-enabled>true</nacos.register-enabled>
-                <nacos.server-addr>10.2.2.51:8848</nacos.server-addr>
+                <nacos.server-addr>172.16.3.87</nacos.server-addr>
-                <nacos.discovery.namespace>bd205d23-e696-47be-b995-916313f86e99</nacos.discovery.namespace>
+                <nacos.discovery.namespace>bf153d2b-7aa5-4b6e-ba7b-4977e54eb126</nacos.discovery.namespace>
                 <nacos.config.namespace></nacos.config.namespace>
                 <nacos.config.group></nacos.config.group>
                 <nacos.config-enabled>false</nacos.config-enabled>

epmet-gateway/src/main/resources/bootstrap.yml

@@ -17,20 +17,34 @@ spring:
   messages:
     encoding: UTF-8
     basename: i18n/messages_common
+  # redis 单机配置(单机与集群只能开启一个另一个需要注释掉)
   redis:
-    # 烟台使用cluster模式下使用cluster:配置段
+    # 地址
-    #    database: @spring.redis.index@
+    host: 172.16.3.87
-    #    host: @spring.redis.host@
+    # 端口，默认为6379
-    #    port: @spring.redis.port@
+    port: 6379
-    #    password: @spring.redis.password@
+    # 数据库索引
-    #    timeout: 30s
-
     database: @spring.redis.index@
+    # 密码(如没有密码请注释掉)
     password: @spring.redis.password@
+    # 连接超时时间
     timeout: 30s
-    cluster:
+    # 是否开启ssl
-      nodes: @spring.redis.cluster.nodes@
+    ssl: false
-      max-redirects: @spring.redis.cluster.max-redirects@
+#  redis:
+#    # 烟台使用cluster模式下使用cluster:配置段
+#    #    database: @spring.redis.index@
+#    #    host: @spring.redis.host@
+#    #    port: @spring.redis.port@
+#    #    password: @spring.redis.password@
+#    #    timeout: 30s
+#
+#    database: @spring.redis.index@
+#    password: @spring.redis.password@
+#    timeout: 30s
+#    cluster:
+#      nodes: @spring.redis.cluster.nodes@
+#      max-redirects: @spring.redis.cluster.max-redirects@
   cloud:
     gateway:
       locator:

epmet-module/data-aggregator/data-aggregator-server/pom.xml

@@ -606,96 +606,96 @@
 
                 <!--gov-org -->
                 <datasource.druid.govorg.url>
-                    <![CDATA[jdbc:mysql://10.2.2.44:3306/epmet_gov_org?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                    <![CDATA[jdbc:mysql://172.16.3.86:3306/epmet_gov_org?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
                 </datasource.druid.govorg.url>
                 <datasource.druid.govorg.username>epmet_gov_org_user</datasource.druid.govorg.username>
                 <datasource.druid.govorg.password>EpmEt-db-UsEr</datasource.druid.govorg.password>
 
                 <!-- govissue -->
                 <datasource.druid.govissue.url>
-                    <![CDATA[jdbc:mysql://10.2.2.44:3306/epmet_gov_issue?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                    <![CDATA[jdbc:mysql://172.16.3.86:3306/epmet_gov_issue?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
                 </datasource.druid.govissue.url>
                 <datasource.druid.govissue.username>epmet_gov_issue_user</datasource.druid.govissue.username>
                 <datasource.druid.govissue.password>EpmEt-db-UsEr</datasource.druid.govissue.password>
 
                 <!-- gov-project -->
                 <datasource.druid.govproject.url>
-                    <![CDATA[jdbc:mysql://10.2.2.44:3306/epmet_gov_project?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                    <![CDATA[jdbc:mysql://172.16.3.86:3306/epmet_gov_project?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
                 </datasource.druid.govproject.url>
                 <datasource.druid.govproject.username>epmet_gov_project_user</datasource.druid.govproject.username>
                 <datasource.druid.govproject.password>EpmEt-db-UsEr</datasource.druid.govproject.password>
 
                 <!-- resi-group -->
                 <datasource.druid.resigroup.url>
-                    <![CDATA[jdbc:mysql://10.2.2.44:3306/epmet_resi_group?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                    <![CDATA[jdbc:mysql://172.16.3.86:3306/epmet_resi_group?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
                 </datasource.druid.resigroup.url>
                 <datasource.druid.resigroup.username>epmet_resi_group_user</datasource.druid.resigroup.username>
                 <datasource.druid.resigroup.password>EpmEt-db-UsEr</datasource.druid.resigroup.password>
 
                 <!-- epmet-user -->
                 <datasource.druid.epmetuser.url>
-                    <![CDATA[jdbc:mysql://10.2.2.44:3306/epmet_user?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                    <![CDATA[jdbc:mysql://172.16.3.86:3306/epmet_user?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
                 </datasource.druid.epmetuser.url>
                 <datasource.druid.epmetuser.username>epmet_user_user</datasource.druid.epmetuser.username>
                 <datasource.druid.epmetuser.password>EpmEt-db-UsEr</datasource.druid.epmetuser.password>
 
                 <!--  epmet_common_service-->
                 <datasource.druid.commonservice.url>
-                    <![CDATA[jdbc:mysql://10.2.2.44:3306/epmet_common_service?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                    <![CDATA[jdbc:mysql://172.16.3.86:3306/epmet_common_service?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
                 </datasource.druid.commonservice.url>
                 <datasource.druid.commonservice.username>epmet_common_service_user</datasource.druid.commonservice.username>
                 <datasource.druid.commonservice.password>EpmEt-db-UsEr</datasource.druid.commonservice.password>
 
                 <!-- opercrm-->
                 <datasource.druid.opercrm.url>
-                    <![CDATA[jdbc:mysql://10.2.2.44:3306/epmet_oper_crm?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                    <![CDATA[jdbc:mysql://172.16.3.86:3306/epmet_oper_crm?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
                 </datasource.druid.opercrm.url>
                 <datasource.druid.opercrm.username>epmet_oper_crm_user</datasource.druid.opercrm.username>
                 <datasource.druid.opercrm.password>EpmEt-db-UsEr</datasource.druid.opercrm.password>
 
                 <!-- data_statistical -->
                 <datasource.druid.stats.url>
-                    <![CDATA[jdbc:mysql://10.2.2.44:3306/epmet_data_statistical?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                    <![CDATA[jdbc:mysql://172.16.3.86:3306/epmet_data_statistical?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
                 </datasource.druid.stats.url>
                 <datasource.druid.stats.username>epmet_data_statistical</datasource.druid.stats.username>
                 <datasource.druid.stats.password>EpmEt-db-UsEr</datasource.druid.stats.password>
 
                 <!-- epmet_evaluation_index -->
                 <datasource.druid.evaluationIndex.url>
-                    <![CDATA[jdbc:mysql://10.2.2.44:3306/epmet_evaluation_index?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                    <![CDATA[jdbc:mysql://172.16.3.86:3306/epmet_evaluation_index?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
                 </datasource.druid.evaluationIndex.url>
                 <datasource.druid.evaluationIndex.username>epmet_evaluation_index_user</datasource.druid.evaluationIndex.username>
                 <datasource.druid.evaluationIndex.password>EpmEt-db-UsEr</datasource.druid.evaluationIndex.password>
 
                 <datasource.druid.opercustomize.url>
-                    <![CDATA[jdbc:mysql://10.2.2.44:3306/epmet_oper_customize?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                    <![CDATA[jdbc:mysql://172.16.3.86:3306/epmet_oper_customize?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
                 </datasource.druid.opercustomize.url>
                 <datasource.druid.opercustomize.username>epmet_oper_customize_user</datasource.druid.opercustomize.username>
                 <datasource.druid.opercustomize.password>EpmEt-db-UsEr</datasource.druid.opercustomize.password>
 
                 <datasource.druid.epmetmessage.url>
-                    <![CDATA[jdbc:mysql://10.2.2.44:3306/epmet_message?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                    <![CDATA[jdbc:mysql://172.16.3.86:3306/epmet_message?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
                 </datasource.druid.epmetmessage.url>
                 <datasource.druid.epmetmessage.username>epmet_message_user</datasource.druid.epmetmessage.username>
                 <datasource.druid.epmetmessage.password>EpmEt-db-UsEr</datasource.druid.epmetmessage.password>
 
                 <!-- 问卷调查 -->
                 <datasource.druid.epmettduck.url>
-                    <![CDATA[jdbc:mysql://10.2.2.44:3306/epmet_tduck?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                    <![CDATA[jdbc:mysql://172.16.3.86:3306/epmet_tduck?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
                 </datasource.druid.epmettduck.url>
                 <datasource.druid.epmettduck.username>epmet_tduck</datasource.druid.epmettduck.username>
                 <datasource.druid.epmettduck.password>EpmEt-db-UsEr</datasource.druid.epmettduck.password>
 
                 <!--heart-->
                 <datasource.druid.heart.url>
-                    <![CDATA[jdbc:mysql://10.2.2.44:3306/epmet_heart?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                    <![CDATA[jdbc:mysql://172.16.3.86:3306/epmet_heart?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
                 </datasource.druid.heart.url>
                 <datasource.druid.heart.username>epmet_heart_user</datasource.druid.heart.username>
                 <datasource.druid.heart.password>EpmEt-db-UsEr</datasource.druid.heart.password>
 
                 <!--epmet_resi_partymember-->
                 <datasource.druid.partymember.url>
-                    <![CDATA[jdbc:mysql://10.2.2.44:3306/epmet_resi_partymember?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                    <![CDATA[jdbc:mysql://172.16.3.86:3306/epmet_resi_partymember?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
                 </datasource.druid.partymember.url>
                 <datasource.druid.partymember.username>epmet_resi_partymember_user</datasource.druid.partymember.username>
                 <datasource.druid.partymember.password>EpmEt-db-UsEr</datasource.druid.partymember.password>
@@ -711,8 +711,8 @@
 
                 <!-- nacos -->
                 <nacos.register-enabled>true</nacos.register-enabled>
-                <nacos.server-addr>10.2.2.51:8848</nacos.server-addr>
+                <nacos.server-addr>172.16.3.87</nacos.server-addr>
-                <nacos.discovery.namespace>bd205d23-e696-47be-b995-916313f86e99</nacos.discovery.namespace>
+                <nacos.discovery.namespace>bf153d2b-7aa5-4b6e-ba7b-4977e54eb126</nacos.discovery.namespace>
                 <nacos.config.namespace></nacos.config.namespace>
                 <nacos.config.group></nacos.config.group>
                 <nacos.config-enabled>false</nacos.config-enabled>
@@ -722,7 +722,7 @@
                 <nacos.service-list-changed-listening.enable>true</nacos.service-list-changed-listening.enable>
 
                 <!--flyway migration 数据库迁移工具-->
-                <spring.flyway.enabled>true</spring.flyway.enabled>
+                <spring.flyway.enabled>false</spring.flyway.enabled>
 
                 <!--生产钉钉 机器人地址-->
                 <dingTalk.robot.webHook>https://oapi.dingtalk.com/robot/send?access_token=c96c904b375f8b63eb10036db43a18628365dd87aa8669a9052cf95c911b4df0</dingTalk.robot.webHook>

epmet-module/data-aggregator/data-aggregator-server/src/main/resources/bootstrap.yml

@@ -9,20 +9,34 @@ spring:
     allow-bean-definition-overriding: true
   application:
     name: data-aggregator-server
+  # redis 单机配置(单机与集群只能开启一个另一个需要注释掉)
   redis:
-    # 烟台使用cluster模式下使用cluster:配置段
+    # 地址
-    #    database: @spring.redis.index@
+    host: 172.16.3.87
-    #    host: @spring.redis.host@
+    # 端口，默认为6379
-    #    port: @spring.redis.port@
+    port: 6379
-    #    password: @spring.redis.password@
+    # 数据库索引
-    #    timeout: 30s
-
     database: @spring.redis.index@
+    # 密码(如没有密码请注释掉)
     password: @spring.redis.password@
+    # 连接超时时间
     timeout: 30s
-    cluster:
+    # 是否开启ssl
-      nodes: @spring.redis.cluster.nodes@
+    ssl: false
-      max-redirects: @spring.redis.cluster.max-redirects@
+#  redis:
+#    # 烟台使用cluster模式下使用cluster:配置段
+#    #    database: @spring.redis.index@
+#    #    host: @spring.redis.host@
+#    #    port: @spring.redis.port@
+#    #    password: @spring.redis.password@
+#    #    timeout: 30s
+#
+#    database: @spring.redis.index@
+#    password: @spring.redis.password@
+#    timeout: 30s
+#    cluster:
+#      nodes: @spring.redis.cluster.nodes@
+#      max-redirects: @spring.redis.cluster.max-redirects@
   datasource:
       #MySQL
     druid:

epmet-module/data-report/data-report-server/pom.xml

@@ -334,19 +334,19 @@
 
                 <!-- 数据库配置-->
                 <datasource.druid.stats.url>
-                    <![CDATA[jdbc:mysql://10.2.2.44:3306/epmet_data_statistical?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                    <![CDATA[jdbc:mysql://172.16.3.86:3306/epmet_data_statistical?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
                 </datasource.druid.stats.url>
                 <datasource.druid.stats.username>epmet_data_statistical</datasource.druid.stats.username>
                 <datasource.druid.stats.password>EpmEt-db-UsEr</datasource.druid.stats.password>
 
                 <datasource.druid.statsdisplay.url>
-                    <![CDATA[jdbc:mysql://10.2.2.44:3306/epmet_data_statistical_display?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                    <![CDATA[jdbc:mysql://172.16.3.86:3306/epmet_data_statistical_display?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
                 </datasource.druid.statsdisplay.url>
                 <datasource.druid.statsdisplay.username>epmet_data_stats_display_user</datasource.druid.statsdisplay.username>
                 <datasource.druid.statsdisplay.password>EpmEt-db-UsEr</datasource.druid.statsdisplay.password>
 
                 <datasource.druid.evaluationIndex.url>
-                    <![CDATA[jdbc:mysql://10.2.2.44:3306/epmet_evaluation_index?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                    <![CDATA[jdbc:mysql://172.16.3.86:3306/epmet_evaluation_index?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
                 </datasource.druid.evaluationIndex.url>
                 <datasource.druid.evaluationIndex.username>epmet_evaluation_index_user</datasource.druid.evaluationIndex.username>
                 <datasource.druid.evaluationIndex.password>EpmEt-db-UsEr</datasource.druid.evaluationIndex.password>
@@ -362,8 +362,8 @@
 
                 <!-- nacos -->
                 <nacos.register-enabled>true</nacos.register-enabled>
-                <nacos.server-addr>10.2.2.51:8848</nacos.server-addr>
+                <nacos.server-addr>172.16.3.87</nacos.server-addr>
-                <nacos.discovery.namespace>bd205d23-e696-47be-b995-916313f86e99</nacos.discovery.namespace>
+                <nacos.discovery.namespace>bf153d2b-7aa5-4b6e-ba7b-4977e54eb126</nacos.discovery.namespace>
                 <nacos.config.namespace></nacos.config.namespace>
                 <nacos.config.group></nacos.config.group>
                 <nacos.config-enabled>false</nacos.config-enabled>
@@ -373,7 +373,7 @@
                 <nacos.service-list-changed-listening.enable>true</nacos.service-list-changed-listening.enable>
 
                 <!--flyway migration 数据库迁移工具-->
-                <spring.flyway.enabled>true</spring.flyway.enabled>
+                <spring.flyway.enabled>false</spring.flyway.enabled>
 
                 <!--生产钉钉 机器人地址-->
                 <dingTalk.robot.webHook>https://oapi.dingtalk.com/robot/send?access_token=c96c904b375f8b63eb10036db43a18628365dd87aa8669a9052cf95c911b4df0</dingTalk.robot.webHook>

epmet-module/data-report/data-report-server/src/main/resources/bootstrap.yml

@@ -15,20 +15,34 @@ spring:
   jackson:
     time-zone: GMT+8
     date-format: yyyy-MM-dd HH:mm:ss
+  # redis 单机配置(单机与集群只能开启一个另一个需要注释掉)
   redis:
-    # 烟台使用cluster模式下使用cluster:配置段
+    # 地址
-    #    database: @spring.redis.index@
+    host: 172.16.3.87
-    #    host: @spring.redis.host@
+    # 端口，默认为6379
-    #    port: @spring.redis.port@
+    port: 6379
-    #    password: @spring.redis.password@
+    # 数据库索引
-    #    timeout: 30s
-
     database: @spring.redis.index@
+    # 密码(如没有密码请注释掉)
     password: @spring.redis.password@
+    # 连接超时时间
     timeout: 30s
-    cluster:
+    # 是否开启ssl
-      nodes: @spring.redis.cluster.nodes@
+    ssl: false
-      max-redirects: @spring.redis.cluster.max-redirects@
+#  redis:
+#    # 烟台使用cluster模式下使用cluster:配置段
+#    #    database: @spring.redis.index@
+#    #    host: @spring.redis.host@
+#    #    port: @spring.redis.port@
+#    #    password: @spring.redis.password@
+#    #    timeout: 30s
+#
+#    database: @spring.redis.index@
+#    password: @spring.redis.password@
+#    timeout: 30s
+#    cluster:
+#      nodes: @spring.redis.cluster.nodes@
+#      max-redirects: @spring.redis.cluster.max-redirects@
   datasource:
     druid:
       #MySQL

epmet-module/data-statistical/data-statistical-server/pom.xml

@@ -239,13 +239,15 @@
                 <datasource.druid.statsdisplay.url>
                     <![CDATA[jdbc:mysql://192.168.1.140:3306/epmet_data_statistical_display?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
                 </datasource.druid.statsdisplay.url>
-                <datasource.druid.statsdisplay.username>epmet_data_stats_display_user</datasource.druid.statsdisplay.username>
+                <datasource.druid.statsdisplay.username>epmet_data_stats_display_user
+                </datasource.druid.statsdisplay.username>
                 <datasource.druid.statsdisplay.password>EpmEt-db-UsEr</datasource.druid.statsdisplay.password>
 
                 <datasource.druid.evaluationIndex.url>
                     <![CDATA[jdbc:mysql://192.168.1.140:3306/epmet_evaluation_index?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
                 </datasource.druid.evaluationIndex.url>
-                <datasource.druid.evaluationIndex.username>epmet_evaluation_index_user</datasource.druid.evaluationIndex.username>
+                <datasource.druid.evaluationIndex.username>epmet_evaluation_index_user
+                </datasource.druid.evaluationIndex.username>
                 <datasource.druid.evaluationIndex.password>EpmEt-db-UsEr</datasource.druid.evaluationIndex.password>
 
                 <datasource.druid.evaluationIndex1.url>
@@ -257,7 +259,8 @@
                 <datasource.druid.partyMember.url>
                     <![CDATA[jdbc:mysql://192.168.1.140:3306/epmet_resi_partymember?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
                 </datasource.druid.partyMember.url>
-                <datasource.druid.partyMember.username>epmet_resi_partymember_user</datasource.druid.partyMember.username>
+                <datasource.druid.partyMember.username>epmet_resi_partymember_user
+                </datasource.druid.partyMember.username>
                 <datasource.druid.partyMember.password>EpmEt-db-UsEr</datasource.druid.partyMember.password>
 
                 <datasource.druid.epmetHeart.url>
@@ -276,7 +279,8 @@
                 <datasource.druid.operCustomize.url>
                     <![CDATA[jdbc:mysql://192.168.1.140:3306/epmet_oper_customize?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
                 </datasource.druid.operCustomize.url>
-                <datasource.druid.operCustomize.username>epmet_oper_customize_user</datasource.druid.operCustomize.username>
+                <datasource.druid.operCustomize.username>epmet_oper_customize_user
+                </datasource.druid.operCustomize.username>
                 <datasource.druid.operCustomize.password>EpmEt-db-UsEr</datasource.druid.operCustomize.password>
 
                 <!-- redis配置 -->
@@ -305,11 +309,15 @@
                 <thread.threadPool.queue-capacity>20</thread.threadPool.queue-capacity>
                 <thread.threadPool.keep-alive-seconds>60</thread.threadPool.keep-alive-seconds>
                 <thread.threadPool.thread-name-prefix>data-statistical</thread.threadPool.thread-name-prefix>
-                <thread.threadPool.rejected-execution-handler>callerRunsPolicy</thread.threadPool.rejected-execution-handler>
+                <thread.threadPool.rejected-execution-handler>callerRunsPolicy
+                </thread.threadPool.rejected-execution-handler>
 
                 <!--钉钉 机器人地址-->
-                <dingTalk.robot.webHook>https://oapi.dingtalk.com/robot/send?access_token=e894e5690f9d6a527722974c71548ff6c0fe29bd956589a09e21b16442a35ed4</dingTalk.robot.webHook>
+                <dingTalk.robot.webHook>
-                <dingTalk.robot.secret>SECfcc020bdc83bb17a2c00f39977b1fbc409ef4188c7beaea11c5caa90eeaf87fd</dingTalk.robot.secret>
+                    https://oapi.dingtalk.com/robot/send?access_token=e894e5690f9d6a527722974c71548ff6c0fe29bd956589a09e21b16442a35ed4
+                </dingTalk.robot.webHook>
+                <dingTalk.robot.secret>SECfcc020bdc83bb17a2c00f39977b1fbc409ef4188c7beaea11c5caa90eeaf87fd
+                </dingTalk.robot.secret>
 
                 <!--rocketmq-->
                 <rocketmq.enable>true</rocketmq.enable>
@@ -377,13 +385,15 @@
                 <datasource.druid.statsdisplay.url>
                     <![CDATA[jdbc:mysql://192.168.1.140:3306/epmet_data_statistical_display?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
                 </datasource.druid.statsdisplay.url>
-                <datasource.druid.statsdisplay.username>epmet_data_stats_display_user</datasource.druid.statsdisplay.username>
+                <datasource.druid.statsdisplay.username>epmet_data_stats_display_user
+                </datasource.druid.statsdisplay.username>
                 <datasource.druid.statsdisplay.password>EpmEt-db-UsEr</datasource.druid.statsdisplay.password>
 
                 <datasource.druid.evaluationIndex.url>
                     <![CDATA[jdbc:mysql://192.168.1.140:3306/epmet_evaluation_index?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
                 </datasource.druid.evaluationIndex.url>
-                <datasource.druid.evaluationIndex.username>epmet_evaluation_index_user</datasource.druid.evaluationIndex.username>
+                <datasource.druid.evaluationIndex.username>epmet_evaluation_index_user
+                </datasource.druid.evaluationIndex.username>
                 <datasource.druid.evaluationIndex.password>EpmEt-db-UsEr</datasource.druid.evaluationIndex.password>
 
                 <datasource.druid.evaluationIndex1.url>
@@ -395,7 +405,8 @@
                 <datasource.druid.partyMember.url>
                     <![CDATA[jdbc:mysql://192.168.1.140:3306/epmet_resi_partymember?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
                 </datasource.druid.partyMember.url>
-                <datasource.druid.partyMember.username>epmet_resi_partymember_user</datasource.druid.partyMember.username>
+                <datasource.druid.partyMember.username>epmet_resi_partymember_user
+                </datasource.druid.partyMember.username>
                 <datasource.druid.partyMember.password>EpmEt-db-UsEr</datasource.druid.partyMember.password>
 
                 <datasource.druid.epmetHeart.url>
@@ -414,7 +425,8 @@
                 <datasource.druid.operCustomize.url>
                     <![CDATA[jdbc:mysql://192.168.1.140:3306/epmet_oper_customize?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
                 </datasource.druid.operCustomize.url>
-                <datasource.druid.operCustomize.username>epmet_oper_customize_user</datasource.druid.operCustomize.username>
+                <datasource.druid.operCustomize.username>epmet_oper_customize_user
+                </datasource.druid.operCustomize.username>
                 <datasource.druid.operCustomize.password>EpmEt-db-UsEr</datasource.druid.operCustomize.password>
 
                 <!-- redis配置 -->
@@ -443,11 +455,15 @@
                 <thread.threadPool.queue-capacity>20</thread.threadPool.queue-capacity>
                 <thread.threadPool.keep-alive-seconds>60</thread.threadPool.keep-alive-seconds>
                 <thread.threadPool.thread-name-prefix>data-statistical</thread.threadPool.thread-name-prefix>
-                <thread.threadPool.rejected-execution-handler>callerRunsPolicy</thread.threadPool.rejected-execution-handler>
+                <thread.threadPool.rejected-execution-handler>callerRunsPolicy
+                </thread.threadPool.rejected-execution-handler>
 
                 <!--钉钉 机器人地址-->
-                <dingTalk.robot.webHook>https://oapi.dingtalk.com/robot/send?access_token=e894e5690f9d6a527722974c71548ff6c0fe29bd956589a09e21b16442a35ed4</dingTalk.robot.webHook>
+                <dingTalk.robot.webHook>
-                <dingTalk.robot.secret>SECfcc020bdc83bb17a2c00f39977b1fbc409ef4188c7beaea11c5caa90eeaf87fd</dingTalk.robot.secret>
+                    https://oapi.dingtalk.com/robot/send?access_token=e894e5690f9d6a527722974c71548ff6c0fe29bd956589a09e21b16442a35ed4
+                </dingTalk.robot.webHook>
+                <dingTalk.robot.secret>SECfcc020bdc83bb17a2c00f39977b1fbc409ef4188c7beaea11c5caa90eeaf87fd
+                </dingTalk.robot.secret>
 
                 <!--rocketmq-->
                 <rocketmq.enable>false</rocketmq.enable>
@@ -580,11 +596,15 @@
                 <thread.threadPool.queue-capacity>20</thread.threadPool.queue-capacity>
                 <thread.threadPool.keep-alive-seconds>60</thread.threadPool.keep-alive-seconds>
                 <thread.threadPool.thread-name-prefix>data-statistical</thread.threadPool.thread-name-prefix>
-                <thread.threadPool.rejected-execution-handler>callerRunsPolicy</thread.threadPool.rejected-execution-handler>
+                <thread.threadPool.rejected-execution-handler>callerRunsPolicy
+                </thread.threadPool.rejected-execution-handler>
 
                 <!--测试钉钉 机器人地址-->
-                <dingTalk.robot.webHook>https://oapi.dingtalk.com/robot/send?access_token=e894e5690f9d6a527722974c71548ff6c0fe29bd956589a09e21b16442a35ed4</dingTalk.robot.webHook>
+                <dingTalk.robot.webHook>
-                <dingTalk.robot.secret>SECfcc020bdc83bb17a2c00f39977b1fbc409ef4188c7beaea11c5caa90eeaf87fd</dingTalk.robot.secret>
+                    https://oapi.dingtalk.com/robot/send?access_token=e894e5690f9d6a527722974c71548ff6c0fe29bd956589a09e21b16442a35ed4
+                </dingTalk.robot.webHook>
+                <dingTalk.robot.secret>SECfcc020bdc83bb17a2c00f39977b1fbc409ef4188c7beaea11c5caa90eeaf87fd
+                </dingTalk.robot.secret>
 
                 <!--rocketmq-->
                 <rocketmq.enable>true</rocketmq.enable>
@@ -599,93 +619,99 @@
 
                 <!-- 数据库配置-->
                 <datasource.druid.stats.url>
-                    <![CDATA[jdbc:mysql://10.2.2.44:3306/epmet_data_statistical?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                    <![CDATA[jdbc:mysql://172.16.3.86:3306/epmet_data_statistical?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
                 </datasource.druid.stats.url>
                 <datasource.druid.stats.username>epmet_data_statistical</datasource.druid.stats.username>
                 <datasource.druid.stats.password>EpmEt-db-UsEr</datasource.druid.stats.password>
 
                 <datasource.druid.org.url>
-                    <![CDATA[jdbc:mysql://10.2.2.44:3306/epmet_gov_org?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                    <![CDATA[jdbc:mysql://172.16.3.86:3306/epmet_gov_org?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
                 </datasource.druid.org.url>
                 <datasource.druid.org.username>epmet_gov_org_user</datasource.druid.org.username>
                 <datasource.druid.org.password>EpmEt-db-UsEr</datasource.druid.org.password>
 
                 <datasource.druid.issue.url>
-                    <![CDATA[jdbc:mysql://10.2.2.44:3306/epmet_gov_issue?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                    <![CDATA[jdbc:mysql://172.16.3.86:3306/epmet_gov_issue?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
                 </datasource.druid.issue.url>
                 <datasource.druid.issue.username>epmet_gov_issue_user</datasource.druid.issue.username>
                 <datasource.druid.issue.password>EpmEt-db-UsEr</datasource.druid.issue.password>
 
                 <datasource.druid.project.url>
-                    <![CDATA[jdbc:mysql://10.2.2.44:3306/epmet_gov_project?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                    <![CDATA[jdbc:mysql://172.16.3.86:3306/epmet_gov_project?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
                 </datasource.druid.project.url>
                 <datasource.druid.project.username>epmet_gov_project_user</datasource.druid.project.username>
                 <datasource.druid.project.password>EpmEt-db-UsEr</datasource.druid.project.password>
 
                 <datasource.druid.voice.url>
-                    <![CDATA[jdbc:mysql://10.2.2.44:3306/epmet_gov_voice?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                    <![CDATA[jdbc:mysql://172.16.3.86:3306/epmet_gov_voice?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
                 </datasource.druid.voice.url>
                 <datasource.druid.voice.username>epmet_gov_voice_user</datasource.druid.voice.username>
                 <datasource.druid.voice.password>EpmEt-db-UsEr</datasource.druid.voice.password>
 
                 <datasource.druid.crm.url>
-                    <![CDATA[jdbc:mysql://10.2.2.44:3306/epmet_oper_crm?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                    <![CDATA[jdbc:mysql://172.16.3.86:3306/epmet_oper_crm?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
                 </datasource.druid.crm.url>
                 <datasource.druid.crm.username>epmet_oper_crm_user</datasource.druid.crm.username>
                 <datasource.druid.crm.password>EpmEt-db-UsEr</datasource.druid.crm.password>
 
                 <datasource.druid.group.url>
-                    <![CDATA[jdbc:mysql://10.2.2.44:3306/epmet_resi_group?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                    <![CDATA[jdbc:mysql://172.16.3.86:3306/epmet_resi_group?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
                 </datasource.druid.group.url>
                 <datasource.druid.group.username>epmet_resi_group_user</datasource.druid.group.username>
                 <datasource.druid.group.password>EpmEt-db-UsEr</datasource.druid.group.password>
 
                 <datasource.druid.user.url>
-                    <![CDATA[jdbc:mysql://10.2.2.44:3306/epmet_user?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                    <![CDATA[jdbc:mysql://172.16.3.86:3306/epmet_user?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
                 </datasource.druid.user.url>
                 <datasource.druid.user.username>epmet_user_user</datasource.druid.user.username>
                 <datasource.druid.user.password>EpmEt-db-UsEr</datasource.druid.user.password>
 
                 <datasource.druid.statsdisplay.url>
-                    <![CDATA[jdbc:mysql://10.2.2.44:3306/epmet_data_statistical_display?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                    <![CDATA[jdbc:mysql://172.16.3.86:3306/epmet_data_statistical_display?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
                 </datasource.druid.statsdisplay.url>
-                <datasource.druid.statsdisplay.username>epmet_data_stats_display_user</datasource.druid.statsdisplay.username>
+                <datasource.druid.statsdisplay.username>epmet_data_stats_display_user
+                </datasource.druid.statsdisplay.username>
                 <datasource.druid.statsdisplay.password>EpmEt-db-UsEr</datasource.druid.statsdisplay.password>
 
                 <datasource.druid.evaluationIndex.url>
-                    <![CDATA[jdbc:mysql://10.2.2.44:3306/epmet_evaluation_index?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                    <![CDATA[jdbc:mysql://172.16.3.86:3306/epmet_evaluation_index?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
                 </datasource.druid.evaluationIndex.url>
-                <datasource.druid.evaluationIndex.username>epmet_evaluation_index_user</datasource.druid.evaluationIndex.username>
+                <datasource.druid.evaluationIndex.username>epmet_evaluation_index_user
+                </datasource.druid.evaluationIndex.username>
                 <datasource.druid.evaluationIndex.password>EpmEt-db-UsEr</datasource.druid.evaluationIndex.password>
 
                 <datasource.druid.evaluationIndex1.url>
-                    <![CDATA[jdbc:mysql://10.2.2.44:3306/epmet_evaluation_index?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                    <![CDATA[jdbc:mysql://172.16.3.86:3306/epmet_evaluation_index?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
                 </datasource.druid.evaluationIndex1.url>
-                <datasource.druid.evaluationIndex1.username>epmet_cloud_viewer</datasource.druid.evaluationIndex1.username>
+                <datasource.druid.evaluationIndex1.username>epmet_cloud_viewer
-                <datasource.druid.evaluationIndex1.password>EpmEtclOUdvIEwEr@w</datasource.druid.evaluationIndex1.password>
+                </datasource.druid.evaluationIndex1.username>
+                <datasource.druid.evaluationIndex1.password>EpmEtclOUdvIEwEr@w
+                </datasource.druid.evaluationIndex1.password>
 
                 <datasource.druid.partyMember.url>
-                    <![CDATA[jdbc:mysql://10.2.2.44:3306/epmet_resi_partymember?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                    <![CDATA[jdbc:mysql://172.16.3.86:3306/epmet_resi_partymember?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
                 </datasource.druid.partyMember.url>
-                <datasource.druid.partyMember.username>epmet_resi_partymember_user</datasource.druid.partyMember.username>
+                <datasource.druid.partyMember.username>epmet_resi_partymember_user
+                </datasource.druid.partyMember.username>
                 <datasource.druid.partyMember.password>EpmEt-db-UsEr</datasource.druid.partyMember.password>
 
                 <datasource.druid.epmetHeart.url>
-                    <![CDATA[jdbc:mysql://10.2.2.44:3306/epmet_heart?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                    <![CDATA[jdbc:mysql://172.16.3.86:3306/epmet_heart?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
                 </datasource.druid.epmetHeart.url>
                 <datasource.druid.epmetHeart.username>epmet_heart_user</datasource.druid.epmetHeart.username>
                 <datasource.druid.epmetHeart.password>EpmEt-db-UsEr</datasource.druid.epmetHeart.password>
 
                 <datasource.druid.epmetPoint.url>
-                    <![CDATA[jdbc:mysql://10.2.2.44:3306/epmet_point?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                    <![CDATA[jdbc:mysql://172.16.3.86:3306/epmet_point?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
                 </datasource.druid.epmetPoint.url>
                 <datasource.druid.epmetPoint.username>epmet_point_user</datasource.druid.epmetPoint.username>
                 <datasource.druid.epmetPoint.password>EpmEt-db-UsEr</datasource.druid.epmetPoint.password>
 
                 <datasource.druid.operCustomize.url>
-                    <![CDATA[jdbc:mysql://10.2.2.44:3306/epmet_oper_customize?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                    <![CDATA[jdbc:mysql://172.16.3.86:3306/epmet_oper_customize?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
                 </datasource.druid.operCustomize.url>
-                <datasource.druid.operCustomize.username>epmet_oper_customize_user</datasource.druid.operCustomize.username>
+                <datasource.druid.operCustomize.username>epmet_oper_customize_user
+                </datasource.druid.operCustomize.username>
                 <datasource.druid.operCustomize.password>EpmEt-db-UsEr</datasource.druid.operCustomize.password>
 
                 <!-- redis配置 -->
@@ -698,8 +724,8 @@
                 <spring.redis.password>rEdIs@yAntAI_666</spring.redis.password>
                 <!-- nacos -->
                 <nacos.register-enabled>true</nacos.register-enabled>
-                <nacos.server-addr>10.2.2.51:8848</nacos.server-addr>
+                <nacos.server-addr>172.16.3.87</nacos.server-addr>
-                <nacos.discovery.namespace>bd205d23-e696-47be-b995-916313f86e99</nacos.discovery.namespace>
+                <nacos.discovery.namespace>bf153d2b-7aa5-4b6e-ba7b-4977e54eb126</nacos.discovery.namespace>
                 <nacos.config.namespace></nacos.config.namespace>
                 <nacos.config.group></nacos.config.group>
                 <nacos.config-enabled>false</nacos.config-enabled>
@@ -717,15 +743,19 @@
                 <thread.threadPool.queue-capacity>20</thread.threadPool.queue-capacity>
                 <thread.threadPool.keep-alive-seconds>60</thread.threadPool.keep-alive-seconds>
                 <thread.threadPool.thread-name-prefix>data-statistical</thread.threadPool.thread-name-prefix>
-                <thread.threadPool.rejected-execution-handler>callerRunsPolicy</thread.threadPool.rejected-execution-handler>
+                <thread.threadPool.rejected-execution-handler>callerRunsPolicy
+                </thread.threadPool.rejected-execution-handler>
 
                 <!--生产钉钉 机器人地址-->
-                <dingTalk.robot.webHook>https://oapi.dingtalk.com/robot/send?access_token=c96c904b375f8b63eb10036db43a18628365dd87aa8669a9052cf95c911b4df0</dingTalk.robot.webHook>
+                <dingTalk.robot.webHook>
-                <dingTalk.robot.secret>SEC134641aac79c2514b74cbb87028d706c34d071747f60a279a34bf8d2ad75be8e</dingTalk.robot.secret>
+                    https://oapi.dingtalk.com/robot/send?access_token=c96c904b375f8b63eb10036db43a18628365dd87aa8669a9052cf95c911b4df0
+                </dingTalk.robot.webHook>
+                <dingTalk.robot.secret>SEC134641aac79c2514b74cbb87028d706c34d071747f60a279a34bf8d2ad75be8e
+                </dingTalk.robot.secret>
 
                 <!--rocketmq-->
                 <rocketmq.enable>true</rocketmq.enable>
-                <rocketmq.nameserver>10.2.2.50:9876;10.2.2.51:9876</rocketmq.nameserver>
+                <rocketmq.nameserver>172.16.3.86:9876;172.16.3.87:9876</rocketmq.nameserver>
             </properties>
         </profile>
     </profiles>

epmet-module/data-statistical/data-statistical-server/src/main/resources/bootstrap.yml

@@ -15,20 +15,34 @@ spring:
   jackson:
     time-zone: GMT+8
     date-format: yyyy-MM-dd HH:mm:ss
+  # redis 单机配置(单机与集群只能开启一个另一个需要注释掉)
   redis:
-    # 烟台使用cluster模式下使用cluster:配置段
+    # 地址
-    #    database: @spring.redis.index@
+    host: 172.16.3.87
-    #    host: @spring.redis.host@
+    # 端口，默认为6379
-    #    port: @spring.redis.port@
+    port: 6379
-    #    password: @spring.redis.password@
+    # 数据库索引
-    #    timeout: 30s
-
     database: @spring.redis.index@
+    # 密码(如没有密码请注释掉)
     password: @spring.redis.password@
+    # 连接超时时间
     timeout: 30s
-    cluster:
+    # 是否开启ssl
-      nodes: @spring.redis.cluster.nodes@
+    ssl: false
-      max-redirects: @spring.redis.cluster.max-redirects@
+#  redis:
+#    # 烟台使用cluster模式下使用cluster:配置段
+#    #    database: @spring.redis.index@
+#    #    host: @spring.redis.host@
+#    #    port: @spring.redis.port@
+#    #    password: @spring.redis.password@
+#    #    timeout: 30s
+#
+#    database: @spring.redis.index@
+#    password: @spring.redis.password@
+#    timeout: 30s
+#    cluster:
+#      nodes: @spring.redis.cluster.nodes@
+#      max-redirects: @spring.redis.cluster.max-redirects@
   datasource:
     druid:
       #MySQL

epmet-module/epmet-activiti/epmet-activiti-server/pom.xml

@@ -299,7 +299,7 @@
                 <!-- nacos -->
                 <nacos.register-enabled>true</nacos.register-enabled>
                 <nacos.server-addr>192.168.11.180:8848</nacos.server-addr>
-                <nacos.discovery.namespace>bd205d23-e696-47be-b995-916313f86e99</nacos.discovery.namespace>
+                <nacos.discovery.namespace>bf153d2b-7aa5-4b6e-ba7b-4977e54eb126</nacos.discovery.namespace>
                 <nacos.config.namespace></nacos.config.namespace>
                 <nacos.config.group></nacos.config.group>
                 <nacos.config-enabled>false</nacos.config-enabled>

epmet-module/epmet-common-service/common-service-server/pom.xml

@@ -270,7 +270,7 @@
 
                 <!-- 数据库配置-->
                 <spring.datasource.druid.url>
-                    <![CDATA[jdbc:mysql://10.2.2.44:3306/epmet_common_service?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                    <![CDATA[jdbc:mysql://172.16.3.86:3306/epmet_common_service?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
                 </spring.datasource.druid.url>
                 <spring.datasource.druid.username>epmet_common_service_user</spring.datasource.druid.username>
                 <spring.datasource.druid.password>EpmEt-db-UsEr</spring.datasource.druid.password>
@@ -284,8 +284,8 @@
                 <spring.redis.password>rEdIs@yAntAI_666</spring.redis.password>
                 <!-- nacos -->
                 <nacos.register-enabled>true</nacos.register-enabled>
-                <nacos.server-addr>10.2.2.51:8848</nacos.server-addr>
+                <nacos.server-addr>172.16.3.87</nacos.server-addr>
-                <nacos.discovery.namespace>bd205d23-e696-47be-b995-916313f86e99</nacos.discovery.namespace>
+                <nacos.discovery.namespace>bf153d2b-7aa5-4b6e-ba7b-4977e54eb126</nacos.discovery.namespace>
                 <nacos.config.namespace></nacos.config.namespace>
                 <nacos.config.group></nacos.config.group>
                 <nacos.config-enabled>false</nacos.config-enabled>
@@ -293,7 +293,7 @@
                 <!--是否开启服务列表变更监听-->
                 <nacos.service-list-changed-listening.enable>true</nacos.service-list-changed-listening.enable>
 
-                <spring.flyway.enabled>true</spring.flyway.enabled>
+                <spring.flyway.enabled>false</spring.flyway.enabled>
                 <!--亿联云消息网关配置-->
                 <elink.mq.host>https://estos.elinkservice.cn:7519/estos/</elink.mq.host>
                 <elink.mq.sendMsgPath>producerService/producer/sendMsg</elink.mq.sendMsgPath>

epmet-module/epmet-common-service/common-service-server/src/main/resources/bootstrap.yml

@@ -18,20 +18,34 @@ spring:
   jackson:
     time-zone: GMT+8
     date-format: yyyy-MM-dd HH:mm:ss
+  # redis 单机配置(单机与集群只能开启一个另一个需要注释掉)
   redis:
-    # 烟台使用cluster模式下使用cluster:配置段
+    # 地址
-    #    database: @spring.redis.index@
+    host: 172.16.3.87
-    #    host: @spring.redis.host@
+    # 端口，默认为6379
-    #    port: @spring.redis.port@
+    port: 6379
-    #    password: @spring.redis.password@
+    # 数据库索引
-    #    timeout: 30s
-
     database: @spring.redis.index@
+    # 密码(如没有密码请注释掉)
     password: @spring.redis.password@
+    # 连接超时时间
     timeout: 30s
-    cluster:
+    # 是否开启ssl
-      nodes: @spring.redis.cluster.nodes@
+    ssl: false
-      max-redirects: @spring.redis.cluster.max-redirects@
+#  redis:
+#    # 烟台使用cluster模式下使用cluster:配置段
+#    #    database: @spring.redis.index@
+#    #    host: @spring.redis.host@
+#    #    port: @spring.redis.port@
+#    #    password: @spring.redis.password@
+#    #    timeout: 30s
+#
+#    database: @spring.redis.index@
+#    password: @spring.redis.password@
+#    timeout: 30s
+#    cluster:
+#      nodes: @spring.redis.cluster.nodes@
+#      max-redirects: @spring.redis.cluster.max-redirects@
   datasource:
     druid:
       #MySQL

epmet-module/epmet-ext/epmet-ext-server/pom.xml

@@ -348,7 +348,7 @@
 
                 <!-- 数据库配置-->
                 <spring.datasource.druid.url>
-                    <![CDATA[jdbc:mysql://10.2.2.44:3306/epmet_third?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                    <![CDATA[jdbc:mysql://172.16.3.86:3306/epmet_third?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
                 </spring.datasource.druid.url>
                 <spring.datasource.druid.username>epmet_third_user</spring.datasource.druid.username>
                 <spring.datasource.druid.password>EpmEt-db-UsEr</spring.datasource.druid.password>
@@ -362,8 +362,8 @@
                 <spring.redis.password>rEdIs@yAntAI_666</spring.redis.password>
                 <!-- nacos -->
                 <nacos.register-enabled>true</nacos.register-enabled>
-                <nacos.server-addr>10.2.2.51:8848</nacos.server-addr>
+                <nacos.server-addr>172.16.3.87</nacos.server-addr>
-                <nacos.discovery.namespace>bd205d23-e696-47be-b995-916313f86e99</nacos.discovery.namespace>
+                <nacos.discovery.namespace>bf153d2b-7aa5-4b6e-ba7b-4977e54eb126</nacos.discovery.namespace>
                 <nacos.config.namespace></nacos.config.namespace>
                 <nacos.config.group></nacos.config.group>
                 <nacos.config-enabled>false</nacos.config-enabled>
@@ -371,7 +371,7 @@
                 <!--是否开启服务列表变更监听-->
                 <nacos.service-list-changed-listening.enable>true</nacos.service-list-changed-listening.enable>
 
-                <spring.flyway.enabled>true</spring.flyway.enabled>
+                <spring.flyway.enabled>false</spring.flyway.enabled>
 
                 <!--生产钉钉 机器人地址-->
                 <dingTalk.robot.webHook>

epmet-module/epmet-ext/epmet-ext-server/src/main/resources/bootstrap.yml

@@ -15,20 +15,34 @@ spring:
   jackson:
     time-zone: GMT+8
     date-format: yyyy-MM-dd HH:mm:ss
+  # redis 单机配置(单机与集群只能开启一个另一个需要注释掉)
   redis:
-    # 烟台使用cluster模式下使用cluster:配置段
+    # 地址
-    #    database: @spring.redis.index@
+    host: 172.16.3.87
-    #    host: @spring.redis.host@
+    # 端口，默认为6379
-    #    port: @spring.redis.port@
+    port: 6379
-    #    password: @spring.redis.password@
+    # 数据库索引
-    #    timeout: 30s
-
     database: @spring.redis.index@
+    # 密码(如没有密码请注释掉)
     password: @spring.redis.password@
+    # 连接超时时间
     timeout: 30s
-    cluster:
+    # 是否开启ssl
-      nodes: @spring.redis.cluster.nodes@
+    ssl: false
-      max-redirects: @spring.redis.cluster.max-redirects@
+#  redis:
+#    # 烟台使用cluster模式下使用cluster:配置段
+#    #    database: @spring.redis.index@
+#    #    host: @spring.redis.host@
+#    #    port: @spring.redis.port@
+#    #    password: @spring.redis.password@
+#    #    timeout: 30s
+#
+#    database: @spring.redis.index@
+#    password: @spring.redis.password@
+#    timeout: 30s
+#    cluster:
+#      nodes: @spring.redis.cluster.nodes@
+#      max-redirects: @spring.redis.cluster.max-redirects@
   datasource:
     druid:
       #MySQL

epmet-module/epmet-heart/epmet-heart-server/pom.xml

@@ -331,7 +331,7 @@
 
                 <!-- 数据库配置-->
                 <datasource.druid.url>
-                    <![CDATA[jdbc:mysql://10.2.2.44:3306/epmet_heart?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                    <![CDATA[jdbc:mysql://172.16.3.86:3306/epmet_heart?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
                 </datasource.druid.url>
                 <datasource.druid.username>epmet_heart_user</datasource.druid.username>
                 <datasource.druid.password>EpmEt-db-UsEr</datasource.druid.password>
@@ -345,8 +345,8 @@
                 <spring.redis.password>rEdIs@yAntAI_666</spring.redis.password>
                 <!-- nacos -->
                 <nacos.register-enabled>true</nacos.register-enabled>
-                <nacos.server-addr>10.2.2.51:8848</nacos.server-addr>
+                <nacos.server-addr>172.16.3.87</nacos.server-addr>
-                <nacos.discovery.namespace>bd205d23-e696-47be-b995-916313f86e99</nacos.discovery.namespace>
+                <nacos.discovery.namespace>bf153d2b-7aa5-4b6e-ba7b-4977e54eb126</nacos.discovery.namespace>
                 <nacos.config.namespace></nacos.config.namespace>
                 <nacos.config.group></nacos.config.group>
                 <nacos.config-enabled>false</nacos.config-enabled>
@@ -354,7 +354,7 @@
                 <!--是否开启服务列表变更监听-->
                 <nacos.service-list-changed-listening.enable>true</nacos.service-list-changed-listening.enable>
 
-                <spring.flyway.enabled>true</spring.flyway.enabled>
+                <spring.flyway.enabled>false</spring.flyway.enabled>
                 <openapi.scan.server.url>https://epmet-open.elinkservice.cn/api/epmetscan/api</openapi.scan.server.url>
                 <!--亿联云消息网关配置-->
                 <elink.mq.host>https://estos.elinkservice.cn:7519/estos/</elink.mq.host>
@@ -367,7 +367,7 @@
 
                 <!--rocketmq-->
                 <rocketmq.enable>true</rocketmq.enable>
-                <rocketmq.nameserver>10.2.2.50:9876;10.2.2.51:9876</rocketmq.nameserver>
+                <rocketmq.nameserver>172.16.3.86:9876;172.16.3.87:9876</rocketmq.nameserver>
 
                 <!--线程池-->
                 <thread.threadPool.enable-customize>true</thread.threadPool.enable-customize>

epmet-module/epmet-heart/epmet-heart-server/src/main/resources/bootstrap.yml

@@ -15,20 +15,34 @@ spring:
   jackson:
     time-zone: GMT+8
     date-format: yyyy-MM-dd HH:mm:ss
+  # redis 单机配置(单机与集群只能开启一个另一个需要注释掉)
   redis:
-    # 烟台使用cluster模式下使用cluster:配置段
+    # 地址
-    #    database: @spring.redis.index@
+    host: 172.16.3.87
-    #    host: @spring.redis.host@
+    # 端口，默认为6379
-    #    port: @spring.redis.port@
+    port: 6379
-    #    password: @spring.redis.password@
+    # 数据库索引
-    #    timeout: 30s
-
     database: @spring.redis.index@
+    # 密码(如没有密码请注释掉)
     password: @spring.redis.password@
+    # 连接超时时间
     timeout: 30s
-    cluster:
+    # 是否开启ssl
-      nodes: @spring.redis.cluster.nodes@
+    ssl: false
-      max-redirects: @spring.redis.cluster.max-redirects@
+#  redis:
+#    # 烟台使用cluster模式下使用cluster:配置段
+#    #    database: @spring.redis.index@
+#    #    host: @spring.redis.host@
+#    #    port: @spring.redis.port@
+#    #    password: @spring.redis.password@
+#    #    timeout: 30s
+#
+#    database: @spring.redis.index@
+#    password: @spring.redis.password@
+#    timeout: 30s
+#    cluster:
+#      nodes: @spring.redis.cluster.nodes@
+#      max-redirects: @spring.redis.cluster.max-redirects@
   datasource:
     druid:
       #MySQL

epmet-module/epmet-job/epmet-job-server/pom.xml

@@ -262,7 +262,7 @@
 
                 <!-- 数据库配置-->
                 <spring.datasource.druid.url>
-                    <![CDATA[jdbc:mysql://10.2.2.44:3306/epmet_job?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                    <![CDATA[jdbc:mysql://172.16.3.86:3306/epmet_job?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
                 </spring.datasource.druid.url>
                 <spring.datasource.druid.username>epmet_job_user</spring.datasource.druid.username>
                 <spring.datasource.druid.password>EpmEt-db-UsEr</spring.datasource.druid.password>
@@ -276,8 +276,8 @@
                 <spring.redis.password>rEdIs@yAntAI_666</spring.redis.password>
                 <!-- nacos -->
                 <nacos.register-enabled>true</nacos.register-enabled>
-                <nacos.server-addr>10.2.2.51:8848</nacos.server-addr>
+                <nacos.server-addr>172.16.3.87</nacos.server-addr>
-                <nacos.discovery.namespace>bd205d23-e696-47be-b995-916313f86e99</nacos.discovery.namespace>
+                <nacos.discovery.namespace>bf153d2b-7aa5-4b6e-ba7b-4977e54eb126</nacos.discovery.namespace>
                 <nacos.config.namespace></nacos.config.namespace>
                 <nacos.config.group></nacos.config.group>
                 <nacos.config-enabled>false</nacos.config-enabled>
@@ -286,7 +286,7 @@
                 <!--是否开启服务列表变更监听-->
                 <nacos.service-list-changed-listening.enable>true</nacos.service-list-changed-listening.enable>
 
-                <spring.flyway.enabled>true</spring.flyway.enabled>
+                <spring.flyway.enabled>false</spring.flyway.enabled>
 
                 <!--生产钉钉 机器人地址-->
                 <dingTalk.robot.webHook>https://oapi.dingtalk.com/robot/send?access_token=c96c904b375f8b63eb10036db43a18628365dd87aa8669a9052cf95c911b4df0</dingTalk.robot.webHook>

epmet-module/epmet-job/epmet-job-server/src/main/resources/bootstrap.yml

@@ -18,20 +18,34 @@ spring:
   jackson:
     time-zone: GMT+8
     date-format: yyyy-MM-dd HH:mm:ss
+  # redis 单机配置(单机与集群只能开启一个另一个需要注释掉)
   redis:
-    # 烟台使用cluster模式下使用cluster:配置段
+    # 地址
-    #    database: @spring.redis.index@
+    host: 172.16.3.87
-    #    host: @spring.redis.host@
+    # 端口，默认为6379
-    #    port: @spring.redis.port@
+    port: 6379
-    #    password: @spring.redis.password@
+    # 数据库索引
-    #    timeout: 30s
-
     database: @spring.redis.index@
+    # 密码(如没有密码请注释掉)
     password: @spring.redis.password@
+    # 连接超时时间
     timeout: 30s
-    cluster:
+    # 是否开启ssl
-      nodes: @spring.redis.cluster.nodes@
+    ssl: false
-      max-redirects: @spring.redis.cluster.max-redirects@
+#  redis:
+#    # 烟台使用cluster模式下使用cluster:配置段
+#    #    database: @spring.redis.index@
+#    #    host: @spring.redis.host@
+#    #    port: @spring.redis.port@
+#    #    password: @spring.redis.password@
+#    #    timeout: 30s
+#
+#    database: @spring.redis.index@
+#    password: @spring.redis.password@
+#    timeout: 30s
+#    cluster:
+#      nodes: @spring.redis.cluster.nodes@
+#      max-redirects: @spring.redis.cluster.max-redirects@
   datasource:
     druid:
       #MySQL

epmet-module/epmet-message/epmet-message-server/pom.xml

@@ -319,7 +319,7 @@
 
                 <!-- 数据库配置-->
                 <spring.datasource.druid.url>
-                    <![CDATA[jdbc:mysql://10.2.2.44:3306/epmet_message?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                    <![CDATA[jdbc:mysql://172.16.3.86:3306/epmet_message?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
                 </spring.datasource.druid.url>
                 <spring.datasource.druid.username>epmet_message_user</spring.datasource.druid.username>
                 <spring.datasource.druid.password>EpmEt-db-UsEr</spring.datasource.druid.password>
@@ -333,8 +333,8 @@
                 <spring.redis.password>rEdIs@yAntAI_666</spring.redis.password>
                 <!-- nacos -->
                 <nacos.register-enabled>true</nacos.register-enabled>
-                <nacos.server-addr>10.2.2.51:8848</nacos.server-addr>
+                <nacos.server-addr>172.16.3.87</nacos.server-addr>
-                <nacos.discovery.namespace>bd205d23-e696-47be-b995-916313f86e99</nacos.discovery.namespace>
+                <nacos.discovery.namespace>bf153d2b-7aa5-4b6e-ba7b-4977e54eb126</nacos.discovery.namespace>
                 <nacos.config.namespace></nacos.config.namespace>
                 <nacos.config.group></nacos.config.group>
                 <nacos.config-enabled>false</nacos.config-enabled>
@@ -343,7 +343,7 @@
                 <!--是否开启服务列表变更监听-->
                 <nacos.service-list-changed-listening.enable>true</nacos.service-list-changed-listening.enable>
 
-                <spring.flyway.enabled>true</spring.flyway.enabled>
+                <spring.flyway.enabled>false</spring.flyway.enabled>
 
                 <!--线程池-->
                 <thread.threadPool.enable-customize>true</thread.threadPool.enable-customize>
@@ -362,7 +362,7 @@
                 </dingTalk.robot.secret>
 
                 <!--rocketmq-->
-                <rocketmq.nameserver>10.2.2.50:9876;10.2.2.51:9876</rocketmq.nameserver>
+                <rocketmq.nameserver>172.16.3.86:9876;172.16.3.87:9876</rocketmq.nameserver>
                 <rocketmq.producer.group>epmet_message</rocketmq.producer.group>
             </properties>
         </profile>

epmet-module/epmet-message/epmet-message-server/src/main/resources/bootstrap.yml

@@ -18,20 +18,34 @@ spring:
   jackson:
     time-zone: GMT+8
     date-format: yyyy-MM-dd HH:mm:ss
+  # redis 单机配置(单机与集群只能开启一个另一个需要注释掉)
   redis:
-    # 烟台使用cluster模式下使用cluster:配置段
+    # 地址
-    #    database: @spring.redis.index@
+    host: 172.16.3.87
-    #    host: @spring.redis.host@
+    # 端口，默认为6379
-    #    port: @spring.redis.port@
+    port: 6379
-    #    password: @spring.redis.password@
+    # 数据库索引
-    #    timeout: 30s
-
     database: @spring.redis.index@
+    # 密码(如没有密码请注释掉)
     password: @spring.redis.password@
+    # 连接超时时间
     timeout: 30s
-    cluster:
+    # 是否开启ssl
-      nodes: @spring.redis.cluster.nodes@
+    ssl: false
-      max-redirects: @spring.redis.cluster.max-redirects@
+#  redis:
+#    # 烟台使用cluster模式下使用cluster:配置段
+#    #    database: @spring.redis.index@
+#    #    host: @spring.redis.host@
+#    #    port: @spring.redis.port@
+#    #    password: @spring.redis.password@
+#    #    timeout: 30s
+#
+#    database: @spring.redis.index@
+#    password: @spring.redis.password@
+#    timeout: 30s
+#    cluster:
+#      nodes: @spring.redis.cluster.nodes@
+#      max-redirects: @spring.redis.cluster.max-redirects@
   datasource:
     druid:
       #MySQL

epmet-module/epmet-oss/epmet-oss-server/pom.xml

@@ -279,7 +279,7 @@
 
                 <!-- 数据库配置-->
                 <spring.datasource.druid.url>
-                    <![CDATA[jdbc:mysql://10.2.2.44:3306/epmet_oss?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                    <![CDATA[jdbc:mysql://172.16.3.86:3306/epmet_oss?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
                 </spring.datasource.druid.url>
                 <spring.datasource.druid.username>epmet_oss_user</spring.datasource.druid.username>
                 <spring.datasource.druid.password>EpmEt-db-UsEr</spring.datasource.druid.password>
@@ -293,8 +293,8 @@
                 <spring.redis.password>rEdIs@yAntAI_666</spring.redis.password>
                 <!-- nacos -->
                 <nacos.register-enabled>true</nacos.register-enabled>
-                <nacos.server-addr>10.2.2.51:8848</nacos.server-addr>
+                <nacos.server-addr>172.16.3.87</nacos.server-addr>
-                <nacos.discovery.namespace>bd205d23-e696-47be-b995-916313f86e99</nacos.discovery.namespace>
+                <nacos.discovery.namespace>bf153d2b-7aa5-4b6e-ba7b-4977e54eb126</nacos.discovery.namespace>
                 <nacos.config.namespace></nacos.config.namespace>
                 <nacos.config.group></nacos.config.group>
                 <nacos.config-enabled>false</nacos.config-enabled>
@@ -311,7 +311,7 @@
                 <thread.threadPool.thread-name-prefix>epmet-oss</thread.threadPool.thread-name-prefix>
                 <thread.threadPool.rejected-execution-handler>callerRunsPolicy</thread.threadPool.rejected-execution-handler>
 
-                <spring.flyway.enabled>true</spring.flyway.enabled>
+                <spring.flyway.enabled>false</spring.flyway.enabled>
                 <!--生产钉钉 机器人地址-->
                 <dingTalk.robot.webHook>
                     https://oapi.dingtalk.com/robot/send?access_token=c96c904b375f8b63eb10036db43a18628365dd87aa8669a9052cf95c911b4df0

epmet-module/epmet-oss/epmet-oss-server/src/main/resources/bootstrap.yml

@@ -18,22 +18,36 @@ spring:
   jackson:
     time-zone: GMT+8
     date-format: yyyy-MM-dd HH:mm:ss
+  # redis 单机配置(单机与集群只能开启一个另一个需要注释掉)
   redis:
-    # 烟台使用cluster模式下使用cluster:配置段
+    # 地址
-    cluster-enabled: true
+    host: 172.16.3.87
-
+    # 端口，默认为6379
-#    database: @spring.redis.index@
+    port: 6379
-#    host: @spring.redis.host@
+    # 数据库索引
-#    port: @spring.redis.port@
-#    password: @spring.redis.password@
-#    timeout: 30s
-
     database: @spring.redis.index@
+    # 密码(如没有密码请注释掉)
     password: @spring.redis.password@
+    # 连接超时时间
     timeout: 30s
-    cluster:
+    # 是否开启ssl
-      nodes: @spring.redis.cluster.nodes@
+    ssl: false
-      max-redirects: @spring.redis.cluster.max-redirects@
+#  redis:
+#    # 烟台使用cluster模式下使用cluster:配置段
+#    cluster-enabled: true
+#
+##    database: @spring.redis.index@
+##    host: @spring.redis.host@
+##    port: @spring.redis.port@
+##    password: @spring.redis.password@
+##    timeout: 30s
+#
+#    database: @spring.redis.index@
+#    password: @spring.redis.password@
+#    timeout: 30s
+#    cluster:
+#      nodes: @spring.redis.cluster.nodes@
+#      max-redirects: @spring.redis.cluster.max-redirects@
   datasource:
     druid:
       #MySQL

epmet-module/epmet-point/epmet-point-server/pom.xml

@@ -250,7 +250,7 @@
                 <spring.redis.password>EpmEtrEdIs!q@w</spring.redis.password>
                 <!-- nacos -->
                 <nacos.register-enabled>true</nacos.register-enabled>
-                <nacos.server-addr>192.168.10.150:8848</nacos.server-addr>
+                <nacos.server-addr>172.16.3.87</nacos.server-addr>
                 <nacos.discovery.namespace>67e3c350-533e-4d7c-9f8f-faf1b4aa82ae</nacos.discovery.namespace>
                 <nacos.config.namespace></nacos.config.namespace>
                 <nacos.config.group></nacos.config.group>
@@ -290,7 +290,7 @@
 
                 <!-- 数据库配置-->
                 <datasource.druid.url>
-                    <![CDATA[jdbc:mysql://10.2.2.44:3306/epmet_point?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                    <![CDATA[jdbc:mysql://172.16.3.86:3306/epmet_point?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
                 </datasource.druid.url>
                 <datasource.druid.username>epmet_point_user</datasource.druid.username>
                 <datasource.druid.password>EpmEt-db-UsEr</datasource.druid.password>
@@ -304,8 +304,8 @@
                 <spring.redis.password>rEdIs@yAntAI_666</spring.redis.password>
                 <!-- nacos -->
                 <nacos.register-enabled>true</nacos.register-enabled>
-                <nacos.server-addr>10.2.2.51:8848</nacos.server-addr>
+                <nacos.server-addr>172.16.3.87</nacos.server-addr>
-                <nacos.discovery.namespace>bd205d23-e696-47be-b995-916313f86e99</nacos.discovery.namespace>
+                <nacos.discovery.namespace>bf153d2b-7aa5-4b6e-ba7b-4977e54eb126</nacos.discovery.namespace>
                 <nacos.config.namespace></nacos.config.namespace>
                 <nacos.config.group></nacos.config.group>
                 <nacos.config-enabled>false</nacos.config-enabled>
@@ -313,7 +313,7 @@
                 <!--是否开启服务列表变更监听-->
                 <nacos.service-list-changed-listening.enable>true</nacos.service-list-changed-listening.enable>
 
-                <spring.flyway.enabled>true</spring.flyway.enabled>
+                <spring.flyway.enabled>false</spring.flyway.enabled>
 
                 <!--线程池-->
                 <thread.threadPool.enable-customize>true</thread.threadPool.enable-customize>
@@ -330,7 +330,7 @@
 
                 <!--rocketmq-->
                 <rocketmq.enable>true</rocketmq.enable>
-                <rocketmq.nameserver>10.2.2.50:9876;10.2.2.51:9876</rocketmq.nameserver>
+                <rocketmq.nameserver>172.16.3.86:9876;172.16.3.87:9876</rocketmq.nameserver>
             </properties>
         </profile>
     </profiles>

epmet-module/epmet-point/epmet-point-server/src/main/resources/bootstrap.yml

@@ -15,20 +15,34 @@ spring:
   jackson:
     time-zone: GMT+8
     date-format: yyyy-MM-dd HH:mm:ss
+  # redis 单机配置(单机与集群只能开启一个另一个需要注释掉)
   redis:
-    # 烟台使用cluster模式下使用cluster:配置段
+    # 地址
-    #    database: @spring.redis.index@
+    host: 172.16.3.87
-    #    host: @spring.redis.host@
+    # 端口，默认为6379
-    #    port: @spring.redis.port@
+    port: 6379
-    #    password: @spring.redis.password@
+    # 数据库索引
-    #    timeout: 30s
-
     database: @spring.redis.index@
+    # 密码(如没有密码请注释掉)
     password: @spring.redis.password@
+    # 连接超时时间
     timeout: 30s
-    cluster:
+    # 是否开启ssl
-      nodes: @spring.redis.cluster.nodes@
+    ssl: false
-      max-redirects: @spring.redis.cluster.max-redirects@
+#  redis:
+#    # 烟台使用cluster模式下使用cluster:配置段
+#    #    database: @spring.redis.index@
+#    #    host: @spring.redis.host@
+#    #    port: @spring.redis.port@
+#    #    password: @spring.redis.password@
+#    #    timeout: 30s
+#
+#    database: @spring.redis.index@
+#    password: @spring.redis.password@
+#    timeout: 30s
+#    cluster:
+#      nodes: @spring.redis.cluster.nodes@
+#      max-redirects: @spring.redis.cluster.max-redirects@
   datasource:
     druid:
       #MySQL

epmet-module/epmet-third/epmet-third-server/pom.xml

@@ -380,7 +380,7 @@
 
                 <!-- 数据库配置-->
                 <spring.datasource.druid.url>
-                    <![CDATA[jdbc:mysql://10.2.2.44:3306/epmet_third?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                    <![CDATA[jdbc:mysql://172.16.3.86:3306/epmet_third?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
                 </spring.datasource.druid.url>
                 <spring.datasource.druid.username>epmet_third_user</spring.datasource.druid.username>
                 <spring.datasource.druid.password>EpmEt-db-UsEr</spring.datasource.druid.password>
@@ -394,8 +394,8 @@
                 <spring.redis.password>rEdIs@yAntAI_666</spring.redis.password>
                 <!-- nacos -->
                 <nacos.register-enabled>true</nacos.register-enabled>
-                <nacos.server-addr>10.2.2.51:8848</nacos.server-addr>
+                <nacos.server-addr>172.16.3.87</nacos.server-addr>
-                <nacos.discovery.namespace>bd205d23-e696-47be-b995-916313f86e99</nacos.discovery.namespace>
+                <nacos.discovery.namespace>bf153d2b-7aa5-4b6e-ba7b-4977e54eb126</nacos.discovery.namespace>
                 <nacos.config.namespace></nacos.config.namespace>
                 <nacos.config.group></nacos.config.group>
                 <nacos.config-enabled>false</nacos.config-enabled>
@@ -412,7 +412,7 @@
                 <thread.threadPool.thread-name-prefix>epmet-third</thread.threadPool.thread-name-prefix>
                 <thread.threadPool.rejected-execution-handler>callerRunsPolicy</thread.threadPool.rejected-execution-handler>
 
-                <spring.flyway.enabled>true</spring.flyway.enabled>
+                <spring.flyway.enabled>false</spring.flyway.enabled>
 
                 <!--生产钉钉 机器人地址-->
                 <dingTalk.robot.webHook>

epmet-module/epmet-third/epmet-third-server/src/main/resources/bootstrap.yml

@@ -15,20 +15,34 @@ spring:
   jackson:
     time-zone: GMT+8
     date-format: yyyy-MM-dd HH:mm:ss
+  # redis 单机配置(单机与集群只能开启一个另一个需要注释掉)
   redis:
-    # 烟台使用cluster模式下使用cluster:配置段
+    # 地址
-    #    database: @spring.redis.index@
+    host: 172.16.3.87
-    #    host: @spring.redis.host@
+    # 端口，默认为6379
-    #    port: @spring.redis.port@
+    port: 6379
-    #    password: @spring.redis.password@
+    # 数据库索引
-    #    timeout: 30s
-
     database: @spring.redis.index@
+    # 密码(如没有密码请注释掉)
     password: @spring.redis.password@
+    # 连接超时时间
     timeout: 30s
-    cluster:
+    # 是否开启ssl
-      nodes: @spring.redis.cluster.nodes@
+    ssl: false
-      max-redirects: @spring.redis.cluster.max-redirects@
+#  redis:
+#    # 烟台使用cluster模式下使用cluster:配置段
+#    #    database: @spring.redis.index@
+#    #    host: @spring.redis.host@
+#    #    port: @spring.redis.port@
+#    #    password: @spring.redis.password@
+#    #    timeout: 30s
+#
+#    database: @spring.redis.index@
+#    password: @spring.redis.password@
+#    timeout: 30s
+#    cluster:
+#      nodes: @spring.redis.cluster.nodes@
+#      max-redirects: @spring.redis.cluster.max-redirects@
   datasource:
     druid:
       #MySQL

epmet-module/gov-access/gov-access-server/pom.xml

@@ -248,7 +248,7 @@
 
                 <!-- 数据库配置-->
                 <spring.datasource.druid.url>
-                    <![CDATA[jdbc:mysql://10.2.2.44:3306/epmet_gov_access?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                    <![CDATA[jdbc:mysql://172.16.3.86:3306/epmet_gov_access?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
                 </spring.datasource.druid.url>
                 <spring.datasource.druid.username>epmet_gov_access_user</spring.datasource.druid.username>
                 <spring.datasource.druid.password>EpmEt-db-UsEr</spring.datasource.druid.password>
@@ -262,8 +262,8 @@
                 <spring.redis.password>rEdIs@yAntAI_666</spring.redis.password>
                 <!-- nacos -->
                 <nacos.register-enabled>true</nacos.register-enabled>
-                <nacos.server-addr>10.2.2.51:8848</nacos.server-addr>
+                <nacos.server-addr>172.16.3.87</nacos.server-addr>
-                <nacos.discovery.namespace>bd205d23-e696-47be-b995-916313f86e99</nacos.discovery.namespace>
+                <nacos.discovery.namespace>bf153d2b-7aa5-4b6e-ba7b-4977e54eb126</nacos.discovery.namespace>
                 <nacos.config.namespace></nacos.config.namespace>
                 <nacos.config.group></nacos.config.group>
                 <nacos.config-enabled>false</nacos.config-enabled>
@@ -281,7 +281,7 @@
                 <thread.threadPool.rejected-execution-handler>callerRunsPolicy</thread.threadPool.rejected-execution-handler>
 
                 <!--flyway migration 数据库迁移工具-->
-                <spring.flyway.enabled>true</spring.flyway.enabled>
+                <spring.flyway.enabled>false</spring.flyway.enabled>
 
                 <!--生产钉钉 机器人地址-->
                 <dingTalk.robot.webHook>https://oapi.dingtalk.com/robot/send?access_token=c96c904b375f8b63eb10036db43a18628365dd87aa8669a9052cf95c911b4df0</dingTalk.robot.webHook>

epmet-module/gov-access/gov-access-server/src/main/resources/bootstrap.yml

@@ -15,20 +15,34 @@ spring:
   jackson:
     time-zone: GMT+8
     date-format: yyyy-MM-dd HH:mm:ss
+  # redis 单机配置(单机与集群只能开启一个另一个需要注释掉)
   redis:
-    # 烟台使用cluster模式下使用cluster:配置段
+    # 地址
-    #    database: @spring.redis.index@
+    host: 172.16.3.87
-    #    host: @spring.redis.host@
+    # 端口，默认为6379
-    #    port: @spring.redis.port@
+    port: 6379
-    #    password: @spring.redis.password@
+    # 数据库索引
-    #    timeout: 30s
-
     database: @spring.redis.index@
+    # 密码(如没有密码请注释掉)
     password: @spring.redis.password@
+    # 连接超时时间
     timeout: 30s
-    cluster:
+    # 是否开启ssl
-      nodes: @spring.redis.cluster.nodes@
+    ssl: false
-      max-redirects: @spring.redis.cluster.max-redirects@
+#  redis:
+#    # 烟台使用cluster模式下使用cluster:配置段
+#    #    database: @spring.redis.index@
+#    #    host: @spring.redis.host@
+#    #    port: @spring.redis.port@
+#    #    password: @spring.redis.password@
+#    #    timeout: 30s
+#
+#    database: @spring.redis.index@
+#    password: @spring.redis.password@
+#    timeout: 30s
+#    cluster:
+#      nodes: @spring.redis.cluster.nodes@
+#      max-redirects: @spring.redis.cluster.max-redirects@
   datasource:
     druid:
       #MySQL

epmet-module/gov-grid/gov-grid-server/pom.xml

@@ -242,8 +242,8 @@
                 <spring.redis.password>rEdIs@yAntAI_666</spring.redis.password>
                 <!-- nacos -->
                 <nacos.register-enabled>true</nacos.register-enabled>
-                <nacos.server-addr>10.2.2.51:8848</nacos.server-addr>
+                <nacos.server-addr>172.16.3.87</nacos.server-addr>
-                <nacos.discovery.namespace>bd205d23-e696-47be-b995-916313f86e99</nacos.discovery.namespace>
+                <nacos.discovery.namespace>bf153d2b-7aa5-4b6e-ba7b-4977e54eb126</nacos.discovery.namespace>
                 <nacos.config.namespace></nacos.config.namespace>
                 <nacos.config.group></nacos.config.group>
                 <nacos.config-enabled>false</nacos.config-enabled>
@@ -260,7 +260,7 @@
                 <thread.threadPool.thread-name-prefix>gov-grid</thread.threadPool.thread-name-prefix>
                 <thread.threadPool.rejected-execution-handler>callerRunsPolicy</thread.threadPool.rejected-execution-handler>
 
-                <spring.flyway.enabled>true</spring.flyway.enabled>
+                <spring.flyway.enabled>false</spring.flyway.enabled>
 
                 <!--生产钉钉 机器人地址-->
                 <dingTalk.robot.webHook>

epmet-module/gov-grid/gov-grid-server/src/main/resources/bootstrap.yml

@@ -18,20 +18,34 @@ spring:
   jackson:
     time-zone: GMT+8
     date-format: yyyy-MM-dd HH:mm:ss
+  # redis 单机配置(单机与集群只能开启一个另一个需要注释掉)
   redis:
-    # 烟台使用cluster模式下使用cluster:配置段
+    # 地址
-    #    database: @spring.redis.index@
+    host: 172.16.3.87
-    #    host: @spring.redis.host@
+    # 端口，默认为6379
-    #    port: @spring.redis.port@
+    port: 6379
-    #    password: @spring.redis.password@
+    # 数据库索引
-    #    timeout: 30s
-
     database: @spring.redis.index@
+    # 密码(如没有密码请注释掉)
     password: @spring.redis.password@
+    # 连接超时时间
     timeout: 30s
-    cluster:
+    # 是否开启ssl
-      nodes: @spring.redis.cluster.nodes@
+    ssl: false
-      max-redirects: @spring.redis.cluster.max-redirects@
+#  redis:
+#    # 烟台使用cluster模式下使用cluster:配置段
+#    #    database: @spring.redis.index@
+#    #    host: @spring.redis.host@
+#    #    port: @spring.redis.port@
+#    #    password: @spring.redis.password@
+#    #    timeout: 30s
+#
+#    database: @spring.redis.index@
+#    password: @spring.redis.password@
+#    timeout: 30s
+#    cluster:
+#      nodes: @spring.redis.cluster.nodes@
+#      max-redirects: @spring.redis.cluster.max-redirects@
   cloud:
     nacos:
       discovery:

epmet-module/gov-issue/gov-issue-server/pom.xml

@@ -303,7 +303,7 @@
 
                 <!-- 数据库配置-->
                 <spring.datasource.druid.url>
-                    <![CDATA[jdbc:mysql://10.2.2.44:3306/epmet_gov_issue?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                    <![CDATA[jdbc:mysql://172.16.3.86:3306/epmet_gov_issue?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
                 </spring.datasource.druid.url>
                 <spring.datasource.druid.username>epmet_gov_issue_user</spring.datasource.druid.username>
                 <spring.datasource.druid.password>EpmEt-db-UsEr</spring.datasource.druid.password>
@@ -317,8 +317,8 @@
                 <spring.redis.password>rEdIs@yAntAI_666</spring.redis.password>
                 <!-- nacos -->
                 <nacos.register-enabled>true</nacos.register-enabled>
-                <nacos.server-addr>10.2.2.51:8848</nacos.server-addr>
+                <nacos.server-addr>172.16.3.87</nacos.server-addr>
-                <nacos.discovery.namespace>bd205d23-e696-47be-b995-916313f86e99</nacos.discovery.namespace>
+                <nacos.discovery.namespace>bf153d2b-7aa5-4b6e-ba7b-4977e54eb126</nacos.discovery.namespace>
                 <nacos.config.namespace></nacos.config.namespace>
                 <nacos.config.group></nacos.config.group>
                 <nacos.config-enabled>false</nacos.config-enabled>
@@ -335,7 +335,7 @@
                 <thread.threadPool.thread-name-prefix>gov-issue</thread.threadPool.thread-name-prefix>
                 <thread.threadPool.rejected-execution-handler>callerRunsPolicy</thread.threadPool.rejected-execution-handler>
 
-                <spring.flyway.enabled>true</spring.flyway.enabled>
+                <spring.flyway.enabled>false</spring.flyway.enabled>
                 <openapi.scan.server.url>https://epmet-open.elinkservice.cn/api/epmetscan/api</openapi.scan.server.url>
 
                 <!--生产钉钉 机器人地址-->
@@ -347,7 +347,7 @@
 
                 <!--rocketmq-->
                 <rocketmq.enable>true</rocketmq.enable>
-                <rocketmq.nameserver>10.2.2.50:9876;10.2.2.51:9876</rocketmq.nameserver>
+                <rocketmq.nameserver>172.16.3.86:9876;172.16.3.87:9876</rocketmq.nameserver>
             </properties>
         </profile>
     </profiles>

epmet-module/gov-issue/gov-issue-server/src/main/resources/bootstrap.yml

@@ -15,20 +15,34 @@ spring:
   jackson:
     time-zone: GMT+8
     date-format: yyyy-MM-dd HH:mm:ss
+  # redis 单机配置(单机与集群只能开启一个另一个需要注释掉)
   redis:
-    # 烟台使用cluster模式下使用cluster:配置段
+    # 地址
-    #    database: @spring.redis.index@
+    host: 172.16.3.87
-    #    host: @spring.redis.host@
+    # 端口，默认为6379
-    #    port: @spring.redis.port@
+    port: 6379
-    #    password: @spring.redis.password@
+    # 数据库索引
-    #    timeout: 30s
-
     database: @spring.redis.index@
+    # 密码(如没有密码请注释掉)
     password: @spring.redis.password@
+    # 连接超时时间
     timeout: 30s
-    cluster:
+    # 是否开启ssl
-      nodes: @spring.redis.cluster.nodes@
+    ssl: false
-      max-redirects: @spring.redis.cluster.max-redirects@
+#  redis:
+#    # 烟台使用cluster模式下使用cluster:配置段
+#    #    database: @spring.redis.index@
+#    #    host: @spring.redis.host@
+#    #    port: @spring.redis.port@
+#    #    password: @spring.redis.password@
+#    #    timeout: 30s
+#
+#    database: @spring.redis.index@
+#    password: @spring.redis.password@
+#    timeout: 30s
+#    cluster:
+#      nodes: @spring.redis.cluster.nodes@
+#      max-redirects: @spring.redis.cluster.max-redirects@
   datasource:
     druid:
       #MySQL

epmet-module/gov-mine/gov-mine-server/pom.xml

@@ -256,8 +256,8 @@
                 <spring.redis.password>rEdIs@yAntAI_666</spring.redis.password>
                 <!-- nacos -->
                 <nacos.register-enabled>true</nacos.register-enabled>
-                <nacos.server-addr>10.2.2.51:8848</nacos.server-addr>
+                <nacos.server-addr>172.16.3.87</nacos.server-addr>
-                <nacos.discovery.namespace>bd205d23-e696-47be-b995-916313f86e99</nacos.discovery.namespace>
+                <nacos.discovery.namespace>bf153d2b-7aa5-4b6e-ba7b-4977e54eb126</nacos.discovery.namespace>
                 <nacos.config.namespace></nacos.config.namespace>
                 <nacos.config.group></nacos.config.group>
                 <nacos.config-enabled>false</nacos.config-enabled>

epmet-module/gov-mine/gov-mine-server/src/main/resources/bootstrap.yml

@@ -15,20 +15,34 @@ spring:
   jackson:
     time-zone: GMT+8
     date-format: yyyy-MM-dd HH:mm:ss
+  # redis 单机配置(单机与集群只能开启一个另一个需要注释掉)
   redis:
-    # 烟台使用cluster模式下使用cluster:配置段
+    # 地址
-    #    database: @spring.redis.index@
+    host: 172.16.3.87
-    #    host: @spring.redis.host@
+    # 端口，默认为6379
-    #    port: @spring.redis.port@
+    port: 6379
-    #    password: @spring.redis.password@
+    # 数据库索引
-    #    timeout: 30s
-
     database: @spring.redis.index@
+    # 密码(如没有密码请注释掉)
     password: @spring.redis.password@
+    # 连接超时时间
     timeout: 30s
-    cluster:
+    # 是否开启ssl
-      nodes: @spring.redis.cluster.nodes@
+    ssl: false
-      max-redirects: @spring.redis.cluster.max-redirects@
+#  redis:
+#    # 烟台使用cluster模式下使用cluster:配置段
+#    #    database: @spring.redis.index@
+#    #    host: @spring.redis.host@
+#    #    port: @spring.redis.port@
+#    #    password: @spring.redis.password@
+#    #    timeout: 30s
+#
+#    database: @spring.redis.index@
+#    password: @spring.redis.password@
+#    timeout: 30s
+#    cluster:
+#      nodes: @spring.redis.cluster.nodes@
+#      max-redirects: @spring.redis.cluster.max-redirects@
   cloud:
     nacos:
       discovery:

epmet-module/gov-org/gov-org-server/pom.xml

@@ -359,7 +359,7 @@
 
                 <!-- 数据库配置-->
                 <spring.datasource.druid.url>
-                    <![CDATA[jdbc:mysql://10.2.2.44:3306/epmet_gov_org?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                    <![CDATA[jdbc:mysql://172.16.3.86:3306/epmet_gov_org?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
                 </spring.datasource.druid.url>
                 <spring.datasource.druid.username>epmet_gov_org_user</spring.datasource.druid.username>
                 <spring.datasource.druid.password>EpmEt-db-UsEr</spring.datasource.druid.password>
@@ -373,8 +373,8 @@
                 <spring.redis.password>rEdIs@yAntAI_666</spring.redis.password>
                 <!-- nacos -->
                 <nacos.register-enabled>true</nacos.register-enabled>
-                <nacos.server-addr>10.2.2.51:8848</nacos.server-addr>
+                <nacos.server-addr>172.16.3.87</nacos.server-addr>
-                <nacos.discovery.namespace>bd205d23-e696-47be-b995-916313f86e99</nacos.discovery.namespace>
+                <nacos.discovery.namespace>bf153d2b-7aa5-4b6e-ba7b-4977e54eb126</nacos.discovery.namespace>
                 <nacos.config.namespace></nacos.config.namespace>
                 <nacos.config.group></nacos.config.group>
                 <nacos.config-enabled>false</nacos.config-enabled>
@@ -391,7 +391,7 @@
                 <thread.threadPool.thread-name-prefix>gov-org</thread.threadPool.thread-name-prefix>
                 <thread.threadPool.rejected-execution-handler>callerRunsPolicy</thread.threadPool.rejected-execution-handler>
 
-                <spring.flyway.enabled>true</spring.flyway.enabled>
+                <spring.flyway.enabled>false</spring.flyway.enabled>
 
                 <!--生产钉钉 机器人地址-->
                 <dingTalk.robot.webHook>
@@ -402,7 +402,7 @@
 
                 <!--rocketmq-->
                 <rocketmq.enable>true</rocketmq.enable>
-                <rocketmq.nameserver>10.2.2.50:9876;10.2.2.51:9876</rocketmq.nameserver>
+                <rocketmq.nameserver>172.16.3.86:9876;172.16.3.87:9876</rocketmq.nameserver>
                 <rocketmq.producer.group>epmet_message</rocketmq.producer.group>
             </properties>
         </profile>

epmet-module/gov-org/gov-org-server/src/main/resources/bootstrap.yml

@@ -18,20 +18,34 @@ spring:
   jackson:
     time-zone: GMT+8
     date-format: yyyy-MM-dd HH:mm:ss
+  # redis 单机配置(单机与集群只能开启一个另一个需要注释掉)
   redis:
-    # 烟台使用cluster模式下使用cluster:配置段
+    # 地址
-    #    database: @spring.redis.index@
+    host: 172.16.3.87
-    #    host: @spring.redis.host@
+    # 端口，默认为6379
-    #    port: @spring.redis.port@
+    port: 6379
-    #    password: @spring.redis.password@
+    # 数据库索引
-    #    timeout: 30s
-
     database: @spring.redis.index@
+    # 密码(如没有密码请注释掉)
     password: @spring.redis.password@
+    # 连接超时时间
     timeout: 30s
-    cluster:
+    # 是否开启ssl
-      nodes: @spring.redis.cluster.nodes@
+    ssl: false
-      max-redirects: @spring.redis.cluster.max-redirects@
+#  redis:
+#    # 烟台使用cluster模式下使用cluster:配置段
+#    #    database: @spring.redis.index@
+#    #    host: @spring.redis.host@
+#    #    port: @spring.redis.port@
+#    #    password: @spring.redis.password@
+#    #    timeout: 30s
+#
+#    database: @spring.redis.index@
+#    password: @spring.redis.password@
+#    timeout: 30s
+#    cluster:
+#      nodes: @spring.redis.cluster.nodes@
+#      max-redirects: @spring.redis.cluster.max-redirects@
   # 数据迁移工具flyway
   flyway:
     enabled: @spring.flyway.enabled@

epmet-module/gov-project/gov-project-server/pom.xml

@@ -338,7 +338,7 @@
 
                 <!-- 数据库配置-->
                 <spring.datasource.druid.url>
-                    <![CDATA[jdbc:mysql://10.2.2.44:3306/epmet_gov_project?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                    <![CDATA[jdbc:mysql://172.16.3.86:3306/epmet_gov_project?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
                 </spring.datasource.druid.url>
                 <spring.datasource.druid.username>epmet_gov_project_user</spring.datasource.druid.username>
                 <spring.datasource.druid.password>EpmEt-db-UsEr</spring.datasource.druid.password>
@@ -352,8 +352,8 @@
                 <spring.redis.password>rEdIs@yAntAI_666</spring.redis.password>
                 <!-- nacos -->
                 <nacos.register-enabled>true</nacos.register-enabled>
-                <nacos.server-addr>10.2.2.51:8848</nacos.server-addr>
+                <nacos.server-addr>172.16.3.87</nacos.server-addr>
-                <nacos.discovery.namespace>bd205d23-e696-47be-b995-916313f86e99</nacos.discovery.namespace>
+                <nacos.discovery.namespace>bf153d2b-7aa5-4b6e-ba7b-4977e54eb126</nacos.discovery.namespace>
                 <nacos.config.namespace></nacos.config.namespace>
                 <nacos.config.group></nacos.config.group>
                 <nacos.config-enabled>false</nacos.config-enabled>
@@ -370,7 +370,7 @@
                 <thread.threadPool.thread-name-prefix>gov-project</thread.threadPool.thread-name-prefix>
                 <thread.threadPool.rejected-execution-handler>callerRunsPolicy</thread.threadPool.rejected-execution-handler>
 
-                <spring.flyway.enabled>true</spring.flyway.enabled>
+                <spring.flyway.enabled>false</spring.flyway.enabled>
                 <openapi.scan.server.url>https://epmet-open.elinkservice.cn/api/epmetscan/api</openapi.scan.server.url>
 
                 <!--生产钉钉 机器人地址-->

epmet-module/gov-project/gov-project-server/src/main/resources/bootstrap.yml

@@ -15,20 +15,34 @@ spring:
   jackson:
     time-zone: GMT+8
     date-format: yyyy-MM-dd HH:mm:ss
+  # redis 单机配置(单机与集群只能开启一个另一个需要注释掉)
   redis:
-    # 烟台使用cluster模式下使用cluster:配置段
+    # 地址
-    #    database: @spring.redis.index@
+    host: 172.16.3.87
-    #    host: @spring.redis.host@
+    # 端口，默认为6379
-    #    port: @spring.redis.port@
+    port: 6379
-    #    password: @spring.redis.password@
+    # 数据库索引
-    #    timeout: 30s
-
     database: @spring.redis.index@
+    # 密码(如没有密码请注释掉)
     password: @spring.redis.password@
+    # 连接超时时间
     timeout: 30s
-    cluster:
+    # 是否开启ssl
-      nodes: @spring.redis.cluster.nodes@
+    ssl: false
-      max-redirects: @spring.redis.cluster.max-redirects@
+#  redis:
+#    # 烟台使用cluster模式下使用cluster:配置段
+#    #    database: @spring.redis.index@
+#    #    host: @spring.redis.host@
+#    #    port: @spring.redis.port@
+#    #    password: @spring.redis.password@
+#    #    timeout: 30s
+#
+#    database: @spring.redis.index@
+#    password: @spring.redis.password@
+#    timeout: 30s
+#    cluster:
+#      nodes: @spring.redis.cluster.nodes@
+#      max-redirects: @spring.redis.cluster.max-redirects@
   datasource:
     druid:
       #MySQL

epmet-module/gov-voice/gov-voice-server/pom.xml

@@ -259,7 +259,7 @@
 
                 <!-- 数据库配置-->
                 <spring.datasource.druid.url>
-                    <![CDATA[jdbc:mysql://10.2.2.44:3306/epmet_gov_voice?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                    <![CDATA[jdbc:mysql://172.16.3.86:3306/epmet_gov_voice?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
                 </spring.datasource.druid.url>
                 <spring.datasource.druid.username>epmet_gov_voice_user</spring.datasource.druid.username>
                 <spring.datasource.druid.password>EpmEt-db-UsEr</spring.datasource.druid.password>
@@ -273,8 +273,8 @@
                 <spring.redis.password>rEdIs@yAntAI_666</spring.redis.password>
                 <!-- nacos -->
                 <nacos.register-enabled>true</nacos.register-enabled>
-                <nacos.server-addr>10.2.2.51:8848</nacos.server-addr>
+                <nacos.server-addr>172.16.3.87</nacos.server-addr>
-                <nacos.discovery.namespace>bd205d23-e696-47be-b995-916313f86e99</nacos.discovery.namespace>
+                <nacos.discovery.namespace>bf153d2b-7aa5-4b6e-ba7b-4977e54eb126</nacos.discovery.namespace>
                 <nacos.config.namespace></nacos.config.namespace>
                 <nacos.config.group></nacos.config.group>
                 <nacos.config-enabled>false</nacos.config-enabled>
@@ -291,7 +291,7 @@
                 <thread.threadPool.thread-name-prefix>gov-voice</thread.threadPool.thread-name-prefix>
                 <thread.threadPool.rejected-execution-handler>callerRunsPolicy</thread.threadPool.rejected-execution-handler>
 
-                <spring.flyway.enabled>true</spring.flyway.enabled>
+                <spring.flyway.enabled>false</spring.flyway.enabled>
                 <openapi.scan.server.url>https://epmet-open.elinkservice.cn/api/epmetscan/api</openapi.scan.server.url>
 
                 <!--生产钉钉 机器人地址-->

epmet-module/gov-voice/gov-voice-server/src/main/resources/bootstrap.yml

@@ -15,20 +15,34 @@ spring:
   jackson:
     time-zone: GMT+8
     date-format: yyyy-MM-dd HH:mm:ss
+  # redis 单机配置(单机与集群只能开启一个另一个需要注释掉)
   redis:
-    # 烟台使用cluster模式下使用cluster:配置段
+    # 地址
-    #    database: @spring.redis.index@
+    host: 172.16.3.87
-    #    host: @spring.redis.host@
+    # 端口，默认为6379
-    #    port: @spring.redis.port@
+    port: 6379
-    #    password: @spring.redis.password@
+    # 数据库索引
-    #    timeout: 30s
-
     database: @spring.redis.index@
+    # 密码(如没有密码请注释掉)
     password: @spring.redis.password@
+    # 连接超时时间
     timeout: 30s
-    cluster:
+    # 是否开启ssl
-      nodes: @spring.redis.cluster.nodes@
+    ssl: false
-      max-redirects: @spring.redis.cluster.max-redirects@
+#  redis:
+#    # 烟台使用cluster模式下使用cluster:配置段
+#    #    database: @spring.redis.index@
+#    #    host: @spring.redis.host@
+#    #    port: @spring.redis.port@
+#    #    password: @spring.redis.password@
+#    #    timeout: 30s
+#
+#    database: @spring.redis.index@
+#    password: @spring.redis.password@
+#    timeout: 30s
+#    cluster:
+#      nodes: @spring.redis.cluster.nodes@
+#      max-redirects: @spring.redis.cluster.max-redirects@
   datasource:
     druid:
       #MySQL

epmet-module/open-data-worker/open-data-worker-server/pom.xml

@@ -273,7 +273,7 @@
 
                 <!-- 数据库配置-->
                 <spring.datasource.druid.url>
-                    <![CDATA[jdbc:mysql://10.2.2.44:3306/epmet_open_data?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                    <![CDATA[jdbc:mysql://172.16.3.86:3306/epmet_open_data?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
                 </spring.datasource.druid.url>
                 <spring.datasource.druid.username>epmet_open_data_user</spring.datasource.druid.username>
                 <spring.datasource.druid.password>EpmEt-db-UsEr</spring.datasource.druid.password>
@@ -287,8 +287,8 @@
                 <spring.redis.password>rEdIs@yAntAI_666</spring.redis.password>
                 <!-- nacos -->
                 <nacos.register-enabled>true</nacos.register-enabled>
-                <nacos.server-addr>10.2.2.51:8848</nacos.server-addr>
+                <nacos.server-addr>172.16.3.87</nacos.server-addr>
-                <nacos.discovery.namespace>bd205d23-e696-47be-b995-916313f86e99</nacos.discovery.namespace>
+                <nacos.discovery.namespace>bf153d2b-7aa5-4b6e-ba7b-4977e54eb126</nacos.discovery.namespace>
                 <nacos.config.namespace></nacos.config.namespace>
                 <nacos.config.group></nacos.config.group>
                 <nacos.config-enabled>false</nacos.config-enabled>
@@ -306,7 +306,7 @@
                 <thread.threadPool.rejected-execution-handler>callerRunsPolicy</thread.threadPool.rejected-execution-handler>
 
                 <!--flyway migration 数据库迁移工具-->
-                <spring.flyway.enabled>true</spring.flyway.enabled>
+                <spring.flyway.enabled>false</spring.flyway.enabled>
 
                 <!--生产钉钉 机器人地址-->
                 <dingTalk.robot.webHook>https://oapi.dingtalk.com/robot/send?access_token=c96c904b375f8b63eb10036db43a18628365dd87aa8669a9052cf95c911b4df0</dingTalk.robot.webHook>
@@ -314,7 +314,7 @@
 
                 <!--rocketmq-->
                 <rocketmq.enable>true</rocketmq.enable>
-                <rocketmq.nameserver>10.2.2.50:9876;10.2.2.51:9876</rocketmq.nameserver>
+                <rocketmq.nameserver>172.16.3.86:9876;172.16.3.87:9876</rocketmq.nameserver>
             </properties>
         </profile>
     </profiles>

epmet-module/open-data-worker/open-data-worker-server/src/main/resources/bootstrap.yml

@@ -15,20 +15,34 @@ spring:
   jackson:
     time-zone: GMT+8
     date-format: yyyy-MM-dd HH:mm:ss
+  # redis 单机配置(单机与集群只能开启一个另一个需要注释掉)
   redis:
-    # 烟台使用cluster模式下使用cluster:配置段
+    # 地址
-    #    database: @spring.redis.index@
+    host: 172.16.3.87
-    #    host: @spring.redis.host@
+    # 端口，默认为6379
-    #    port: @spring.redis.port@
+    port: 6379
-    #    password: @spring.redis.password@
+    # 数据库索引
-    #    timeout: 30s
-
     database: @spring.redis.index@
+    # 密码(如没有密码请注释掉)
     password: @spring.redis.password@
+    # 连接超时时间
     timeout: 30s
-    cluster:
+    # 是否开启ssl
-      nodes: @spring.redis.cluster.nodes@
+    ssl: false
-      max-redirects: @spring.redis.cluster.max-redirects@
+#  redis:
+#    # 烟台使用cluster模式下使用cluster:配置段
+#    #    database: @spring.redis.index@
+#    #    host: @spring.redis.host@
+#    #    port: @spring.redis.port@
+#    #    password: @spring.redis.password@
+#    #    timeout: 30s
+#
+#    database: @spring.redis.index@
+#    password: @spring.redis.password@
+#    timeout: 30s
+#    cluster:
+#      nodes: @spring.redis.cluster.nodes@
+#      max-redirects: @spring.redis.cluster.max-redirects@
   datasource:
     druid:
       #MySQL

epmet-module/oper-access/oper-access-server/pom.xml

@@ -244,7 +244,7 @@
 
                 <!-- 数据库配置-->
                 <spring.datasource.druid.url>
-                    <![CDATA[jdbc:mysql://10.2.2.44:3306/epmet_oper_access?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                    <![CDATA[jdbc:mysql://172.16.3.86:3306/epmet_oper_access?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
                 </spring.datasource.druid.url>
                 <spring.datasource.druid.username>epmet_oper_access_user</spring.datasource.druid.username>
                 <spring.datasource.druid.password>EpmEt-db-UsEr</spring.datasource.druid.password>
@@ -258,8 +258,8 @@
                 <spring.redis.password>rEdIs@yAntAI_666</spring.redis.password>
                 <!-- nacos -->
                 <nacos.register-enabled>true</nacos.register-enabled>
-                <nacos.server-addr>10.2.2.51:8848</nacos.server-addr>
+                <nacos.server-addr>172.16.3.87</nacos.server-addr>
-                <nacos.discovery.namespace>bd205d23-e696-47be-b995-916313f86e99</nacos.discovery.namespace>
+                <nacos.discovery.namespace>bf153d2b-7aa5-4b6e-ba7b-4977e54eb126</nacos.discovery.namespace>
                 <nacos.config.namespace></nacos.config.namespace>
                 <nacos.config.group></nacos.config.group>
                 <nacos.config-enabled>false</nacos.config-enabled>
@@ -276,7 +276,7 @@
                 <thread.threadPool.thread-name-prefix>oper-access</thread.threadPool.thread-name-prefix>
                 <thread.threadPool.rejected-execution-handler>callerRunsPolicy</thread.threadPool.rejected-execution-handler>
 
-                <spring.flyway.enabled>true</spring.flyway.enabled>
+                <spring.flyway.enabled>false</spring.flyway.enabled>
 
                 <!--生产钉钉 机器人地址-->
                 <dingTalk.robot.webHook>

epmet-module/oper-access/oper-access-server/src/main/resources/bootstrap.yml

@@ -18,20 +18,34 @@ spring:
   jackson:
     time-zone: GMT+8
     date-format: yyyy-MM-dd HH:mm:ss
+  # redis 单机配置(单机与集群只能开启一个另一个需要注释掉)
   redis:
-    # 烟台使用cluster模式下使用cluster:配置段
+    # 地址
-    #    database: @spring.redis.index@
+    host: 172.16.3.87
-    #    host: @spring.redis.host@
+    # 端口，默认为6379
-    #    port: @spring.redis.port@
+    port: 6379
-    #    password: @spring.redis.password@
+    # 数据库索引
-    #    timeout: 30s
-
     database: @spring.redis.index@
+    # 密码(如没有密码请注释掉)
     password: @spring.redis.password@
+    # 连接超时时间
     timeout: 30s
-    cluster:
+    # 是否开启ssl
-      nodes: @spring.redis.cluster.nodes@
+    ssl: false
-      max-redirects: @spring.redis.cluster.max-redirects@
+#  redis:
+#    # 烟台使用cluster模式下使用cluster:配置段
+#    #    database: @spring.redis.index@
+#    #    host: @spring.redis.host@
+#    #    port: @spring.redis.port@
+#    #    password: @spring.redis.password@
+#    #    timeout: 30s
+#
+#    database: @spring.redis.index@
+#    password: @spring.redis.password@
+#    timeout: 30s
+#    cluster:
+#      nodes: @spring.redis.cluster.nodes@
+#      max-redirects: @spring.redis.cluster.max-redirects@
   datasource:
     druid:
       #MySQL

epmet-module/oper-crm/oper-crm-server/pom.xml

@@ -298,7 +298,7 @@
 
                 <!-- 数据库配置-->
                 <spring.datasource.druid.url>
-                    <![CDATA[jdbc:mysql://10.2.2.44:3306/epmet_oper_crm?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                    <![CDATA[jdbc:mysql://172.16.3.86:3306/epmet_oper_crm?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
                 </spring.datasource.druid.url>
                 <spring.datasource.druid.username>epmet_oper_crm_user</spring.datasource.druid.username>
                 <spring.datasource.druid.password>EpmEt-db-UsEr</spring.datasource.druid.password>
@@ -312,8 +312,8 @@
                 <spring.redis.password>rEdIs@yAntAI_666</spring.redis.password>
                 <!-- nacos -->
                 <nacos.register-enabled>true</nacos.register-enabled>
-                <nacos.server-addr>10.2.2.51:8848</nacos.server-addr>
+                <nacos.server-addr>172.16.3.87</nacos.server-addr>
-                <nacos.discovery.namespace>bd205d23-e696-47be-b995-916313f86e99</nacos.discovery.namespace>
+                <nacos.discovery.namespace>bf153d2b-7aa5-4b6e-ba7b-4977e54eb126</nacos.discovery.namespace>
                 <nacos.config.namespace></nacos.config.namespace>
                 <nacos.config.group></nacos.config.group>
                 <nacos.config-enabled>false</nacos.config-enabled>
@@ -330,7 +330,7 @@
                 <thread.threadPool.thread-name-prefix>oper-crm</thread.threadPool.thread-name-prefix>
                 <thread.threadPool.rejected-execution-handler>callerRunsPolicy</thread.threadPool.rejected-execution-handler>
 
-                <spring.flyway.enabled>true</spring.flyway.enabled>
+                <spring.flyway.enabled>false</spring.flyway.enabled>
 
                 <!--生产钉钉 机器人地址-->
                 <dingTalk.robot.webHook>

epmet-module/oper-crm/oper-crm-server/src/main/resources/bootstrap.yml

@@ -18,20 +18,34 @@ spring:
   jackson:
     time-zone: GMT+8
     date-format: yyyy-MM-dd HH:mm:ss
+  # redis 单机配置(单机与集群只能开启一个另一个需要注释掉)
   redis:
-    # 烟台使用cluster模式下使用cluster:配置段
+    # 地址
-    #    database: @spring.redis.index@
+    host: 172.16.3.87
-    #    host: @spring.redis.host@
+    # 端口，默认为6379
-    #    port: @spring.redis.port@
+    port: 6379
-    #    password: @spring.redis.password@
+    # 数据库索引
-    #    timeout: 30s
-
     database: @spring.redis.index@
+    # 密码(如没有密码请注释掉)
     password: @spring.redis.password@
+    # 连接超时时间
     timeout: 30s
-    cluster:
+    # 是否开启ssl
-      nodes: @spring.redis.cluster.nodes@
+    ssl: false
-      max-redirects: @spring.redis.cluster.max-redirects@
+#  redis:
+#    # 烟台使用cluster模式下使用cluster:配置段
+#    #    database: @spring.redis.index@
+#    #    host: @spring.redis.host@
+#    #    port: @spring.redis.port@
+#    #    password: @spring.redis.password@
+#    #    timeout: 30s
+#
+#    database: @spring.redis.index@
+#    password: @spring.redis.password@
+#    timeout: 30s
+#    cluster:
+#      nodes: @spring.redis.cluster.nodes@
+#      max-redirects: @spring.redis.cluster.max-redirects@
   datasource:
     druid:
       #MySQL

epmet-module/oper-customize/oper-customize-server/pom.xml

@@ -299,7 +299,7 @@
 
                 <!-- 数据库配置-->
                 <spring.datasource.druid.url>
-                    <![CDATA[jdbc:mysql://10.2.2.44:3306/epmet_oper_customize?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                    <![CDATA[jdbc:mysql://172.16.3.86:3306/epmet_oper_customize?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
                 </spring.datasource.druid.url>
                 <spring.datasource.druid.username>epmet_oper_customize_user</spring.datasource.druid.username>
                 <spring.datasource.druid.password>EpmEt-db-UsEr</spring.datasource.druid.password>
@@ -313,8 +313,8 @@
                 <spring.redis.password>rEdIs@yAntAI_666</spring.redis.password>
                 <!-- nacos -->
                 <nacos.register-enabled>true</nacos.register-enabled>
-                <nacos.server-addr>10.2.2.51:8848</nacos.server-addr>
+                <nacos.server-addr>172.16.3.87</nacos.server-addr>
-                <nacos.discovery.namespace>bd205d23-e696-47be-b995-916313f86e99</nacos.discovery.namespace>
+                <nacos.discovery.namespace>bf153d2b-7aa5-4b6e-ba7b-4977e54eb126</nacos.discovery.namespace>
                 <nacos.config.namespace></nacos.config.namespace>
                 <nacos.config.group></nacos.config.group>
                 <nacos.config-enabled>false</nacos.config-enabled>
@@ -331,7 +331,7 @@
                 <thread.threadPool.thread-name-prefix>oper-customize</thread.threadPool.thread-name-prefix>
                 <thread.threadPool.rejected-execution-handler>callerRunsPolicy</thread.threadPool.rejected-execution-handler>
 
-                <spring.flyway.enabled>true</spring.flyway.enabled>
+                <spring.flyway.enabled>false</spring.flyway.enabled>
 
                 <!--生产钉钉 机器人地址-->
                 <dingTalk.robot.webHook>
@@ -342,7 +342,7 @@
 
                 <!--rocketmq-->
                 <rocketmq.enable>true</rocketmq.enable>
-                <rocketmq.nameserver>10.2.2.50:9876;10.2.2.51:9876</rocketmq.nameserver>
+                <rocketmq.nameserver>172.16.3.86:9876;172.16.3.87:9876</rocketmq.nameserver>
                 <rocketmq.producer.group>epmet_message</rocketmq.producer.group>
             </properties>
         </profile>

epmet-module/oper-customize/oper-customize-server/src/main/resources/bootstrap.yml

@@ -18,20 +18,34 @@ spring:
   jackson:
     time-zone: GMT+8
     date-format: yyyy-MM-dd HH:mm:ss
+  # redis 单机配置(单机与集群只能开启一个另一个需要注释掉)
   redis:
-    # 烟台使用cluster模式下使用cluster:配置段
+    # 地址
-    #    database: @spring.redis.index@
+    host: 172.16.3.87
-    #    host: @spring.redis.host@
+    # 端口，默认为6379
-    #    port: @spring.redis.port@
+    port: 6379
-    #    password: @spring.redis.password@
+    # 数据库索引
-    #    timeout: 30s
-
     database: @spring.redis.index@
+    # 密码(如没有密码请注释掉)
     password: @spring.redis.password@
+    # 连接超时时间
     timeout: 30s
-    cluster:
+    # 是否开启ssl
-      nodes: @spring.redis.cluster.nodes@
+    ssl: false
-      max-redirects: @spring.redis.cluster.max-redirects@
+#  redis:
+#    # 烟台使用cluster模式下使用cluster:配置段
+#    #    database: @spring.redis.index@
+#    #    host: @spring.redis.host@
+#    #    port: @spring.redis.port@
+#    #    password: @spring.redis.password@
+#    #    timeout: 30s
+#
+#    database: @spring.redis.index@
+#    password: @spring.redis.password@
+#    timeout: 30s
+#    cluster:
+#      nodes: @spring.redis.cluster.nodes@
+#      max-redirects: @spring.redis.cluster.max-redirects@
   datasource:
     druid:
       #MySQL

epmet-module/resi-group/resi-group-server/pom.xml

@@ -344,7 +344,7 @@
 
                 <!-- 数据库配置-->
                 <spring.datasource.druid.url>
-                    <![CDATA[jdbc:mysql://10.2.2.44:3306/epmet_resi_group?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                    <![CDATA[jdbc:mysql://172.16.3.86:3306/epmet_resi_group?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
                 </spring.datasource.druid.url>
                 <spring.datasource.druid.username>epmet_resi_group_user</spring.datasource.druid.username>
                 <spring.datasource.druid.password>EpmEt-db-UsEr</spring.datasource.druid.password>
@@ -358,8 +358,8 @@
                 <spring.redis.password>rEdIs@yAntAI_666</spring.redis.password>
                 <!-- nacos -->
                 <nacos.register-enabled>true</nacos.register-enabled>
-                <nacos.server-addr>10.2.2.51:8848</nacos.server-addr>
+                <nacos.server-addr>172.16.3.87</nacos.server-addr>
-                <nacos.discovery.namespace>bd205d23-e696-47be-b995-916313f86e99</nacos.discovery.namespace>
+                <nacos.discovery.namespace>bf153d2b-7aa5-4b6e-ba7b-4977e54eb126</nacos.discovery.namespace>
                 <nacos.config.namespace></nacos.config.namespace>
                 <nacos.config.group></nacos.config.group>
                 <nacos.config-enabled>false</nacos.config-enabled>
@@ -368,7 +368,7 @@
                 <!--是否开启服务列表变更监听-->
                 <nacos.service-list-changed-listening.enable>true</nacos.service-list-changed-listening.enable>
 
-                <spring.flyway.enabled>true</spring.flyway.enabled>
+                <spring.flyway.enabled>false</spring.flyway.enabled>
 
                 <!--亿联云消息网关配置-->
                 <elink.mq.host>https://estos.elinkservice.cn:7519/estos/</elink.mq.host>
@@ -395,7 +395,7 @@
 
                 <!--rocketmq-->
                 <rocketmq.enable>true</rocketmq.enable>
-                <rocketmq.nameserver>10.2.2.50:9876;10.2.2.51:9876</rocketmq.nameserver>
+                <rocketmq.nameserver>172.16.3.86:9876;172.16.3.87:9876</rocketmq.nameserver>
             </properties>
         </profile>
     </profiles>

epmet-module/resi-group/resi-group-server/src/main/resources/bootstrap.yml

@@ -18,20 +18,34 @@ spring:
   jackson:
     time-zone: GMT+8
     date-format: yyyy-MM-dd HH:mm:ss
+  # redis 单机配置(单机与集群只能开启一个另一个需要注释掉)
   redis:
-    # 烟台使用cluster模式下使用cluster:配置段
+    # 地址
-    #    database: @spring.redis.index@
+    host: 172.16.3.87
-    #    host: @spring.redis.host@
+    # 端口，默认为6379
-    #    port: @spring.redis.port@
+    port: 6379
-    #    password: @spring.redis.password@
+    # 数据库索引
-    #    timeout: 30s
-
     database: @spring.redis.index@
+    # 密码(如没有密码请注释掉)
     password: @spring.redis.password@
+    # 连接超时时间
     timeout: 30s
-    cluster:
+    # 是否开启ssl
-      nodes: @spring.redis.cluster.nodes@
+    ssl: false
-      max-redirects: @spring.redis.cluster.max-redirects@
+#  redis:
+#    # 烟台使用cluster模式下使用cluster:配置段
+#    #    database: @spring.redis.index@
+#    #    host: @spring.redis.host@
+#    #    port: @spring.redis.port@
+#    #    password: @spring.redis.password@
+#    #    timeout: 30s
+#
+#    database: @spring.redis.index@
+#    password: @spring.redis.password@
+#    timeout: 30s
+#    cluster:
+#      nodes: @spring.redis.cluster.nodes@
+#      max-redirects: @spring.redis.cluster.max-redirects@
   datasource:
     druid:
       #MySQL

epmet-module/resi-guide/resi-guide-server/pom.xml

@@ -265,7 +265,7 @@
 
                 <!-- 数据库配置-->
                 <spring.datasource.druid.url>
-                    <![CDATA[jdbc:mysql://10.2.2.44:3306/epmet_resi_guide?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                    <![CDATA[jdbc:mysql://172.16.3.86:3306/epmet_resi_guide?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
                 </spring.datasource.druid.url>
                 <spring.datasource.druid.username>epmet_resi_guide_user</spring.datasource.druid.username>
                 <spring.datasource.druid.password>EpmEt-db-UsEr</spring.datasource.druid.password>
@@ -279,8 +279,8 @@
                 <spring.redis.password>rEdIs@yAntAI_666</spring.redis.password>
                 <!-- nacos -->
                 <nacos.register-enabled>true</nacos.register-enabled>
-                <nacos.server-addr>10.2.2.51:8848</nacos.server-addr>
+                <nacos.server-addr>172.16.3.87</nacos.server-addr>
-                <nacos.discovery.namespace>bd205d23-e696-47be-b995-916313f86e99</nacos.discovery.namespace>
+                <nacos.discovery.namespace>bf153d2b-7aa5-4b6e-ba7b-4977e54eb126</nacos.discovery.namespace>
                 <nacos.config.namespace></nacos.config.namespace>
                 <nacos.config.group></nacos.config.group>
                 <nacos.config-enabled>false</nacos.config-enabled>
@@ -298,7 +298,7 @@
                 <thread.threadPool.thread-name-prefix>epmet-guide-</thread.threadPool.thread-name-prefix>
                 <thread.threadPool.rejected-execution-handler>callerRunsPolicy</thread.threadPool.rejected-execution-handler>
 
-                <spring.flyway.enabled>true</spring.flyway.enabled>
+                <spring.flyway.enabled>false</spring.flyway.enabled>
 
                 <!--生产钉钉 机器人地址-->
                 <dingTalk.robot.webHook>

epmet-module/resi-guide/resi-guide-server/src/main/resources/bootstrap.yml

@@ -18,20 +18,34 @@ spring:
   jackson:
     time-zone: GMT+8
     date-format: yyyy-MM-dd HH:mm:ss
+  # redis 单机配置(单机与集群只能开启一个另一个需要注释掉)
   redis:
-    # 烟台使用cluster模式下使用cluster:配置段
+    # 地址
-    #    database: @spring.redis.index@
+    host: 172.16.3.87
-    #    host: @spring.redis.host@
+    # 端口，默认为6379
-    #    port: @spring.redis.port@
+    port: 6379
-    #    password: @spring.redis.password@
+    # 数据库索引
-    #    timeout: 30s
-
     database: @spring.redis.index@
+    # 密码(如没有密码请注释掉)
     password: @spring.redis.password@
+    # 连接超时时间
     timeout: 30s
-    cluster:
+    # 是否开启ssl
-      nodes: @spring.redis.cluster.nodes@
+    ssl: false
-      max-redirects: @spring.redis.cluster.max-redirects@
+#  redis:
+#    # 烟台使用cluster模式下使用cluster:配置段
+#    #    database: @spring.redis.index@
+#    #    host: @spring.redis.host@
+#    #    port: @spring.redis.port@
+#    #    password: @spring.redis.password@
+#    #    timeout: 30s
+#
+#    database: @spring.redis.index@
+#    password: @spring.redis.password@
+#    timeout: 30s
+#    cluster:
+#      nodes: @spring.redis.cluster.nodes@
+#      max-redirects: @spring.redis.cluster.max-redirects@
   datasource:
     druid:
       #MySQL

epmet-module/resi-hall/resi-hall-server/pom.xml

@@ -225,8 +225,8 @@
                 <spring.redis.password>rEdIs@yAntAI_666</spring.redis.password>
                 <!-- nacos -->
                 <nacos.register-enabled>true</nacos.register-enabled>
-                <nacos.server-addr>10.2.2.51:8848</nacos.server-addr>
+                <nacos.server-addr>172.16.3.87</nacos.server-addr>
-                <nacos.discovery.namespace>bd205d23-e696-47be-b995-916313f86e99</nacos.discovery.namespace>
+                <nacos.discovery.namespace>bf153d2b-7aa5-4b6e-ba7b-4977e54eb126</nacos.discovery.namespace>
                 <nacos.config.namespace></nacos.config.namespace>
                 <nacos.config.group></nacos.config.group>
                 <nacos.config-enabled>false</nacos.config-enabled>
@@ -243,7 +243,7 @@
                 <thread.threadPool.thread-name-prefix>resi-hall</thread.threadPool.thread-name-prefix>
                 <thread.threadPool.rejected-execution-handler>callerRunsPolicy</thread.threadPool.rejected-execution-handler>
 
-                <spring.flyway.enabled>true</spring.flyway.enabled>
+                <spring.flyway.enabled>false</spring.flyway.enabled>
 
                 <!--生产钉钉 机器人地址-->
                 <dingTalk.robot.webHook>

epmet-module/resi-hall/resi-hall-server/src/main/resources/bootstrap.yml

@@ -18,20 +18,34 @@ spring:
   jackson:
     time-zone: GMT+8
     date-format: yyyy-MM-dd HH:mm:ss
+  # redis 单机配置(单机与集群只能开启一个另一个需要注释掉)
   redis:
-    # 平阴cluster模式下使用cluster:配置段
+    # 地址
-    #    database: @spring.redis.index@
+    host: 172.16.3.87
-    #    host: @spring.redis.host@
+    # 端口，默认为6379
-    #    port: @spring.redis.port@
+    port: 6379
-    #    password: @spring.redis.password@
+    # 数据库索引
-    #    timeout: 30s
-
     database: @spring.redis.index@
+    # 密码(如没有密码请注释掉)
     password: @spring.redis.password@
+    # 连接超时时间
     timeout: 30s
-    cluster:
+    # 是否开启ssl
-      nodes: @spring.redis.cluster.nodes@
+    ssl: false
-      max-redirects: @spring.redis.cluster.max-redirects@
+#  redis:
+#    # 平阴cluster模式下使用cluster:配置段
+#    #    database: @spring.redis.index@
+#    #    host: @spring.redis.host@
+#    #    port: @spring.redis.port@
+#    #    password: @spring.redis.password@
+#    #    timeout: 30s
+#
+#    database: @spring.redis.index@
+#    password: @spring.redis.password@
+#    timeout: 30s
+#    cluster:
+#      nodes: @spring.redis.cluster.nodes@
+#      max-redirects: @spring.redis.cluster.max-redirects@
   cloud:
     nacos:
       discovery:

epmet-module/resi-home/resi-home-server/pom.xml

@@ -246,8 +246,8 @@
                 <spring.redis.password>rEdIs@yAntAI_666</spring.redis.password>
                 <!-- nacos -->
                 <nacos.register-enabled>true</nacos.register-enabled>
-                <nacos.server-addr>10.2.2.51:8848</nacos.server-addr>
+                <nacos.server-addr>172.16.3.87</nacos.server-addr>
-                <nacos.discovery.namespace>bd205d23-e696-47be-b995-916313f86e99</nacos.discovery.namespace>
+                <nacos.discovery.namespace>bf153d2b-7aa5-4b6e-ba7b-4977e54eb126</nacos.discovery.namespace>
                 <nacos.config.namespace></nacos.config.namespace>
                 <nacos.config.group></nacos.config.group>
                 <nacos.config-enabled>false</nacos.config-enabled>

epmet-module/resi-home/resi-home-server/src/main/resources/bootstrap.yml

@@ -18,20 +18,34 @@ spring:
   jackson:
     time-zone: GMT+8
     date-format: yyyy-MM-dd HH:mm:ss
+  # redis 单机配置(单机与集群只能开启一个另一个需要注释掉)
   redis:
-    # 烟台使用cluster模式下使用cluster:配置段
+    # 地址
-    #    database: @spring.redis.index@
+    host: 172.16.3.87
-    #    host: @spring.redis.host@
+    # 端口，默认为6379
-    #    port: @spring.redis.port@
+    port: 6379
-    #    password: @spring.redis.password@
+    # 数据库索引
-    #    timeout: 30s
-
     database: @spring.redis.index@
+    # 密码(如没有密码请注释掉)
     password: @spring.redis.password@
+    # 连接超时时间
     timeout: 30s
-    cluster:
+    # 是否开启ssl
-      nodes: @spring.redis.cluster.nodes@
+    ssl: false
-      max-redirects: @spring.redis.cluster.max-redirects@
+#  redis:
+#    # 烟台使用cluster模式下使用cluster:配置段
+#    #    database: @spring.redis.index@
+#    #    host: @spring.redis.host@
+#    #    port: @spring.redis.port@
+#    #    password: @spring.redis.password@
+#    #    timeout: 30s
+#
+#    database: @spring.redis.index@
+#    password: @spring.redis.password@
+#    timeout: 30s
+#    cluster:
+#      nodes: @spring.redis.cluster.nodes@
+#      max-redirects: @spring.redis.cluster.max-redirects@
   cloud:
     nacos:
       discovery:

epmet-module/resi-mine/resi-mine-server/pom.xml

@@ -262,8 +262,8 @@
                 <spring.redis.password>rEdIs@yAntAI_666</spring.redis.password>
                 <!-- nacos -->
                 <nacos.register-enabled>true</nacos.register-enabled>
-                <nacos.server-addr>10.2.2.51:8848</nacos.server-addr>
+                <nacos.server-addr>172.16.3.87</nacos.server-addr>
-                <nacos.discovery.namespace>bd205d23-e696-47be-b995-916313f86e99</nacos.discovery.namespace>
+                <nacos.discovery.namespace>bf153d2b-7aa5-4b6e-ba7b-4977e54eb126</nacos.discovery.namespace>
                 <nacos.config.namespace></nacos.config.namespace>
                 <nacos.config.group></nacos.config.group>
                 <nacos.config-enabled>false</nacos.config-enabled>

epmet-module/resi-mine/resi-mine-server/src/main/resources/bootstrap.yml

@@ -18,20 +18,34 @@ spring:
   jackson:
     time-zone: GMT+8
     date-format: yyyy-MM-dd HH:mm:ss
+  # redis 单机配置(单机与集群只能开启一个另一个需要注释掉)
   redis:
-    # 烟台使用cluster模式下使用cluster:配置段
+    # 地址
-    #    database: @spring.redis.index@
+    host: 172.16.3.87
-    #    host: @spring.redis.host@
+    # 端口，默认为6379
-    #    port: @spring.redis.port@
+    port: 6379
-    #    password: @spring.redis.password@
+    # 数据库索引
-    #    timeout: 30s
-
     database: @spring.redis.index@
+    # 密码(如没有密码请注释掉)
     password: @spring.redis.password@
+    # 连接超时时间
     timeout: 30s
-    cluster:
+    # 是否开启ssl
-      nodes: @spring.redis.cluster.nodes@
+    ssl: false
-      max-redirects: @spring.redis.cluster.max-redirects@
+#  redis:
+#    # 烟台使用cluster模式下使用cluster:配置段
+#    #    database: @spring.redis.index@
+#    #    host: @spring.redis.host@
+#    #    port: @spring.redis.port@
+#    #    password: @spring.redis.password@
+#    #    timeout: 30s
+#
+#    database: @spring.redis.index@
+#    password: @spring.redis.password@
+#    timeout: 30s
+#    cluster:
+#      nodes: @spring.redis.cluster.nodes@
+#      max-redirects: @spring.redis.cluster.max-redirects@
   cloud:
     nacos:
       discovery:

epmet-module/resi-partymember/resi-partymember-server/pom.xml

@@ -332,7 +332,7 @@
 
                 <!-- 数据库配置-->
                 <spring.datasource.druid.url>
-                    <![CDATA[jdbc:mysql://10.2.2.44:3306/epmet_resi_partymember?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                    <![CDATA[jdbc:mysql://172.16.3.86:3306/epmet_resi_partymember?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
                 </spring.datasource.druid.url>
                 <spring.datasource.druid.username>epmet_resi_partymember_user</spring.datasource.druid.username>
                 <spring.datasource.druid.password>EpmEt-db-UsEr</spring.datasource.druid.password>
@@ -346,8 +346,8 @@
                 <spring.redis.password>rEdIs@yAntAI_666</spring.redis.password>
                 <!-- nacos -->
                 <nacos.register-enabled>true</nacos.register-enabled>
-                <nacos.server-addr>10.2.2.51:8848</nacos.server-addr>
+                <nacos.server-addr>172.16.3.87</nacos.server-addr>
-                <nacos.discovery.namespace>bd205d23-e696-47be-b995-916313f86e99</nacos.discovery.namespace>
+                <nacos.discovery.namespace>bf153d2b-7aa5-4b6e-ba7b-4977e54eb126</nacos.discovery.namespace>
                 <nacos.config.namespace></nacos.config.namespace>
                 <nacos.config.group></nacos.config.group>
                 <nacos.config-enabled>false</nacos.config-enabled>
@@ -365,7 +365,7 @@
                 <thread.threadPool.thread-name-prefix>resi-partymember-</thread.threadPool.thread-name-prefix>
                 <thread.threadPool.rejected-execution-handler>callerRunsPolicy</thread.threadPool.rejected-execution-handler>
 
-                <spring.flyway.enabled>true</spring.flyway.enabled>
+                <spring.flyway.enabled>false</spring.flyway.enabled>
 
 
                 <!--生产钉钉 机器人地址-->
@@ -377,7 +377,7 @@
 
                 <!--rocketmq-->
                 <rocketmq.enable>true</rocketmq.enable>
-                <rocketmq.nameserver>10.2.2.50:9876;10.2.2.51:9876</rocketmq.nameserver>
+                <rocketmq.nameserver>172.16.3.86:9876;172.16.3.87:9876</rocketmq.nameserver>
             </properties>
         </profile>
     </profiles>

epmet-module/resi-partymember/resi-partymember-server/src/main/resources/bootstrap.yml

@@ -18,20 +18,34 @@ spring:
   jackson:
     time-zone: GMT+8
     date-format: yyyy-MM-dd HH:mm:ss
+  # redis 单机配置(单机与集群只能开启一个另一个需要注释掉)
   redis:
-    # 烟台使用cluster模式下使用cluster:配置段
+    # 地址
-    #    database: @spring.redis.index@
+    host: 172.16.3.87
-    #    host: @spring.redis.host@
+    # 端口，默认为6379
-    #    port: @spring.redis.port@
+    port: 6379
-    #    password: @spring.redis.password@
+    # 数据库索引
-    #    timeout: 30s
-
     database: @spring.redis.index@
+    # 密码(如没有密码请注释掉)
     password: @spring.redis.password@
+    # 连接超时时间
     timeout: 30s
-    cluster:
+    # 是否开启ssl
-      nodes: @spring.redis.cluster.nodes@
+    ssl: false
-      max-redirects: @spring.redis.cluster.max-redirects@
+#  redis:
+#    # 烟台使用cluster模式下使用cluster:配置段
+#    #    database: @spring.redis.index@
+#    #    host: @spring.redis.host@
+#    #    port: @spring.redis.port@
+#    #    password: @spring.redis.password@
+#    #    timeout: 30s
+#
+#    database: @spring.redis.index@
+#    password: @spring.redis.password@
+#    timeout: 30s
+#    cluster:
+#      nodes: @spring.redis.cluster.nodes@
+#      max-redirects: @spring.redis.cluster.max-redirects@
   datasource:
     druid:
       #MySQL

epmet-module/resi-voice/resi-voice-server/pom.xml

@@ -225,8 +225,8 @@
                 <spring.redis.password>rEdIs@yAntAI_666</spring.redis.password>
                 <!-- nacos -->
                 <nacos.register-enabled>true</nacos.register-enabled>
-                <nacos.server-addr>10.2.2.51:8848</nacos.server-addr>
+                <nacos.server-addr>172.16.3.87</nacos.server-addr>
-                <nacos.discovery.namespace>bd205d23-e696-47be-b995-916313f86e99</nacos.discovery.namespace>
+                <nacos.discovery.namespace>bf153d2b-7aa5-4b6e-ba7b-4977e54eb126</nacos.discovery.namespace>
                 <nacos.config.namespace></nacos.config.namespace>
                 <nacos.config.group></nacos.config.group>
                 <nacos.config-enabled>false</nacos.config-enabled>

epmet-module/resi-voice/resi-voice-server/src/main/resources/bootstrap.yml

@@ -15,20 +15,34 @@ spring:
   jackson:
     time-zone: GMT+8
     date-format: yyyy-MM-dd HH:mm:ss
+  # redis 单机配置(单机与集群只能开启一个另一个需要注释掉)
   redis:
-    # 烟台使用cluster模式下使用cluster:配置段
+    # 地址
-    #    database: @spring.redis.index@
+    host: 172.16.3.87
-    #    host: @spring.redis.host@
+    # 端口，默认为6379
-    #    port: @spring.redis.port@
+    port: 6379
-    #    password: @spring.redis.password@
+    # 数据库索引
-    #    timeout: 30s
-
     database: @spring.redis.index@
+    # 密码(如没有密码请注释掉)
     password: @spring.redis.password@
+    # 连接超时时间
     timeout: 30s
-    cluster:
+    # 是否开启ssl
-      nodes: @spring.redis.cluster.nodes@
+    ssl: false
-      max-redirects: @spring.redis.cluster.max-redirects@
+#  redis:
+#    # 烟台使用cluster模式下使用cluster:配置段
+#    #    database: @spring.redis.index@
+#    #    host: @spring.redis.host@
+#    #    port: @spring.redis.port@
+#    #    password: @spring.redis.password@
+#    #    timeout: 30s
+#
+#    database: @spring.redis.index@
+#    password: @spring.redis.password@
+#    timeout: 30s
+#    cluster:
+#      nodes: @spring.redis.cluster.nodes@
+#      max-redirects: @spring.redis.cluster.max-redirects@
   cloud:
     nacos:
       discovery:

epmet-openapi/epmet-openapi-scan/pom.xml

@@ -226,8 +226,8 @@
                 <spring.redis.password>rEdIs@yAntAI_666</spring.redis.password>
                 <!-- nacos -->
                 <nacos.register-enabled>true</nacos.register-enabled>
-                <nacos.server-addr>10.2.2.51:8848</nacos.server-addr>
+                <nacos.server-addr>172.16.3.87</nacos.server-addr>
-                <nacos.discovery.namespace>bd205d23-e696-47be-b995-916313f86e99</nacos.discovery.namespace>
+                <nacos.discovery.namespace>bf153d2b-7aa5-4b6e-ba7b-4977e54eb126</nacos.discovery.namespace>
                 <nacos.config.namespace></nacos.config.namespace>
                 <nacos.config.group></nacos.config.group>
                 <nacos.config-enabled>false</nacos.config-enabled>

epmet-openapi/epmet-openapi-scan/src/main/resources/bootstrap.yml

@@ -18,20 +18,34 @@ spring:
   jackson:
     time-zone: GMT+8
     date-format: yyyy-MM-dd HH:mm:ss
+  # redis 单机配置(单机与集群只能开启一个另一个需要注释掉)
   redis:
-    # 烟台使用cluster模式下使用cluster:配置段
+    # 地址
-    #    database: @spring.redis.index@
+    host: 172.16.3.87
-    #    host: @spring.redis.host@
+    # 端口，默认为6379
-    #    port: @spring.redis.port@
+    port: 6379
-    #    password: @spring.redis.password@
+    # 数据库索引
-    #    timeout: 30s
-
     database: @spring.redis.index@
+    # 密码(如没有密码请注释掉)
     password: @spring.redis.password@
+    # 连接超时时间
     timeout: 30s
-    cluster:
+    # 是否开启ssl
-      nodes: @spring.redis.cluster.nodes@
+    ssl: false
-      max-redirects: @spring.redis.cluster.max-redirects@
+#  redis:
+#    # 烟台使用cluster模式下使用cluster:配置段
+#    #    database: @spring.redis.index@
+#    #    host: @spring.redis.host@
+#    #    port: @spring.redis.port@
+#    #    password: @spring.redis.password@
+#    #    timeout: 30s
+#
+#    database: @spring.redis.index@
+#    password: @spring.redis.password@
+#    timeout: 30s
+#    cluster:
+#      nodes: @spring.redis.cluster.nodes@
+#      max-redirects: @spring.redis.cluster.max-redirects@
   cloud:
     nacos:
       discovery:

epmet-user/epmet-user-server/pom.xml

@@ -349,7 +349,7 @@
 
                 <!-- 数据库配置-->
                 <spring.datasource.druid.url>
-                    <![CDATA[jdbc:mysql://10.2.2.44:3306/epmet_user?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                    <![CDATA[jdbc:mysql://172.16.3.86:3306/epmet_user?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
                 </spring.datasource.druid.url>
                 <spring.datasource.druid.username>epmet_user_user</spring.datasource.druid.username>
                 <spring.datasource.druid.password>EpmEt-db-UsEr</spring.datasource.druid.password>
@@ -363,9 +363,10 @@
                 <spring.redis.password>rEdIs@yAntAI_666</spring.redis.password>
                 <!-- nacos -->
                 <nacos.register-enabled>true</nacos.register-enabled>
-                <nacos.server-addr>10.2.2.51:8848</nacos.server-addr>
+                <nacos.server-addr>172.16.3.87</nacos.server-addr>
-                <nacos.discovery.namespace>bd205d23-e696-47be-b995-916313f86e99</nacos.discovery.namespace>
+<!--                <nacos.discovery.namespace>bd205d23-e696-47be-b995-916313f86e99</nacos.discovery.namespace>-->
                 <nacos.config.namespace></nacos.config.namespace>
+                <nacos.discovery.namespace>bf153d2b-7aa5-4b6e-ba7b-4977e54eb126</nacos.discovery.namespace>
                 <nacos.config.group></nacos.config.group>
                 <nacos.config-enabled>false</nacos.config-enabled>
                 <nacos.ip/>
@@ -373,7 +374,7 @@
                 <!--是否开启服务列表变更监听-->
                 <nacos.service-list-changed-listening.enable>true</nacos.service-list-changed-listening.enable>
 
-                <spring.flyway.enabled>true</spring.flyway.enabled>
+                <spring.flyway.enabled>false</spring.flyway.enabled>
                 <openapi.scan.server.url>https://epmet-open.elinkservice.cn/api/epmetscan/api</openapi.scan.server.url>
 
                 <!--生产钉钉 机器人地址-->
@@ -384,7 +385,7 @@
                 </dingTalk.robot.secret>
                 <!--rocketmq-->
                 <rocketmq.enable>true</rocketmq.enable>
-                <rocketmq.nameserver>10.2.2.50:9876;10.2.2.51:9876</rocketmq.nameserver>
+                <rocketmq.nameserver>172.16.3.86:9876;172.16.3.87:9876</rocketmq.nameserver>
 
                 <!--线程池-->
                 <thread.threadPool.enable-customize>true</thread.threadPool.enable-customize>

epmet-user/epmet-user-server/src/main/java/com/epmet/processor/YanTaiNatSyncProcessor.java

@@ -15,11 +15,11 @@ import static com.epmet.constant.EpidemicConstant.JOB_TYPE_NAT;
   * @Author wxz
   * @Date 2022/11/20 上午11:43
  */
-@Component
+//@Component
 @Slf4j
 public class YanTaiNatSyncProcessor extends AbstractDataSyncJobProcessor {
 
-    @Autowired
+//    @Autowired
     private DataSyncConfigService dataSyncConfigService;
 
     /**
@@ -29,7 +29,7 @@ public class YanTaiNatSyncProcessor extends AbstractDataSyncJobProcessor {
      * @author wxz
      * @date 2022/11/8 下午5:42
      */
-    @Scheduled(cron = "0/10 * * * * ? ")
+//    @Scheduled(cron = "0/10 * * * * ? ")
     public void scanJobs() {
         scanAndExecWaitingJobs();
     }

epmet-user/epmet-user-server/src/main/java/com/epmet/processor/YanTaiResiComparisonSyncProcessor.java

@@ -14,21 +14,21 @@ import org.springframework.stereotype.Component;
   * @Author wxz
   * @Date 2022/11/15 下午5:54
  */
-@Component
+//@Component
 @Slf4j
 public class YanTaiResiComparisonSyncProcessor extends AbstractDataSyncJobProcessor {
 
-    @Autowired
+//    @Autowired
     private IcResiComparisonRecordService icResiComparisonRecordService;
 
-    @Autowired
+//    @Autowired
     RedisUtils redisUtils;
 
     /**
      * 定时扫描和执行同步任务
      * 10s扫一次库
      */
-    @Scheduled(cron = "0/10 * * * * ? ")
+//    @Scheduled(cron = "0/10 * * * * ? ")
     public void scanJobs() {
         scanAndExecWaitingJobs();
     }

epmet-user/epmet-user-server/src/main/java/com/epmet/processor/YanTaiTripReportSyncProcessor.java

@@ -18,7 +18,7 @@ import static com.epmet.constant.EpidemicConstant.JOB_TYPE_TRIP_REPORT;
 @Slf4j
 public class YanTaiTripReportSyncProcessor extends AbstractDataSyncJobProcessor {
 
-    @Autowired
+//    @Autowired
     private DataSyncConfigService dataSyncConfigService;
 
     /**
@@ -26,7 +26,7 @@ public class YanTaiTripReportSyncProcessor extends AbstractDataSyncJobProcessor
      * @Author zxc
      * @Date 2022/11/11 10:32
      */
-    @Scheduled(cron = "0/10 * * * * ? ")
+//    @Scheduled(cron = "0/10 * * * * ? ")
     public void scanJobs() {
         scanAndExecWaitingJobs();
     }

epmet-user/epmet-user-server/src/main/java/com/epmet/processor/YanTaiVaccineSyncProcessor.java

@@ -15,11 +15,11 @@ import static com.epmet.constant.EpidemicConstant.JOB_TYPE_VACCINE;
   * @Author wxz
   * @Date 2022/11/20 上午11:55
  */
-@Component
+//@Component
 @Slf4j
 public class YanTaiVaccineSyncProcessor extends AbstractDataSyncJobProcessor {
 
-    @Autowired
+//    @Autowired
     private DataSyncConfigService dataSyncConfigService;
 
     /**
@@ -27,7 +27,7 @@ public class YanTaiVaccineSyncProcessor extends AbstractDataSyncJobProcessor {
      * @Author zxc
      * @Date 2022/11/11 10:32
      */
-    @Scheduled(cron = "0/10 * * * * ? ")
+//    @Scheduled(cron = "0/10 * * * * ? ")
     public void scanJobs() {
         scanAndExecWaitingJobs();
     }

epmet-user/epmet-user-server/src/main/resources/bootstrap.yml

@@ -18,20 +18,34 @@ spring:
   jackson:
     time-zone: GMT+8
     date-format: yyyy-MM-dd HH:mm:ss
+  # redis 单机配置(单机与集群只能开启一个另一个需要注释掉)
   redis:
-    # 烟台使用cluster模式下使用cluster:配置段
+    # 地址
-    #    database: @spring.redis.index@
+    host: 172.16.3.87
-    #    host: @spring.redis.host@
+    # 端口，默认为6379
-    #    port: @spring.redis.port@
+    port: 6379
-    #    password: @spring.redis.password@
+    # 数据库索引
-    #    timeout: 30s
-
     database: @spring.redis.index@
+    # 密码(如没有密码请注释掉)
     password: @spring.redis.password@
+    # 连接超时时间
     timeout: 30s
-    cluster:
+    # 是否开启ssl
-      nodes: @spring.redis.cluster.nodes@
+    ssl: false
-      max-redirects: @spring.redis.cluster.max-redirects@
+#  redis:
+#    # 烟台使用cluster模式下使用cluster:配置段
+#    #    database: @spring.redis.index@
+#    #    host: @spring.redis.host@
+#    #    port: @spring.redis.port@
+#    #    password: @spring.redis.password@
+#    #    timeout: 30s
+#
+#    database: @spring.redis.index@
+#    password: @spring.redis.password@
+#    timeout: 30s
+#    cluster:
+#      nodes: @spring.redis.cluster.nodes@
+#      max-redirects: @spring.redis.cluster.max-redirects@
   datasource:
     druid:
       #MySQL