From d85f6af915fb23f43f1b9b0e46b25f697fbc0064 Mon Sep 17 00:00:00 2001
From: zhangyuan <zhangyuan@sarnasea.com>
Date: Tue, 15 Jun 2021 17:08:05 +0800
Subject: [PATCH] =?UTF-8?q?=E6=97=A0=E7=94=A8=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 epdc-cloud-vim-yushan/pom.xml                 | 80 -------------------
 .../src/main/resources/application.yml        |  1 -
 2 files changed, 81 deletions(-)

diff --git a/epdc-cloud-vim-yushan/pom.xml b/epdc-cloud-vim-yushan/pom.xml
index 4d45a6e..4700eba 100644
--- a/epdc-cloud-vim-yushan/pom.xml
+++ b/epdc-cloud-vim-yushan/pom.xml
@@ -14,22 +14,11 @@
     <packaging>jar</packaging>
 
     <dependencies>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-web</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-context-support</artifactId>
-        </dependency>
-
         <dependency>
             <groupId>com.alibaba.cloud</groupId>
             <artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>
         </dependency>
 
-
         <!-- zipkin client -->
         <dependency>
             <groupId>org.springframework.cloud</groupId>
@@ -50,12 +39,6 @@
         </dependency>
 
         <!-- common start -->
-        <dependency>
-            <groupId>com.esua.epdc.yushan</groupId>
-            <artifactId>epdc-commons-mybatis</artifactId>
-            <version>${epdc-cloud-commons.version}</version>
-        </dependency>
-
         <dependency>
             <groupId>com.esua.epdc.yushan</groupId>
             <artifactId>epdc-commons-dynamic-datasource</artifactId>
@@ -93,7 +76,6 @@
         </dependency>
     </dependencies>
 
-
     <build>
         <finalName>${project.artifactId}</finalName>
         <plugins>
@@ -161,26 +143,6 @@
                 <nacos.namespace>95aea863-dcc6-4f75-b256-9a6061a30a40</nacos.namespace>
 
                 <spring.zipkin.base-url>http://localhost:9411</spring.zipkin.base-url>
-                <!--小程序配置-->
-                <wx.ma.appId>wxdd8530c5f4926766</wx.ma.appId>
-                <wx.ma.secret>5bf4fb813145431b3493a10aa7e041e9</wx.ma.secret>
-                <!--工作端小程序-->
-                <work.wx.ma.appId>wx29b074840ef4bfd9</work.wx.ma.appId>
-                <work.wx.ma.secret>4adb1afccc69f205cdf5b521d74e2aca</work.wx.ma.secret>
-                <!--数据分析端小程序-->
-                <analysis.wx.ma.appId>wxfa4afaa2b5f9c876</analysis.wx.ma.appId>
-                <analysis.wx.ma.secret>7db9f049c78c9a6cafa673deebe8330d</analysis.wx.ma.secret>
-                <!--RocketMQ-->
-                <rocketmq.name.server>47.104.85.99:9876;114.215.125.123:9876</rocketmq.name.server>
-                <rocketmq.producer.group>organizationGroup</rocketmq.producer.group>
-                <rocketmq.consumer.group>organizationGroup</rocketmq.consumer.group>
-                <rocketmq.producer.category.group>categoryGroup</rocketmq.producer.category.group>
-                <rocketmq.consumer.category.group>categoryGroup</rocketmq.consumer.category.group>
-
-                <epmet.secret>6939e90472734ce49cfde1bffced8e52e22451d241fd4c89a5089ae1b6da332b</epmet.secret>
-                <epmet.appId>db0c48cb419c8a73c95af4b370c01bc8</epmet.appId>
-                <epmet.customerId>ab7536372abdc2bd9ad4a4a69cdc0564</epmet.customerId>
-                <epmet.url>http://epmet-dev.elinkservice.cn:48080/api</epmet.url>
             </properties>
         </profile>
 
@@ -203,27 +165,6 @@
                 <nacos.namespace>95aea863-dcc6-4f75-b256-9a6061a30a40</nacos.namespace>
 
                 <spring.zipkin.base-url>http://localhost:9411</spring.zipkin.base-url>
-
-                <!--党群e家小程序配置-->
-                <wx.ma.appId>wx50ebeb95943868cd</wx.ma.appId>
-                <wx.ma.secret>c2719c261fe87b3e2d572552d2c8275d</wx.ma.secret>
-                <!--工作端小程序-->
-                <work.wx.ma.appId>wx6d45fd2f4dfe7ce4</work.wx.ma.appId>
-                <work.wx.ma.secret>54a30a48b100bbad20d7823cd9e1fb17</work.wx.ma.secret>
-                <!--数据分析端小程序-->
-                <analysis.wx.ma.appId>wxfa4afaa2b5f9c876</analysis.wx.ma.appId>
-                <analysis.wx.ma.secret>7db9f049c78c9a6cafa673deebe8330d</analysis.wx.ma.secret>
-                <!--RocketMQ-->
-                <rocketmq.name.server>47.104.85.99:9876;114.215.125.123:9876</rocketmq.name.server>
-                <rocketmq.producer.group>organizationGroup</rocketmq.producer.group>
-                <rocketmq.consumer.group>organizationGroup</rocketmq.consumer.group>
-                <rocketmq.producer.category.group>categoryGroup</rocketmq.producer.category.group>
-                <rocketmq.consumer.category.group>categoryGroup</rocketmq.consumer.category.group>
-
-                <epmet.secret>44ebf984898c497280a149a57c1c7b34b324ba06451148a9a2304b2c0f0035c8</epmet.secret>
-                <epmet.appId>93726b188b7c5f9b7b390bcd198a17a2</epmet.appId>
-                <epmet.customerId>a4bbf298d8e427844038cee466f022ef</epmet.customerId>
-                <epmet.url>https://epmet-test.elinkservice.cn/api</epmet.url>
             </properties>
         </profile>
 
@@ -248,32 +189,11 @@
 
                 <spring.zipkin.base-url>http://172.31.171.61:9411</spring.zipkin.base-url>
 
-                <!--党群e家小程序配置-->
-                <wx.ma.appId>wx50ebeb95943868cd</wx.ma.appId>
-                <wx.ma.secret>c2719c261fe87b3e2d572552d2c8275d</wx.ma.secret>
-                <!--工作端小程序-->
-                <work.wx.ma.appId>wx6d45fd2f4dfe7ce4</work.wx.ma.appId>
-                <work.wx.ma.secret>54a30a48b100bbad20d7823cd9e1fb17</work.wx.ma.secret>
-                <!--数据分析端小程序-->
-                <analysis.wx.ma.appId>wxfa4afaa2b5f9c876</analysis.wx.ma.appId>
-                <analysis.wx.ma.secret>7db9f049c78c9a6cafa673deebe8330d</analysis.wx.ma.secret>
-
                 <spring.datasource.druid.url>
                     <![CDATA[jdbc:mysql://rm-m5ew61hl12e70oaw8.mysql.rds.aliyuncs.com:3306/esua_epdc_admin?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>elinkepdc@Yushan2020</spring.datasource.druid.password>
-                <!--RocketMQ-->
-                <rocketmq.name.server>172.16.1.242:9876;172.16.1.243:9876</rocketmq.name.server>
-                <rocketmq.producer.group>organizationGroup</rocketmq.producer.group>
-                <rocketmq.consumer.group>organizationGroup</rocketmq.consumer.group>
-                <rocketmq.producer.category.group>categoryGroup</rocketmq.producer.category.group>
-                <rocketmq.consumer.category.group>categoryGroup</rocketmq.consumer.category.group>
-
-                <epmet.secret>3289e6e3901340d9b14dfb32e165f9d0377f638a27284b71835991fed63e2d1f</epmet.secret>
-                <epmet.appId>b73231ed4b82c290ca78ef3648b0b169</epmet.appId>
-                <epmet.customerId>46c55cb862d6d5e6d05d2ab61a1cc07e</epmet.customerId>
-                <epmet.url>https://epmet-open.elinkservice.cn/api</epmet.url>
             </properties>
         </profile>
     </profiles>
diff --git a/epdc-cloud-vim-yushan/src/main/resources/application.yml b/epdc-cloud-vim-yushan/src/main/resources/application.yml
index bfb3088..8350693 100644
--- a/epdc-cloud-vim-yushan/src/main/resources/application.yml
+++ b/epdc-cloud-vim-yushan/src/main/resources/application.yml
@@ -91,4 +91,3 @@ hystrix:
 ribbon:
   ReadTimeout: 300000
   ConnectTimeout: 300000
-