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

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

@@ -138,6 +138,17 @@
                 <server.port>9092</server.port>
                 <spring.profiles.active>dev</spring.profiles.active>
 
+                <spring.redis.index>2</spring.redis.index>
+                <spring.redis.host>114.215.125.123</spring.redis.host>
+                <spring.redis.port>9603</spring.redis.port>
+                <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]]>
+                </spring.datasource.druid.url>
+                <spring.datasource.druid.username>jinshui</spring.datasource.druid.username>
+                <spring.datasource.druid.password>jinshui@833066</spring.datasource.druid.password>
+
                 <!-- nacos -->
                 <nacos.register-enabled>false</nacos.register-enabled>
                 <nacos.server-addr>47.104.224.45:8848</nacos.server-addr>
@@ -160,6 +171,17 @@
                 <server.port>9308</server.port>
                 <spring.profiles.active>test</spring.profiles.active>
 
+                <spring.redis.index>2</spring.redis.index>
+                <spring.redis.host>114.215.125.123</spring.redis.host>
+                <spring.redis.port>9603</spring.redis.port>
+                <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]]>
+                </spring.datasource.druid.url>
+                <spring.datasource.druid.username>jinshui</spring.datasource.druid.username>
+                <spring.datasource.druid.password>jinshui@833066</spring.datasource.druid.password>
+
                 <!-- nacos -->
                 <nacos.register-enabled>true</nacos.register-enabled>
                 <nacos.server-addr>47.104.224.45:8848</nacos.server-addr>

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

@@ -1,31 +1,16 @@
 spring:
   redis:
-    database: 2
-    host: 47.104.224.45
+    database: @spring.redis.index@
+    host: @spring.redis.host@
     timeout: 30s
-    port: 6379
-    password: elink@888
+    port: @spring.redis.port@
+    password: @spring.redis.password@
   datasource:
     druid:
       driver-class-name: com.mysql.cj.jdbc.Driver
-      url: jdbc:mysql://47.104.224.45:3308/esua_epdc_admin?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
-      username: epdc
-      password: elink833066
-      #Oracle
-#      driver-class-name: oracle.jdbc.OracleDriver
-#      url: jdbc:oracle:thin:@localhost:1521:xe
-#      username: renren_cloud
-#      password: 123456
-      #SQLServer
-#      driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
-#      url: jdbc:sqlserver://localhost:1433;DatabaseName=renren_cloud
-#      username: sa
-#      password: 123456
-      #postgresql
-#      driver-class-name: org.postgresql.Driver
-#      url: jdbc:postgresql://localhost:5432/renren_cloud
-#      username: postgres
-#      password: 123456
+      url: @spring.datasource.druid.url@
+      username: @spring.datasource.druid.username@
+      password: @spring.datasource.druid.password@
       initial-size: 10
       max-active: 100
       min-idle: 10
@@ -39,18 +24,13 @@ spring:
       test-while-idle: true
       test-on-borrow: false
       test-on-return: false
-
-
-##多数据源的配置，需要引用renren-commons-dynamic-datasource
-#dynamic:
-#  datasource:
-#    slave1:
-#      driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
-#      url: jdbc:sqlserver://localhost:1433;DatabaseName=renren_cloud
-#      username: sa
-#      password: 123456
-#    slave2:
-#      driver-class-name: org.postgresql.Driver
-#      url: jdbc:postgresql://localhost:5432/renren_cloud
-#      username: postgres
-#      password: 123456
+      stat-view-servlet:
+        enabled: true
+        url-pattern: /druid/*
+        #login-username: admin
+        #login-password: admin
+      filter:
+        stat:
+          log-slow-sql: true
+          slow-sql-millis: 1000
+          merge-sql: false

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

@@ -1,16 +1,16 @@
 spring:
   redis:
-    database: 2
-    host: 47.104.224.45
+    database: @spring.redis.index@
+    host: @spring.redis.host@
     timeout: 30s
-    port: 6379
-    password: elink@888
+    port: @spring.redis.port@
+    password: @spring.redis.password@
   datasource:
     druid:
       driver-class-name: com.mysql.cj.jdbc.Driver
-      url: jdbc:mysql://47.104.224.45:3308/esua_epdc_admin?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
-      username: epdc
-      password: elink833066
+      url: @spring.datasource.druid.url@
+      username: @spring.datasource.druid.username@
+      password: @spring.datasource.druid.password@
       initial-size: 10
       max-active: 100
       min-idle: 10

esua-epdc/epdc-module/epdc-api/epdc-api-server/epdc-api-server.iml

@@ -255,5 +255,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" 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-api/epdc-api-server/pom.xml

@@ -157,10 +157,10 @@
                 <spring.redis.password>elink@888</spring.redis.password>
 
                 <spring.datasource.druid.url>
-                    <![CDATA[jdbc:mysql://47.104.224.45:3308/esua_epdc_api?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                    <![CDATA[jdbc:mysql://47.104.224.45:3308/js_esua_epdc_api?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>elink833066</spring.datasource.druid.password>
+                <spring.datasource.druid.username>jinshui</spring.datasource.druid.username>
+                <spring.datasource.druid.password>jinshui@833066</spring.datasource.druid.password>
 
                 <nacos.register-enabled>false</nacos.register-enabled>
                 <nacos.server-addr>47.104.224.45:8848</nacos.server-addr>
@@ -191,10 +191,10 @@
                 <spring.redis.password>elink@888</spring.redis.password>
 
                 <spring.datasource.druid.url>
-                    <![CDATA[jdbc:mysql://47.104.224.45:3308/esua_epdc_api?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                    <![CDATA[jdbc:mysql://47.104.224.45:3308/js_esua_epdc_api?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>elink833066</spring.datasource.druid.password>
+                <spring.datasource.druid.username>jinshui</spring.datasource.druid.username>
+                <spring.datasource.druid.password>jinshui@833066</spring.datasource.druid.password>
 
                 <nacos.register-enabled>true</nacos.register-enabled>
                 <nacos.server-addr>47.104.224.45:8848</nacos.server-addr>

esua-epdc/epdc-module/epdc-api/epdc-api.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-custom/epdc-custom-server/pom.xml

@@ -134,10 +134,10 @@
                 <spring.redis.password>elink@888</spring.redis.password>
 
                 <spring.datasource.druid.url>
-                    <![CDATA[jdbc:mysql://47.104.224.45:3308/esua_epdc_custom?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                    <![CDATA[jdbc:mysql://47.104.224.45:3308/js_esua_epdc_custom?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>elink833066</spring.datasource.druid.password>
+                <spring.datasource.druid.username>jinshui</spring.datasource.druid.username>
+                <spring.datasource.druid.password>jinshui@833066</spring.datasource.druid.password>
 
                 <nacos.register-enabled>false</nacos.register-enabled>
                 <nacos.server-addr>47.104.224.45:8848</nacos.server-addr>
@@ -158,10 +158,10 @@
                 <spring.redis.password>elink@888</spring.redis.password>
 
                 <spring.datasource.druid.url>
-                    <![CDATA[jdbc:mysql://47.104.224.45:3308/esua_epdc_custom?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                    <![CDATA[jdbc:mysql://47.104.224.45:3308/js_esua_epdc_custom?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>elink833066</spring.datasource.druid.password>
+                <spring.datasource.druid.username>jinshui</spring.datasource.druid.username>
+                <spring.datasource.druid.password>jinshui@833066</spring.datasource.druid.password>
 
                 <nacos.register-enabled>true</nacos.register-enabled>
                 <nacos.server-addr>47.104.224.45:8848</nacos.server-addr>

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

@@ -153,10 +153,10 @@
                 <spring.redis.password>elink@888</spring.redis.password>
 
                 <spring.datasource.druid.url>
-                    <![CDATA[jdbc:mysql://47.104.224.45:3308/esua_epdc_events?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                    <![CDATA[jdbc:mysql://47.104.224.45:3308/js_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>elink833066</spring.datasource.druid.password>
+                <spring.datasource.druid.username>jinshui</spring.datasource.druid.username>
+                <spring.datasource.druid.password>jinshui@833066</spring.datasource.druid.password>
 
                 <nacos.register-enabled>false</nacos.register-enabled>
                 <nacos.server-addr>47.104.224.45:8848</nacos.server-addr>
@@ -191,10 +191,10 @@
                 <spring.redis.password>elink@888</spring.redis.password>
 
                 <spring.datasource.druid.url>
-                    <![CDATA[jdbc:mysql://47.104.224.45:3308/esua_epdc_events?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                    <![CDATA[jdbc:mysql://47.104.224.45:3308/js_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>elink833066</spring.datasource.druid.password>
+                <spring.datasource.druid.username>jinshui</spring.datasource.druid.username>
+                <spring.datasource.druid.password>jinshui@833066</spring.datasource.druid.password>
 
                 <nacos.register-enabled>true</nacos.register-enabled>
                 <nacos.server-addr>47.104.224.45:8848</nacos.server-addr>

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

@@ -129,10 +129,10 @@
                 <spring.redis.password>elink@888</spring.redis.password>
 
                 <spring.datasource.druid.url>
-                    <![CDATA[jdbc:mysql://47.104.224.45:3308/esua_epdc_group?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                    <![CDATA[jdbc:mysql://47.104.224.45:3308/js_esua_epdc_group?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>elink833066</spring.datasource.druid.password>
+                <spring.datasource.druid.username>jinshui</spring.datasource.druid.username>
+                <spring.datasource.druid.password>jinshui@833066</spring.datasource.druid.password>
 
                 <nacos.register-enabled>false</nacos.register-enabled>
                 <nacos.server-addr>47.104.224.45:8848</nacos.server-addr>
@@ -155,10 +155,10 @@
                 <spring.redis.password>elink@888</spring.redis.password>
 
                 <spring.datasource.druid.url>
-                    <![CDATA[jdbc:mysql://47.104.224.45:3308/esua_epdc_group?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                    <![CDATA[jdbc:mysql://47.104.224.45:3308/js_esua_epdc_group?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>elink833066</spring.datasource.druid.password>
+                <spring.datasource.druid.username>jinshui</spring.datasource.druid.username>
+                <spring.datasource.druid.password>jinshui@833066</spring.datasource.druid.password>
 
                 <nacos.register-enabled>true</nacos.register-enabled>
                 <nacos.server-addr>47.104.224.45:8848</nacos.server-addr>

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

@@ -152,10 +152,10 @@
                 <spring.redis.password>elink@888</spring.redis.password>
 
                 <spring.datasource.druid.url>
-                    <![CDATA[jdbc:mysql://47.104.224.45:3308/esua_epdc_job?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                    <![CDATA[jdbc:mysql://47.104.224.45:3308/js_esua_epdc_job?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>elink833066</spring.datasource.druid.password>
+                <spring.datasource.druid.username>jinshui</spring.datasource.druid.username>
+                <spring.datasource.druid.password>jinshui@833066</spring.datasource.druid.password>
 
                 <nacos.register-enabled>false</nacos.register-enabled>
                 <nacos.server-addr>47.104.224.45:8848</nacos.server-addr>
@@ -175,10 +175,10 @@
                 <spring.redis.password>elink@888</spring.redis.password>
 
                 <spring.datasource.druid.url>
-                    <![CDATA[jdbc:mysql://47.104.224.45:3308/esua_epdc_job?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                    <![CDATA[jdbc:mysql://47.104.224.45:3308/js_esua_epdc_job?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>elink833066</spring.datasource.druid.password>
+                <spring.datasource.druid.username>jinshui</spring.datasource.druid.username>
+                <spring.datasource.druid.password>jinshui@833066</spring.datasource.druid.password>
 
                 <nacos.register-enabled>true</nacos.register-enabled>
                 <nacos.server-addr>47.104.224.45:8848</nacos.server-addr>

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

@@ -123,10 +123,10 @@
                 <spring.redis.password>elink@888</spring.redis.password>
 
                 <spring.datasource.druid.url>
-                    <![CDATA[jdbc:mysql://47.104.224.45:3308/esua_epdc_kpi?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                    <![CDATA[jdbc:mysql://47.104.224.45:3308/js_esua_epdc_kpi?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>elink833066</spring.datasource.druid.password>
+                <spring.datasource.druid.username>jinshui</spring.datasource.druid.username>
+                <spring.datasource.druid.password>jinshui@833066</spring.datasource.druid.password>
 
                 <nacos.register-enabled>false</nacos.register-enabled>
                 <nacos.server-addr>47.104.224.45:8848</nacos.server-addr>
@@ -146,10 +146,10 @@
                 <spring.redis.password>elink@888</spring.redis.password>
 
                 <spring.datasource.druid.url>
-                    <![CDATA[jdbc:mysql://47.104.224.45:3308/esua_epdc_kpi?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                    <![CDATA[jdbc:mysql://47.104.224.45:3308/js_esua_epdc_kpi?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>elink833066</spring.datasource.druid.password>
+                <spring.datasource.druid.username>jinshui</spring.datasource.druid.username>
+                <spring.datasource.druid.password>jinshui@833066</spring.datasource.druid.password>
 
                 <nacos.register-enabled>true</nacos.register-enabled>
                 <nacos.server-addr>47.104.224.45:8848</nacos.server-addr>

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

@@ -152,10 +152,10 @@
                 <spring.redis.password>elink@888</spring.redis.password>
 
                 <spring.datasource.druid.url>
-                    <![CDATA[jdbc:mysql://47.104.224.45:3308/esua_epdc_admin?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                    <![CDATA[jdbc:mysql://47.104.224.45:3308/js_esua_epdc_admin?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>elink833066</spring.datasource.druid.password>
+                <spring.datasource.druid.username>jinshui</spring.datasource.druid.username>
+                <spring.datasource.druid.password>jinshui@833066</spring.datasource.druid.password>
 
                 <nacos.register-enabled>false</nacos.register-enabled>
                 <nacos.server-addr>47.104.224.45:8848</nacos.server-addr>
@@ -175,10 +175,10 @@
                 <spring.redis.password>elink@888</spring.redis.password>
 
                 <spring.datasource.druid.url>
-                    <![CDATA[jdbc:mysql://47.104.224.45:3308/esua_epdc_admin?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                    <![CDATA[jdbc:mysql://47.104.224.45:3308/js_esua_epdc_admin?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>elink833066</spring.datasource.druid.password>
+                <spring.datasource.druid.username>jinshui</spring.datasource.druid.username>
+                <spring.datasource.druid.password>jinshui@833066</spring.datasource.druid.password>
 
                 <nacos.register-enabled>true</nacos.register-enabled>
                 <nacos.server-addr>47.104.224.45:8848</nacos.server-addr>

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

@@ -123,10 +123,10 @@
                 <spring.redis.password>elink@888</spring.redis.password>
 
                 <spring.datasource.druid.url>
-                    <![CDATA[jdbc:mysql://47.104.224.45:3308/esua_epdc_news?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                    <![CDATA[jdbc:mysql://47.104.224.45:3308/js_esua_epdc_news?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>elink833066</spring.datasource.druid.password>
+                <spring.datasource.druid.username>jinshui</spring.datasource.druid.username>
+                <spring.datasource.druid.password>jinshui@833066</spring.datasource.druid.password>
 
                 <nacos.register-enabled>false</nacos.register-enabled>
                 <nacos.server-addr>47.104.224.45:8848</nacos.server-addr>
@@ -149,10 +149,10 @@
                 <spring.redis.password>elink@888</spring.redis.password>
 
                 <spring.datasource.druid.url>
-                    <![CDATA[jdbc:mysql://47.104.224.45:3308/esua_epdc_news?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                    <![CDATA[jdbc:mysql://47.104.224.45:3308/js_esua_epdc_news?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>elink833066</spring.datasource.druid.password>
+                <spring.datasource.druid.username>jinshui</spring.datasource.druid.username>
+                <spring.datasource.druid.password>jinshui@833066</spring.datasource.druid.password>
 
                 <nacos.register-enabled>true</nacos.register-enabled>
                 <nacos.server-addr>47.104.224.45:8848</nacos.server-addr>

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

@@ -165,10 +165,10 @@
                 <spring.redis.password>elink@888</spring.redis.password>
 
                 <spring.datasource.druid.url>
-                    <![CDATA[jdbc:mysql://47.104.224.45:3308/esua_epdc_admin?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                    <![CDATA[jdbc:mysql://47.104.224.45:3308/js_esua_epdc_admin?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>elink833066</spring.datasource.druid.password>
+                <spring.datasource.druid.username>jinshui</spring.datasource.druid.username>
+                <spring.datasource.druid.password>jinshui@833066</spring.datasource.druid.password>
 
                 <nacos.register-enabled>false</nacos.register-enabled>
                 <nacos.server-addr>47.104.224.45:8848</nacos.server-addr>
@@ -188,10 +188,10 @@
                 <spring.redis.password>elink@888</spring.redis.password>
 
                 <spring.datasource.druid.url>
-                    <![CDATA[jdbc:mysql://47.104.224.45:3308/esua_epdc_admin?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                    <![CDATA[jdbc:mysql://47.104.224.45:3308/js_esua_epdc_admin?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>elink833066</spring.datasource.druid.password>
+                <spring.datasource.druid.username>jinshui</spring.datasource.druid.username>
+                <spring.datasource.druid.password>jinshui@833066</spring.datasource.druid.password>
 
                 <nacos.register-enabled>true</nacos.register-enabled>
                 <nacos.server-addr>47.104.224.45:8848</nacos.server-addr>

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

@@ -128,10 +128,10 @@
                 <spring.redis.password>elink@888</spring.redis.password>
 
                 <spring.datasource.druid.url>
-                    <![CDATA[jdbc:mysql://47.104.224.45:3308/esua_epdc_user?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                    <![CDATA[jdbc:mysql://47.104.224.45:3308/js_esua_epdc_user?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>elink833066</spring.datasource.druid.password>
+                <spring.datasource.druid.username>jinshui</spring.datasource.druid.username>
+                <spring.datasource.druid.password>jinshui@833066</spring.datasource.druid.password>
 
                 <nacos.register-enabled>false</nacos.register-enabled>
                 <nacos.server-addr>47.104.224.45:8848</nacos.server-addr>
@@ -154,10 +154,10 @@
                 <spring.redis.password>elink@888</spring.redis.password>
 
                 <spring.datasource.druid.url>
-                    <![CDATA[jdbc:mysql://47.104.224.45:3308/esua_epdc_user?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                    <![CDATA[jdbc:mysql://47.104.224.45:3308/js_esua_epdc_user?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>elink833066</spring.datasource.druid.password>
+                <spring.datasource.druid.username>jinshui</spring.datasource.druid.username>
+                <spring.datasource.druid.password>jinshui@833066</spring.datasource.druid.password>
 
                 <nacos.register-enabled>true</nacos.register-enabled>
                 <nacos.server-addr>47.104.224.45:8848</nacos.server-addr>

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

@@ -146,10 +146,10 @@
                 <spring.redis.password>elink@888</spring.redis.password>
 
                 <spring.datasource.druid.url>
-                    <![CDATA[jdbc:mysql://47.104.224.45:3308/esua_epdc_api?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                    <![CDATA[jdbc:mysql://47.104.224.45:3308/js_esua_epdc_api?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>elink833066</spring.datasource.druid.password>
+                <spring.datasource.druid.username>jinshui</spring.datasource.druid.username>
+                <spring.datasource.druid.password>jinshui@833066</spring.datasource.druid.password>
 
                 <nacos.register-enabled>false</nacos.register-enabled>
                 <nacos.server-addr>47.104.224.45:8848</nacos.server-addr>
@@ -177,10 +177,10 @@
                 <spring.redis.password>elink@888</spring.redis.password>
 
                 <spring.datasource.druid.url>
-                    <![CDATA[jdbc:mysql://47.104.224.45:3308/esua_epdc_api?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                    <![CDATA[jdbc:mysql://47.104.224.45:3308/js_esua_epdc_api?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>elink833066</spring.datasource.druid.password>
+                <spring.datasource.druid.username>jinshui</spring.datasource.druid.username>
+                <spring.datasource.druid.password>jinshui@833066</spring.datasource.druid.password>
 
                 <nacos.register-enabled>true</nacos.register-enabled>
                 <nacos.server-addr>47.104.224.45:8848</nacos.server-addr>