From 86c248fa0eb8a93741ca470319ea062f2af07c6d Mon Sep 17 00:00:00 2001
From: wangkang <wangkangit@163.com>
Date: Tue, 3 Jul 2018 14:06:48 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../udf-admin-server/src/main/resources/bootstrap.properties | 2 +-
 udf-server/udf-eureka-config-server/pom.xml                  | 4 ++--
 .../src/main/resources/bootstrap-dev.properties              | 1 -
 .../src/main/resources/bootstrap.properties                  | 5 ++---
 .../src/main/resources/bootstrap.properties                  | 2 +-
 .../udf-zuul-server/src/main/resources/bootstrap.properties  | 2 +-
 6 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/udf-server/udf-admin-server/src/main/resources/bootstrap.properties b/udf-server/udf-admin-server/src/main/resources/bootstrap.properties
index 684124f..c09afb8 100644
--- a/udf-server/udf-admin-server/src/main/resources/bootstrap.properties
+++ b/udf-server/udf-admin-server/src/main/resources/bootstrap.properties
@@ -36,4 +36,4 @@ org.itkk.application.config.dateFormat=yyyy-MM-dd'T'HH:mm:ss:SSSZ
 ########################################################
 endpoints.shutdown.enabled=true
 endpoints.shutdown.sensitive=true
-management.port=${management.port}
\ No newline at end of file
+management.server.port=${management.port}
\ No newline at end of file
diff --git a/udf-server/udf-eureka-config-server/pom.xml b/udf-server/udf-eureka-config-server/pom.xml
index 486f1d7..b24e476 100644
--- a/udf-server/udf-eureka-config-server/pom.xml
+++ b/udf-server/udf-eureka-config-server/pom.xml
@@ -21,10 +21,10 @@
     <!-- 依赖 -->
     <dependencies>
         <!-- spring-boot-starter-security -->
-        <dependency>
+        <!--<dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-security</artifactId>
-        </dependency>
+        </dependency>-->
         <!-- spring cloud starter eureka server -->
         <dependency>
             <groupId>org.springframework.cloud</groupId>
diff --git a/udf-server/udf-eureka-config-server/src/main/resources/bootstrap-dev.properties b/udf-server/udf-eureka-config-server/src/main/resources/bootstrap-dev.properties
index 04556d1..8cfb66c 100644
--- a/udf-server/udf-eureka-config-server/src/main/resources/bootstrap-dev.properties
+++ b/udf-server/udf-eureka-config-server/src/main/resources/bootstrap-dev.properties
@@ -11,7 +11,6 @@ eureka.environment=${spring.profiles.active}
 ###eureka.instance ( EurekaInstanceConfigBean ) (must reboot)
 ########################################################
 eureka.instance.preferIpAddress=true
-eureka.instance.instanceId=${spring.cloud.client.ipAddress}:${server.port}
 ########################################################
 ###eureka.client (EurekaClientConfigBean , EurekaServerConfigBean ) (must reboot)
 ########################################################
diff --git a/udf-server/udf-eureka-config-server/src/main/resources/bootstrap.properties b/udf-server/udf-eureka-config-server/src/main/resources/bootstrap.properties
index 684124f..584bf18 100644
--- a/udf-server/udf-eureka-config-server/src/main/resources/bootstrap.properties
+++ b/udf-server/udf-eureka-config-server/src/main/resources/bootstrap.properties
@@ -34,6 +34,5 @@ org.itkk.application.config.dateFormat=yyyy-MM-dd'T'HH:mm:ss:SSSZ
 ########################################################
 ### shutdown
 ########################################################
-endpoints.shutdown.enabled=true
-endpoints.shutdown.sensitive=true
-management.port=${management.port}
\ No newline at end of file
+management.endpoint.shutdown.enabled=true
+management.server.port=${management.port}
\ No newline at end of file
diff --git a/udf-server/udf-general-server/src/main/resources/bootstrap.properties b/udf-server/udf-general-server/src/main/resources/bootstrap.properties
index 684124f..c09afb8 100644
--- a/udf-server/udf-general-server/src/main/resources/bootstrap.properties
+++ b/udf-server/udf-general-server/src/main/resources/bootstrap.properties
@@ -36,4 +36,4 @@ org.itkk.application.config.dateFormat=yyyy-MM-dd'T'HH:mm:ss:SSSZ
 ########################################################
 endpoints.shutdown.enabled=true
 endpoints.shutdown.sensitive=true
-management.port=${management.port}
\ No newline at end of file
+management.server.port=${management.port}
\ No newline at end of file
diff --git a/udf-server/udf-zuul-server/src/main/resources/bootstrap.properties b/udf-server/udf-zuul-server/src/main/resources/bootstrap.properties
index 684124f..c09afb8 100644
--- a/udf-server/udf-zuul-server/src/main/resources/bootstrap.properties
+++ b/udf-server/udf-zuul-server/src/main/resources/bootstrap.properties
@@ -36,4 +36,4 @@ org.itkk.application.config.dateFormat=yyyy-MM-dd'T'HH:mm:ss:SSSZ
 ########################################################
 endpoints.shutdown.enabled=true
 endpoints.shutdown.sensitive=true
-management.port=${management.port}
\ No newline at end of file
+management.server.port=${management.port}
\ No newline at end of file