Merge pull request #11 from buession/development

Release 2.3.0
buession · Aug 17, 2023 · 2b6ddfc · 2b6ddfc
2 parents 3eb6143 + 767a665
commit 2b6ddfc
Show file tree

Hide file tree

Showing 45 changed files with 751 additions and 68 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,21 @@
 ===========================
 
 
+## [2.3.0](https://github.com/buession/buession-springcloud/releases/tag/v2.3.0) (2023-08-17)
+
+### 🔨依赖升级
+
+- [依赖库版本升级和安全漏洞修复](https://github.com/buession/buession-parent/releases/tag/v2.3.0)
+
+
+### 🐞 Bug 修复
+
+- **buession-springcloud-config-server** 修复 CloudConfigServerWebApplication 在 reactive 模式下无法启动的问题
+
+
+---
+
+
 ## [2.2.1](https://github.com/buession/buession-springcloud/releases/tag/v2.2.1) (2023-03-31)
 
 ### 🔨依赖升级

diff --git a/buession-springcloud-bus/pom.xml b/buession-springcloud-bus/pom.xml
@@ -7,7 +7,7 @@
 		<groupId>com.buession.springcloud</groupId>
 		<artifactId>buession-springcloud-parent</artifactId>
 		<relativePath>../buession-springcloud-parent</relativePath>
-		<version>2.2.1</version>
+		<version>2.3.0</version>
 	</parent>
 	<artifactId>buession-springcloud-bus</artifactId>
 	<url>https://springcloud.buession.com/</url>

diff --git a/buession-springcloud-common/pom.xml b/buession-springcloud-common/pom.xml
@@ -7,7 +7,7 @@
 		<groupId>com.buession.springcloud</groupId>
 		<artifactId>buession-springcloud-parent</artifactId>
 		<relativePath>../buession-springcloud-parent</relativePath>
-		<version>2.2.1</version>
+		<version>2.3.0</version>
 	</parent>
 	<artifactId>buession-springcloud-common</artifactId>
 	<url>https://springcloud.buession.com/</url>

diff --git a/buession-springcloud-config-client/pom.xml b/buession-springcloud-config-client/pom.xml
@@ -7,7 +7,7 @@
 		<groupId>com.buession.springcloud</groupId>
 		<artifactId>buession-springcloud-parent</artifactId>
 		<relativePath>../buession-springcloud-parent</relativePath>
-		<version>2.2.1</version>
+		<version>2.3.0</version>
 	</parent>
 	<artifactId>buession-springcloud-config-client</artifactId>
 	<url>https://springcloud.buession.com/</url>

diff --git a/buession-springcloud-config-server/pom.xml b/buession-springcloud-config-server/pom.xml
@@ -7,7 +7,7 @@
 		<groupId>com.buession.springcloud</groupId>
 		<artifactId>buession-springcloud-parent</artifactId>
 		<relativePath>../buession-springcloud-parent</relativePath>
-		<version>2.2.1</version>
+		<version>2.3.0</version>
 	</parent>
 	<artifactId>buession-springcloud-config-server</artifactId>
 	<url>https://springcloud.buession.com/</url>

diff --git a/...config-server/src/main/java/com/buession/springcloud/config/server/CloudConfigServer.java b/...config-server/src/main/java/com/buession/springcloud/config/server/CloudConfigServer.java
@@ -19,19 +19,18 @@
  * +-------------------------------------------------------------------------------------------------------+
  * | License: http://www.apache.org/licenses/LICENSE-2.0.txt 										       |
  * | Author: Yong.Teng <[email protected]> 													       |
- * | Copyright @ 2013-2020 Buession.com Inc.														       |
+ * | Copyright @ 2013-2023 Buession.com Inc.														       |
  * +-------------------------------------------------------------------------------------------------------+
  */
 package com.buession.springcloud.config.server;
 
 import com.buession.core.utils.VersionUtils;
-import org.springframework.cloud.config.server.config.ConfigServerAutoConfiguration;
 
 /**
  * @author Yong.Teng
  */
 public class CloudConfigServer {
 
-	public final static String VERSION = VersionUtils.determineClassVersion(ConfigServerAutoConfiguration.class);
+	public final static String VERSION = VersionUtils.determineClassVersion(CloudConfigServer.class);
 
 }
diff --git a/...src/main/java/com/buession/springcloud/config/server/CloudConfigServerWebApplication.java b/...src/main/java/com/buession/springcloud/config/server/CloudConfigServerWebApplication.java
@@ -19,14 +19,16 @@
  * +-------------------------------------------------------------------------------------------------------+
  * | License: http://www.apache.org/licenses/LICENSE-2.0.txt 										       |
  * | Author: Yong.Teng <[email protected]> 													       |
- * | Copyright @ 2013-2020 Buession.com Inc.														       |
+ * | Copyright @ 2013-2023 Buession.com Inc.														       |
  * +-------------------------------------------------------------------------------------------------------+
  */
 package com.buession.springcloud.config.server;
 
 import com.buession.springboot.boot.application.Application;
 import com.buession.springboot.web.application.AbstractWebApplication;
+import com.buession.springboot.web.utils.WebApplicationTypeBuilder;
 import org.springframework.boot.Banner;
+import org.springframework.boot.WebApplicationType;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.autoconfigure.cassandra.CassandraAutoConfiguration;
@@ -68,7 +70,7 @@ public static void main(final String[] args){
 	}
 
 	@Override
-	protected Banner getBanner(){
+	public Banner getBanner(){
 		return new CloudConfigServerBanner();
 	}
 

diff --git a/buession-springcloud-consul/pom.xml b/buession-springcloud-consul/pom.xml
@@ -7,7 +7,7 @@
 		<groupId>com.buession.springcloud</groupId>
 		<artifactId>buession-springcloud-parent</artifactId>
 		<relativePath>../buession-springcloud-parent</relativePath>
-		<version>2.2.1</version>
+		<version>2.3.0</version>
 	</parent>
 	<artifactId>buession-springcloud-consul</artifactId>
 	<url>https://springcloud.buession.com/</url>

diff --git a/buession-springcloud-feign/pom.xml b/buession-springcloud-feign/pom.xml
@@ -7,7 +7,7 @@
 		<groupId>com.buession.springcloud</groupId>
 		<artifactId>buession-springcloud-parent</artifactId>
 		<relativePath>../buession-springcloud-parent</relativePath>
-		<version>2.2.1</version>
+		<version>2.3.0</version>
 	</parent>
 	<artifactId>buession-springcloud-feign</artifactId>
 	<url>https://springcloud.buession.com/</url>

diff --git a/...a/com/buession/springcloud/feign/interceptor/AbstractClientHeadersRequestInterceptor.java b/...a/com/buession/springcloud/feign/interceptor/AbstractClientHeadersRequestInterceptor.java
@@ -19,7 +19,7 @@
  * +-------------------------------------------------------------------------------------------------------+
  * | License: http://www.apache.org/licenses/LICENSE-2.0.txt 										       |
  * | Author: Yong.Teng <[email protected]> 													       |
- * | Copyright @ 2013-2022 Buession.com Inc.														       |
+ * | Copyright @ 2013-2023 Buession.com Inc.														       |
  * +-------------------------------------------------------------------------------------------------------+
  */
 package com.buession.springcloud.feign.interceptor;
@@ -84,8 +84,7 @@ public AbstractClientHeadersRequestInterceptor(){
 	 *
 	 * @since 2.1.0
 	 */
-	public AbstractClientHeadersRequestInterceptor(Set<String> allowedHeaderNames,
-												   Set<String> ignoreHeaderNames){
+	public AbstractClientHeadersRequestInterceptor(Set<String> allowedHeaderNames, Set<String> ignoreHeaderNames){
 		this.allowedHeaderNames = allowedHeaderNames;
 		this.ignoreHeaderNames = ignoreHeaderNames;
 	}

diff --git a/...ssion/springcloud/feign/interceptor/reactive/ReactiveClientHeadersRequestInterceptor.java b/...ssion/springcloud/feign/interceptor/reactive/ReactiveClientHeadersRequestInterceptor.java
@@ -19,7 +19,7 @@
  * +-------------------------------------------------------------------------------------------------------+
  * | License: http://www.apache.org/licenses/LICENSE-2.0.txt 										       |
  * | Author: Yong.Teng <[email protected]> 													       |
- * | Copyright @ 2013-2022 Buession.com Inc.														       |
+ * | Copyright @ 2013-2023 Buession.com Inc.														       |
  * +-------------------------------------------------------------------------------------------------------+
  */
 package com.buession.springcloud.feign.interceptor.reactive;
@@ -57,8 +57,7 @@ public ReactiveClientHeadersRequestInterceptor(){
 	 *
 	 * @since 2.1.0
 	 */
-	public ReactiveClientHeadersRequestInterceptor(Set<String> allowedHeaderNames,
-												   Set<String> ignoreHeaderNames){
+	public ReactiveClientHeadersRequestInterceptor(Set<String> allowedHeaderNames, Set<String> ignoreHeaderNames){
 		super(allowedHeaderNames, ignoreHeaderNames);
 	}
 

diff --git a/...uession/springcloud/feign/interceptor/servlet/ServletClientHeadersRequestInterceptor.java b/...uession/springcloud/feign/interceptor/servlet/ServletClientHeadersRequestInterceptor.java
@@ -21,7 +21,7 @@
  * +------------------------------------------------------------------------------------------------+
  * | License: http://www.apache.org/licenses/LICENSE-2.0.txt 										|
  * | Author: Yong.Teng <[email protected]> 													|
- * | Copyright @ 2013-2022 Buession.com Inc.														|
+ * | Copyright @ 2013-2023 Buession.com Inc.														|
  * +------------------------------------------------------------------------------------------------+
  */
 package com.buession.springcloud.feign.interceptor.servlet;
@@ -61,8 +61,7 @@ public ServletClientHeadersRequestInterceptor(){
 	 *
 	 * @since 2.1.0
 	 */
-	public ServletClientHeadersRequestInterceptor(Set<String> allowedHeaderNames,
-												  Set<String> ignoreHeaderNames){
+	public ServletClientHeadersRequestInterceptor(Set<String> allowedHeaderNames, Set<String> ignoreHeaderNames){
 		super(allowedHeaderNames, ignoreHeaderNames);
 	}
 
@@ -78,16 +77,14 @@ public void apply(final RequestTemplate requestTemplate){
 			while(headerNames != null && headerNames.hasMoreElements()){
 				String name = headerNames.nextElement();
 
-				if(isIgnoreHeaderName(name) == false){
-					Enumeration<String> value = request.getHeaders(name);
-					List<String> values = new ArrayList<>();
+				Enumeration<String> value = request.getHeaders(name);
+				List<String> values = new ArrayList<>();
 
-					while(value != null && value.hasMoreElements()){
-						values.add(value.nextElement());
-					}
-
-					applyHeader(requestTemplate, name, values);
+				while(value != null && value.hasMoreElements()){
+					values.add(value.nextElement());
 				}
+
+				applyHeader(requestTemplate, name, values);
 			}
 		}catch(IllegalStateException e){
 			logger.error(e.getMessage());

diff --git a/buession-springcloud-gateway/pom.xml b/buession-springcloud-gateway/pom.xml
@@ -7,7 +7,7 @@
 		<groupId>com.buession.springcloud</groupId>
 		<artifactId>buession-springcloud-parent</artifactId>
 		<relativePath>../buession-springcloud-parent</relativePath>
-		<version>2.2.1</version>
+		<version>2.3.0</version>
 	</parent>
 	<artifactId>buession-springcloud-gateway</artifactId>
 	<url>https://springcloud.buession.com/</url>
@@ -111,6 +111,7 @@
 		<dependency>
 			<groupId>io.netty</groupId>
 			<artifactId>netty-transport-native-epoll</artifactId>
+			<classifier>linux-x86_64</classifier>
 		</dependency>
 
 		<dependency>

diff --git a/buession-springcloud-hystrix/pom.xml b/buession-springcloud-hystrix/pom.xml
@@ -7,7 +7,7 @@
 		<groupId>com.buession.springcloud</groupId>
 		<artifactId>buession-springcloud-parent</artifactId>
 		<relativePath>../buession-springcloud-parent</relativePath>
-		<version>2.2.1</version>
+		<version>2.3.0</version>
 	</parent>
 	<artifactId>buession-springcloud-hystrix</artifactId>
 	<url>https://springcloud.buession.com/</url>

diff --git a/buession-springcloud-kubernetes/pom.xml b/buession-springcloud-kubernetes/pom.xml
@@ -7,7 +7,7 @@
 		<groupId>com.buession.springcloud</groupId>
 		<artifactId>buession-springcloud-parent</artifactId>
 		<relativePath>../buession-springcloud-parent</relativePath>
-		<version>2.2.1</version>
+		<version>2.3.0</version>
 	</parent>
 	<artifactId>buession-springcloud-kubernetes</artifactId>
 	<url>https://springcloud.buession.com/</url>

diff --git a/buession-springcloud-loadbalancer/pom.xml b/buession-springcloud-loadbalancer/pom.xml
@@ -7,7 +7,7 @@
 		<groupId>com.buession.springcloud</groupId>
 		<artifactId>buession-springcloud-parent</artifactId>
 		<relativePath>../buession-springcloud-parent</relativePath>
-		<version>2.2.1</version>
+		<version>2.3.0</version>
 	</parent>
 	<artifactId>buession-springcloud-loadbalancer</artifactId>
 	<url>https://springcloud.buession.com/</url>

diff --git a/buession-springcloud-metrics/pom.xml b/buession-springcloud-metrics/pom.xml
@@ -7,7 +7,7 @@
 		<groupId>com.buession.springcloud</groupId>
 		<artifactId>buession-springcloud-parent</artifactId>
 		<relativePath>../buession-springcloud-parent</relativePath>
-		<version>2.2.1</version>
+		<version>2.3.0</version>
 	</parent>
 	<artifactId>buession-springcloud-metrics</artifactId>
 	<url>https://springcloud.buession.com/</url>

diff --git a/buession-springcloud-nacos-config-client/pom.xml b/buession-springcloud-nacos-config-client/pom.xml
@@ -7,7 +7,7 @@
 		<groupId>com.buession.springcloud</groupId>
 		<artifactId>buession-springcloud-parent</artifactId>
 		<relativePath>../buession-springcloud-parent</relativePath>
-		<version>2.2.1</version>
+		<version>2.3.0</version>
 	</parent>
 	<artifactId>buession-springcloud-nacos-config-client</artifactId>
 	<url>https://springcloud.buession.com/</url>
@@ -74,6 +74,11 @@
 			</exclusions>
 		</dependency>
 
+		<dependency>
+			<groupId>org.apache.httpcomponents</groupId>
+			<artifactId>httpasyncclient</artifactId>
+		</dependency>
+
 		<dependency>
 			<groupId>com.google.code.findbugs</groupId>
 			<artifactId>jsr305</artifactId>

diff --git a/buession-springcloud-nacos-discovery/pom.xml b/buession-springcloud-nacos-discovery/pom.xml
@@ -7,7 +7,7 @@
 		<groupId>com.buession.springcloud</groupId>
 		<artifactId>buession-springcloud-parent</artifactId>
 		<relativePath>../buession-springcloud-parent</relativePath>
-		<version>2.2.1</version>
+		<version>2.3.0</version>
 	</parent>
 	<artifactId>buession-springcloud-nacos-discovery</artifactId>
 	<url>https://springcloud.buession.com/</url>
@@ -91,6 +91,11 @@
 			</exclusions>
 		</dependency>
 
+		<dependency>
+			<groupId>org.apache.httpcomponents</groupId>
+			<artifactId>httpasyncclient</artifactId>
+		</dependency>
+
 		<dependency>
 			<groupId>com.google.code.findbugs</groupId>
 			<artifactId>jsr305</artifactId>

diff --git a/buession-springcloud-parent/pom.xml b/buession-springcloud-parent/pom.xml
@@ -7,13 +7,13 @@
 		<groupId>com.buession</groupId>
 		<artifactId>parent</artifactId>
 		<relativePath/>
-		<version>2.2.1</version>
+		<version>2.3.0</version>
 	</parent>
 	<groupId>com.buession.springcloud</groupId>
 	<artifactId>buession-springcloud-parent</artifactId>
 	<url>https://springcloud.buession.com/</url>
 	<description>Buession SpringCloud Framework Parent</description>
-	<version>2.2.1</version>
+	<version>2.3.0</version>
 	<packaging>pom</packaging>
 
 	<organization>
@@ -74,8 +74,8 @@
 	</modules>
 
 	<properties>
-		<buession.version>2.2.1</buession.version>
-		<buession.springboot.version>2.2.1</buession.springboot.version>
+		<buession.version>2.3.0</buession.version>
+		<buession.springboot.version>2.3.0</buession.springboot.version>
 		<springcloud.base.version>2.2.9.RELEASE</springcloud.base.version>
 		<springcloud.config.version>2.2.8.RELEASE</springcloud.config.version>
 		<springcloud.netflix.version>2.2.10.RELEASE</springcloud.netflix.version>

diff --git a/buession-springcloud-ribbon/pom.xml b/buession-springcloud-ribbon/pom.xml
@@ -7,7 +7,7 @@
 		<groupId>com.buession.springcloud</groupId>
 		<artifactId>buession-springcloud-parent</artifactId>
 		<relativePath>../buession-springcloud-parent</relativePath>
-		<version>2.2.1</version>
+		<version>2.3.0</version>
 	</parent>
 	<artifactId>buession-springcloud-ribbon</artifactId>
 	<url>https://springcloud.buession.com/</url>

diff --git a/buession-springcloud-stream/pom.xml b/buession-springcloud-stream/pom.xml
@@ -7,7 +7,7 @@
 		<groupId>com.buession.springcloud</groupId>
 		<artifactId>buession-springcloud-parent</artifactId>
 		<relativePath>../buession-springcloud-parent</relativePath>
-		<version>2.2.1</version>
+		<version>2.3.0</version>
 	</parent>
 	<artifactId>buession-springcloud-stream</artifactId>
 	<url>https://springcloud.buession.com/</url>

diff --git a/buession-springcloud-zipkin/pom.xml b/buession-springcloud-zipkin/pom.xml
@@ -7,7 +7,7 @@
 		<groupId>com.buession.springcloud</groupId>
 		<artifactId>buession-springcloud-parent</artifactId>
 		<relativePath>../buession-springcloud-parent</relativePath>
-		<version>2.2.1</version>
+		<version>2.3.0</version>
 	</parent>
 	<artifactId>buession-springcloud-zipkin</artifactId>
 	<url>https://springcloud.buession.com/</url>

diff --git a/buession-springcloud-zuul/pom.xml b/buession-springcloud-zuul/pom.xml
@@ -7,7 +7,7 @@
 		<groupId>com.buession.springcloud</groupId>
 		<artifactId>buession-springcloud-parent</artifactId>
 		<relativePath>../buession-springcloud-parent</relativePath>
-		<version>2.2.1</version>
+		<version>2.3.0</version>
 	</parent>
 	<artifactId>buession-springcloud-zuul</artifactId>
 	<url>https://springcloud.buession.com/</url>