From 5fdddfd47c2b425ae3208322ceada56efdcfa288 Mon Sep 17 00:00:00 2001
From: tanghc <thc8775@163.com>
Date: Thu, 2 Jan 2020 10:34:30 +0800
Subject: [PATCH] 2.5.9

---
 changelog.md                                | 5 +++++
 sop-auth/pom.xml                            | 2 +-
 sop-common/pom.xml                          | 2 +-
 sop-common/sop-gateway-common/pom.xml       | 4 ++--
 sop-common/sop-service-common/pom.xml       | 4 ++--
 sop-example/sop-book/sop-book-web/pom.xml   | 2 +-
 sop-example/sop-easyopen/pom.xml            | 2 +-
 sop-example/sop-springmvc/pom.xml           | 2 +-
 sop-example/sop-story/sop-story-web/pom.xml | 2 +-
 sop-gateway/pom.xml                         | 2 +-
 sop-website/pom.xml                         | 2 +-
 11 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/changelog.md b/changelog.md
index 49e32814..2d94d5e8 100644
--- a/changelog.md
+++ b/changelog.md
@@ -1,5 +1,10 @@
 # changelog
 
+## 2.5.9
+
+- 优化获取context-path
+- 修复结果返回产生的NPE问题
+
 ## 2.5.8
 
 - 优化参数绑定
diff --git a/sop-auth/pom.xml b/sop-auth/pom.xml
index 9097898a..4245a5ec 100644
--- a/sop-auth/pom.xml
+++ b/sop-auth/pom.xml
@@ -26,7 +26,7 @@
 		<dependency>
 			<groupId>com.gitee.sop</groupId>
 			<artifactId>sop-service-common</artifactId>
-			<version>2.5.8-SNAPSHOT</version>
+			<version>2.5.9-SNAPSHOT</version>
 		</dependency>
 		<!-- sop相关配置 end-->
 
diff --git a/sop-common/pom.xml b/sop-common/pom.xml
index dc84cd09..a12af096 100644
--- a/sop-common/pom.xml
+++ b/sop-common/pom.xml
@@ -5,7 +5,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>com.gitee.sop</groupId>
 	<artifactId>sop-common</artifactId>
-	<version>2.5.8-SNAPSHOT</version>
+	<version>2.5.9-SNAPSHOT</version>
 	<packaging>pom</packaging>
 
 	<properties>
diff --git a/sop-common/sop-gateway-common/pom.xml b/sop-common/sop-gateway-common/pom.xml
index e5de7f61..a900714e 100644
--- a/sop-common/sop-gateway-common/pom.xml
+++ b/sop-common/sop-gateway-common/pom.xml
@@ -5,11 +5,11 @@
     <parent>
         <groupId>com.gitee.sop</groupId>
         <artifactId>sop-common</artifactId>
-        <version>2.5.8-SNAPSHOT</version>
+        <version>2.5.9-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>sop-gateway-common</artifactId>
-    <version>2.5.8-SNAPSHOT</version>
+    <version>2.5.9-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <name>sop-gateway-common</name>
diff --git a/sop-common/sop-service-common/pom.xml b/sop-common/sop-service-common/pom.xml
index 372dfb50..17760a18 100644
--- a/sop-common/sop-service-common/pom.xml
+++ b/sop-common/sop-service-common/pom.xml
@@ -6,11 +6,11 @@
     <parent>
         <groupId>com.gitee.sop</groupId>
         <artifactId>sop-common</artifactId>
-        <version>2.5.8-SNAPSHOT</version>
+        <version>2.5.9-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>sop-service-common</artifactId>
-    <version>2.5.8-SNAPSHOT</version>
+    <version>2.5.9-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <name>sop-service-common</name>
diff --git a/sop-example/sop-book/sop-book-web/pom.xml b/sop-example/sop-book/sop-book-web/pom.xml
index 97679424..6c284d50 100644
--- a/sop-example/sop-book/sop-book-web/pom.xml
+++ b/sop-example/sop-book/sop-book-web/pom.xml
@@ -28,7 +28,7 @@
         <dependency>
             <groupId>com.gitee.sop</groupId>
             <artifactId>sop-service-common</artifactId>
-            <version>2.5.8-SNAPSHOT</version>
+            <version>2.5.9-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>com.gitee.sop</groupId>
diff --git a/sop-example/sop-easyopen/pom.xml b/sop-example/sop-easyopen/pom.xml
index 0b169726..c1515e53 100644
--- a/sop-example/sop-easyopen/pom.xml
+++ b/sop-example/sop-easyopen/pom.xml
@@ -29,7 +29,7 @@
 		<dependency>
 			<groupId>com.gitee.sop</groupId>
 			<artifactId>sop-service-common</artifactId>
-			<version>2.5.8-SNAPSHOT</version>
+			<version>2.5.9-SNAPSHOT</version>
 		</dependency>
 
 		<!-- 使用nacos注册中心
diff --git a/sop-example/sop-springmvc/pom.xml b/sop-example/sop-springmvc/pom.xml
index 98380e3c..ee85a3f8 100644
--- a/sop-example/sop-springmvc/pom.xml
+++ b/sop-example/sop-springmvc/pom.xml
@@ -20,7 +20,7 @@
         <dependency>
             <groupId>com.gitee.sop</groupId>
             <artifactId>sop-service-common</artifactId>
-            <version>2.5.8-SNAPSHOT</version>
+            <version>2.5.9-SNAPSHOT</version>
         </dependency>
         <!-- nacos  -->
         <dependency>
diff --git a/sop-example/sop-story/sop-story-web/pom.xml b/sop-example/sop-story/sop-story-web/pom.xml
index 6ee32a77..837b9b0f 100644
--- a/sop-example/sop-story/sop-story-web/pom.xml
+++ b/sop-example/sop-story/sop-story-web/pom.xml
@@ -28,7 +28,7 @@
         <dependency>
             <groupId>com.gitee.sop</groupId>
             <artifactId>sop-service-common</artifactId>
-            <version>2.5.8-SNAPSHOT</version>
+            <version>2.5.9-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>com.gitee.sop</groupId>
diff --git a/sop-gateway/pom.xml b/sop-gateway/pom.xml
index 10c993e2..005c7a44 100644
--- a/sop-gateway/pom.xml
+++ b/sop-gateway/pom.xml
@@ -29,7 +29,7 @@
         <dependency>
             <groupId>com.gitee.sop</groupId>
             <artifactId>sop-gateway-common</artifactId>
-            <version>2.5.8-SNAPSHOT</version>
+            <version>2.5.9-SNAPSHOT</version>
         </dependency>
 
         <!-- ↓↓↓ 使用spring cloud zuul ↓↓↓ -->
diff --git a/sop-website/pom.xml b/sop-website/pom.xml
index b1e519ad..12b7b82d 100644
--- a/sop-website/pom.xml
+++ b/sop-website/pom.xml
@@ -35,7 +35,7 @@
         <dependency>
             <groupId>com.gitee.sop</groupId>
             <artifactId>sop-gateway-common</artifactId>
-            <version>2.5.8-SNAPSHOT</version>
+            <version>2.5.9-SNAPSHOT</version>
         </dependency>
 
         <dependency>