Merge remote-tracking branch 'origin/master' into feature/points

esua-epdc/epdc-admin/epdc-admin-server/pom.xml

@@ -152,6 +152,8 @@
                 <!-- nacos -->
                 <nacos.register-enabled>false</nacos.register-enabled>
                 <nacos.server-addr>47.104.224.45:8848</nacos.server-addr>
+                <nacos.ip></nacos.ip>
+                <nacos.namespace>fa5bf520-09c1-410c-a876-28e98c0534d3</nacos.namespace>
 
                 <spring.zipkin.base-url>http://localhost:9411</spring.zipkin.base-url>
                 <!--小程序配置-->
@@ -168,7 +170,7 @@
         <profile>
             <id>test</id>
             <properties>
-                <server.port>9308</server.port>
+                <server.port>11002</server.port>
                 <spring.profiles.active>test</spring.profiles.active>
 
                 <spring.redis.index>2</spring.redis.index>
@@ -185,6 +187,8 @@
                 <!-- nacos -->
                 <nacos.register-enabled>true</nacos.register-enabled>
                 <nacos.server-addr>47.104.224.45:8848</nacos.server-addr>
+                <nacos.ip>219.146.91.110</nacos.ip>
+                <nacos.namespace>fa5bf520-09c1-410c-a876-28e98c0534d3</nacos.namespace>
 
                 <spring.zipkin.base-url>http://localhost:9411</spring.zipkin.base-url>
                 <!--小程序配置-->

esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/application.yml

@@ -22,6 +22,8 @@ spring:
       discovery:
         server-addr: @nacos.server-addr@
         register-enabled: @nacos.register-enabled@
+        ip: @nacos.ip@
+        namespace: @nacos.namespace@
     alibaba:
       seata:
         tx-service-group: epdc-admin-server-fescar-service-group

esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/registry.conf

@@ -4,7 +4,7 @@ registry {
 
   nacos {
     serverAddr = "@nacos.server-addr@"
-    namespace = "public"
+    namespace = "@nacos.namespace@"
     cluster = "default"
   }
 }
@@ -15,7 +15,7 @@ config {
 
   nacos {
     serverAddr = "@nacos.server-addr@"
-    namespace = "public"
+    namespace = "@nacos.namespace@"
     cluster = "default"
   }
 }

esua-epdc/epdc-auth/pom.xml

@@ -108,13 +108,15 @@
 
                 <!-- redis配置 -->
                 <spring.redis.index>2</spring.redis.index>
-                <spring.redis.host>47.104.224.45</spring.redis.host>
+                <spring.redis.host>114.215.125.123</spring.redis.host>
-                <spring.redis.port>6379</spring.redis.port>
+                <spring.redis.port>9603</spring.redis.port>
-                <spring.redis.password>elink@888</spring.redis.password>
+                <spring.redis.password>epdc!redis@master1405</spring.redis.password>
 
                 <!-- nacos -->
                 <nacos.register-enabled>false</nacos.register-enabled>
                 <nacos.server-addr>47.104.224.45:8848</nacos.server-addr>
+                <nacos.ip></nacos.ip>
+                <nacos.namespace>fa5bf520-09c1-410c-a876-28e98c0534d3</nacos.namespace>
 
                 <spring.zipkin.base-url>http://localhost:9411</spring.zipkin.base-url>
             </properties>
@@ -122,18 +124,20 @@
         <profile>
             <id>test</id>
             <properties>
-                <server.port>9056</server.port>
+                <server.port>11001</server.port>
                 <spring.profiles.active>test</spring.profiles.active>
 
                 <!-- redis配置 -->
                 <spring.redis.index>2</spring.redis.index>
-                <spring.redis.host>47.104.224.45</spring.redis.host>
+                <spring.redis.host>114.215.125.123</spring.redis.host>
-                <spring.redis.port>6379</spring.redis.port>
+                <spring.redis.port>9603</spring.redis.port>
-                <spring.redis.password>elink@888</spring.redis.password>
+                <spring.redis.password>epdc!redis@master1405</spring.redis.password>
 
                 <!-- nacos -->
                 <nacos.register-enabled>true</nacos.register-enabled>
                 <nacos.server-addr>47.104.224.45:8848</nacos.server-addr>
+                <nacos.ip>219.146.91.110</nacos.ip>
+                <nacos.namespace>fa5bf520-09c1-410c-a876-28e98c0534d3</nacos.namespace>
 
                 <spring.zipkin.base-url>http://localhost:9411</spring.zipkin.base-url>
             </properties>

esua-epdc/epdc-auth/src/main/resources/application.yml

@@ -27,6 +27,8 @@ spring:
       discovery:
         server-addr: @nacos.server-addr@
         register-enabled: @nacos.register-enabled@
+        ip: @nacos.ip@
+        namespace: @nacos.namespace@
   zipkin:
     # 指定了 zipkin 服务器的地址
     base-url: @spring.zipkin.base-url@

esua-epdc/epdc-gateway/pom.xml

@@ -90,12 +90,13 @@
             </activation>
             <properties>
                 <server.port>9094</server.port>
+                <spring.profiles.active>dev</spring.profiles.active>
 
                 <!-- redis配置 -->
                 <spring.redis.index>2</spring.redis.index>
-                <spring.redis.host>47.104.224.45</spring.redis.host>
+                <spring.redis.host>114.215.125.123</spring.redis.host>
-                <spring.redis.port>6379</spring.redis.port>
+                <spring.redis.port>9603</spring.redis.port>
-                <spring.redis.password>elink@888</spring.redis.password>
+                <spring.redis.password>epdc!redis@master1405</spring.redis.password>
 
                 <!-- gateway routes -->
                 <gateway.routes.epdc-auth-server.uri>lb://epdc-auth-server</gateway.routes.epdc-auth-server.uri>
@@ -133,6 +134,8 @@
                 <!-- nacos -->
                 <nacos.register-enabled>false</nacos.register-enabled>
                 <nacos.server-addr>47.104.224.45:8848</nacos.server-addr>
+                <nacos.ip></nacos.ip>
+                <nacos.namespace>fa5bf520-09c1-410c-a876-28e98c0534d3</nacos.namespace>
 
                 <spring.zipkin.base-url>http://localhost:9411</spring.zipkin.base-url>
             </properties>
@@ -140,13 +143,14 @@
         <profile>
             <id>test</id>
             <properties>
-                <server.port>9094</server.port>
+                <server.port>11000</server.port>
+                <spring.profiles.active>test</spring.profiles.active>
 
                 <!-- redis配置 -->
                 <spring.redis.index>2</spring.redis.index>
-                <spring.redis.host>47.104.224.45</spring.redis.host>
+                <spring.redis.host>114.215.125.123</spring.redis.host>
-                <spring.redis.port>6379</spring.redis.port>
+                <spring.redis.port>9603</spring.redis.port>
-                <spring.redis.password>elink@888</spring.redis.password>
+                <spring.redis.password>epdc!redis@master1405</spring.redis.password>
 
                 <!-- gateway routes -->
                 <gateway.routes.epdc-auth-server.uri>lb://epdc-auth-server</gateway.routes.epdc-auth-server.uri>
@@ -174,6 +178,8 @@
                 <!-- nacos -->
                 <nacos.register-enabled>true</nacos.register-enabled>
                 <nacos.server-addr>47.104.224.45:8848</nacos.server-addr>
+                <nacos.ip>219.146.91.110</nacos.ip>
+                <nacos.namespace>fa5bf520-09c1-410c-a876-28e98c0534d3</nacos.namespace>
 
                 <spring.zipkin.base-url>http://localhost:9411</spring.zipkin.base-url>
             </properties>
@@ -182,6 +188,7 @@
             <id>prod</id>
             <properties>
                 <server.port>9104</server.port>
+                <spring.profiles.active>prod</spring.profiles.active>
                 <docker.tag>prod</docker.tag>
 
                 <!-- gateway routes -->

esua-epdc/epdc-gateway/src/main/resources/application.yml

@@ -8,6 +8,9 @@ server:
 spring:
   application:
     name: epdc-gateway-server
+  #环境 dev|test|prod
+  profiles:
+    active: @spring.profiles.active@
   servlet:
     multipart:
       enabled: true
@@ -166,6 +169,8 @@ spring:
       discovery:
         server-addr: @nacos.server-addr@
         register-enabled: @nacos.register-enabled@
+        ip: @nacos.ip@
+        namespace: @nacos.namespace@
   zipkin:
     # 指定了 zipkin 服务器的地址
     base-url: @spring.zipkin.base-url@

esua-epdc/epdc-module/epdc-api/epdc-api-server/pom.xml

@@ -152,9 +152,9 @@
                 <server.port>9040</server.port>
 
                 <spring.redis.index>2</spring.redis.index>
-                <spring.redis.host>47.104.224.45</spring.redis.host>
+                <spring.redis.host>114.215.125.123</spring.redis.host>
-                <spring.redis.port>6379</spring.redis.port>
+                <spring.redis.port>9603</spring.redis.port>
-                <spring.redis.password>elink@888</spring.redis.password>
+                <spring.redis.password>epdc!redis@master1405</spring.redis.password>
 
                 <spring.datasource.druid.url>
                     <![CDATA[jdbc:mysql://47.104.224.45:3308/js_esua_epdc_api?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
@@ -164,6 +164,8 @@
 
                 <nacos.register-enabled>false</nacos.register-enabled>
                 <nacos.server-addr>47.104.224.45:8848</nacos.server-addr>
+                <nacos.ip></nacos.ip>
+                <nacos.namespace>fa5bf520-09c1-410c-a876-28e98c0534d3</nacos.namespace>
                 <!--公众号配置-->
                 <wx.mp.configs.appId>wx3ef8f2cd12a19fcb</wx.mp.configs.appId>
                 <wx.mp.configs.secret>948aa2f21dbaa3943288ea5b119ac6f2</wx.mp.configs.secret>
@@ -183,12 +185,12 @@
             <properties>
                 <spring.profiles.active>test</spring.profiles.active>
 
-                <server.port>9040</server.port>
+                <server.port>11003</server.port>
 
                 <spring.redis.index>2</spring.redis.index>
-                <spring.redis.host>47.104.224.45</spring.redis.host>
+                <spring.redis.host>114.215.125.123</spring.redis.host>
-                <spring.redis.port>6379</spring.redis.port>
+                <spring.redis.port>9603</spring.redis.port>
-                <spring.redis.password>elink@888</spring.redis.password>
+                <spring.redis.password>epdc!redis@master1405</spring.redis.password>
 
                 <spring.datasource.druid.url>
                     <![CDATA[jdbc:mysql://47.104.224.45:3308/js_esua_epdc_api?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
@@ -198,6 +200,8 @@
 
                 <nacos.register-enabled>true</nacos.register-enabled>
                 <nacos.server-addr>47.104.224.45:8848</nacos.server-addr>
+                <nacos.ip>219.146.91.110</nacos.ip>
+                <nacos.namespace>fa5bf520-09c1-410c-a876-28e98c0534d3</nacos.namespace>
                 <!--公众号配置-->
                 <wx.mp.configs.appId>wx3ef8f2cd12a19fcb</wx.mp.configs.appId>
                 <wx.mp.configs.secret>948aa2f21dbaa3943288ea5b119ac6f2</wx.mp.configs.secret>

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/resources/application.yml

@@ -34,6 +34,8 @@ spring:
       discovery:
         server-addr: @nacos.server-addr@
         register-enabled: @nacos.register-enabled@
+        ip: @nacos.ip@
+        namespace: @nacos.namespace@
     alibaba:
       seata:
         tx-service-group: epdc-api-server-fescar-service-group

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/resources/registry.conf

@@ -4,7 +4,7 @@ registry {
 
   nacos {
     serverAddr = "@nacos.server-addr@"
-    namespace = "public"
+    namespace = "@nacos.namespace@"
     cluster = "default"
   }
 }
@@ -15,7 +15,7 @@ config {
 
   nacos {
     serverAddr = "@nacos.server-addr@"
-    namespace = "public"
+    namespace = "@nacos.namespace@"
     cluster = "default"
   }
 }

esua-epdc/epdc-module/epdc-custom/epdc-custom-server/pom.xml

@@ -129,9 +129,9 @@
                 <server.port>9076</server.port>
 
                 <spring.redis.index>2</spring.redis.index>
-                <spring.redis.host>47.104.224.45</spring.redis.host>
+                <spring.redis.host>114.215.125.123</spring.redis.host>
-                <spring.redis.port>6379</spring.redis.port>
+                <spring.redis.port>9603</spring.redis.port>
-                <spring.redis.password>elink@888</spring.redis.password>
+                <spring.redis.password>epdc!redis@master1405</spring.redis.password>
 
                 <spring.datasource.druid.url>
                     <![CDATA[jdbc:mysql://47.104.224.45:3308/js_esua_epdc_custom?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
@@ -153,9 +153,9 @@
                 <server.port>9076</server.port>
 
                 <spring.redis.index>2</spring.redis.index>
-                <spring.redis.host>47.104.224.45</spring.redis.host>
+                <spring.redis.host>114.215.125.123</spring.redis.host>
-                <spring.redis.port>6379</spring.redis.port>
+                <spring.redis.port>9603</spring.redis.port>
-                <spring.redis.password>elink@888</spring.redis.password>
+                <spring.redis.password>epdc!redis@master1405</spring.redis.password>
 
                 <spring.datasource.druid.url>
                     <![CDATA[jdbc:mysql://47.104.224.45:3308/js_esua_epdc_custom?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>

esua-epdc/epdc-module/epdc-events/epdc-events-server/pom.xml

@@ -148,9 +148,9 @@
                 <server.port>9066</server.port>
 
                 <spring.redis.index>2</spring.redis.index>
-                <spring.redis.host>47.104.224.45</spring.redis.host>
+                <spring.redis.host>114.215.125.123</spring.redis.host>
-                <spring.redis.port>6379</spring.redis.port>
+                <spring.redis.port>9603</spring.redis.port>
-                <spring.redis.password>elink@888</spring.redis.password>
+                <spring.redis.password>epdc!redis@master1405</spring.redis.password>
 
                 <spring.datasource.druid.url>
                     <![CDATA[jdbc:mysql://47.104.224.45:3308/js_esua_epdc_events?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
@@ -161,6 +161,8 @@
                 <nacos.register-enabled>false</nacos.register-enabled>
                 <nacos.server-addr>47.104.224.45:8848</nacos.server-addr>
                 <nacos.register.ip></nacos.register.ip>
+                <nacos.ip></nacos.ip>
+                <nacos.namespace>fa5bf520-09c1-410c-a876-28e98c0534d3</nacos.namespace>
 
                 <docker.tag>dev</docker.tag>
 
@@ -183,12 +185,12 @@
             <properties>
                 <spring.profiles.active>test</spring.profiles.active>
 
-                <server.port>9066</server.port>
+                <server.port>11004</server.port>
 
                 <spring.redis.index>2</spring.redis.index>
-                <spring.redis.host>47.104.224.45</spring.redis.host>
+                <spring.redis.host>114.215.125.123</spring.redis.host>
-                <spring.redis.port>6379</spring.redis.port>
+                <spring.redis.port>9603</spring.redis.port>
-                <spring.redis.password>elink@888</spring.redis.password>
+                <spring.redis.password>epdc!redis@master1405</spring.redis.password>
 
                 <spring.datasource.druid.url>
                     <![CDATA[jdbc:mysql://47.104.224.45:3308/js_esua_epdc_events?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
@@ -198,6 +200,8 @@
 
                 <nacos.register-enabled>true</nacos.register-enabled>
                 <nacos.server-addr>47.104.224.45:8848</nacos.server-addr>
+                <nacos.ip>219.146.91.110</nacos.ip>
+                <nacos.namespace>fa5bf520-09c1-410c-a876-28e98c0534d3</nacos.namespace>
 
                 <docker.tag>test</docker.tag>
 

esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/application.yml

@@ -28,6 +28,8 @@ spring:
       discovery:
         server-addr: @nacos.server-addr@
         register-enabled: @nacos.register-enabled@
+        ip: @nacos.ip@
+        namespace: @nacos.namespace@
     alibaba:
       seata:
         tx-service-group: epdc-events-server-fescar-service-group

esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/registry.conf

@@ -4,7 +4,7 @@ registry {
 
   nacos {
     serverAddr = "@nacos.server-addr@"
-    namespace = "public"
+    namespace = "@nacos.namespace@"
     cluster = "default"
   }
 }
@@ -15,7 +15,7 @@ config {
 
   nacos {
     serverAddr = "@nacos.server-addr@"
-    namespace = "public"
+    namespace = "@nacos.namespace@"
     cluster = "default"
   }
 }

esua-epdc/epdc-module/epdc-group/epdc-group-server/pom.xml

@@ -124,9 +124,9 @@
                 <server.port>9063</server.port>
 
                 <spring.redis.index>2</spring.redis.index>
-                <spring.redis.host>47.104.224.45</spring.redis.host>
+                <spring.redis.host>114.215.125.123</spring.redis.host>
-                <spring.redis.port>6379</spring.redis.port>
+                <spring.redis.port>9603</spring.redis.port>
-                <spring.redis.password>elink@888</spring.redis.password>
+                <spring.redis.password>epdc!redis@master1405</spring.redis.password>
 
                 <spring.datasource.druid.url>
                     <![CDATA[jdbc:mysql://47.104.224.45:3308/js_esua_epdc_group?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
@@ -136,6 +136,8 @@
 
                 <nacos.register-enabled>false</nacos.register-enabled>
                 <nacos.server-addr>47.104.224.45:8848</nacos.server-addr>
+                <nacos.ip></nacos.ip>
+                <nacos.namespace>fa5bf520-09c1-410c-a876-28e98c0534d3</nacos.namespace>
                 <!--RocketMQ-->
                 <rocketmq.name.server>47.104.85.99:9876;114.215.125.123:9876</rocketmq.name.server>
                 <rocketmq.consumer.group>jinshui-organizationGroup</rocketmq.consumer.group>
@@ -147,12 +149,12 @@
             <properties>
                 <spring.profiles.active>test</spring.profiles.active>
 
-                <server.port>9063</server.port>
+                <server.port>11005</server.port>
 
                 <spring.redis.index>2</spring.redis.index>
-                <spring.redis.host>47.104.224.45</spring.redis.host>
+                <spring.redis.host>114.215.125.123</spring.redis.host>
-                <spring.redis.port>6379</spring.redis.port>
+                <spring.redis.port>9603</spring.redis.port>
-                <spring.redis.password>elink@888</spring.redis.password>
+                <spring.redis.password>epdc!redis@master1405</spring.redis.password>
 
                 <spring.datasource.druid.url>
                     <![CDATA[jdbc:mysql://47.104.224.45:3308/js_esua_epdc_group?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
@@ -162,6 +164,8 @@
 
                 <nacos.register-enabled>true</nacos.register-enabled>
                 <nacos.server-addr>47.104.224.45:8848</nacos.server-addr>
+                <nacos.ip>219.146.91.110</nacos.ip>
+                <nacos.namespace>fa5bf520-09c1-410c-a876-28e98c0534d3</nacos.namespace>
                 <!--RocketMQ-->
                 <rocketmq.name.server>47.104.85.99:9876;114.215.125.123:9876</rocketmq.name.server>
                 <rocketmq.consumer.group>jinshui-organizationGroup</rocketmq.consumer.group>

esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/resources/application.yml

@@ -28,6 +28,8 @@ spring:
       discovery:
         server-addr: @nacos.server-addr@
         register-enabled: @nacos.register-enabled@
+        ip: @nacos.ip@
+        namespace: @nacos.namespace@
     alibaba:
       seata:
         tx-service-group: epdc-group-server-fescar-service-group

esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/resources/registry.conf

@@ -4,7 +4,7 @@ registry {
 
   nacos {
     serverAddr = "@nacos.server-addr@"
-    namespace = "public"
+    namespace = "@nacos.namespace@"
     cluster = "default"
   }
 }
@@ -15,7 +15,7 @@ config {
 
   nacos {
     serverAddr = "@nacos.server-addr@"
-    namespace = "public"
+    namespace = "@nacos.namespace@"
     cluster = "default"
   }
 }

esua-epdc/epdc-module/epdc-job/epdc-job-server/pom.xml

@@ -147,9 +147,9 @@
                 <server.port>9061</server.port>
 
                 <spring.redis.index>2</spring.redis.index>
-                <spring.redis.host>47.104.224.45</spring.redis.host>
+                <spring.redis.host>114.215.125.123</spring.redis.host>
-                <spring.redis.port>6379</spring.redis.port>
+                <spring.redis.port>9603</spring.redis.port>
-                <spring.redis.password>elink@888</spring.redis.password>
+                <spring.redis.password>epdc!redis@master1405</spring.redis.password>
 
                 <spring.datasource.druid.url>
                     <![CDATA[jdbc:mysql://47.104.224.45:3308/js_esua_epdc_job?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
@@ -170,9 +170,9 @@
                 <server.port>9061</server.port>
 
                 <spring.redis.index>2</spring.redis.index>
-                <spring.redis.host>47.104.224.45</spring.redis.host>
+                <spring.redis.host>114.215.125.123</spring.redis.host>
-                <spring.redis.port>6379</spring.redis.port>
+                <spring.redis.port>9603</spring.redis.port>
-                <spring.redis.password>elink@888</spring.redis.password>
+                <spring.redis.password>epdc!redis@master1405</spring.redis.password>
 
                 <spring.datasource.druid.url>
                     <![CDATA[jdbc:mysql://47.104.224.45:3308/js_esua_epdc_job?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>

esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/resources/registry.conf

@@ -4,7 +4,7 @@ registry {
 
   nacos {
     serverAddr = "@nacos.server-addr@"
-    namespace = "public"
+    namespace = "@nacos.namespace@"
     cluster = "default"
   }
 }
@@ -15,7 +15,7 @@ config {
 
   nacos {
     serverAddr = "@nacos.server-addr@"
-    namespace = "public"
+    namespace = "@nacos.namespace@"
     cluster = "default"
   }
 }

esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/pom.xml

@@ -118,9 +118,9 @@
                 <server.port>9987</server.port>
 
                 <spring.redis.index>2</spring.redis.index>
-                <spring.redis.host>47.104.224.45</spring.redis.host>
+                <spring.redis.host>114.215.125.123</spring.redis.host>
-                <spring.redis.port>6379</spring.redis.port>
+                <spring.redis.port>9603</spring.redis.port>
-                <spring.redis.password>elink@888</spring.redis.password>
+                <spring.redis.password>epdc!redis@master1405</spring.redis.password>
 
                 <spring.datasource.druid.url>
                     <![CDATA[jdbc:mysql://47.104.224.45:3308/js_esua_epdc_kpi?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
@@ -141,9 +141,9 @@
                 <server.port>9987</server.port>
 
                 <spring.redis.index>2</spring.redis.index>
-                <spring.redis.host>47.104.224.45</spring.redis.host>
+                <spring.redis.host>114.215.125.123</spring.redis.host>
-                <spring.redis.port>6379</spring.redis.port>
+                <spring.redis.port>9603</spring.redis.port>
-                <spring.redis.password>elink@888</spring.redis.password>
+                <spring.redis.password>epdc!redis@master1405</spring.redis.password>
 
                 <spring.datasource.druid.url>
                     <![CDATA[jdbc:mysql://47.104.224.45:3308/js_esua_epdc_kpi?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>

esua-epdc/epdc-module/epdc-message/epdc-message-server/pom.xml

@@ -147,9 +147,9 @@
                 <server.port>9062</server.port>
 
                 <spring.redis.index>2</spring.redis.index>
-                <spring.redis.host>47.104.224.45</spring.redis.host>
+                <spring.redis.host>114.215.125.123</spring.redis.host>
-                <spring.redis.port>6379</spring.redis.port>
+                <spring.redis.port>9603</spring.redis.port>
-                <spring.redis.password>elink@888</spring.redis.password>
+                <spring.redis.password>epdc!redis@master1405</spring.redis.password>
 
                 <spring.datasource.druid.url>
                     <![CDATA[jdbc:mysql://47.104.224.45:3308/js_esua_epdc_admin?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
@@ -159,6 +159,8 @@
 
                 <nacos.register-enabled>false</nacos.register-enabled>
                 <nacos.server-addr>47.104.224.45:8848</nacos.server-addr>
+                <nacos.ip></nacos.ip>
+                <nacos.namespace>fa5bf520-09c1-410c-a876-28e98c0534d3</nacos.namespace>
             </properties>
         </profile>
 
@@ -167,12 +169,12 @@
             <properties>
                 <spring.profiles.active>test</spring.profiles.active>
 
-                <server.port>9062</server.port>
+                <server.port>11006</server.port>
 
                 <spring.redis.index>2</spring.redis.index>
-                <spring.redis.host>47.104.224.45</spring.redis.host>
+                <spring.redis.host>114.215.125.123</spring.redis.host>
-                <spring.redis.port>6379</spring.redis.port>
+                <spring.redis.port>9603</spring.redis.port>
-                <spring.redis.password>elink@888</spring.redis.password>
+                <spring.redis.password>epdc!redis@master1405</spring.redis.password>
 
                 <spring.datasource.druid.url>
                     <![CDATA[jdbc:mysql://47.104.224.45:3308/js_esua_epdc_admin?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
@@ -182,6 +184,8 @@
 
                 <nacos.register-enabled>true</nacos.register-enabled>
                 <nacos.server-addr>47.104.224.45:8848</nacos.server-addr>
+                <nacos.ip>219.146.91.110</nacos.ip>
+                <nacos.namespace>fa5bf520-09c1-410c-a876-28e98c0534d3</nacos.namespace>
             </properties>
         </profile>
 

esua-epdc/epdc-module/epdc-message/epdc-message-server/src/main/resources/application.yml

@@ -26,6 +26,8 @@ spring:
       discovery:
         server-addr: @nacos.server-addr@
         register-enabled: @nacos.register-enabled@
+        ip: @nacos.ip@
+        namespace: @nacos.namespace@
     alibaba:
       seata:
         tx-service-group: epdc-message-server-fescar-service-group

esua-epdc/epdc-module/epdc-message/epdc-message-server/src/main/resources/registry.conf

@@ -4,7 +4,7 @@ registry {
 
   nacos {
     serverAddr = "@nacos.server-addr@"
-    namespace = "public"
+    namespace = "@nacos.namespace@"
     cluster = "default"
   }
 }
@@ -15,7 +15,7 @@ config {
 
   nacos {
     serverAddr = "@nacos.server-addr@"
-    namespace = "public"
+    namespace = "@nacos.namespace@"
     cluster = "default"
   }
 }

esua-epdc/epdc-module/epdc-module.iml

@@ -45,5 +45,7 @@
     <orderEntry type="library" scope="TEST" name="Maven: org.springframework:spring-jcl:5.1.9.RELEASE" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.springframework:spring-test:5.1.9.RELEASE" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.xmlunit:xmlunit-core:2.6.3" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: javax.xml.bind:jaxb-api:2.3.1" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: javax.activation:javax.activation-api:1.2.0" level="project" />
   </component>
 </module>

esua-epdc/epdc-module/epdc-news/epdc-news-server/pom.xml

@@ -118,9 +118,9 @@
                 <server.port>9064</server.port>
 
                 <spring.redis.index>2</spring.redis.index>
-                <spring.redis.host>47.104.224.45</spring.redis.host>
+                <spring.redis.host>114.215.125.123</spring.redis.host>
-                <spring.redis.port>6379</spring.redis.port>
+                <spring.redis.port>9603</spring.redis.port>
-                <spring.redis.password>elink@888</spring.redis.password>
+                <spring.redis.password>epdc!redis@master1405</spring.redis.password>
 
                 <spring.datasource.druid.url>
                     <![CDATA[jdbc:mysql://47.104.224.45:3308/js_esua_epdc_news?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
@@ -130,6 +130,8 @@
 
                 <nacos.register-enabled>false</nacos.register-enabled>
                 <nacos.server-addr>47.104.224.45:8848</nacos.server-addr>
+                <nacos.ip></nacos.ip>
+                <nacos.namespace>fa5bf520-09c1-410c-a876-28e98c0534d3</nacos.namespace>
                 <!--RocketMQ-->
                 <rocketmq.name.server>47.104.85.99:9876;114.215.125.123:9876</rocketmq.name.server>
                 <rocketmq.consumer.group>jinshui-organizationGroup</rocketmq.consumer.group>
@@ -141,12 +143,12 @@
             <properties>
                 <spring.profiles.active>test</spring.profiles.active>
 
-                <server.port>9064</server.port>
+                <server.port>11007</server.port>
 
                 <spring.redis.index>2</spring.redis.index>
-                <spring.redis.host>47.104.224.45</spring.redis.host>
+                <spring.redis.host>114.215.125.123</spring.redis.host>
-                <spring.redis.port>6379</spring.redis.port>
+                <spring.redis.port>9603</spring.redis.port>
-                <spring.redis.password>elink@888</spring.redis.password>
+                <spring.redis.password>epdc!redis@master1405</spring.redis.password>
 
                 <spring.datasource.druid.url>
                     <![CDATA[jdbc:mysql://47.104.224.45:3308/js_esua_epdc_news?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
@@ -156,6 +158,8 @@
 
                 <nacos.register-enabled>true</nacos.register-enabled>
                 <nacos.server-addr>47.104.224.45:8848</nacos.server-addr>
+                <nacos.ip>219.146.91.110</nacos.ip>
+                <nacos.namespace>fa5bf520-09c1-410c-a876-28e98c0534d3</nacos.namespace>
                 <!--RocketMQ-->
                 <rocketmq.name.server>47.104.85.99:9876;114.215.125.123:9876</rocketmq.name.server>
                 <rocketmq.consumer.group>jinshui-organizationGroup</rocketmq.consumer.group>

esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/resources/application.yml

@@ -28,6 +28,8 @@ spring:
       discovery:
         server-addr: @nacos.server-addr@
         register-enabled: @nacos.register-enabled@
+        ip: @nacos.ip@
+        namespace: @nacos.namespace@
     alibaba:
       seata:
         tx-service-group: epdc-news-server-fescar-service-group

esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/resources/registry.conf

@@ -4,7 +4,7 @@ registry {
 
   nacos {
     serverAddr = "@nacos.server-addr@"
-    namespace = "public"
+    namespace = "@nacos.namespace@"
     cluster = "default"
   }
 }
@@ -15,7 +15,7 @@ config {
 
   nacos {
     serverAddr = "@nacos.server-addr@"
-    namespace = "public"
+    namespace = "@nacos.namespace@"
     cluster = "default"
   }
 }

esua-epdc/epdc-module/epdc-oss/epdc-oss-server/pom.xml

@@ -160,9 +160,9 @@
                 <server.port>9065</server.port>
 
                 <spring.redis.index>2</spring.redis.index>
-                <spring.redis.host>47.104.224.45</spring.redis.host>
+                <spring.redis.host>114.215.125.123</spring.redis.host>
-                <spring.redis.port>6379</spring.redis.port>
+                <spring.redis.port>9603</spring.redis.port>
-                <spring.redis.password>elink@888</spring.redis.password>
+                <spring.redis.password>epdc!redis@master1405</spring.redis.password>
 
                 <spring.datasource.druid.url>
                     <![CDATA[jdbc:mysql://47.104.224.45:3308/js_esua_epdc_admin?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
@@ -172,6 +172,10 @@
 
                 <nacos.register-enabled>false</nacos.register-enabled>
                 <nacos.server-addr>47.104.224.45:8848</nacos.server-addr>
+                <nacos.ip></nacos.ip>
+                <nacos.namespace>fa5bf520-09c1-410c-a876-28e98c0534d3</nacos.namespace>
+
+                <fastdfs.server-addr></fastdfs.server-addr>
             </properties>
         </profile>
 
@@ -180,12 +184,12 @@
             <properties>
                 <spring.profiles.active>test</spring.profiles.active>
 
-                <server.port>9065</server.port>
+                <server.port>11008</server.port>
 
                 <spring.redis.index>2</spring.redis.index>
-                <spring.redis.host>47.104.224.45</spring.redis.host>
+                <spring.redis.host>114.215.125.123</spring.redis.host>
-                <spring.redis.port>6379</spring.redis.port>
+                <spring.redis.port>9603</spring.redis.port>
-                <spring.redis.password>elink@888</spring.redis.password>
+                <spring.redis.password>epdc!redis@master1405</spring.redis.password>
 
                 <spring.datasource.druid.url>
                     <![CDATA[jdbc:mysql://47.104.224.45:3308/js_esua_epdc_admin?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
@@ -195,6 +199,10 @@
 
                 <nacos.register-enabled>true</nacos.register-enabled>
                 <nacos.server-addr>47.104.224.45:8848</nacos.server-addr>
+                <nacos.ip></nacos.ip>
+                <nacos.namespace>fa5bf520-09c1-410c-a876-28e98c0534d3</nacos.namespace>
+
+                <fastdfs.server-addr></fastdfs.server-addr>
             </properties>
         </profile>
 

esua-epdc/epdc-module/epdc-oss/epdc-oss-server/src/main/resources/application.yml

@@ -31,6 +31,8 @@ spring:
       discovery:
         server-addr: @nacos.server-addr@
         register-enabled: @nacos.register-enabled@
+        ip: @nacos.ip@
+        namespace: @nacos.namespace@
     alibaba:
       seata:
         tx-service-group: epdc-oss-server-fescar-service-group

esua-epdc/epdc-module/epdc-oss/epdc-oss-server/src/main/resources/registry.conf

@@ -4,7 +4,7 @@ registry {
 
   nacos {
     serverAddr = "@nacos.server-addr@"
-    namespace = "public"
+    namespace = "@nacos.namespace@"
     cluster = "default"
   }
 }
@@ -15,7 +15,7 @@ config {
 
   nacos {
     serverAddr = "@nacos.server-addr@"
-    namespace = "public"
+    namespace = "@nacos.namespace@"
     cluster = "default"
   }
 }

esua-epdc/epdc-module/epdc-user/epdc-user-server/pom.xml

@@ -123,9 +123,9 @@
                 <server.port>9068</server.port>
 
                 <spring.redis.index>2</spring.redis.index>
-                <spring.redis.host>47.104.224.45</spring.redis.host>
+                <spring.redis.host>114.215.125.123</spring.redis.host>
-                <spring.redis.port>6379</spring.redis.port>
+                <spring.redis.port>9603</spring.redis.port>
-                <spring.redis.password>elink@888</spring.redis.password>
+                <spring.redis.password>epdc!redis@master1405</spring.redis.password>
 
                 <spring.datasource.druid.url>
                     <![CDATA[jdbc:mysql://47.104.224.45:3308/js_esua_epdc_user?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
@@ -135,6 +135,8 @@
 
                 <nacos.register-enabled>false</nacos.register-enabled>
                 <nacos.server-addr>47.104.224.45:8848</nacos.server-addr>
+                <nacos.ip></nacos.ip>
+                <nacos.namespace>fa5bf520-09c1-410c-a876-28e98c0534d3</nacos.namespace>
                 <!--RocketMQ-->
                 <rocketmq.name.server>47.104.85.99:9876;114.215.125.123:9876</rocketmq.name.server>
                 <rocketmq.consumer.group>jinshui-organizationGroup</rocketmq.consumer.group>
@@ -146,12 +148,12 @@
             <properties>
                 <spring.profiles.active>test</spring.profiles.active>
 
-                <server.port>9068</server.port>
+                <server.port>11009</server.port>
 
                 <spring.redis.index>2</spring.redis.index>
-                <spring.redis.host>47.104.224.45</spring.redis.host>
+                <spring.redis.host>114.215.125.123</spring.redis.host>
-                <spring.redis.port>6379</spring.redis.port>
+                <spring.redis.port>9603</spring.redis.port>
-                <spring.redis.password>elink@888</spring.redis.password>
+                <spring.redis.password>epdc!redis@master1405</spring.redis.password>
 
                 <spring.datasource.druid.url>
                     <![CDATA[jdbc:mysql://47.104.224.45:3308/js_esua_epdc_user?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
@@ -161,6 +163,8 @@
 
                 <nacos.register-enabled>true</nacos.register-enabled>
                 <nacos.server-addr>47.104.224.45:8848</nacos.server-addr>
+                <nacos.ip>219.146.91.110</nacos.ip>
+                <nacos.namespace>fa5bf520-09c1-410c-a876-28e98c0534d3</nacos.namespace>
                 <!--RocketMQ-->
                 <rocketmq.name.server>47.104.85.99:9876;114.215.125.123:9876</rocketmq.name.server>
                 <rocketmq.consumer.group>jinshui-organizationGroup</rocketmq.consumer.group>

esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/application.yml

@@ -36,6 +36,8 @@ spring:
       discovery:
         server-addr: @nacos.server-addr@
         register-enabled: @nacos.register-enabled@
+        ip: @nacos.ip@
+        namespace: @nacos.namespace@
     alibaba:
       seata:
         tx-service-group: epdc-user-server-fescar-service-group

esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/registry.conf

@@ -4,7 +4,7 @@ registry {
 
   nacos {
     serverAddr = "@nacos.server-addr@"
-    namespace = "public"
+    namespace = "@nacos.namespace@"
     cluster = "default"
   }
 }
@@ -15,7 +15,7 @@ config {
 
   nacos {
     serverAddr = "@nacos.server-addr@"
-    namespace = "public"
+    namespace = "@nacos.namespace@"
     cluster = "default"
   }
 }

esua-epdc/epdc-module/epdc-webservice/epdc-webservice.iml

@@ -124,7 +124,6 @@
     <orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-to-slf4j:2.11.2" level="project" />
     <orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-api:2.11.2" level="project" />
     <orderEntry type="library" name="Maven: org.slf4j:jul-to-slf4j:1.7.26" level="project" />
-    <orderEntry type="library" name="Maven: javax.annotation:javax.annotation-api:1.3.2" level="project" />
     <orderEntry type="library" scope="RUNTIME" name="Maven: org.yaml:snakeyaml:1.23" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-json:2.1.7.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.9.9" level="project" />
@@ -185,12 +184,9 @@
     <orderEntry type="library" name="Maven: org.apache.cxf:cxf-rt-transports-http:3.3.0" level="project" />
     <orderEntry type="library" name="Maven: org.apache.cxf:cxf-core:3.3.0" level="project" />
     <orderEntry type="library" name="Maven: org.glassfish.jaxb:jaxb-runtime:2.3.1" level="project" />
-    <orderEntry type="library" name="Maven: javax.xml.bind:jaxb-api:2.3.1" level="project" />
     <orderEntry type="library" name="Maven: org.glassfish.jaxb:txw2:2.3.1" level="project" />
     <orderEntry type="library" name="Maven: com.sun.istack:istack-commons-runtime:3.0.7" level="project" />
-    <orderEntry type="library" name="Maven: org.jvnet.staxex:stax-ex:1.8" level="project" />
     <orderEntry type="library" name="Maven: com.sun.xml.fastinfoset:FastInfoset:1.2.15" level="project" />
-    <orderEntry type="library" name="Maven: javax.activation:javax.activation-api:1.2.0" level="project" />
     <orderEntry type="library" name="Maven: com.fasterxml.woodstox:woodstox-core:5.0.3" level="project" />
     <orderEntry type="library" name="Maven: org.codehaus.woodstox:stax2-api:3.1.4" level="project" />
     <orderEntry type="library" name="Maven: org.apache.ws.xmlschema:xmlschema-core:2.2.4" level="project" />
@@ -218,6 +214,17 @@
     <orderEntry type="library" name="Maven: org.apache.cxf:cxf-rt-ws-policy:3.3.0" level="project" />
     <orderEntry type="library" name="Maven: org.apache.neethi:neethi:3.1.1" level="project" />
     <orderEntry type="library" name="Maven: javax.validation:validation-api:2.0.1.Final" level="project" />
+    <orderEntry type="library" name="Maven: javax.annotation:javax.annotation-api:1.3.2" level="project" />
+    <orderEntry type="library" name="Maven: javax.xml.ws:jaxws-api:2.3.1" level="project" />
+    <orderEntry type="library" name="Maven: javax.xml.soap:javax.xml.soap-api:1.4.0" level="project" />
+    <orderEntry type="library" name="Maven: com.sun.activation:javax.activation:1.2.0" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.geronimo.specs:geronimo-ws-metadata_2.0_spec:1.1.3" level="project" />
+    <orderEntry type="library" name="Maven: com.sun.xml.messaging.saaj:saaj-impl:1.5.0" level="project" />
+    <orderEntry type="library" name="Maven: org.jvnet.mimepull:mimepull:1.9.11" level="project" />
+    <orderEntry type="library" name="Maven: org.jvnet.staxex:stax-ex:1.8" level="project" />
+    <orderEntry type="library" name="Maven: javax.activation:activation:1.1" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.geronimo.specs:geronimo-jta_1.1_spec:1.1.1" level="project" />
+    <orderEntry type="library" name="Maven: org.jboss.spec.javax.rmi:jboss-rmi-api_1.0_spec:1.0.6.Final" level="project" />
     <orderEntry type="library" scope="PROVIDED" name="Maven: org.projectlombok:lombok:1.18.8" level="project" />
     <orderEntry type="library" name="Maven: com.thoughtworks.xstream:xstream:1.4.11.1" level="project" />
     <orderEntry type="library" name="Maven: xmlpull:xmlpull:1.1.3.1" level="project" />
@@ -240,5 +247,7 @@
     <orderEntry type="library" scope="TEST" name="Maven: com.vaadin.external.google:android-json:0.0.20131108.vaadin1" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.springframework:spring-test:5.1.9.RELEASE" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.xmlunit:xmlunit-core:2.6.3" level="project" />
+    <orderEntry type="library" name="Maven: javax.xml.bind:jaxb-api:2.3.1" level="project" />
+    <orderEntry type="library" name="Maven: javax.activation:javax.activation-api:1.2.0" level="project" />
   </component>
 </module>

esua-epdc/epdc-module/epdc-webservice/pom.xml

@@ -167,74 +167,6 @@
                 <server.port>9075</server.port>
                 <spring.profiles.active>prod</spring.profiles.active>
 
-                <spring.redis.index>0</spring.redis.index>
-                <spring.redis.host>10.5.34.164</spring.redis.host>
-                <spring.redis.port>6379</spring.redis.port>
-                <spring.redis.password>Elink@833066</spring.redis.password>
-
-                <spring.datasource.druid.url>
-                    <![CDATA[jdbc:mysql://10.5.34.164:3306/esua_epdc_events?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
-                </spring.datasource.druid.url>
-                <spring.datasource.druid.username>epdc</spring.datasource.druid.username>
-                <spring.datasource.druid.password>Elink@833066</spring.datasource.druid.password>
-
-                <nacos.register-enabled>false</nacos.register-enabled>
-                <nacos.server-addr>10.5.34.164:8848</nacos.server-addr>
-            </properties>
-        </profile>
-        <profile>
-            <id>prod_kongcun</id>
-            <properties>
-                <server.port>9075</server.port>
-                <spring.profiles.active>prod</spring.profiles.active>
-
-                <!-- redis配置 -->
-                <spring.redis.index>0</spring.redis.index>
-                <spring.redis.host>172.16.1.238</spring.redis.host>
-                <spring.redis.port>6379</spring.redis.port>
-                <spring.redis.password>Elink833066</spring.redis.password>
-
-                <spring.datasource.druid.url>
-                    <![CDATA[jdbc:mysql://172.16.1.239:3306/esua_epdc_events?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
-                </spring.datasource.druid.url>
-                <spring.datasource.druid.username>epdc</spring.datasource.druid.username>
-                <spring.datasource.druid.password>Elink@833066</spring.datasource.druid.password>
-
-                <!-- nacos -->
-                <nacos.register-enabled>false</nacos.register-enabled>
-                <nacos.server-addr>172.16.1.238:8848</nacos.server-addr>
-            </properties>
-        </profile>
-        <profile>
-            <id>prod_shibei_aliyun</id>
-            <properties>
-                <server.port>9075</server.port>
-                <spring.profiles.active>prod</spring.profiles.active>
-
-                <!-- redis配置 -->
-                <spring.redis.index>0</spring.redis.index>
-                <spring.redis.host>172.16.0.54</spring.redis.host>
-                <spring.redis.port>6379</spring.redis.port>
-                <spring.redis.password>Elink833066</spring.redis.password>
-
-                <spring.datasource.druid.url>
-                    <![CDATA[jdbc:mysql://172.16.0.52:3306/esua_epdc_events?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
-                </spring.datasource.druid.url>
-                <spring.datasource.druid.username>epdc</spring.datasource.druid.username>
-                <spring.datasource.druid.password>Elink@833066</spring.datasource.druid.password>
-
-                <!-- nacos -->
-                <nacos.register-enabled>false</nacos.register-enabled>
-                <nacos.server-addr>172.16.0.52:8848</nacos.server-addr>
-            </properties>
-        </profile>
-
-        <profile>
-            <id>prod_jinshui</id>
-            <properties>
-                <server.port>9075</server.port>
-                <spring.profiles.active>prod</spring.profiles.active>
-
                 <!-- redis配置 -->
                 <spring.redis.index>0</spring.redis.index>
                 <spring.redis.host>172.19.0.11</spring.redis.host>

esua-epdc/epdc-module/epdc-websocket/epdc-websocket-server/pom.xml

@@ -141,9 +141,9 @@
                 <server.port>9988</server.port>
 
                 <spring.redis.index>2</spring.redis.index>
-                <spring.redis.host>47.104.224.45</spring.redis.host>
+                <spring.redis.host>114.215.125.123</spring.redis.host>
-                <spring.redis.port>6379</spring.redis.port>
+                <spring.redis.port>9603</spring.redis.port>
-                <spring.redis.password>elink@888</spring.redis.password>
+                <spring.redis.password>epdc!redis@master1405</spring.redis.password>
 
                 <spring.datasource.druid.url>
                     <![CDATA[jdbc:mysql://47.104.224.45:3308/js_esua_epdc_api?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
@@ -153,14 +153,8 @@
 
                 <nacos.register-enabled>false</nacos.register-enabled>
                 <nacos.server-addr>47.104.224.45:8848</nacos.server-addr>
-                <!--公众号配置-->
+                <nacos.ip></nacos.ip>
-                <wx.mp.configs.appId>wx3ef8f2cd12a19fcb</wx.mp.configs.appId>
+                <nacos.namespace>fa5bf520-09c1-410c-a876-28e98c0534d3</nacos.namespace>
-                <wx.mp.configs.secret>948aa2f21dbaa3943288ea5b119ac6f2</wx.mp.configs.secret>
-                <wx.mp.configs.token>111</wx.mp.configs.token>
-                <wx.mp.configs.aesKey>111</wx.mp.configs.aesKey>
-                <!--小程序配置-->
-                <wx.ma.appId>wxdd8530c5f4926766</wx.ma.appId>
-                <wx.ma.secret>5bf4fb813145431b3493a10aa7e041e9</wx.ma.secret>
             </properties>
         </profile>
 
@@ -169,12 +163,12 @@
             <properties>
                 <spring.profiles.active>test</spring.profiles.active>
 
-                <server.port>9988</server.port>
+                <server.port>11010</server.port>
 
                 <spring.redis.index>2</spring.redis.index>
-                <spring.redis.host>47.104.224.45</spring.redis.host>
+                <spring.redis.host>114.215.125.123</spring.redis.host>
-                <spring.redis.port>6379</spring.redis.port>
+                <spring.redis.port>9603</spring.redis.port>
-                <spring.redis.password>elink@888</spring.redis.password>
+                <spring.redis.password>epdc!redis@master1405</spring.redis.password>
 
                 <spring.datasource.druid.url>
                     <![CDATA[jdbc:mysql://47.104.224.45:3308/js_esua_epdc_api?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
@@ -184,17 +178,8 @@
 
                 <nacos.register-enabled>true</nacos.register-enabled>
                 <nacos.server-addr>47.104.224.45:8848</nacos.server-addr>
-                <!--公众号配置-->
+                <nacos.ip>219.146.91.110</nacos.ip>
-                <wx.mp.configs.appId>wx3ef8f2cd12a19fcb</wx.mp.configs.appId>
+                <nacos.namespace>fa5bf520-09c1-410c-a876-28e98c0534d3</nacos.namespace>
-                <wx.mp.configs.secret>948aa2f21dbaa3943288ea5b119ac6f2</wx.mp.configs.secret>
-                <wx.mp.configs.token>111</wx.mp.configs.token>
-                <wx.mp.configs.aesKey>111</wx.mp.configs.aesKey>
-                <!--小程序配置-->
-<!--                <wx.ma.appId>wxdd8530c5f4926766</wx.ma.appId>-->
-<!--                <wx.ma.secret>5bf4fb813145431b3493a10aa7e041e9</wx.ma.secret>-->
-
-                <wx.ma.appId>wx5d3e97461d248397</wx.ma.appId>
-                <wx.ma.secret>bfed51b731e53db9affb9e6131e7ae12</wx.ma.secret>
             </properties>
         </profile>
 
@@ -221,15 +206,6 @@
                 </spring.datasource.druid.url>
                 <spring.datasource.druid.username>epdc</spring.datasource.druid.username>
                 <spring.datasource.druid.password>Elink@833066</spring.datasource.druid.password>
-
-                <!--公众号配置-->
-                <wx.mp.configs.appId>wx3ef8f2cd12a19fcb</wx.mp.configs.appId>
-                <wx.mp.configs.secret>948aa2f21dbaa3943288ea5b119ac6f2</wx.mp.configs.secret>
-                <wx.mp.configs.token>111</wx.mp.configs.token>
-                <wx.mp.configs.aesKey>111</wx.mp.configs.aesKey>
-                <!--居民端小程序配置-->
-                <wx.ma.appId>wx6dcf544cdae7d4ec</wx.ma.appId>
-                <wx.ma.secret>9e0882274ad3821400370312a56a8470</wx.ma.secret>
             </properties>
         </profile>
     </profiles>

esua-epdc/epdc-module/epdc-websocket/epdc-websocket-server/src/main/resources/application.yml

@@ -26,6 +26,8 @@ spring:
       discovery:
         server-addr: @nacos.server-addr@
         register-enabled: @nacos.register-enabled@
+        ip: @nacos.ip@
+        namespace: @nacos.namespace@
 
 feign:
   hystrix: