diff --git a/pom.xml b/pom.xml index 603886b54..070e126a8 100644 --- a/pom.xml +++ b/pom.xml @@ -171,10 +171,10 @@ - - - - + + org.apache.maven.plugins + maven-checkstyle-plugin + org.apache.maven.plugins maven-compiler-plugin diff --git a/spring-cloud-starter-tencent-polaris-router/src/main/java/com/tencent/cloud/polaris/router/config/FeignLoadBalancerConfiguration.java b/spring-cloud-starter-tencent-polaris-router/src/main/java/com/tencent/cloud/polaris/router/config/FeignLoadBalancerConfiguration.java index 17222e23c..9e783a217 100644 --- a/spring-cloud-starter-tencent-polaris-router/src/main/java/com/tencent/cloud/polaris/router/config/FeignLoadBalancerConfiguration.java +++ b/spring-cloud-starter-tencent-polaris-router/src/main/java/com/tencent/cloud/polaris/router/config/FeignLoadBalancerConfiguration.java @@ -23,6 +23,7 @@ import com.netflix.loadbalancer.ILoadBalancer; import com.tencent.cloud.polaris.router.feign.PolarisFeignLoadBalancer; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; +import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingClass; import org.springframework.cloud.client.ConditionalOnDiscoveryEnabled; import org.springframework.cloud.netflix.ribbon.ServerIntrospector; import org.springframework.context.annotation.Bean; @@ -40,6 +41,7 @@ import org.springframework.context.annotation.Configuration; public class FeignLoadBalancerConfiguration { @Bean + @ConditionalOnMissingClass("com.netflix.zuul.http.ZuulServlet") @ConditionalOnMissingBean public PolarisFeignLoadBalancer polarisFeignLoadBalancer(ILoadBalancer lb, IClientConfig clientConfig, ServerIntrospector serverIntrospector) {