study/Spring-Cloud-Alibaba
1
0
Fork 0
mirror of https://gitee.com/mirrors/Spring-Cloud-Alibaba.git synced 2021-06-26 13:25:11 +08:00
Code Issues Releases Wiki Activity

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

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

# Conflicts:
#	spring-cloud-alibaba-seata/src/main/java/com/alibaba/cloud/seata/GlobalTransactionAutoConfiguration.java
This commit is contained in:
slievrly
2019-12-31 18:45:14 +08:00
parent 34d8267068 aba89ed5ba
commit 7b79b6a11b
83 changed files with 231 additions and 313 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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

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

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

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

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