diff --git a/CHANGELOG.md b/CHANGELOG.md index eb6ee171..a63574ae 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,3 +5,4 @@ - [feat:add custom label resolver spi for rate limit](https://github.com/Tencent/spring-cloud-tencent/pull/105) - [feat:fix discovery weight param not set to register request bug](https://github.com/Tencent/spring-cloud-tencent/pull/102) - [Bugfix: fix causing cpu 100% when set ScheduledThreadPoolExecutor corePoolSize=0](https://github.com/Tencent/spring-cloud-tencent/pull/98) +- [Feat: optimize router dependency](https://github.com/Tencent/spring-cloud-tencent/pull/110) diff --git a/spring-cloud-starter-tencent-polaris-circuitbreaker/pom.xml b/spring-cloud-starter-tencent-polaris-circuitbreaker/pom.xml index 14b82571..a76c72d0 100644 --- a/spring-cloud-starter-tencent-polaris-circuitbreaker/pom.xml +++ b/spring-cloud-starter-tencent-polaris-circuitbreaker/pom.xml @@ -24,11 +24,63 @@ com.tencent.polaris polaris-discovery-factory + + + com.tencent.polaris + router-rule + + + com.tencent.polaris + router-nearby + + + com.tencent.polaris + router-metadata + + + com.tencent.polaris + router-canary + + + com.tencent.polaris + router-set + + com.tencent.polaris polaris-circuitbreaker-factory + + + com.tencent.polaris + router-rule + + + com.tencent.polaris + router-nearby + + + com.tencent.polaris + router-metadata + + + com.tencent.polaris + router-canary + + + com.tencent.polaris + router-set + + + com.tencent.polaris + router-isolated + + + com.tencent.polaris + router-healthy + + diff --git a/spring-cloud-starter-tencent-polaris-config/pom.xml b/spring-cloud-starter-tencent-polaris-config/pom.xml index d257cd08..10b362a6 100644 --- a/spring-cloud-starter-tencent-polaris-config/pom.xml +++ b/spring-cloud-starter-tencent-polaris-config/pom.xml @@ -24,6 +24,36 @@ com.tencent.polaris polaris-configuration-factory + + + com.tencent.polaris + router-rule + + + com.tencent.polaris + router-nearby + + + com.tencent.polaris + router-metadata + + + com.tencent.polaris + router-canary + + + com.tencent.polaris + router-set + + + com.tencent.polaris + router-isolated + + + com.tencent.polaris + router-healthy + + diff --git a/spring-cloud-starter-tencent-polaris-discovery/pom.xml b/spring-cloud-starter-tencent-polaris-discovery/pom.xml index 4fca20c4..71ae069b 100644 --- a/spring-cloud-starter-tencent-polaris-discovery/pom.xml +++ b/spring-cloud-starter-tencent-polaris-discovery/pom.xml @@ -15,70 +15,100 @@ - - com.tencent.cloud - spring-cloud-tencent-polaris-context - - + + com.tencent.cloud + spring-cloud-tencent-polaris-context + + - - - com.tencent.polaris - polaris-discovery-factory - + + + com.tencent.polaris + polaris-discovery-factory + + + com.tencent.polaris + router-rule + + + com.tencent.polaris + router-nearby + + + com.tencent.polaris + router-metadata + + + com.tencent.polaris + router-canary + + + com.tencent.polaris + router-set + + + com.tencent.polaris + router-isolated + + + com.tencent.polaris + router-healthy + + + - - com.tencent.polaris - polaris-test-common - test - + + com.tencent.polaris + polaris-test-common + test + - - com.tencent.polaris - polaris-test-mock-discovery - test - - + + com.tencent.polaris + polaris-test-mock-discovery + test + + - - org.springframework.cloud - spring-cloud-starter-netflix-ribbon - + + org.springframework.cloud + spring-cloud-starter-netflix-ribbon + - - org.springframework.boot - spring-boot-starter-web - true - + + org.springframework.boot + spring-boot-starter-web + true + - - org.springframework.boot - spring-boot-starter-webflux - true - + + org.springframework.boot + spring-boot-starter-webflux + true + - - org.springframework.boot - spring-boot-starter-test - test - + + org.springframework.boot + spring-boot-starter-test + test + - - io.projectreactor - reactor-test - test - + + io.projectreactor + reactor-test + test + - - org.powermock - powermock-module-junit4 - test - + + org.powermock + powermock-module-junit4 + test + - - org.powermock - powermock-api-mockito2 - test - - + + org.powermock + powermock-api-mockito2 + test + + diff --git a/spring-cloud-starter-tencent-polaris-discovery/src/main/java/com/tencent/cloud/polaris/ribbon/PolarisServerList.java b/spring-cloud-starter-tencent-polaris-discovery/src/main/java/com/tencent/cloud/polaris/ribbon/PolarisServerList.java index 4ab2ae02..15d72323 100644 --- a/spring-cloud-starter-tencent-polaris-discovery/src/main/java/com/tencent/cloud/polaris/ribbon/PolarisServerList.java +++ b/spring-cloud-starter-tencent-polaris-discovery/src/main/java/com/tencent/cloud/polaris/ribbon/PolarisServerList.java @@ -56,7 +56,7 @@ public class PolarisServerList extends AbstractServerList { } private List getServers() { - InstancesResponse allInstances = polarisDiscoveryHandler.getInstances(serviceId); + InstancesResponse allInstances = polarisDiscoveryHandler.getFilteredInstances(serviceId); ServiceInstances serviceInstances = allInstances.toServiceInstances(); List polarisServers = new ArrayList<>(); for (Instance instance : serviceInstances.getInstances()) { diff --git a/spring-cloud-starter-tencent-polaris-ratelimit/pom.xml b/spring-cloud-starter-tencent-polaris-ratelimit/pom.xml index e3886ecf..a313fb96 100644 --- a/spring-cloud-starter-tencent-polaris-ratelimit/pom.xml +++ b/spring-cloud-starter-tencent-polaris-ratelimit/pom.xml @@ -25,6 +25,36 @@ com.tencent.polaris polaris-ratelimit-factory + + + com.tencent.polaris + router-rule + + + com.tencent.polaris + router-nearby + + + com.tencent.polaris + router-metadata + + + com.tencent.polaris + router-canary + + + com.tencent.polaris + router-set + + + com.tencent.polaris + router-isolated + + + com.tencent.polaris + router-healthy + + diff --git a/spring-cloud-starter-tencent-polaris-router/pom.xml b/spring-cloud-starter-tencent-polaris-router/pom.xml index cffa4f08..0bf38eec 100644 --- a/spring-cloud-starter-tencent-polaris-router/pom.xml +++ b/spring-cloud-starter-tencent-polaris-router/pom.xml @@ -25,11 +25,52 @@ com.tencent.polaris polaris-router-factory + + + com.tencent.polaris + router-rule + + + com.tencent.polaris + router-nearby + + + com.tencent.polaris + router-metadata + + + com.tencent.polaris + router-canary + + + com.tencent.polaris + router-set + + + com.tencent.polaris + router-isolated + + + com.tencent.polaris + router-healthy + + + - org.springframework.cloud - spring-cloud-starter-netflix-ribbon + com.tencent.polaris + router-rule + + + + com.tencent.polaris + router-nearby + + + + com.tencent.polaris + router-metadata @@ -39,6 +80,11 @@ + + org.springframework.cloud + spring-cloud-starter-netflix-ribbon + + org.springframework.boot spring-boot-starter-test diff --git a/spring-cloud-tencent-examples/polaris-discovery-example/discovery-caller-service/pom.xml b/spring-cloud-tencent-examples/polaris-discovery-example/discovery-caller-service/pom.xml index c8bfaf0c..fd2eed66 100644 --- a/spring-cloud-tencent-examples/polaris-discovery-example/discovery-caller-service/pom.xml +++ b/spring-cloud-tencent-examples/polaris-discovery-example/discovery-caller-service/pom.xml @@ -32,11 +32,6 @@ - - - com.tencent.cloud - spring-cloud-starter-tencent-polaris-router - @@ -66,4 +61,4 @@ - \ No newline at end of file + diff --git a/spring-cloud-tencent-polaris-context/pom.xml b/spring-cloud-tencent-polaris-context/pom.xml index a11dc5ae..c3f9e2ad 100644 --- a/spring-cloud-tencent-polaris-context/pom.xml +++ b/spring-cloud-tencent-polaris-context/pom.xml @@ -57,31 +57,17 @@ flow-cache-expired - - com.tencent.polaris - router-isolated - - - - com.tencent.polaris - router-healthy - - - - com.tencent.polaris - router-rule - - - - com.tencent.polaris - router-nearby - - - - com.tencent.polaris - router-metadata - + + + com.tencent.polaris + router-isolated + + + com.tencent.polaris + router-healthy + + com.tencent.polaris loadbalancer-random