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

Polish spring-cloud-incubator/spring-cloud-alibaba#549 : Update samples

Browse Source
This commit is contained in:
mercyblitz 2019-04-13 08:55:57 +08:00
parent da86149ffb
commit 0c73d6e6af
2 changed files with 44 additions and 75 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
spring-cloud-alibaba-dubbo/src/main/java/org/springframework/cloud/alibaba/dubbo/autoconfigure/DubboLoadBalancedRestTemplateAutoConfiguration.java
View File

@ -95,7 +95,6 @@ public class DubboLoadBalancedRestTemplateAutoConfiguration implements BeanClass
*/ */
private ClientHttpRequestInterceptor loadBalancerInterceptorBean; private ClientHttpRequestInterceptor loadBalancerInterceptorBean;
@Override @Override
public void afterSingletonsInstantiated() { public void afterSingletonsInstantiated() {
loadBalancerInterceptorBean = retryLoadBalancerInterceptor != null ? loadBalancerInterceptorBean = retryLoadBalancerInterceptor != null ?

118
spring-cloud-alibaba-examples/spring-cloud-alibaba-dubbo-examples/pom.xml
View File

@ -96,87 +96,57 @@
<version>${project.version}</version> <version>${project.version}</version>
</dependency> </dependency>
</dependencies> <!-- Spring Cloud Nacos Service Discovery -->
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>
</dependency>
<profiles> <!-- Spring Cloud Eureka Service Discovery -->
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-netflix-eureka-client</artifactId>
</dependency>
<!-- Nacos --> <!-- Spring Cloud Zookeeper Service Discovery -->
<profile> <dependency>
<id>nacos</id> <groupId>org.springframework.cloud</groupId>
<activation> <artifactId>spring-cloud-starter-zookeeper-discovery</artifactId>
<activeByDefault>true</activeByDefault> <version>${spring-cloud-zookeeper.version}</version>
</activation> <exclusions>
<dependencies> <exclusion>
<!-- Nacos Service Discovery -->
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>
</dependency>
</dependencies>
</profile>
<profile>
<id>eureka</id>
<dependencies>
<!-- Eureka Service Discovery -->
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-netflix-eureka-client</artifactId>
</dependency>
</dependencies>
</profile>
<!-- Zookeeper -->
<profile>
<id>zookeeper</id>
<dependencies>
<!-- Zookeeper Service Discovery -->
<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>
<artifactId>zookeeper</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.apache.zookeeper</groupId> <groupId>org.apache.zookeeper</groupId>
<artifactId>zookeeper</artifactId> <artifactId>zookeeper</artifactId>
<version>3.4.12</version> </exclusion>
<optional>true</optional> </exclusions>
<exclusions> </dependency>
<exclusion>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency> <dependency>
<groupId>org.apache.curator</groupId> <groupId>org.apache.zookeeper</groupId>
<artifactId>curator-framework</artifactId> <artifactId>zookeeper</artifactId>
<version>${curator.version}</version> <version>3.4.12</version>
</dependency> <optional>true</optional>
</dependencies> <exclusions>
</profile> <exclusion>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
</exclusion>
</exclusions>
</dependency>
<profile> <dependency>
<id>consul</id> <groupId>org.apache.curator</groupId>
<dependencies> <artifactId>curator-framework</artifactId>
<!-- Spring Cloud Consul --> <version>${curator.version}</version>
<dependency> </dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-consul-discovery</artifactId>
<version>${spring-cloud-consul.version}</version>
</dependency>
</dependencies>
</profile>
</profiles> <!-- Spring Cloud Consul Service Discovery -->
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-consul-discovery</artifactId>
<version>${spring-cloud-consul.version}</version>
</dependency>
</dependencies>
<build> <build>
<plugins> <plugins>