From f28ac4a5be5e7b18e8c707b31441ae9011356385 Mon Sep 17 00:00:00 2001
From: yujintao <yujintaodotcn@foxmail.com>
Date: Fri, 10 Jan 2020 10:58:03 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/elink/esua/epdc/ApiApplication.java     |  3 ---
 .../epdc-module/epdc-heart/epdc-heart-server/pom.xml | 12 ++++++------
 .../java/com/elink/esua/epdc/UserApplication.java    |  3 ---
 3 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/ApiApplication.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/ApiApplication.java
index 326c93a90..96d647692 100644
--- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/ApiApplication.java
+++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/ApiApplication.java
@@ -8,8 +8,6 @@
 
 package com.elink.esua.epdc;
 
-import com.alibaba.nacos.spring.context.annotation.config.NacosPropertySource;
-import com.elink.esua.epdc.commons.tools.constant.ServiceConstant;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
@@ -24,7 +22,6 @@ import org.springframework.cloud.openfeign.EnableFeignClients;
 @SpringBootApplication
 @EnableDiscoveryClient
 @EnableFeignClients
-@NacosPropertySource(dataId = ServiceConstant.EPDC_API_SERVER, autoRefreshed = true)
 public class ApiApplication {
 
     public static void main(String[] args) {
diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/pom.xml b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/pom.xml
index 49f322adf..20e3e932e 100644
--- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/pom.xml
+++ b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/pom.xml
@@ -130,7 +130,7 @@
             <!--<properties>
                 <spring.profiles.active>dev</spring.profiles.active>
 
-                <server.port>9060</server.port>
+                <server.port>9072</server.port>
 
                 <spring.redis.index>2</spring.redis.index>
                 <spring.redis.host>47.104.224.45</spring.redis.host>
@@ -149,7 +149,7 @@
                 <spring.zipkin.base-url>http://localhost:9411</spring.zipkin.base-url>
             </properties>-->
             <properties>
-                <server.port>9060</server.port>
+                <server.port>9072</server.port>
                 <nacos.server-addr>47.104.224.45:8848</nacos.server-addr>
                 <nacos.config.namespace>513d6635-3cfe-401f-b8b6-a04417288f47</nacos.config.namespace>
                 <nacos.config.group>EPDC_HEART</nacos.config.group>
@@ -162,7 +162,7 @@
             <!--<properties>
                 <spring.profiles.active>test</spring.profiles.active>
 
-                <server.port>9060</server.port>
+                <server.port>9072</server.port>
 
                 <spring.redis.index>2</spring.redis.index>
                 <spring.redis.host>47.104.224.45</spring.redis.host>
@@ -181,7 +181,7 @@
                 <spring.zipkin.base-url>http://localhost:9411</spring.zipkin.base-url>
             </properties>-->
             <properties>
-                <server.port>9060</server.port>
+                <server.port>9072</server.port>
                 <nacos.server-addr>47.104.224.45:8848</nacos.server-addr>
                 <nacos.config.namespace>6a3577b4-7b79-43f6-aebb-9c3f31263f6a</nacos.config.namespace>
                 <nacos.config.group>EPDC_HEART</nacos.config.group>
@@ -194,7 +194,7 @@
             <properties>
                 <spring.profiles.active>prod</spring.profiles.active>
 
-                <server.port>9060</server.port>
+                <server.port>9072</server.port>
 
                 <spring.redis.index>2</spring.redis.index>
                 <spring.redis.host>47.104.224.45</spring.redis.host>
@@ -219,7 +219,7 @@
             <properties>
                 <spring.profiles.active>prod</spring.profiles.active>
 
-                <server.port>9060</server.port>
+                <server.port>9072</server.port>
 
                 <!-- redis配置 -->
                 <spring.redis.index>0</spring.redis.index>
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/UserApplication.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/UserApplication.java
index e2e855ab6..4407c63d6 100644
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/UserApplication.java
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/UserApplication.java
@@ -8,8 +8,6 @@
 
 package com.elink.esua.epdc;
 
-import com.alibaba.nacos.spring.context.annotation.config.NacosPropertySource;
-import com.elink.esua.epdc.commons.tools.constant.ServiceConstant;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
@@ -24,7 +22,6 @@ import org.springframework.cloud.openfeign.EnableFeignClients;
 @SpringBootApplication
 @EnableDiscoveryClient
 @EnableFeignClients
-@NacosPropertySource(dataId = ServiceConstant.EPDC_USER_SERVER, autoRefreshed = true)
 public class UserApplication {
 
     public static void main(String[] args) {