pull/1458/head
shedfreewu 10 months ago
parent c74d90e886
commit 97fb657dfa

@ -171,10 +171,10 @@
</plugins> </plugins>
</pluginManagement> </pluginManagement>
<plugins> <plugins>
<!-- <plugin>--> <plugin>
<!-- <groupId>org.apache.maven.plugins</groupId>--> <groupId>org.apache.maven.plugins</groupId>
<!-- <artifactId>maven-checkstyle-plugin</artifactId>--> <artifactId>maven-checkstyle-plugin</artifactId>
<!-- </plugin>--> </plugin>
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId> <artifactId>maven-compiler-plugin</artifactId>

@ -23,6 +23,7 @@ import com.netflix.loadbalancer.ILoadBalancer;
import com.tencent.cloud.polaris.router.feign.PolarisFeignLoadBalancer; import com.tencent.cloud.polaris.router.feign.PolarisFeignLoadBalancer;
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingClass;
import org.springframework.cloud.client.ConditionalOnDiscoveryEnabled; import org.springframework.cloud.client.ConditionalOnDiscoveryEnabled;
import org.springframework.cloud.netflix.ribbon.ServerIntrospector; import org.springframework.cloud.netflix.ribbon.ServerIntrospector;
import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Bean;
@ -40,6 +41,7 @@ import org.springframework.context.annotation.Configuration;
public class FeignLoadBalancerConfiguration { public class FeignLoadBalancerConfiguration {
@Bean @Bean
@ConditionalOnMissingClass("com.netflix.zuul.http.ZuulServlet")
@ConditionalOnMissingBean @ConditionalOnMissingBean
public PolarisFeignLoadBalancer polarisFeignLoadBalancer(ILoadBalancer lb, IClientConfig clientConfig, public PolarisFeignLoadBalancer polarisFeignLoadBalancer(ILoadBalancer lb, IClientConfig clientConfig,
ServerIntrospector serverIntrospector) { ServerIntrospector serverIntrospector) {

Loading…
Cancel
Save