Merge remote-tracking branch 'origin/3.1.x'

spring-cloud-commons/src/main/java/org/springframework/cloud/client/loadbalancer/RequestData.java

@@ -74,6 +74,11 @@ public class RequestData {
 				new HashMap<>());
 	}
 
+	public RequestData(ServerHttpRequest request, Map<String, Object> attributes) {
+		this(request.getMethod(), request.getURI(), request.getHeaders(), buildCookies(request.getCookies()),
+				attributes);
+	}
+
 	private static MultiValueMap<String, String> buildCookies(MultiValueMap<String, HttpCookie> cookies) {
 		HttpHeaders newCookies = new HttpHeaders();
 		if (cookies != null) {

spring-cloud-loadbalancer/src/main/java/org/springframework/cloud/loadbalancer/annotation/LoadBalancerClientConfiguration.java

@@ -56,6 +56,7 @@ import org.springframework.web.reactive.function.client.WebClient;
  * @author Olga Maciaszek-Sharma
  * @author Tim Ysewyn
  * @author BaoLin Zhu
+ * @author changjin wei(魏昌进)
  */
 @Configuration(proxyBeanMethods = false)
 @ConditionalOnDiscoveryEnabled
@@ -97,7 +98,7 @@ public class LoadBalancerClientConfiguration {
 		}
 
 		@Bean
-		@ConditionalOnBean({ XForwardedHeadersTransformer.class, LoadBalancerClientFactory.class })
+		@ConditionalOnBean(LoadBalancerClientFactory.class)
 		@ConditionalOnMissingBean
 		public XForwardedHeadersTransformer xForwarderHeadersTransformer(LoadBalancerClientFactory clientFactory) {
 			return new XForwardedHeadersTransformer(clientFactory);