Merge remote-tracking branch 'upstream/master' into springboot

Signed-off-by: slievrly <slievrly@163.com>

# Conflicts:
#	spring-cloud-alibaba-seata/src/main/java/com/alibaba/cloud/seata/GlobalTransactionAutoConfiguration.java

pom.xml

@@ -81,14 +81,16 @@
         <spring-cloud-stream.version>Horsham.RELEASE</spring-cloud-stream.version>
         <spring-cloud-consul.version>2.2.0.RELEASE</spring-cloud-consul.version>
         <spring-cloud-config.version>2.2.0.RELEASE</spring-cloud-config.version>
+        <spring-cloud-zookeeper.version>2.2.0.RELEASE</spring-cloud-zookeeper.version>
 
         <junit.version>4.12</junit.version>
         <javax-servlet-api>3.0</javax-servlet-api>
         <slf4j-api.version>1.7.25</slf4j-api.version>
 
         <!-- Apache Dubbo -->
-        <dubbo-spring-boot.version>2.7.1</dubbo-spring-boot.version>
+        <dubbo-spring-boot.version>2.7.3</dubbo-spring-boot.version>
         <dubbo.version>2.7.3</dubbo.version>
+        <curator.version>4.0.1</curator.version>
 
         <!-- Apache RocketMQ -->
         <rocketmq.starter.version>2.0.2</rocketmq.starter.version>
@@ -218,6 +220,14 @@
                 <scope>import</scope>
             </dependency>
 
+            <dependency>
+                <groupId>org.springframework.cloud</groupId>
+                <artifactId>spring-cloud-zookeeper-dependencies</artifactId>
+                <version>${spring-cloud-zookeeper.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+
             <dependency>
                 <groupId>org.apache.dubbo</groupId>
                 <artifactId>dubbo-spring-boot-starter</artifactId>

spring-cloud-alibaba-dependencies/pom.xml

@@ -29,7 +29,6 @@
         <alicloud.context.version>1.0.5</alicloud.context.version>
         <aliyun.sdk.edas.version>2.44.0</aliyun.sdk.edas.version>
         <schedulerX.client.version>2.1.6</schedulerX.client.version>
-        <dubbo.version>2.7.3</dubbo.version>
         <aliyun.java.sdk.dysmsapi>1.1.0</aliyun.java.sdk.dysmsapi>
         <aliyun.sdk.mns>1.1.8.6</aliyun.sdk.mns>
         <aliyun.java.sdk.dyvmsapi>1.1.1</aliyun.java.sdk.dyvmsapi>

spring-cloud-alibaba-dubbo/pom.xml

@@ -13,12 +13,6 @@
     <artifactId>spring-cloud-alibaba-dubbo</artifactId>
     <name>Spring Cloud Alibaba Dubbo</name>
 
-    <properties>
-        <spring-cloud-zookeeper.version>2.2.0.RELEASE</spring-cloud-zookeeper.version>
-        <spring-cloud-consul.version>2.2.0.RELEASE</spring-cloud-consul.version>
-        <curator.version>4.0.1</curator.version>
-    </properties>
-
     <dependencyManagement>
 
         <dependencies>

spring-cloud-alibaba-dubbo/src/main/java/com/alibaba/cloud/dubbo/autoconfigure/DubboLoadBalancedRestTemplateAutoConfiguration.java

@@ -60,7 +60,7 @@ import org.springframework.web.client.RestTemplate;
  *
  * @author <a href="mailto:mercyblitz@gmail.com">Mercy</a>
  */
-@Configuration
+@Configuration(proxyBeanMethods = false)
 @ConditionalOnClass(name = { "org.springframework.web.client.RestTemplate" })
 @AutoConfigureAfter(name = {
 		"org.springframework.cloud.client.loadbalancer.LoadBalancerAutoConfiguration" })

spring-cloud-alibaba-dubbo/src/main/java/com/alibaba/cloud/dubbo/autoconfigure/DubboMetadataAutoConfiguration.java

@@ -51,7 +51,7 @@ import org.springframework.util.CollectionUtils;
  *
  * @author <a href="mailto:mercyblitz@gmail.com">Mercy</a>
  */
-@Configuration
+@Configuration(proxyBeanMethods = false)
 @Import({ DubboServiceMetadataRepository.class, IntrospectiveDubboMetadataService.class,
 		DubboMetadataServiceExporter.class, JSONUtils.class })
 public class DubboMetadataAutoConfiguration {

spring-cloud-alibaba-dubbo/src/main/java/com/alibaba/cloud/dubbo/autoconfigure/DubboOpenFeignAutoConfiguration.java

@@ -37,7 +37,7 @@ import static com.alibaba.cloud.dubbo.autoconfigure.DubboOpenFeignAutoConfigurat
 @ConditionalOnClass(name = { "feign.Feign", TARGETER_CLASS_NAME })
 @AutoConfigureAfter(
 		name = { "org.springframework.cloud.openfeign.FeignAutoConfiguration" })
-@Configuration
+@Configuration(proxyBeanMethods = false)
 public class DubboOpenFeignAutoConfiguration {
 
 	/**

spring-cloud-alibaba-dubbo/src/main/java/com/alibaba/cloud/dubbo/autoconfigure/DubboServiceAutoConfiguration.java

@@ -39,7 +39,7 @@ import org.springframework.core.env.PropertyResolver;
  *
  * @author <a href="mailto:mercyblitz@gmail.com">Mercy</a>
  */
-@Configuration
+@Configuration(proxyBeanMethods = false)
 @EnableConfigurationProperties(DubboCloudProperties.class)
 public class DubboServiceAutoConfiguration {
 
@@ -60,7 +60,7 @@ public class DubboServiceAutoConfiguration {
 		return environment;
 	}
 
-	@Configuration
+	@Configuration(proxyBeanMethods = false)
 	@Import({ DubboGenericServiceExecutionContextFactory.class,
 			RequestParamServiceParameterResolver.class,
 			RequestBodyServiceParameterResolver.class,

spring-cloud-alibaba-dubbo/src/main/java/com/alibaba/cloud/dubbo/autoconfigure/DubboServiceDiscoveryAutoConfiguration.java

@@ -94,7 +94,7 @@ import static org.springframework.util.StringUtils.hasText;
  * @see Configuration
  * @see DiscoveryClient
  */
-@Configuration
+@Configuration(proxyBeanMethods = false)
 @ConditionalOnClass(name = "org.springframework.cloud.client.discovery.DiscoveryClient")
 @ConditionalOnProperty(name = "spring.cloud.discovery.enabled", matchIfMissing = true)
 @AutoConfigureAfter(
@@ -262,7 +262,7 @@ public class DubboServiceDiscoveryAutoConfiguration {
 	/**
 	 * Eureka Customized Configuration.
 	 */
-	@Configuration
+	@Configuration(proxyBeanMethods = false)
 	@ConditionalOnBean(name = EUREKA_CLIENT_AUTO_CONFIGURATION_CLASS_NAME)
 	public class EurekaConfiguration {
 
@@ -293,7 +293,7 @@ public class DubboServiceDiscoveryAutoConfiguration {
 	/**
 	 * Zookeeper Customized Configuration.
 	 */
-	@Configuration
+	@Configuration(proxyBeanMethods = false)
 	@ConditionalOnBean(name = ZOOKEEPER_DISCOVERY_AUTO_CONFIGURATION_CLASS_NAME)
 	@Aspect
 	public class ZookeeperConfiguration
@@ -490,7 +490,7 @@ public class DubboServiceDiscoveryAutoConfiguration {
 	/**
 	 * Consul Customized Configuration.
 	 */
-	@Configuration
+	@Configuration(proxyBeanMethods = false)
 	@ConditionalOnBean(name = CONSUL_DISCOVERY_AUTO_CONFIGURATION_CLASS_NAME)
 	class ConsulConfiguration {
 
@@ -499,7 +499,7 @@ public class DubboServiceDiscoveryAutoConfiguration {
 	/**
 	 * Nacos Customized Configuration.
 	 */
-	@Configuration
+	@Configuration(proxyBeanMethods = false)
 	@ConditionalOnBean(name = NACOS_DISCOVERY_AUTO_CONFIGURATION_CLASS_NAME)
 	class NacosConfiguration {
 

spring-cloud-alibaba-dubbo/src/main/java/com/alibaba/cloud/dubbo/autoconfigure/DubboServiceRegistrationAutoConfiguration.java

@@ -64,7 +64,7 @@ import static org.springframework.util.ObjectUtils.isEmpty;
  *
  * @author <a href="mailto:mercyblitz@gmail.com">Mercy</a>
  */
-@Configuration
+@Configuration(proxyBeanMethods = false)
 @Import({ DubboServiceRegistrationEventPublishingAspect.class })
 @ConditionalOnProperty(value = "spring.cloud.service-registry.auto-registration.enabled",
 		matchIfMissing = true)
@@ -130,7 +130,7 @@ public class DubboServiceRegistrationAutoConfiguration {
 		}
 	}
 
-	@Configuration
+	@Configuration(proxyBeanMethods = false)
 	@ConditionalOnBean(name = EUREKA_CLIENT_AUTO_CONFIGURATION_CLASS_NAME)
 	@Aspect
 	class EurekaConfiguration implements SmartInitializingSingleton {
@@ -166,7 +166,7 @@ public class DubboServiceRegistrationAutoConfiguration {
 
 	}
 
-	@Configuration
+	@Configuration(proxyBeanMethods = false)
 	@ConditionalOnBean(name = CONSUL_AUTO_SERVICE_AUTO_CONFIGURATION_CLASS_NAME)
 	@AutoConfigureOrder
 	class ConsulConfiguration {

spring-cloud-alibaba-dubbo/src/main/java/com/alibaba/cloud/dubbo/autoconfigure/DubboServiceRegistrationNonWebApplicationAutoConfiguration.java

@@ -51,7 +51,7 @@ import static com.alibaba.cloud.dubbo.autoconfigure.DubboServiceRegistrationAuto
  *
  * @author <a href="mailto:mercyblitz@gmail.com">Mercy</a>
  */
-@Configuration
+@Configuration(proxyBeanMethods = false)
 @ConditionalOnNotWebApplication
 @ConditionalOnProperty(value = "spring.cloud.service-registry.auto-registration.enabled",
 		matchIfMissing = true)
@@ -116,7 +116,7 @@ public class DubboServiceRegistrationNonWebApplicationAutoConfiguration {
 		}
 	}
 
-	@Configuration
+	@Configuration(proxyBeanMethods = false)
 	@ConditionalOnBean(name = ZOOKEEPER_AUTO_SERVICE_AUTO_CONFIGURATION_CLASS_NAME)
 	class ZookeeperConfiguration implements SmartInitializingSingleton {
 
@@ -138,7 +138,7 @@ public class DubboServiceRegistrationNonWebApplicationAutoConfiguration {
 
 	}
 
-	@Configuration
+	@Configuration(proxyBeanMethods = false)
 	@ConditionalOnBean(name = CONSUL_AUTO_SERVICE_AUTO_CONFIGURATION_CLASS_NAME)
 	class ConsulConfiguration {
 

spring-cloud-alibaba-dubbo/src/test/java/com/alibaba/cloud/dubbo/http/matcher/ConsumeMediaTypeExpressionTest.java

@@ -33,16 +33,16 @@ public class ConsumeMediaTypeExpressionTest
 	public void testMatch() {
 		ConsumeMediaTypeExpression expression = createExpression(MediaType.ALL_VALUE);
 
-		Assert.assertTrue(expression.match(MediaType.APPLICATION_JSON_UTF8));
+		Assert.assertTrue(expression.match(MediaType.APPLICATION_JSON));
 
 		expression = createExpression(MediaType.APPLICATION_JSON_VALUE);
-		Assert.assertTrue(expression.match(MediaType.APPLICATION_JSON_UTF8));
+		Assert.assertTrue(expression.match(MediaType.APPLICATION_JSON));
 
 		expression = createExpression(MediaType.APPLICATION_JSON_VALUE + ";q=0.7");
-		Assert.assertTrue(expression.match(MediaType.APPLICATION_JSON_UTF8));
+		Assert.assertTrue(expression.match(MediaType.APPLICATION_JSON));
 
 		expression = createExpression(MediaType.TEXT_HTML_VALUE);
-		Assert.assertFalse(expression.match(MediaType.APPLICATION_JSON_UTF8));
+		Assert.assertFalse(expression.match(MediaType.APPLICATION_JSON));
 	}
 
 }

spring-cloud-alibaba-examples/sentinel-example/sentinel-spring-cloud-gateway-example/src/main/java/com/alibaba/cloud/examples/MySCGConfiguration.java

@@ -25,7 +25,7 @@ import org.springframework.http.MediaType;
 import org.springframework.web.reactive.function.server.ServerResponse;
 import org.springframework.web.server.ServerWebExchange;
 
-import static org.springframework.web.reactive.function.BodyInserters.fromObject;
+import static org.springframework.web.reactive.function.BodyInserters.fromValue;
 
 /**
  * @author <a href="mailto:fangjian0423@gmail.com">Jim</a>
@@ -39,9 +39,8 @@ public class MySCGConfiguration {
 			@Override
 			public Mono<ServerResponse> handleRequest(ServerWebExchange exchange,
 					Throwable t) {
-				return ServerResponse.status(444)
+				return ServerResponse.status(444).contentType(MediaType.APPLICATION_JSON)
-						.contentType(MediaType.APPLICATION_JSON_UTF8)
+						.body(fromValue("SCS Sentinel block"));
-						.body(fromObject("SCS Sentinel block"));
 			}
 		};
 	}

spring-cloud-alibaba-examples/sentinel-example/sentinel-webflux-example/src/main/java/com/alibaba/cloud/examples/MyConfiguration.java

@@ -26,7 +26,7 @@ import org.springframework.http.MediaType;
 import org.springframework.web.reactive.function.server.ServerResponse;
 import org.springframework.web.server.ServerWebExchange;
 
-import static org.springframework.web.reactive.function.BodyInserters.fromObject;
+import static org.springframework.web.reactive.function.BodyInserters.fromValue;
 
 /**
  * @author <a href="mailto:fangjian0423@gmail.com">Jim</a>
@@ -41,8 +41,7 @@ public class MyConfiguration {
 			public Mono<ServerResponse> handleRequest(ServerWebExchange exchange,
 					Throwable t) {
 				return ServerResponse.status(HttpStatus.TOO_MANY_REQUESTS)
-						.contentType(MediaType.APPLICATION_JSON_UTF8)
+						.contentType(MediaType.APPLICATION_JSON).body(fromValue("block"));
-						.body(fromObject("block"));
 			}
 		};
 	}

spring-cloud-alibaba-examples/spring-cloud-alibaba-dubbo-examples/pom.xml

@@ -3,10 +3,10 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <groupId>org.springframework.cloud</groupId>
+        <groupId>com.alibaba.cloud</groupId>
-        <artifactId>spring-cloud-build</artifactId>
+        <artifactId>spring-cloud-alibaba-examples</artifactId>
-        <version>2.2.0.RELEASE</version>
+        <version>2.2.0.BUILD-SNAPSHOT</version>
-        <relativePath/>
+        <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -26,79 +26,4 @@
         <module>spring-cloud-dubbo-servlet-gateway-sample</module>
     </modules>
 
-    <properties>
-        <dubbo.version>2.7.3</dubbo.version>
-        <spring-cloud-commons.version>2.2.0.RELEASE</spring-cloud-commons.version>
-        <spring-cloud-netflix.version>2.2.0.RELEASE</spring-cloud-netflix.version>
-        <spring-cloud-openfeign.version>2.2.0.RELEASE</spring-cloud-openfeign.version>
-        <spring-cloud-zookeeper.version>2.2.0.RELEASE</spring-cloud-zookeeper.version>
-        <spring-cloud-consul.version>2.2.0.RELEASE</spring-cloud-consul.version>
-        <curator.version>4.0.1</curator.version>
-    </properties>
-
-    <dependencyManagement>
-        <dependencies>
-            <!-- Spring Boot dependencies -->
-            <dependency>
-                <groupId>org.springframework.boot</groupId>
-                <artifactId>spring-boot-dependencies</artifactId>
-                <version>${spring-boot.version}</version>
-                <type>pom</type>
-                <scope>import</scope>
-            </dependency>
-
-            <!-- Spring Cloud Alibaba dependencies -->
-            <dependency>
-                <groupId>com.alibaba.cloud</groupId>
-                <artifactId>spring-cloud-alibaba-dependencies</artifactId>
-                <version>${project.version}</version>
-                <type>pom</type>
-                <scope>import</scope>
-            </dependency>
-
-            <dependency>
-                <groupId>org.springframework.cloud</groupId>
-                <artifactId>spring-cloud-netflix-dependencies</artifactId>
-                <version>${spring-cloud-netflix.version}</version>
-                <type>pom</type>
-                <scope>import</scope>
-            </dependency>
-
-            <dependency>
-                <groupId>org.springframework.cloud</groupId>
-                <artifactId>spring-cloud-openfeign-dependencies</artifactId>
-                <version>${spring-cloud-openfeign.version}</version>
-                <type>pom</type>
-                <scope>import</scope>
-            </dependency>
-
-            <dependency>
-                <groupId>org.apache.dubbo</groupId>
-                <artifactId>dubbo-bom</artifactId>
-                <version>${dubbo.version}</version>
-                <type>pom</type>
-                <scope>import</scope>
-            </dependency>
-        </dependencies>
-    </dependencyManagement>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-deploy-plugin</artifactId>
-                <configuration>
-                    <skip>true</skip>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <configuration>
-                    <source>8</source>
-                    <target>8</target>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
 </project>

spring-cloud-alibaba-examples/spring-cloud-alibaba-dubbo-examples/spring-cloud-dubbo-client-sample/pom.xml

@@ -3,10 +3,10 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <groupId>org.springframework.cloud</groupId>
+        <groupId>com.alibaba.cloud</groupId>
-        <artifactId>spring-cloud-build</artifactId>
+        <artifactId>spring-cloud-alibaba-dubbo-examples</artifactId>
-        <version>2.1.3.RELEASE</version>
+        <version>2.2.0.BUILD-SNAPSHOT</version>
-        <relativePath/>
+        <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -15,19 +15,6 @@
     <name>Spring Cloud Dubbo Client Sample</name>
     <version>2.2.0.BUILD-SNAPSHOT</version>
 
-    <dependencyManagement>
-        <dependencies>
-            <!-- Spring Cloud Alibaba dependencies -->
-            <dependency>
-                <groupId>org.springframework.cloud</groupId>
-                <artifactId>spring-cloud-alibaba-dependencies</artifactId>
-                <version>0.9.0.RELEASE</version>
-                <type>pom</type>
-                <scope>import</scope>
-            </dependency>
-        </dependencies>
-    </dependencyManagement>
-
     <dependencies>
         <!-- Sample API -->
         <dependency>
@@ -49,13 +36,13 @@
 
         <!-- Dubbo Spring Cloud Starter -->
         <dependency>
-            <groupId>org.springframework.cloud</groupId>
+            <groupId>com.alibaba.cloud</groupId>
             <artifactId>spring-cloud-starter-dubbo</artifactId>
         </dependency>
 
         <!-- Spring Cloud Nacos Service Discovery -->
         <dependency>
-            <groupId>org.springframework.cloud</groupId>
+            <groupId>com.alibaba.cloud</groupId>
             <artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>
         </dependency>
     </dependencies>

spring-cloud-alibaba-examples/spring-cloud-alibaba-dubbo-examples/spring-cloud-dubbo-client-sample/src/main/java/com/alibaba/cloud/dubbo/bootstrap/DubboSpringCloudClientBootstrap.java

@@ -17,7 +17,6 @@
 package com.alibaba.cloud.dubbo.bootstrap;
 
 import com.alibaba.cloud.dubbo.service.EchoService;
-
 import org.apache.dubbo.config.annotation.Reference;
 
 import org.springframework.boot.SpringApplication;
@@ -27,7 +26,7 @@ import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 /**
- * Dubbo Spring Cloud Client Bootstrap
+ * Dubbo Spring Cloud Client Bootstrap.
  */
 @EnableDiscoveryClient
 @EnableAutoConfiguration
@@ -45,4 +44,5 @@ public class DubboSpringCloudClientBootstrap {
 	public static void main(String[] args) {
 		SpringApplication.run(DubboSpringCloudClientBootstrap.class);
 	}
+
 }

spring-cloud-alibaba-examples/spring-cloud-alibaba-dubbo-examples/spring-cloud-dubbo-consumer-sample/pom.xml

@@ -68,7 +68,6 @@
         <dependency>
             <groupId>org.springframework.cloud</groupId>
             <artifactId>spring-cloud-starter-zookeeper-discovery</artifactId>
-            <version>${spring-cloud-zookeeper.version}</version>
             <exclusions>
                 <exclusion>
                     <groupId>org.apache.zookeeper</groupId>

spring-cloud-alibaba-examples/spring-cloud-alibaba-dubbo-examples/spring-cloud-dubbo-consumer-sample/src/main/java/com/alibaba/cloud/dubbo/bootstrap/DubboSpringCloudConsumerBootstrap.java

@@ -23,7 +23,6 @@ import com.alibaba.cloud.dubbo.annotation.DubboTransported;
 import com.alibaba.cloud.dubbo.service.RestService;
 import com.alibaba.cloud.dubbo.service.User;
 import com.alibaba.cloud.dubbo.service.UserService;
-
 import org.apache.dubbo.config.annotation.Reference;
 
 import org.springframework.beans.factory.annotation.Autowired;
@@ -49,6 +48,7 @@ import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.client.RestTemplate;
 
 import static org.springframework.http.MediaType.APPLICATION_JSON_UTF8_VALUE;
+import static org.springframework.http.MediaType.APPLICATION_JSON_VALUE;
 
 /**
  * Dubbo Spring Cloud Consumer Bootstrap.
@@ -81,51 +81,6 @@ public class DubboSpringCloudConsumerBootstrap {
 	@LoadBalanced
 	private RestTemplate restTemplate;
 
-	@FeignClient("${provider.application.name}")
-	public interface FeignRestService {
-
-		@GetMapping(value = "/param")
-		String param(@RequestParam("param") String param);
-
-		@PostMapping("/params")
-		public String params(@RequestParam("b") String b, @RequestParam("a") int a);
-
-		@PostMapping(value = "/request/body/map", produces = APPLICATION_JSON_UTF8_VALUE)
-		User requestBody(@RequestParam("param") String param,
-				@RequestBody Map<String, Object> data);
-
-		@GetMapping("/headers")
-		public String headers(@RequestHeader("h2") String header2,
-				@RequestHeader("h") String header, @RequestParam("v") Integer value);
-
-		@GetMapping("/path-variables/{p1}/{p2}")
-		public String pathVariables(@PathVariable("p2") String path2,
-				@PathVariable("p1") String path1, @RequestParam("v") String param);
-	}
-
-	@FeignClient("${provider.application.name}")
-	@DubboTransported(protocol = "dubbo")
-	public interface DubboFeignRestService {
-
-		@GetMapping(value = "/param")
-		String param(@RequestParam("param") String param);
-
-		@PostMapping("/params")
-		String params(@RequestParam("b") String paramB, @RequestParam("a") int paramA);
-
-		@PostMapping(value = "/request/body/map", produces = APPLICATION_JSON_UTF8_VALUE)
-		User requestBody(@RequestParam("param") String param,
-				@RequestBody Map<String, Object> data);
-
-		@GetMapping("/headers")
-		public String headers(@RequestHeader("h2") String header2,
-				@RequestParam("v") Integer value, @RequestHeader("h") String header);
-
-		@GetMapping("/path-variables/{p1}/{p2}")
-		public String pathVariables(@RequestParam("v") String param,
-				@PathVariable("p2") String path2, @PathVariable("p1") String path1);
-	}
-
 	@Bean
 	public ApplicationRunner userServiceRunner() {
 		return arguments -> {
@@ -256,4 +211,52 @@ public class DubboSpringCloudConsumerBootstrap {
 		new SpringApplicationBuilder(DubboSpringCloudConsumerBootstrap.class)
 				.properties("spring.profiles.active=nacos").run(args);
 	}
+
+	@FeignClient("${provider.application.name}")
+	public interface FeignRestService {
+
+		@GetMapping("/param")
+		String param(@RequestParam("param") String param);
+
+		@PostMapping("/params")
+		String params(@RequestParam("b") String b, @RequestParam("a") int a);
+
+		@PostMapping(value = "/request/body/map", produces = APPLICATION_JSON_VALUE)
+		User requestBody(@RequestParam("param") String param,
+				@RequestBody Map<String, Object> data);
+
+		@GetMapping("/headers")
+		String headers(@RequestHeader("h2") String header2,
+				@RequestHeader("h") String header, @RequestParam("v") Integer value);
+
+		@GetMapping("/path-variables/{p1}/{p2}")
+		String pathVariables(@PathVariable("p2") String path2,
+				@PathVariable("p1") String path1, @RequestParam("v") String param);
+
+	}
+
+	@FeignClient("${provider.application.name}")
+	@DubboTransported(protocol = "dubbo")
+	public interface DubboFeignRestService {
+
+		@GetMapping("/param")
+		String param(@RequestParam("param") String param);
+
+		@PostMapping("/params")
+		String params(@RequestParam("b") String paramB, @RequestParam("a") int paramA);
+
+		@PostMapping(value = "/request/body/map", produces = APPLICATION_JSON_UTF8_VALUE)
+		User requestBody(@RequestParam("param") String param,
+				@RequestBody Map<String, Object> data);
+
+		@GetMapping("/headers")
+		String headers(@RequestHeader("h2") String header2,
+				@RequestParam("v") Integer value, @RequestHeader("h") String header);
+
+		@GetMapping("/path-variables/{p1}/{p2}")
+		String pathVariables(@RequestParam("v") String param,
+				@PathVariable("p2") String path2, @PathVariable("p1") String path1);
+
+	}
+
 }

spring-cloud-alibaba-examples/spring-cloud-alibaba-dubbo-examples/spring-cloud-dubbo-provider-sample/pom.xml

@@ -59,7 +59,6 @@
         <dependency>
             <groupId>org.springframework.cloud</groupId>
             <artifactId>spring-cloud-starter-zookeeper-discovery</artifactId>
-            <version>${spring-cloud-zookeeper.version}</version>
             <exclusions>
                 <exclusion>
                     <groupId>org.apache.zookeeper</groupId>
@@ -137,6 +136,18 @@
 
     </dependencies>
 
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>org.apache.dubbo</groupId>
+                <artifactId>dubbo-bom</artifactId>
+                <version>${dubbo.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+
     <build>
         <plugins>
             <plugin>

spring-cloud-alibaba-examples/spring-cloud-alibaba-dubbo-examples/spring-cloud-dubbo-provider-sample/src/main/java/com/alibaba/cloud/dubbo/bootstrap/DubboSpringCloudProviderBootstrap.java

@@ -33,4 +33,5 @@ public class DubboSpringCloudProviderBootstrap {
 				.properties("spring.profiles.active=nacos").web(WebApplicationType.NONE)
 				.run(args);
 	}
+
 }

spring-cloud-alibaba-examples/spring-cloud-alibaba-dubbo-examples/spring-cloud-dubbo-provider-sample/src/main/java/com/alibaba/cloud/dubbo/service/InMemoryUserService.java

@@ -44,4 +44,5 @@ public class InMemoryUserService implements UserService {
 	public Collection<User> findAll() {
 		return usersRepository.values();
 	}
+
 }

spring-cloud-alibaba-examples/spring-cloud-alibaba-dubbo-examples/spring-cloud-dubbo-provider-sample/src/main/java/com/alibaba/cloud/dubbo/service/StandardRestService.java

@@ -119,4 +119,5 @@ public class StandardRestService implements RestService {
 		map.put("age", user.getAge());
 		return map;
 	}
+
 }

spring-cloud-alibaba-examples/spring-cloud-alibaba-dubbo-examples/spring-cloud-dubbo-provider-web-sample/pom.xml

@@ -58,7 +58,6 @@
         <dependency>
             <groupId>org.springframework.cloud</groupId>
             <artifactId>spring-cloud-starter-zookeeper-discovery</artifactId>
-            <version>${spring-cloud-zookeeper.version}</version>
             <exclusions>
                 <exclusion>
                     <groupId>org.apache.zookeeper</groupId>

spring-cloud-alibaba-examples/spring-cloud-alibaba-dubbo-examples/spring-cloud-dubbo-provider-web-sample/src/main/java/com/alibaba/cloud/dubbo/bootstrap/DubboSpringCloudWebProviderBootstrap.java

@@ -31,4 +31,5 @@ public class DubboSpringCloudWebProviderBootstrap {
 		new SpringApplicationBuilder(DubboSpringCloudWebProviderBootstrap.class)
 				.properties("spring.profiles.active=nacos").run(args);
 	}
+
 }

spring-cloud-alibaba-examples/spring-cloud-alibaba-dubbo-examples/spring-cloud-dubbo-provider-web-sample/src/main/java/com/alibaba/cloud/dubbo/service/InMemoryUserService.java

@@ -44,4 +44,5 @@ public class InMemoryUserService implements UserService {
 	public Collection<User> findAll() {
 		return usersRepository.values();
 	}
+
 }

spring-cloud-alibaba-examples/spring-cloud-alibaba-dubbo-examples/spring-cloud-dubbo-provider-web-sample/src/main/java/com/alibaba/cloud/dubbo/service/SpringRestService.java

@@ -46,7 +46,7 @@ public class SpringRestService implements RestService {
 	private Logger logger = LoggerFactory.getLogger(getClass());
 
 	@Override
-	@GetMapping(value = "/param")
+	@GetMapping("/param")
 	public String param(@RequestParam String param) {
 		log("/param", param);
 		return param;
@@ -84,7 +84,8 @@ public class SpringRestService implements RestService {
 	}
 
 	@Override
-	@PostMapping(value = "/request/body/map", produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
+	@PostMapping(value = "/request/body/map",
+			produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
 	public User requestBodyMap(@RequestBody Map<String, Object> data,
 			@RequestParam("param") String param) {
 		User user = new User();
@@ -95,7 +96,8 @@ public class SpringRestService implements RestService {
 		return user;
 	}
 
-	@PostMapping(value = "/request/body/user", consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
+	@PostMapping(value = "/request/body/user",
+			consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
 	@Override
 	public Map<String, Object> requestBodyUser(@RequestBody User user) {
 		Map<String, Object> map = new HashMap<>();

spring-cloud-alibaba-examples/spring-cloud-alibaba-dubbo-examples/spring-cloud-dubbo-sample-api/src/main/java/com/alibaba/cloud/dubbo/service/EchoService.java

@@ -22,4 +22,5 @@ package com.alibaba.cloud.dubbo.service;
 public interface EchoService {
 
 	String echo(String message);
+
 }

spring-cloud-alibaba-examples/spring-cloud-alibaba-dubbo-examples/spring-cloud-dubbo-sample-api/src/main/java/com/alibaba/cloud/dubbo/service/RestService.java

@@ -38,4 +38,5 @@ public interface RestService {
 	User requestBodyMap(Map<String, Object> data, String param);
 
 	Map<String, Object> requestBodyUser(User user);
+
 }

spring-cloud-alibaba-examples/spring-cloud-alibaba-dubbo-examples/spring-cloud-dubbo-sample-api/src/main/java/com/alibaba/cloud/dubbo/service/User.java

@@ -59,4 +59,5 @@ public class User implements Serializable {
 	public String toString() {
 		return "User{" + "id=" + id + ", name='" + name + '\'' + ", age=" + age + '}';
 	}
+
 }

spring-cloud-alibaba-examples/spring-cloud-alibaba-dubbo-examples/spring-cloud-dubbo-sample-api/src/main/java/com/alibaba/cloud/dubbo/service/UserService.java

@@ -30,4 +30,5 @@ public interface UserService {
 	boolean remove(Long userId);
 
 	Collection<User> findAll();
+
 }

spring-cloud-alibaba-examples/spring-cloud-alibaba-dubbo-examples/spring-cloud-dubbo-sample-api/src/main/java/com/alibaba/cloud/dubbo/util/LoggerUtils.java

@@ -38,4 +38,5 @@ public abstract class LoggerUtils {
 			logger.info(message);
 		}
 	}
+
 }

spring-cloud-alibaba-examples/spring-cloud-alibaba-dubbo-examples/spring-cloud-dubbo-server-sample/pom.xml

@@ -3,10 +3,10 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <groupId>org.springframework.cloud</groupId>
+        <groupId>com.alibaba.cloud</groupId>
-        <artifactId>spring-cloud-build</artifactId>
+        <artifactId>spring-cloud-alibaba-dubbo-examples</artifactId>
-        <version>2.1.3.RELEASE</version>
+        <version>2.2.0.BUILD-SNAPSHOT</version>
-        <relativePath/>
+        <relativePath>../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
@@ -16,19 +16,6 @@
     <name>Spring Cloud Dubbo Server Sample</name>
     <version>2.2.0.BUILD-SNAPSHOT</version>
 
-    <dependencyManagement>
-        <dependencies>
-            <!-- Spring Cloud Alibaba dependencies -->
-            <dependency>
-                <groupId>org.springframework.cloud</groupId>
-                <artifactId>spring-cloud-alibaba-dependencies</artifactId>
-                <version>0.9.0.RELEASE</version>
-                <type>pom</type>
-                <scope>import</scope>
-            </dependency>
-        </dependencies>
-    </dependencyManagement>
-
     <dependencies>
 
         <!-- Sample API -->
@@ -46,13 +33,13 @@
 
         <!-- Dubbo Spring Cloud Starter -->
         <dependency>
-            <groupId>org.springframework.cloud</groupId>
+            <groupId>com.alibaba.cloud</groupId>
             <artifactId>spring-cloud-starter-dubbo</artifactId>
         </dependency>
 
         <!-- Spring Cloud Nacos Service Discovery -->
         <dependency>
-            <groupId>org.springframework.cloud</groupId>
+            <groupId>com.alibaba.cloud</groupId>
             <artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>
         </dependency>
     </dependencies>

spring-cloud-alibaba-examples/spring-cloud-alibaba-dubbo-examples/spring-cloud-dubbo-server-sample/src/main/java/com/alibaba/cloud/dubbo/bootstrap/DubboSpringCloudServerBootstrap.java

@@ -17,7 +17,6 @@
 package com.alibaba.cloud.dubbo.bootstrap;
 
 import com.alibaba.cloud.dubbo.service.EchoService;
-
 import org.apache.dubbo.config.annotation.Service;
 
 import org.springframework.boot.SpringApplication;
@@ -34,6 +33,7 @@ public class DubboSpringCloudServerBootstrap {
 	public static void main(String[] args) {
 		SpringApplication.run(DubboSpringCloudServerBootstrap.class);
 	}
+
 }
 
 @Service
@@ -43,4 +43,5 @@ class EchoServiceImpl implements EchoService {
 	public String echo(String message) {
 		return "[echo] Hello, " + message;
 	}
-}
+
+}

spring-cloud-alibaba-examples/spring-cloud-alibaba-dubbo-examples/spring-cloud-dubbo-servlet-gateway-sample/src/main/java/com/alibaba/cloud/dubbo/bootstrap/DubboSpringCloudServletGatewayBootstrap.java

@@ -35,4 +35,5 @@ public class DubboSpringCloudServletGatewayBootstrap {
 		new SpringApplicationBuilder(DubboSpringCloudServletGatewayBootstrap.class)
 				.properties("spring.profiles.active=nacos").run(args);
 	}
+
 }

spring-cloud-alibaba-examples/spring-cloud-alibaba-dubbo-examples/spring-cloud-dubbo-servlet-gateway-sample/src/main/java/com/alibaba/cloud/dubbo/gateway/DubboGatewayServlet.java

@@ -41,7 +41,6 @@ import com.alibaba.cloud.dubbo.metadata.repository.DubboServiceMetadataRepositor
 import com.alibaba.cloud.dubbo.service.DubboGenericServiceExecutionContext;
 import com.alibaba.cloud.dubbo.service.DubboGenericServiceExecutionContextFactory;
 import com.alibaba.cloud.dubbo.service.DubboGenericServiceFactory;
-
 import org.apache.dubbo.rpc.service.GenericException;
 import org.apache.dubbo.rpc.service.GenericService;
 
@@ -148,37 +147,6 @@ public class DubboGatewayServlet extends HttpServletBean {
 		return StreamUtils.copyToByteArray(inputStream);
 	}
 
-	private static class HttpRequestAdapter implements HttpRequest {
-
-		private final HttpServletRequest request;
-
-		private HttpRequestAdapter(HttpServletRequest request) {
-			this.request = request;
-		}
-
-		@Override
-		public String getMethodValue() {
-			return request.getMethod();
-		}
-
-		@Override
-		public URI getURI() {
-			try {
-				return new URI(request.getRequestURL().toString() + "?"
-						+ request.getQueryString());
-			}
-			catch (URISyntaxException e) {
-				e.printStackTrace();
-			}
-			throw new RuntimeException();
-		}
-
-		@Override
-		public HttpHeaders getHeaders() {
-			return new HttpHeaders();
-		}
-	}
-
 	private RequestMetadata buildRequestMetadata(HttpServletRequest request,
 			String restPath) {
 		UriComponents uriComponents = fromUriString(request.getRequestURI()).build(true);
@@ -208,4 +176,37 @@ public class DubboGatewayServlet extends HttpServletBean {
 		}
 		return map;
 	}
+
+	private final static class HttpRequestAdapter implements HttpRequest {
+
+		private final HttpServletRequest request;
+
+		private HttpRequestAdapter(HttpServletRequest request) {
+			this.request = request;
+		}
+
+		@Override
+		public String getMethodValue() {
+			return request.getMethod();
+		}
+
+		@Override
+		public URI getURI() {
+			try {
+				return new URI(request.getRequestURL().toString() + "?"
+						+ request.getQueryString());
+			}
+			catch (URISyntaxException e) {
+				e.printStackTrace();
+			}
+			throw new RuntimeException();
+		}
+
+		@Override
+		public HttpHeaders getHeaders() {
+			return new HttpHeaders();
+		}
+
+	}
+
 }

spring-cloud-alibaba-nacos-config-server/src/main/java/com/alibaba/cloud/nacos/config/server/NacosConfigServerAutoConfiguration.java

@@ -36,7 +36,7 @@ import org.springframework.context.annotation.Configuration;
 												// present in class-path
 @ComponentScan(basePackages = { "com.alibaba.nacos.config.server" })
 @AutoConfigureBefore(ConfigServerAutoConfiguration.class)
-@Configuration
+@Configuration(proxyBeanMethods = false)
 public class NacosConfigServerAutoConfiguration {
 
 	@Bean

spring-cloud-alibaba-nacos-config/src/main/java/com/alibaba/cloud/nacos/NacosConfigAutoConfiguration.java

@@ -29,7 +29,7 @@ import org.springframework.context.annotation.Configuration;
 /**
  * @author juven.xuxb
  */
-@Configuration
+@Configuration(proxyBeanMethods = false)
 @ConditionalOnProperty(name = "spring.cloud.nacos.config.enabled", matchIfMissing = true)
 public class NacosConfigAutoConfiguration {
 

spring-cloud-alibaba-nacos-config/src/main/java/com/alibaba/cloud/nacos/NacosConfigBootstrapConfiguration.java

@@ -26,7 +26,7 @@ import org.springframework.context.annotation.Configuration;
 /**
  * @author xiaojing
  */
-@Configuration
+@Configuration(proxyBeanMethods = false)
 @ConditionalOnProperty(name = "spring.cloud.nacos.config.enabled", matchIfMissing = true)
 public class NacosConfigBootstrapConfiguration {
 

spring-cloud-alibaba-nacos-discovery/src/main/java/com/alibaba/cloud/nacos/discovery/NacosDiscoveryAutoConfiguration.java

@@ -27,7 +27,7 @@ import org.springframework.context.annotation.Configuration;
 /**
  * @author <a href="mailto:echooy.mxq@gmail.com">echooymxq</a>
  **/
-@Configuration
+@Configuration(proxyBeanMethods = false)
 @ConditionalOnDiscoveryEnabled
 @ConditionalOnNacosDiscoveryEnabled
 public class NacosDiscoveryAutoConfiguration {

spring-cloud-alibaba-nacos-discovery/src/main/java/com/alibaba/cloud/nacos/discovery/NacosDiscoveryClientConfiguration.java

@@ -35,7 +35,7 @@ import org.springframework.context.annotation.Configuration;
  * @author xiaojing
  * @author echooymxq
  */
-@Configuration
+@Configuration(proxyBeanMethods = false)
 @ConditionalOnDiscoveryEnabled
 @ConditionalOnBlockingDiscoveryEnabled
 @ConditionalOnNacosDiscoveryEnabled

spring-cloud-alibaba-nacos-discovery/src/main/java/com/alibaba/cloud/nacos/discovery/configclient/NacosConfigServerAutoConfiguration.java

@@ -32,7 +32,7 @@ import org.springframework.util.StringUtils;
  *
  * @author JevonYang
  */
-@Configuration
+@Configuration(proxyBeanMethods = false)
 @EnableConfigurationProperties
 @ConditionalOnClass({ NacosDiscoveryProperties.class, ConfigServerProperties.class })
 public class NacosConfigServerAutoConfiguration {

spring-cloud-alibaba-nacos-discovery/src/main/java/com/alibaba/cloud/nacos/discovery/configclient/NacosDiscoveryClientConfigServiceBootstrapConfiguration.java

@@ -34,7 +34,7 @@ import org.springframework.context.annotation.Configuration;
 @ConditionalOnClass(ConfigServicePropertySourceLocator.class)
 @ConditionalOnProperty(value = "spring.cloud.config.discovery.enabled",
 		matchIfMissing = false)
-@Configuration
+@Configuration(proxyBeanMethods = false)
 @ImportAutoConfiguration({ NacosDiscoveryAutoConfiguration.class,
 		NacosDiscoveryClientConfiguration.class,
 		NacosReactiveDiscoveryClientConfiguration.class })

spring-cloud-alibaba-nacos-discovery/src/main/java/com/alibaba/cloud/nacos/discovery/reactive/NacosReactiveDiscoveryClientConfiguration.java

@@ -33,7 +33,7 @@ import org.springframework.context.annotation.Configuration;
 /**
  * @author <a href="mailto:echooy.mxq@gmail.com">echooymxq</a>
  **/
-@Configuration
+@Configuration(proxyBeanMethods = false)
 @ConditionalOnDiscoveryEnabled
 @ConditionalOnReactiveDiscoveryEnabled
 @ConditionalOnNacosDiscoveryEnabled

spring-cloud-alibaba-nacos-discovery/src/main/java/com/alibaba/cloud/nacos/endpoint/NacosDiscoveryEndpointAutoConfiguration.java

@@ -29,7 +29,7 @@ import org.springframework.context.annotation.Configuration;
 /**
  * @author xiaojing
  */
-@Configuration
+@Configuration(proxyBeanMethods = false)
 @ConditionalOnClass(Endpoint.class)
 @ConditionalOnNacosDiscoveryEnabled
 public class NacosDiscoveryEndpointAutoConfiguration {

spring-cloud-alibaba-nacos-discovery/src/main/java/com/alibaba/cloud/nacos/registry/NacosServiceRegistryAutoConfiguration.java

@@ -35,7 +35,7 @@ import org.springframework.context.annotation.Configuration;
  * @author xiaojing
  * @author <a href="mailto:mercyblitz@gmail.com">Mercy</a>
  */
-@Configuration
+@Configuration(proxyBeanMethods = false)
 @EnableConfigurationProperties
 @ConditionalOnNacosDiscoveryEnabled
 @ConditionalOnProperty(value = "spring.cloud.service-registry.auto-registration.enabled",

spring-cloud-alibaba-nacos-discovery/src/main/java/com/alibaba/cloud/nacos/ribbon/NacosRibbonClientConfiguration.java

@@ -29,7 +29,7 @@ import org.springframework.context.annotation.Configuration;
  *
  * @author xiaojing
  */
-@Configuration
+@Configuration(proxyBeanMethods = false)
 @ConditionalOnRibbonNacos
 public class NacosRibbonClientConfiguration {
 

spring-cloud-alibaba-nacos-discovery/src/main/java/com/alibaba/cloud/nacos/ribbon/RibbonNacosAutoConfiguration.java

@@ -30,7 +30,7 @@ import org.springframework.context.annotation.Configuration;
  * {@link org.springframework.boot.autoconfigure.EnableAutoConfiguration
  * Auto-configuration} that sets up Ribbon for Nacos.
  */
-@Configuration
+@Configuration(proxyBeanMethods = false)
 @EnableConfigurationProperties
 @ConditionalOnBean(SpringClientFactory.class)
 @ConditionalOnRibbonNacos

spring-cloud-alibaba-seata/src/main/java/com/alibaba/cloud/seata/feign/SeataFeignClientAutoConfiguration.java

@@ -33,7 +33,7 @@ import org.springframework.context.annotation.Scope;
  * @author xiaojing
  */
 
-@Configuration
+@Configuration(proxyBeanMethods = false)
 @ConditionalOnClass(Client.class)
 @AutoConfigureBefore(FeignAutoConfiguration.class)
 public class SeataFeignClientAutoConfiguration {
@@ -61,7 +61,7 @@ public class SeataFeignClientAutoConfiguration {
 		return SeataFeignBuilder.builder(beanFactory);
 	}
 
-	@Configuration
+	@Configuration(proxyBeanMethods = false)
 	protected static class FeignBeanPostProcessorConfiguration {
 
 		@Bean

spring-cloud-alibaba-seata/src/main/java/com/alibaba/cloud/seata/feign/hystrix/SeataHystrixAutoConfiguration.java

@@ -25,7 +25,7 @@ import org.springframework.context.annotation.Configuration;
 /**
  * @author xiaojing
  */
-@Configuration
+@Configuration(proxyBeanMethods = false)
 @ConditionalOnClass(HystrixCommand.class)
 public class SeataHystrixAutoConfiguration {
 

spring-cloud-alibaba-seata/src/main/java/com/alibaba/cloud/seata/rest/SeataRestTemplateAutoConfiguration.java

@@ -32,7 +32,7 @@ import org.springframework.web.client.RestTemplate;
  * @author xiaojing
  */
 
-@Configuration
+@Configuration(proxyBeanMethods = false)
 public class SeataRestTemplateAutoConfiguration {
 
 	@Bean

spring-cloud-alibaba-sentinel-gateway/src/main/java/com/alibaba/cloud/sentinel/gateway/FallbackProperties.java

@@ -48,7 +48,7 @@ public class FallbackProperties {
 	/**
 	 * Content-Type for `response` mode.
 	 */
-	private String contentType = MediaType.APPLICATION_JSON_UTF8.toString();
+	private String contentType = MediaType.APPLICATION_JSON.toString();
 
 	public String getMode() {
 		return mode;

spring-cloud-alibaba-sentinel-gateway/src/main/java/com/alibaba/cloud/sentinel/gateway/SentinelGatewayAutoConfiguration.java

@@ -48,12 +48,12 @@ import org.springframework.context.annotation.Configuration;
 /**
  * @author <a href="mailto:fangjian0423@gmail.com">Jim</a>
  */
-@Configuration
+@Configuration(proxyBeanMethods = false)
 @ConditionalOnProperty(name = "spring.cloud.sentinel.enabled", matchIfMissing = true)
 public class SentinelGatewayAutoConfiguration {
 
 	@ConditionalOnClass(ObjectMapper.class)
-	@Configuration
+	@Configuration(proxyBeanMethods = false)
 	protected static class SentinelConverterConfiguration {
 
 		static class ApiPredicateItemDeserializer
@@ -93,7 +93,7 @@ public class SentinelGatewayAutoConfiguration {
 
 		}
 
-		@Configuration
+		@Configuration(proxyBeanMethods = false)
 		protected static class SentinelJsonConfiguration {
 
 			private ObjectMapper objectMapper = new ObjectMapper();
@@ -127,7 +127,7 @@ public class SentinelGatewayAutoConfiguration {
 		}
 
 		@ConditionalOnClass(XmlMapper.class)
-		@Configuration
+		@Configuration(proxyBeanMethods = false)
 		protected static class SentinelXmlConfiguration {
 
 			private XmlMapper xmlMapper = new XmlMapper();

spring-cloud-alibaba-sentinel-gateway/src/main/java/com/alibaba/cloud/sentinel/gateway/scg/SentinelSCGAutoConfiguration.java

@@ -33,7 +33,6 @@ import com.alibaba.csp.sentinel.config.SentinelConfig;
 import com.alibaba.csp.sentinel.util.StringUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import reactor.core.publisher.Mono;
 
 import org.springframework.beans.factory.ObjectProvider;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -50,14 +49,13 @@ import org.springframework.http.MediaType;
 import org.springframework.http.codec.ServerCodecConfigurer;
 import org.springframework.web.reactive.function.server.ServerResponse;
 import org.springframework.web.reactive.result.view.ViewResolver;
-import org.springframework.web.server.ServerWebExchange;
 
-import static org.springframework.web.reactive.function.BodyInserters.fromObject;
+import static org.springframework.web.reactive.function.BodyInserters.fromValue;
 
 /**
  * @author <a href="mailto:fangjian0423@gmail.com">Jim</a>
  */
-@Configuration
+@Configuration(proxyBeanMethods = false)
 @ConditionalOnClass(GlobalFilter.class)
 @ConditionalOnProperty(prefix = ConfigConstants.GATEWAY_PREFIX, name = "enabled",
 		havingValue = "true", matchIfMissing = true)
@@ -93,8 +91,7 @@ public class SentinelSCGAutoConfiguration {
 	}
 
 	private void initAppType() {
-		System.setProperty(SentinelConfig.APP_TYPE,
+		System.setProperty(SentinelConfig.APP_TYPE, ConfigConstants.APP_TYPE_SCG_GATEWAY);
-				String.valueOf(ConfigConstants.APP_TYPE_SCG_GATEWAY));
 	}
 
 	private void initFallback() {
@@ -105,17 +102,11 @@ public class SentinelSCGAutoConfiguration {
 		}
 		if (ConfigConstants.FALLBACK_MSG_RESPONSE.equals(fallbackProperties.getMode())) {
 			if (StringUtil.isNotBlank(fallbackProperties.getResponseBody())) {
-				GatewayCallbackManager.setBlockHandler(new BlockRequestHandler() {
+				GatewayCallbackManager.setBlockHandler((exchange, t) -> ServerResponse
-					@Override
+						.status(fallbackProperties.getResponseStatus())
-					public Mono<ServerResponse> handleRequest(ServerWebExchange exchange,
+						.contentType(
-							Throwable t) {
+								MediaType.valueOf(fallbackProperties.getContentType()))
-						return ServerResponse
+						.body(fromValue(fallbackProperties.getResponseBody())));
-								.status(fallbackProperties.getResponseStatus())
-								.contentType(MediaType
-										.valueOf(fallbackProperties.getContentType()))
-								.body(fromObject(fallbackProperties.getResponseBody()));
-					}
-				});
 				logger.info(
 						"[Sentinel SpringCloudGateway] using AnonymousBlockRequestHandler, responseStatus: "
 								+ fallbackProperties.getResponseStatus()

spring-cloud-alibaba-sentinel-gateway/src/main/java/com/alibaba/cloud/sentinel/gateway/zuul/SentinelZuulAutoConfiguration.java

@@ -45,7 +45,7 @@ import org.springframework.context.annotation.Configuration;
  *
  * @author tiger
  */
-@Configuration
+@Configuration(proxyBeanMethods = false)
 @ConditionalOnClass(ZuulServlet.class)
 @ConditionalOnProperty(prefix = ConfigConstants.ZUUl_PREFIX, name = "enabled",
 		havingValue = "true", matchIfMissing = true)

spring-cloud-alibaba-sentinel/src/main/java/com/alibaba/cloud/sentinel/SentinelWebAutoConfiguration.java

@@ -44,7 +44,7 @@ import org.springframework.context.annotation.Configuration;
 /**
  * @author xiaojing
  */
-@Configuration
+@Configuration(proxyBeanMethods = false)
 @ConditionalOnWebApplication(type = Type.SERVLET)
 @ConditionalOnClass(CommonFilter.class)
 @ConditionalOnProperty(name = "spring.cloud.sentinel.enabled", matchIfMissing = true)

spring-cloud-alibaba-sentinel/src/main/java/com/alibaba/cloud/sentinel/SentinelWebFluxAutoConfiguration.java

@@ -46,7 +46,7 @@ import org.springframework.web.reactive.result.view.ViewResolver;
 /**
  * @author <a href="mailto:fangjian0423@gmail.com">Jim</a>
  */
-@Configuration
+@Configuration(proxyBeanMethods = false)
 @ConditionalOnWebApplication(type = Type.REACTIVE)
 @ConditionalOnClass(SentinelReactorTransformer.class)
 @ConditionalOnProperty(name = "spring.cloud.sentinel.enabled", matchIfMissing = true)

spring-cloud-alibaba-sentinel/src/main/java/com/alibaba/cloud/sentinel/custom/SentinelAutoConfiguration.java

@@ -55,7 +55,7 @@ import org.springframework.util.StringUtils;
  * @author jiashuai.xie
  * @author <a href="mailto:fangjian0423@gmail.com">Jim</a>
  */
-@Configuration
+@Configuration(proxyBeanMethods = false)
 @ConditionalOnProperty(name = "spring.cloud.sentinel.enabled", matchIfMissing = true)
 @EnableConfigurationProperties(SentinelProperties.class)
 public class SentinelAutoConfiguration {
@@ -160,10 +160,10 @@ public class SentinelAutoConfiguration {
 	}
 
 	@ConditionalOnClass(ObjectMapper.class)
-	@Configuration
+	@Configuration(proxyBeanMethods = false)
 	protected static class SentinelConverterConfiguration {
 
-		@Configuration
+		@Configuration(proxyBeanMethods = false)
 		protected static class SentinelJsonConfiguration {
 
 			private ObjectMapper objectMapper = new ObjectMapper();
@@ -201,7 +201,7 @@ public class SentinelAutoConfiguration {
 		}
 
 		@ConditionalOnClass(XmlMapper.class)
-		@Configuration
+		@Configuration(proxyBeanMethods = false)
 		protected static class SentinelXmlConfiguration {
 
 			private XmlMapper xmlMapper = new XmlMapper();

spring-cloud-alibaba-sentinel/src/main/java/com/alibaba/cloud/sentinel/custom/SentinelCircuitBreakerConfiguration.java

@@ -23,7 +23,7 @@ import org.springframework.context.annotation.Configuration;
  * <p>
  * support @EnableCircuitBreaker ,Do nothing
  */
-@Configuration
+@Configuration(proxyBeanMethods = false)
 public class SentinelCircuitBreakerConfiguration {
 
 }

spring-cloud-alibaba-sentinel/src/main/java/com/alibaba/cloud/sentinel/feign/SentinelFeignAutoConfiguration.java

@@ -29,7 +29,7 @@ import org.springframework.context.annotation.Scope;
 /**
  * @author <a href="mailto:fangjian0423@gmail.com">Jim</a>
  */
-@Configuration
+@Configuration(proxyBeanMethods = false)
 @ConditionalOnClass({ SphU.class, Feign.class })
 public class SentinelFeignAutoConfiguration {
 

spring-cloud-alibaba-sidecar/src/main/java/com/alibaba/cloud/sidecar/SidecarAutoConfiguration.java

@@ -26,7 +26,7 @@ import org.springframework.web.client.RestTemplate;
 /**
  * @author www.itmuch.com
  */
-@Configuration
+@Configuration(proxyBeanMethods = false)
 @EnableConfigurationProperties(SidecarProperties.class)
 public class SidecarAutoConfiguration {
 

spring-cloud-alibaba-sidecar/src/main/java/com/alibaba/cloud/sidecar/consul/SidecarConsulAutoConfiguration.java

@@ -41,7 +41,7 @@ import org.springframework.context.annotation.Configuration;
 /**
  * @author www.itmuch.com
  */
-@Configuration
+@Configuration(proxyBeanMethods = false)
 @ConditionalOnClass(ConsulServiceRegistryAutoConfiguration.class)
 @AutoConfigureBefore({ ConsulAutoServiceRegistrationAutoConfiguration.class,
 		SidecarAutoConfiguration.class })

spring-cloud-alibaba-sidecar/src/main/java/com/alibaba/cloud/sidecar/nacos/SidecarNacosAutoConfiguration.java

@@ -31,7 +31,7 @@ import org.springframework.context.annotation.Configuration;
 /**
  * @author www.itmuch.com
  */
-@Configuration
+@Configuration(proxyBeanMethods = false)
 @AutoConfigureBefore({ NacosDiscoveryAutoConfiguration.class,
 		SidecarAutoConfiguration.class })
 @ConditionalOnClass(NacosDiscoveryProperties.class)

spring-cloud-alicloud-acm/src/main/java/com/alibaba/alicloud/acm/AcmAutoConfiguration.java

@@ -35,7 +35,7 @@ import org.springframework.context.annotation.Configuration;
  *
  * @author juven.xuxb
  */
-@Configuration
+@Configuration(proxyBeanMethods = false)
 @ConditionalOnClass({ Diamond.class })
 @ConditionalOnProperty(name = "spring.cloud.alicloud.acm.enabled", matchIfMissing = true)
 public class AcmAutoConfiguration implements ApplicationContextAware {

spring-cloud-alicloud-ans/src/main/java/com/alibaba/alicloud/ans/AnsAutoConfiguration.java

@@ -36,7 +36,7 @@ import org.springframework.context.annotation.Configuration;
 /**
  * @author xiaolongzuo
  */
-@Configuration
+@Configuration(proxyBeanMethods = false)
 @EnableConfigurationProperties
 @ConditionalOnClass(
 		name = "org.springframework.boot.web.context.WebServerInitializedEvent")

spring-cloud-alicloud-ans/src/main/java/com/alibaba/alicloud/ans/AnsDiscoveryClientAutoConfiguration.java

@@ -28,7 +28,7 @@ import org.springframework.context.annotation.Configuration;
  * @author xiaolongzuo
  * @author pbting
  */
-@Configuration
+@Configuration(proxyBeanMethods = false)
 @ConditionalOnMissingBean(DiscoveryClient.class)
 @EnableConfigurationProperties
 @AutoConfigureBefore(SimpleDiscoveryClientAutoConfiguration.class)

spring-cloud-alicloud-ans/src/main/java/com/alibaba/alicloud/ans/ribbon/AnsRibbonClientConfiguration.java

@@ -27,7 +27,7 @@ import org.springframework.context.annotation.Configuration;
  * @author xiaolongzuo
  * @author pbting
  */
-@Configuration
+@Configuration(proxyBeanMethods = false)
 public class AnsRibbonClientConfiguration {
 
 	@Bean

spring-cloud-alicloud-ans/src/main/java/com/alibaba/alicloud/ans/ribbon/RibbonAnsAutoConfiguration.java

@@ -29,7 +29,7 @@ import org.springframework.context.annotation.Configuration;
 /**
  * @author xiaolongzuo
  */
-@Configuration
+@Configuration(proxyBeanMethods = false)
 @EnableConfigurationProperties
 @ConditionalOnAnsEnabled
 @ConditionalOnBean(SpringClientFactory.class)

spring-cloud-alicloud-context/src/main/java/com/alibaba/alicloud/context/AliCloudContextAutoConfiguration.java

@@ -26,7 +26,7 @@ import org.springframework.context.annotation.Configuration;
 /**
  * @author xiaolongzuo
  */
-@Configuration
+@Configuration(proxyBeanMethods = false)
 @EnableConfigurationProperties({ AliCloudProperties.class, InetUtilsProperties.class })
 public class AliCloudContextAutoConfiguration {
 

spring-cloud-alicloud-context/src/main/java/com/alibaba/alicloud/context/acm/AcmContextBootstrapConfiguration.java

@@ -36,7 +36,7 @@ import org.springframework.util.StringUtils;
 /**
  * @author xiaolongzuo
  */
-@Configuration
+@Configuration(proxyBeanMethods = false)
 @EnableConfigurationProperties(AcmProperties.class)
 @ConditionalOnClass(name = "com.alibaba.alicloud.acm.AcmAutoConfiguration")
 @ImportAutoConfiguration(EdasContextAutoConfiguration.class)

spring-cloud-alicloud-context/src/main/java/com/alibaba/alicloud/context/ans/AnsContextAutoConfiguration.java

@@ -26,7 +26,7 @@ import org.springframework.context.annotation.Configuration;
 /**
  * @author xiaolongzuo
  */
-@Configuration
+@Configuration(proxyBeanMethods = false)
 @ConditionalOnClass(name = "com.alibaba.alicloud.ans.AnsAutoConfiguration")
 @EnableConfigurationProperties(AnsProperties.class)
 @ImportAutoConfiguration(EdasContextAutoConfiguration.class)

spring-cloud-alicloud-context/src/main/java/com/alibaba/alicloud/context/edas/EdasContextAutoConfiguration.java

@@ -31,7 +31,7 @@ import org.springframework.context.annotation.Configuration;
 /**
  * @author xiaolongzuo
  */
-@Configuration
+@Configuration(proxyBeanMethods = false)
 @EnableConfigurationProperties(EdasProperties.class)
 @ImportAutoConfiguration(AliCloudContextAutoConfiguration.class)
 public class EdasContextAutoConfiguration {

spring-cloud-alicloud-context/src/main/java/com/alibaba/alicloud/context/oss/OssContextAutoConfiguration.java

@@ -38,7 +38,7 @@ import org.springframework.util.StringUtils;
  * @author <a href="mailto:fangjian0423@gmail.com">Jim</a>
  * @author xiaolongzuo
  */
-@Configuration
+@Configuration(proxyBeanMethods = false)
 @ConditionalOnClass(name = "com.alibaba.alicloud.oss.OssAutoConfiguration")
 @ConditionalOnProperty(name = "spring.cloud.alicloud.oss.enabled", matchIfMissing = true)
 @EnableConfigurationProperties(OssProperties.class)

spring-cloud-alicloud-context/src/main/java/com/alibaba/alicloud/context/scx/ScxContextAutoConfiguration.java

@@ -34,7 +34,7 @@ import org.springframework.context.annotation.Configuration;
 /**
  * @author xiaolongzuo
  */
-@Configuration
+@Configuration(proxyBeanMethods = false)
 @ConditionalOnClass(name = "com.alibaba.alicloud.scx.ScxAutoConfiguration")
 @ConditionalOnProperty(name = "spring.cloud.alicloud.scx.enabled", matchIfMissing = true)
 @EnableConfigurationProperties(ScxProperties.class)

spring-cloud-alicloud-context/src/main/java/com/alibaba/alicloud/context/sms/SmsContextAutoConfiguration.java

@@ -25,7 +25,7 @@ import org.springframework.context.annotation.Configuration;
  * @author pbting
  * @author xiaolongzuo
  */
-@Configuration
+@Configuration(proxyBeanMethods = false)
 @EnableConfigurationProperties(SmsProperties.class)
 @ConditionalOnClass(name = "com.aliyuncs.dysmsapi.model.v20170525.SendSmsRequest")
 @ConditionalOnProperty(name = "spring.cloud.alicloud.sms.enabled", matchIfMissing = true)

spring-cloud-alicloud-context/src/main/java/com/alibaba/alicloud/context/statistics/StatisticsTaskStarter.java

@@ -40,7 +40,7 @@ import org.springframework.context.annotation.Configuration;
 /**
  * @author xiaolongzuo
  */
-@Configuration
+@Configuration(proxyBeanMethods = false)
 @AutoConfigureAfter({ ScxContextAutoConfiguration.class,
 		OssContextAutoConfiguration.class, AnsContextAutoConfiguration.class,
 		AcmContextBootstrapConfiguration.class })

spring-cloud-alicloud-oss/src/main/java/com/alibaba/alicloud/oss/OssAutoConfiguration.java

@@ -37,7 +37,7 @@ import static com.alibaba.alicloud.oss.OssConstants.OSS_TASK_EXECUTOR_BEAN_NAME;
  *
  * @author <a href="mailto:fangjian0423@gmail.com">Jim</a>
  */
-@Configuration
+@Configuration(proxyBeanMethods = false)
 @ConditionalOnClass(OSS.class)
 @ConditionalOnProperty(name = OssConstants.ENABLED, havingValue = "true",
 		matchIfMissing = true)

spring-cloud-alicloud-schedulerx/src/main/java/com/alibaba/alicloud/scx/ScxAutoConfiguration.java

@@ -23,7 +23,7 @@ import org.springframework.context.annotation.Configuration;
  *
  * @author xiaolongzuo
  */
-@Configuration
+@Configuration(proxyBeanMethods = false)
 public class ScxAutoConfiguration {
 
 }

spring-cloud-alicloud-sms/src/main/java/com/alibaba/alicloud/sms/config/SmsAutoConfiguration.java

@@ -32,7 +32,7 @@ import org.springframework.context.annotation.Configuration;
 /**
  * @author pbting
  */
-@Configuration
+@Configuration(proxyBeanMethods = false)
 @EnableConfigurationProperties
 @ConditionalOnClass(SendSmsRequest.class)
 @ConditionalOnProperty(value = "spring.cloud.alicloud.sms.enable", matchIfMissing = true)

spring-cloud-circuitbreaker-sentinel/src/main/java/com/alibaba/cloud/circuitbreaker/sentinel/ReactiveSentinelCircuitBreakerAutoConfiguration.java

@@ -33,7 +33,7 @@ import org.springframework.context.annotation.Configuration;
 /**
  * @author Eric Zhao
  */
-@Configuration
+@Configuration(proxyBeanMethods = false)
 @ConditionalOnClass(
 		name = { "reactor.core.publisher.Mono", "reactor.core.publisher.Flux" })
 @ConditionalOnProperty(name = "spring.cloud.circuitbreaker.sentinel.enabled",
@@ -46,7 +46,7 @@ public class ReactiveSentinelCircuitBreakerAutoConfiguration {
 		return new ReactiveSentinelCircuitBreakerFactory();
 	}
 
-	@Configuration
+	@Configuration(proxyBeanMethods = false)
 	@ConditionalOnClass(
 			name = { "reactor.core.publisher.Mono", "reactor.core.publisher.Flux" })
 	public static class ReactiveSentinelCustomizerConfiguration {

spring-cloud-circuitbreaker-sentinel/src/main/java/com/alibaba/cloud/circuitbreaker/sentinel/SentinelCircuitBreakerAutoConfiguration.java

@@ -37,7 +37,7 @@ import org.springframework.context.annotation.Configuration;
  *
  * @author Eric Zhao
  */
-@Configuration
+@Configuration(proxyBeanMethods = false)
 @ConditionalOnClass({ SphU.class })
 @ConditionalOnProperty(name = "spring.cloud.circuitbreaker.sentinel.enabled",
 		havingValue = "true", matchIfMissing = true)
@@ -49,7 +49,7 @@ public class SentinelCircuitBreakerAutoConfiguration {
 		return new SentinelCircuitBreakerFactory();
 	}
 
-	@Configuration
+	@Configuration(proxyBeanMethods = false)
 	public static class SentinelCustomizerConfiguration {
 
 		@Autowired(required = false)

spring-cloud-stream-binder-rocketmq/src/main/java/com/alibaba/cloud/stream/binder/rocketmq/config/RocketMQBinderAutoConfiguration.java

@@ -34,7 +34,7 @@ import org.springframework.context.annotation.Import;
  * @author Timur Valiev
  * @author <a href="mailto:fangjian0423@gmail.com">Jim</a>
  */
-@Configuration
+@Configuration(proxyBeanMethods = false)
 @Import({ RocketMQAutoConfiguration.class,
 		RocketMQBinderHealthIndicatorAutoConfiguration.class })
 @EnableConfigurationProperties({ RocketMQBinderConfigurationProperties.class,

spring-cloud-stream-binder-rocketmq/src/main/java/com/alibaba/cloud/stream/binder/rocketmq/config/RocketMQBinderHealthIndicatorAutoConfiguration.java

@@ -26,7 +26,7 @@ import org.springframework.context.annotation.Configuration;
 /**
  * @author <a href="mailto:fangjian0423@gmail.com">Jim</a>
  */
-@Configuration
+@Configuration(proxyBeanMethods = false)
 @ConditionalOnClass(Endpoint.class)
 public class RocketMQBinderHealthIndicatorAutoConfiguration {
 

spring-cloud-stream-binder-rocketmq/src/main/java/com/alibaba/cloud/stream/binder/rocketmq/config/RocketMQComponent4BinderAutoConfiguration.java

@@ -38,7 +38,7 @@ import org.springframework.util.StringUtils;
 /**
  * @author <a href="mailto:fangjian0423@gmail.com">Jim</a>
  */
-@Configuration
+@Configuration(proxyBeanMethods = false)
 @AutoConfigureAfter(RocketMQAutoConfiguration.class)
 @ConditionalOnMissingBean(DefaultMQProducer.class)
 public class RocketMQComponent4BinderAutoConfiguration {