From e2e939083458c8ba32fbc6c9f5ee38f5cad09a08 Mon Sep 17 00:00:00 2001
From: UndefinedDiary <wangbinglilac@sina.com>
Date: Thu, 22 Aug 2019 11:57:12 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81spring-boot-admin=E7=89=88=E6=9C=AC?=
 =?UTF-8?q?=E4=BD=8E=E4=BA=8Espring-boot=E7=89=88=E6=9C=AC=EF=BC=8C?=
 =?UTF-8?q?=E5=AF=BC=E8=87=B4=E9=A1=B9=E7=9B=AE=E5=90=AF=E5=8A=A8=E5=A4=B1?=
 =?UTF-8?q?=E8=B4=A5=202=E3=80=81spring-boot-admin-server=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AEcontext-path=E9=9C=80=E4=BF=AE=E6=94=B9=E8=87=B3server?=
 =?UTF-8?q?.servlet=E4=B8=8B=EF=BC=8C=E5=90=A6=E5=88=99=E5=90=AF=E5=8A=A8?=
 =?UTF-8?q?=E5=90=8E=E6=97=A0=E6=B3=95=E6=AD=A3=E5=B8=B8=E4=BD=BF=E7=94=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 spring-boot-demo-admin-client/pom.xml                            | 2 +-
 spring-boot-demo-admin-server/pom.xml                            | 2 +-
 spring-boot-demo-admin-server/src/main/resources/application.yml | 4 +++-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/spring-boot-demo-admin-client/pom.xml b/spring-boot-demo-admin-client/pom.xml
index 682adbb..9b8d814 100644
--- a/spring-boot-demo-admin-client/pom.xml
+++ b/spring-boot-demo-admin-client/pom.xml
@@ -20,7 +20,7 @@
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 		<java.version>1.8</java.version>
-		<spring-boot-admin.version>2.0.3</spring-boot-admin.version>
+		<spring-boot-admin.version>2.1.0</spring-boot-admin.version>
 	</properties>
 
 	<dependencies>
diff --git a/spring-boot-demo-admin-server/pom.xml b/spring-boot-demo-admin-server/pom.xml
index e151e93..effb312 100644
--- a/spring-boot-demo-admin-server/pom.xml
+++ b/spring-boot-demo-admin-server/pom.xml
@@ -20,7 +20,7 @@
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 		<java.version>1.8</java.version>
-		<spring-boot-admin.version>2.0.3</spring-boot-admin.version>
+		<spring-boot-admin.version>2.1.0</spring-boot-admin.version>
 	</properties>
 
 	<dependencies>
diff --git a/spring-boot-demo-admin-server/src/main/resources/application.yml b/spring-boot-demo-admin-server/src/main/resources/application.yml
index 93195d1..ef345d4 100644
--- a/spring-boot-demo-admin-server/src/main/resources/application.yml
+++ b/spring-boot-demo-admin-server/src/main/resources/application.yml
@@ -1,7 +1,9 @@
 server:
   port: 8000
+  servlet:
+    context-path: /admin
 spring:
   boot:
     admin:
       # 管控台上下文路径
-      context-path: /admin
\ No newline at end of file
+      context-path: /