From b5301a5b25f403202f8404709903ecabac708f02 Mon Sep 17 00:00:00 2001
From: yujt <work@yujt.net.cn>
Date: Tue, 8 Sep 2020 11:00:01 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=A0=E9=99=A4=E5=AD=90=E6=A8=A1=E5=9D=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitmodules               | 3 ---
 epdc-cloud-gateway-yushan | 1 -
 epdc-cloud-group/pom.xml  | 8 ++++----
 pom.xml                   | 1 -
 4 files changed, 4 insertions(+), 9 deletions(-)
 delete mode 160000 epdc-cloud-gateway-yushan

diff --git a/.gitmodules b/.gitmodules
index 3f1f4a2..682ae57 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -4,9 +4,6 @@
 [submodule "epdc-cloud-commons-yushan"]
 	path = epdc-cloud-commons-yushan
 	url = http://121.42.41.42:7070/r/epdc-cloud-commons-yushan.git
-[submodule "epdc-cloud-gateway-yushan"]
-	path = epdc-cloud-gateway-yushan
-	url = http://121.42.41.42:7070/r/epdc-cloud-gateway-yushan.git
 [submodule "epdc-cloud-parent-yushan"]
 	path = epdc-cloud-parent-yushan
 	url = http://121.42.41.42:7070/r/epdc-cloud-parent-yushan.git
diff --git a/epdc-cloud-gateway-yushan b/epdc-cloud-gateway-yushan
deleted file mode 160000
index 2930742..0000000
--- a/epdc-cloud-gateway-yushan
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 29307425ebc6c065fa5c2559dd4aa1013a8a7a77
diff --git a/epdc-cloud-group/pom.xml b/epdc-cloud-group/pom.xml
index 0030233..a457295 100644
--- a/epdc-cloud-group/pom.xml
+++ b/epdc-cloud-group/pom.xml
@@ -179,15 +179,15 @@
                 <spring.profiles.active>test</spring.profiles.active>
                 <docker.tag>test</docker.tag>
 
-                <server.port>10007</server.port>
+                <server.port>17030</server.port>
 
-                <spring.redis.index>2</spring.redis.index>
+                <spring.redis.index>9</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/esua_epdc_group?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                    <![CDATA[jdbc:mysql://47.104.224.45:3308/yushan_esua_epdc_group?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
                 </spring.datasource.druid.url>
                 <spring.datasource.druid.username>epdcyushan</spring.datasource.druid.username>
                 <spring.datasource.druid.password>elink833066</spring.datasource.druid.password>
@@ -197,7 +197,7 @@
                 <nacos.ip>47.104.85.99</nacos.ip>
                 <nacos.namespace>de000340-5fc4-45aa-bdbc-dd96852012ad</nacos.namespace>
                 <!--RocketMQ-->
-                <rocketmq.name.server>47.104.85.99:9876;114.215.125.123:9876</rocketmq.name.server>
+                <rocketmq.name.server>47.104.85.99:9876</rocketmq.name.server>
                 <rocketmq.consumer.group>organizationGroup</rocketmq.consumer.group>
             </properties>
             <!--<properties>
diff --git a/pom.xml b/pom.xml
index 0b74fc2..f73f3de 100644
--- a/pom.xml
+++ b/pom.xml
@@ -14,7 +14,6 @@
         <module>epdc-cloud-group</module>
         <module>epdc-cloud-client-yushan</module>
         <module>epdc-cloud-commons-yushan</module>
-        <module>epdc-cloud-gateway-yushan</module>
         <module>epdc-cloud-parent-yushan</module>
     </modules>
 </project>