From 5f9bab580734c18baf6b6bbeb2bb5ff473d73312 Mon Sep 17 00:00:00 2001
From: tanghc <thc8775@163.com>
Date: Tue, 26 May 2020 10:05:19 +0800
Subject: [PATCH] 3.1.4

---
 changelog.md                                | 4 ++++
 sop-auth/pom.xml                            | 2 +-
 sop-common/pom.xml                          | 2 +-
 sop-common/sop-bridge-gateway/pom.xml       | 6 +++---
 sop-common/sop-bridge-zuul/pom.xml          | 6 +++---
 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 +-
 13 files changed, 22 insertions(+), 18 deletions(-)

diff --git a/changelog.md b/changelog.md
index 2d68b2e1..aec515d3 100644
--- a/changelog.md
+++ b/changelog.md
@@ -1,5 +1,9 @@
 # changelog
 
+## 3.1.4
+
+- 优化跨域
+
 ## 3.1.3
 
 - 修复监控日志乱码问题
diff --git a/sop-auth/pom.xml b/sop-auth/pom.xml
index 93b8adc3..f1bf6fa5 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>3.1.3-SNAPSHOT</version>
+			<version>3.1.4-SNAPSHOT</version>
 		</dependency>
 		<!-- sop相关配置 end-->
 
diff --git a/sop-common/pom.xml b/sop-common/pom.xml
index 8f357c77..aa568688 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>3.1.3-SNAPSHOT</version>
+	<version>3.1.4-SNAPSHOT</version>
 	<packaging>pom</packaging>
 
 	<properties>
diff --git a/sop-common/sop-bridge-gateway/pom.xml b/sop-common/sop-bridge-gateway/pom.xml
index 2034d181..de573072 100644
--- a/sop-common/sop-bridge-gateway/pom.xml
+++ b/sop-common/sop-bridge-gateway/pom.xml
@@ -5,11 +5,11 @@
     <parent>
         <artifactId>sop-common</artifactId>
         <groupId>com.gitee.sop</groupId>
-        <version>3.1.3-SNAPSHOT</version>
+        <version>3.1.4-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
-    <version>3.1.3-SNAPSHOT</version>
+    <version>3.1.4-SNAPSHOT</version>
 
     <artifactId>sop-bridge-gateway</artifactId>
 
@@ -17,7 +17,7 @@
         <dependency>
             <groupId>com.gitee.sop</groupId>
             <artifactId>sop-gateway-common</artifactId>
-            <version>3.1.3-SNAPSHOT</version>
+            <version>3.1.4-SNAPSHOT</version>
         </dependency>
 
         <dependency>
diff --git a/sop-common/sop-bridge-zuul/pom.xml b/sop-common/sop-bridge-zuul/pom.xml
index aee68506..4767f2c5 100644
--- a/sop-common/sop-bridge-zuul/pom.xml
+++ b/sop-common/sop-bridge-zuul/pom.xml
@@ -5,11 +5,11 @@
     <parent>
         <artifactId>sop-common</artifactId>
         <groupId>com.gitee.sop</groupId>
-        <version>3.1.3-SNAPSHOT</version>
+        <version>3.1.4-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
-    <version>3.1.3-SNAPSHOT</version>
+    <version>3.1.4-SNAPSHOT</version>
 
     <artifactId>sop-bridge-zuul</artifactId>
 
@@ -17,7 +17,7 @@
         <dependency>
             <groupId>com.gitee.sop</groupId>
             <artifactId>sop-gateway-common</artifactId>
-            <version>3.1.3-SNAPSHOT</version>
+            <version>3.1.4-SNAPSHOT</version>
         </dependency>
 
         <dependency>
diff --git a/sop-common/sop-gateway-common/pom.xml b/sop-common/sop-gateway-common/pom.xml
index fc76d072..afc79b01 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>3.1.3-SNAPSHOT</version>
+        <version>3.1.4-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>sop-gateway-common</artifactId>
-    <version>3.1.3-SNAPSHOT</version>
+    <version>3.1.4-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 8833f4f7..3f8df9ad 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>3.1.3-SNAPSHOT</version>
+        <version>3.1.4-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>sop-service-common</artifactId>
-    <version>3.1.3-SNAPSHOT</version>
+    <version>3.1.4-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 a0be69c8..2c9a35aa 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>3.1.3-SNAPSHOT</version>
+            <version>3.1.4-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 5ab9efd2..0a8ba7b7 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>3.1.3-SNAPSHOT</version>
+			<version>3.1.4-SNAPSHOT</version>
 		</dependency>
 
 		<!-- 使用nacos注册中心
diff --git a/sop-example/sop-springmvc/pom.xml b/sop-example/sop-springmvc/pom.xml
index a0afc87e..d323f477 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>3.1.3-SNAPSHOT</version>
+            <version>3.1.4-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 23215698..cd1f93c3 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>3.1.3-SNAPSHOT</version>
+            <version>3.1.4-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>com.gitee.sop</groupId>
diff --git a/sop-gateway/pom.xml b/sop-gateway/pom.xml
index 49238e63..ebd8d9d5 100644
--- a/sop-gateway/pom.xml
+++ b/sop-gateway/pom.xml
@@ -34,7 +34,7 @@
             <groupId>com.gitee.sop</groupId>
              <artifactId>sop-bridge-gateway</artifactId>
              <!--<artifactId>sop-bridge-zuul</artifactId>-->
-            <version>3.1.3-SNAPSHOT</version>
+            <version>3.1.4-SNAPSHOT</version>
         </dependency>
 
         <dependency>
diff --git a/sop-website/pom.xml b/sop-website/pom.xml
index 38fa1e3f..8a602362 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>3.1.3-SNAPSHOT</version>
+            <version>3.1.4-SNAPSHOT</version>
         </dependency>
 
         <dependency>