From de9b1be4bef07b1d78a04d68077a60f8864e5742 Mon Sep 17 00:00:00 2001 From: fangjian0423 Date: Mon, 28 Oct 2019 16:15:18 +0800 Subject: [PATCH 01/12] pass checkstyle plugin --- eclipse/checkstyle-suppressions.xml | 8 ++++++++ pom.xml | 18 ++++++++++++++++++ ...rviceRegistrationAutoConfigurationTest.java | 2 +- .../AbstractMediaTypeExpressionTest.java | 2 +- .../alibaba/cloud/examples/OssApplication.java | 3 +++ .../java/com/alibaba/cloud/examples/Order.java | 15 +++++++++++++++ .../java/com/alibaba/cloud/examples/Order.java | 15 +++++++++++++++ .../alibaba/cloud/examples/ExceptionUtil.java | 6 +++++- .../examples/fallback/EchoServiceFallback.java | 2 +- .../cloud/examples/service/EchoService.java | 4 ++-- .../rocketmq/RocketMQBusApplication.java | 4 ++-- .../bootstrap/NacosConfigServerBootstrap.java | 2 +- .../cloud/nacos/test/NacosMockTest.java | 6 +++++- .../sentinel/ContextIdSentinelFeignTests.java | 2 +- .../alibaba/alicloud/ans/test/AnsMockTest.java | 6 +++++- .../context/oss/OssAutoConfigurationTests.java | 2 +- 16 files changed, 84 insertions(+), 13 deletions(-) create mode 100644 eclipse/checkstyle-suppressions.xml diff --git a/eclipse/checkstyle-suppressions.xml b/eclipse/checkstyle-suppressions.xml new file mode 100644 index 000000000..a83004af1 --- /dev/null +++ b/eclipse/checkstyle-suppressions.xml @@ -0,0 +1,8 @@ + + + + + + \ No newline at end of file diff --git a/pom.xml b/pom.xml index cc677ad22..b1ad7acb1 100644 --- a/pom.xml +++ b/pom.xml @@ -282,6 +282,24 @@ org.apache.maven.plugins maven-checkstyle-plugin + + + checkstyle-validation + validate + + check + + + + eclipse/checkstyle-suppressions.xml + true + true + true + true + warning + + + org.apache.maven.plugins diff --git a/spring-cloud-alibaba-dubbo/src/test/java/com/alibaba/cloud/dubbo/autoconfigure/DubboServiceRegistrationAutoConfigurationTest.java b/spring-cloud-alibaba-dubbo/src/test/java/com/alibaba/cloud/dubbo/autoconfigure/DubboServiceRegistrationAutoConfigurationTest.java index b3fa84d6f..0fac7ac24 100644 --- a/spring-cloud-alibaba-dubbo/src/test/java/com/alibaba/cloud/dubbo/autoconfigure/DubboServiceRegistrationAutoConfigurationTest.java +++ b/spring-cloud-alibaba-dubbo/src/test/java/com/alibaba/cloud/dubbo/autoconfigure/DubboServiceRegistrationAutoConfigurationTest.java @@ -19,7 +19,7 @@ package com.alibaba.cloud.dubbo.autoconfigure; import org.springframework.boot.test.context.SpringBootTest; /** - * {@link DubboServiceRegistrationAutoConfiguration} Test + * {@link DubboServiceRegistrationAutoConfiguration} Test. * * @author Mercy */ diff --git a/spring-cloud-alibaba-dubbo/src/test/java/com/alibaba/cloud/dubbo/http/matcher/AbstractMediaTypeExpressionTest.java b/spring-cloud-alibaba-dubbo/src/test/java/com/alibaba/cloud/dubbo/http/matcher/AbstractMediaTypeExpressionTest.java index e45c040fc..c38b5ba69 100644 --- a/spring-cloud-alibaba-dubbo/src/test/java/com/alibaba/cloud/dubbo/http/matcher/AbstractMediaTypeExpressionTest.java +++ b/spring-cloud-alibaba-dubbo/src/test/java/com/alibaba/cloud/dubbo/http/matcher/AbstractMediaTypeExpressionTest.java @@ -26,7 +26,7 @@ import org.springframework.core.ResolvableType; import org.springframework.http.MediaType; /** - * {@link AbstractMediaTypeExpression} Test + * {@link AbstractMediaTypeExpression} Test. * * @author Mercy */ diff --git a/spring-cloud-alibaba-examples/oss-example/src/main/java/com/alibaba/cloud/examples/OssApplication.java b/spring-cloud-alibaba-examples/oss-example/src/main/java/com/alibaba/cloud/examples/OssApplication.java index 0e3f7b8a4..678d7551e 100644 --- a/spring-cloud-alibaba-examples/oss-example/src/main/java/com/alibaba/cloud/examples/OssApplication.java +++ b/spring-cloud-alibaba-examples/oss-example/src/main/java/com/alibaba/cloud/examples/OssApplication.java @@ -35,6 +35,9 @@ import org.springframework.context.annotation.Bean; @SpringBootApplication public class OssApplication { + /** + * Bucket Name of OSS Example. + */ public static final String BUCKET_NAME = "spring-cloud-alibaba-test"; public static void main(String[] args) throws URISyntaxException { diff --git a/spring-cloud-alibaba-examples/seata-example/business-service/src/main/java/com/alibaba/cloud/examples/Order.java b/spring-cloud-alibaba-examples/seata-example/business-service/src/main/java/com/alibaba/cloud/examples/Order.java index 06ecbde48..fbcb8391d 100644 --- a/spring-cloud-alibaba-examples/seata-example/business-service/src/main/java/com/alibaba/cloud/examples/Order.java +++ b/spring-cloud-alibaba-examples/seata-example/business-service/src/main/java/com/alibaba/cloud/examples/Order.java @@ -20,14 +20,29 @@ import java.io.Serializable; public class Order implements Serializable { + /** + * order id. + */ public long id; + /** + * user id. + */ public String userId; + /** + * commodity code. + */ public String commodityCode; + /** + * count. + */ public int count; + /** + * money. + */ public int money; @Override diff --git a/spring-cloud-alibaba-examples/seata-example/order-service/src/main/java/com/alibaba/cloud/examples/Order.java b/spring-cloud-alibaba-examples/seata-example/order-service/src/main/java/com/alibaba/cloud/examples/Order.java index 06ecbde48..6ad92cc5b 100644 --- a/spring-cloud-alibaba-examples/seata-example/order-service/src/main/java/com/alibaba/cloud/examples/Order.java +++ b/spring-cloud-alibaba-examples/seata-example/order-service/src/main/java/com/alibaba/cloud/examples/Order.java @@ -20,14 +20,29 @@ import java.io.Serializable; public class Order implements Serializable { + /** + * id. + */ public long id; + /** + * user id. + */ public String userId; + /** + * commodity code. + */ public String commodityCode; + /** + * count. + */ public int count; + /** + * money. + */ public int money; @Override diff --git a/spring-cloud-alibaba-examples/sentinel-example/sentinel-core-example/src/main/java/com/alibaba/cloud/examples/ExceptionUtil.java b/spring-cloud-alibaba-examples/sentinel-example/sentinel-core-example/src/main/java/com/alibaba/cloud/examples/ExceptionUtil.java index ef41bda9a..591756f80 100644 --- a/spring-cloud-alibaba-examples/sentinel-example/sentinel-core-example/src/main/java/com/alibaba/cloud/examples/ExceptionUtil.java +++ b/spring-cloud-alibaba-examples/sentinel-example/sentinel-core-example/src/main/java/com/alibaba/cloud/examples/ExceptionUtil.java @@ -25,7 +25,11 @@ import org.springframework.http.client.ClientHttpRequestExecution; /** * @author fangjian */ -public class ExceptionUtil { +public final class ExceptionUtil { + + private ExceptionUtil() { + + } public static SentinelClientHttpResponse handleException(HttpRequest request, byte[] body, ClientHttpRequestExecution execution, BlockException ex) { diff --git a/spring-cloud-alibaba-examples/sentinel-example/sentinel-feign-example/sentinel-feign-consumer-example/src/main/java/com/alibaba/cloud/examples/fallback/EchoServiceFallback.java b/spring-cloud-alibaba-examples/sentinel-example/sentinel-feign-example/sentinel-feign-consumer-example/src/main/java/com/alibaba/cloud/examples/fallback/EchoServiceFallback.java index 3b3afc007..30a9de2be 100644 --- a/spring-cloud-alibaba-examples/sentinel-example/sentinel-feign-example/sentinel-feign-consumer-example/src/main/java/com/alibaba/cloud/examples/fallback/EchoServiceFallback.java +++ b/spring-cloud-alibaba-examples/sentinel-example/sentinel-feign-example/sentinel-feign-consumer-example/src/main/java/com/alibaba/cloud/examples/fallback/EchoServiceFallback.java @@ -33,7 +33,7 @@ public class EchoServiceFallback implements EchoService { } /** - * 调用服务提供方的输出接口 + * 调用服务提供方的输出接口. * @param str 用户输入 * @return */ diff --git a/spring-cloud-alibaba-examples/sentinel-example/sentinel-feign-example/sentinel-feign-consumer-example/src/main/java/com/alibaba/cloud/examples/service/EchoService.java b/spring-cloud-alibaba-examples/sentinel-example/sentinel-feign-example/sentinel-feign-consumer-example/src/main/java/com/alibaba/cloud/examples/service/EchoService.java index 120e711cc..4e0da067b 100644 --- a/spring-cloud-alibaba-examples/sentinel-example/sentinel-feign-example/sentinel-feign-consumer-example/src/main/java/com/alibaba/cloud/examples/service/EchoService.java +++ b/spring-cloud-alibaba-examples/sentinel-example/sentinel-feign-example/sentinel-feign-consumer-example/src/main/java/com/alibaba/cloud/examples/service/EchoService.java @@ -33,9 +33,9 @@ import org.springframework.web.bind.annotation.PathVariable; public interface EchoService { /** - * 调用服务提供方的输出接口 + * 调用服务提供方的输出接口. * @param str 用户输入 - * @return + * @return echo result */ @GetMapping("/echo/{str}") String echo(@PathVariable("str") String str); diff --git a/spring-cloud-alibaba-examples/spring-cloud-bus-rocketmq-example/src/main/java/com/alibaba/cloud/examples/rocketmq/RocketMQBusApplication.java b/spring-cloud-alibaba-examples/spring-cloud-bus-rocketmq-example/src/main/java/com/alibaba/cloud/examples/rocketmq/RocketMQBusApplication.java index eff0e4fb8..91a3ffb35 100644 --- a/spring-cloud-alibaba-examples/spring-cloud-bus-rocketmq-example/src/main/java/com/alibaba/cloud/examples/rocketmq/RocketMQBusApplication.java +++ b/spring-cloud-alibaba-examples/spring-cloud-bus-rocketmq-example/src/main/java/com/alibaba/cloud/examples/rocketmq/RocketMQBusApplication.java @@ -65,7 +65,7 @@ public class RocketMQBusApplication { private ObjectMapper objectMapper; /** - * Publish the {@link UserRemoteApplicationEvent} + * Publish the {@link UserRemoteApplicationEvent}. * @param name the user name * @param destination the destination * @return If published @@ -82,7 +82,7 @@ public class RocketMQBusApplication { } /** - * Listener on the {@link UserRemoteApplicationEvent} + * Listener on the {@link UserRemoteApplicationEvent}. * @param event {@link UserRemoteApplicationEvent} */ @EventListener diff --git a/spring-cloud-alibaba-nacos-config-server/src/test/java/com/alibaba/cloud/nacos/config/server/bootstrap/NacosConfigServerBootstrap.java b/spring-cloud-alibaba-nacos-config-server/src/test/java/com/alibaba/cloud/nacos/config/server/bootstrap/NacosConfigServerBootstrap.java index 2ff7dc1c2..cba01073f 100644 --- a/spring-cloud-alibaba-nacos-config-server/src/test/java/com/alibaba/cloud/nacos/config/server/bootstrap/NacosConfigServerBootstrap.java +++ b/spring-cloud-alibaba-nacos-config-server/src/test/java/com/alibaba/cloud/nacos/config/server/bootstrap/NacosConfigServerBootstrap.java @@ -23,7 +23,7 @@ import org.springframework.cloud.config.server.EnableConfigServer; import org.springframework.context.annotation.Bean; /** - * Nacos Config Server Bootstrap + * Nacos Config Server Bootstrap. * * @author Mercy * @since 0.2.0 diff --git a/spring-cloud-alibaba-nacos-discovery/src/test/java/com/alibaba/cloud/nacos/test/NacosMockTest.java b/spring-cloud-alibaba-nacos-discovery/src/test/java/com/alibaba/cloud/nacos/test/NacosMockTest.java index 684ab749d..a541fd23f 100644 --- a/spring-cloud-alibaba-nacos-discovery/src/test/java/com/alibaba/cloud/nacos/test/NacosMockTest.java +++ b/spring-cloud-alibaba-nacos-discovery/src/test/java/com/alibaba/cloud/nacos/test/NacosMockTest.java @@ -24,7 +24,11 @@ import com.alibaba.nacos.api.naming.pojo.Instance; /** * @author xiaojing */ -public class NacosMockTest { +public final class NacosMockTest { + + private NacosMockTest() { + + } public static Instance serviceInstance(String serviceName, boolean isHealthy, Map metadata) { diff --git a/spring-cloud-alibaba-sentinel/src/test/java/com/alibaba/cloud/sentinel/ContextIdSentinelFeignTests.java b/spring-cloud-alibaba-sentinel/src/test/java/com/alibaba/cloud/sentinel/ContextIdSentinelFeignTests.java index f6996fdbc..7bd67724b 100644 --- a/spring-cloud-alibaba-sentinel/src/test/java/com/alibaba/cloud/sentinel/ContextIdSentinelFeignTests.java +++ b/spring-cloud-alibaba-sentinel/src/test/java/com/alibaba/cloud/sentinel/ContextIdSentinelFeignTests.java @@ -37,7 +37,7 @@ import org.springframework.web.bind.annotation.RequestParam; import static org.assertj.core.api.Assertions.assertThat; /** - * Add this unit test to verify https://github.com/alibaba/spring-cloud-alibaba/pull/838 + * Add this unit test to verify https://github.com/alibaba/spring-cloud-alibaba/pull/838. * * @author Jim */ diff --git a/spring-cloud-alicloud-ans/src/test/java/com/alibaba/alicloud/ans/test/AnsMockTest.java b/spring-cloud-alicloud-ans/src/test/java/com/alibaba/alicloud/ans/test/AnsMockTest.java index 694672f85..0b18f41e3 100644 --- a/spring-cloud-alicloud-ans/src/test/java/com/alibaba/alicloud/ans/test/AnsMockTest.java +++ b/spring-cloud-alicloud-ans/src/test/java/com/alibaba/alicloud/ans/test/AnsMockTest.java @@ -23,7 +23,11 @@ import com.alibaba.ans.shaded.com.taobao.vipserver.client.core.Host; /** * @author xiaojing */ -public class AnsMockTest { +public final class AnsMockTest { + + private AnsMockTest() { + + } public static Host hostInstance(String serviceName, boolean valid, Map metadata) { diff --git a/spring-cloud-alicloud-context/src/test/java/com/alibaba/alicloud/context/oss/OssAutoConfigurationTests.java b/spring-cloud-alicloud-context/src/test/java/com/alibaba/alicloud/context/oss/OssAutoConfigurationTests.java index 5195cbe03..0772e30e1 100644 --- a/spring-cloud-alicloud-context/src/test/java/com/alibaba/alicloud/context/oss/OssAutoConfigurationTests.java +++ b/spring-cloud-alicloud-context/src/test/java/com/alibaba/alicloud/context/oss/OssAutoConfigurationTests.java @@ -27,7 +27,7 @@ import org.springframework.boot.test.context.runner.ApplicationContextRunner; import static org.assertj.core.api.Assertions.assertThat; /** - * {@link OSS} {@link OssProperties} Test + * {@link OSS} {@link OssProperties} Test. * * @author Jim */ From 7ee641259c5524deb22de93e6f61a28d4809324a Mon Sep 17 00:00:00 2001 From: fangjian0423 Date: Mon, 28 Oct 2019 16:15:50 +0800 Subject: [PATCH 02/12] add sentinel circuit breaker dependency to sentinel module --- spring-cloud-alibaba-dependencies/pom.xml | 5 +++++ spring-cloud-alibaba-sentinel/pom.xml | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/spring-cloud-alibaba-dependencies/pom.xml b/spring-cloud-alibaba-dependencies/pom.xml index fbba7fd05..fa4dc326a 100644 --- a/spring-cloud-alibaba-dependencies/pom.xml +++ b/spring-cloud-alibaba-dependencies/pom.xml @@ -307,6 +307,11 @@ spring-cloud-starter-alibaba-sentinel ${project.version} + + com.alibaba.cloud + spring-cloud-circuitbreaker-sentinel + ${project.version} + com.alibaba.cloud spring-cloud-starter-alicloud-oss diff --git a/spring-cloud-alibaba-sentinel/pom.xml b/spring-cloud-alibaba-sentinel/pom.xml index b2ec4afc3..29c659841 100644 --- a/spring-cloud-alibaba-sentinel/pom.xml +++ b/spring-cloud-alibaba-sentinel/pom.xml @@ -30,6 +30,11 @@ true + + com.alibaba.cloud + spring-cloud-circuitbreaker-sentinel + + com.alibaba.csp sentinel-apache-dubbo-adapter From 217296ba023b20fa4d0e6c81ff57c9121ffb56d0 Mon Sep 17 00:00:00 2001 From: zkzlx Date: Mon, 28 Oct 2019 17:51:18 +0800 Subject: [PATCH 03/12] Dependency error --- spring-cloud-alibaba-dependencies/pom.xml | 5 ----- .../sentinel-dubbo-consumer-example/pom.xml | 1 + .../sentinel-dubbo-provider-example/pom.xml | 2 +- 3 files changed, 2 insertions(+), 6 deletions(-) diff --git a/spring-cloud-alibaba-dependencies/pom.xml b/spring-cloud-alibaba-dependencies/pom.xml index fa4dc326a..9461b9491 100644 --- a/spring-cloud-alibaba-dependencies/pom.xml +++ b/spring-cloud-alibaba-dependencies/pom.xml @@ -178,11 +178,6 @@ sentinel-reactor-adapter ${sentinel.version} - - com.alibaba.cloud - sentinel-dubbo-api - ${project.version} - com.alibaba.csp sentinel-cluster-server-default diff --git a/spring-cloud-alibaba-examples/sentinel-example/sentinel-dubbo-example/sentinel-dubbo-consumer-example/pom.xml b/spring-cloud-alibaba-examples/sentinel-example/sentinel-dubbo-example/sentinel-dubbo-consumer-example/pom.xml index 31bc8030a..99e0e1c21 100644 --- a/spring-cloud-alibaba-examples/sentinel-example/sentinel-dubbo-example/sentinel-dubbo-consumer-example/pom.xml +++ b/spring-cloud-alibaba-examples/sentinel-example/sentinel-dubbo-example/sentinel-dubbo-consumer-example/pom.xml @@ -25,6 +25,7 @@ com.alibaba.cloud sentinel-dubbo-api + ${project.version} diff --git a/spring-cloud-alibaba-examples/sentinel-example/sentinel-dubbo-example/sentinel-dubbo-provider-example/pom.xml b/spring-cloud-alibaba-examples/sentinel-example/sentinel-dubbo-example/sentinel-dubbo-provider-example/pom.xml index af1bbac87..570f421b3 100644 --- a/spring-cloud-alibaba-examples/sentinel-example/sentinel-dubbo-example/sentinel-dubbo-provider-example/pom.xml +++ b/spring-cloud-alibaba-examples/sentinel-example/sentinel-dubbo-example/sentinel-dubbo-provider-example/pom.xml @@ -25,6 +25,7 @@ com.alibaba.cloud sentinel-dubbo-api + ${project.version} @@ -41,7 +42,6 @@ org.apache.dubbo dubbo - From 5713effaa1e1d79a107405d5d6e87974d5d794dc Mon Sep 17 00:00:00 2001 From: yuhuangbin Date: Tue, 29 Oct 2019 14:40:02 +0800 Subject: [PATCH 04/12] Update pom.xml upgrade nacos client version to 1.1.4 --- spring-cloud-alibaba-dependencies/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-cloud-alibaba-dependencies/pom.xml b/spring-cloud-alibaba-dependencies/pom.xml index 9461b9491..16acbef66 100644 --- a/spring-cloud-alibaba-dependencies/pom.xml +++ b/spring-cloud-alibaba-dependencies/pom.xml @@ -21,7 +21,7 @@ 1.6.3 3.1.0 0.9.0 - 1.1.1 + 1.1.4 0.8.0 1.0.9 1.0.1 From 45479ec2fee2daebf178b57cbbb758520637b40f Mon Sep 17 00:00:00 2001 From: zhaoyunxing92 <2385585770@qq.com> Date: Thu, 31 Oct 2019 16:35:46 +0800 Subject: [PATCH 05/12] =?UTF-8?q?[fix]=E8=AE=BE=E7=BD=AE=E5=9C=A8web?= =?UTF-8?q?=E7=8E=AF=E5=A2=83=E4=B8=8B=E6=89=8D=E6=B3=A8=E5=85=A5=E6=8B=A6?= =?UTF-8?q?=E6=88=AA=E5=99=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/alibaba/cloud/seata/web/SeataHandlerInterceptor.java | 2 ++ .../cloud/seata/web/SeataHandlerInterceptorConfiguration.java | 2 ++ 2 files changed, 4 insertions(+) diff --git a/spring-cloud-alibaba-seata/src/main/java/com/alibaba/cloud/seata/web/SeataHandlerInterceptor.java b/spring-cloud-alibaba-seata/src/main/java/com/alibaba/cloud/seata/web/SeataHandlerInterceptor.java index dcc0b28c0..da8dde252 100644 --- a/spring-cloud-alibaba-seata/src/main/java/com/alibaba/cloud/seata/web/SeataHandlerInterceptor.java +++ b/spring-cloud-alibaba-seata/src/main/java/com/alibaba/cloud/seata/web/SeataHandlerInterceptor.java @@ -23,6 +23,7 @@ import io.seata.core.context.RootContext; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication; import org.springframework.util.StringUtils; import org.springframework.web.servlet.HandlerInterceptor; @@ -35,6 +36,7 @@ import org.springframework.web.servlet.HandlerInterceptor; * And clean up Seata information after servlet method invocation in * {@link org.springframework.web.servlet.HandlerInterceptor#afterCompletion(HttpServletRequest, HttpServletResponse, Object, Exception)} */ +@ConditionalOnWebApplication public class SeataHandlerInterceptor implements HandlerInterceptor { private static final Logger log = LoggerFactory diff --git a/spring-cloud-alibaba-seata/src/main/java/com/alibaba/cloud/seata/web/SeataHandlerInterceptorConfiguration.java b/spring-cloud-alibaba-seata/src/main/java/com/alibaba/cloud/seata/web/SeataHandlerInterceptorConfiguration.java index 347b0de56..10aa3858b 100644 --- a/spring-cloud-alibaba-seata/src/main/java/com/alibaba/cloud/seata/web/SeataHandlerInterceptorConfiguration.java +++ b/spring-cloud-alibaba-seata/src/main/java/com/alibaba/cloud/seata/web/SeataHandlerInterceptorConfiguration.java @@ -16,12 +16,14 @@ package com.alibaba.cloud.seata.web; +import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication; import org.springframework.web.servlet.config.annotation.InterceptorRegistry; import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; /** * @author xiaojing */ +@ConditionalOnWebApplication public class SeataHandlerInterceptorConfiguration implements WebMvcConfigurer { @Override From 24984db97013d65cf4f3717ed40f3e2ae3ec99eb Mon Sep 17 00:00:00 2001 From: Neptune <42354711+HaojunRen@users.noreply.github.com> Date: Mon, 4 Nov 2019 13:23:09 +0800 Subject: [PATCH 06/12] Update README-zh.md --- README-zh.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/README-zh.md b/README-zh.md index 09fad9067..043653e18 100644 --- a/README-zh.md +++ b/README-zh.md @@ -127,3 +127,7 @@ spring-cloud-alibaba@googlegroups.com，欢迎通过此邮件列表讨论与 spr ![DingQR](https://img.alicdn.com/tfs/TB1zrRie4v1gK0jSZFFXXb0sXXa-7862-3570.png) 如图片有问题，访问 https://img.alicdn.com/tfs/TB1zrRie4v1gK0jSZFFXXb0sXXa-7862-3570.png + +## 社区相关开源 + +[** Nepxion Discovery **] 集成Spring Cloud Alibaba、Nacos、Sentinel等阿里巴巴中间件，实现网关和服务的灰度发布、路由、权重、限流、熔断、降级、隔离、监控、追踪等功能的微服务开源解决 From bfdf610173a2fdf90417cea955c9b230b7214f99 Mon Sep 17 00:00:00 2001 From: Neptune <42354711+HaojunRen@users.noreply.github.com> Date: Mon, 4 Nov 2019 13:26:08 +0800 Subject: [PATCH 07/12] Update README-zh.md --- README-zh.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README-zh.md b/README-zh.md index 043653e18..44bc8ad5e 100644 --- a/README-zh.md +++ b/README-zh.md @@ -130,4 +130,4 @@ spring-cloud-alibaba@googlegroups.com，欢迎通过此邮件列表讨论与 spr ## 社区相关开源 -[** Nepxion Discovery **] 集成Spring Cloud Alibaba、Nacos、Sentinel等阿里巴巴中间件，实现网关和服务的灰度发布、路由、权重、限流、熔断、降级、隔离、监控、追踪等功能的微服务开源解决 +- [**Nepxion Discovery**] 集成Spring Cloud Alibaba、Nacos、Sentinel等阿里巴巴中间件，实现网关和服务的灰度发布、路由、权重、限流、熔断、降级、隔离、监控、追踪等功能的微服务开源解决。地址：[Github地址](https://github.com/Nepxion) From d95794fa502dbc8ffdaa4b1784120534f09febfd Mon Sep 17 00:00:00 2001 From: Neptune <42354711+HaojunRen@users.noreply.github.com> Date: Mon, 4 Nov 2019 13:27:18 +0800 Subject: [PATCH 08/12] Update README-zh.md --- README-zh.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README-zh.md b/README-zh.md index 44bc8ad5e..fe3b54adb 100644 --- a/README-zh.md +++ b/README-zh.md @@ -130,4 +130,4 @@ spring-cloud-alibaba@googlegroups.com，欢迎通过此邮件列表讨论与 spr ## 社区相关开源 -- [**Nepxion Discovery**] 集成Spring Cloud Alibaba、Nacos、Sentinel等阿里巴巴中间件，实现网关和服务的灰度发布、路由、权重、限流、熔断、降级、隔离、监控、追踪等功能的微服务开源解决。地址：[Github地址](https://github.com/Nepxion) +- [**Nepxion Discovery**] 集成Spring Cloud Alibaba、Nacos、Sentinel等阿里巴巴中间件，实现网关和服务的灰度发布、路由、权重、限流、熔断、降级、隔离、监控、追踪等功能的微服务开源解决。访问 [https://github.com/Nepxion](https://github.com/Nepxion) From 9d5d1e81ad066b7a16f41c8707e8266931fbe33f Mon Sep 17 00:00:00 2001 From: Neptune <42354711+HaojunRen@users.noreply.github.com> Date: Mon, 4 Nov 2019 13:41:41 +0800 Subject: [PATCH 09/12] Update README-zh.md --- README-zh.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README-zh.md b/README-zh.md index fe3b54adb..1caaa7c40 100644 --- a/README-zh.md +++ b/README-zh.md @@ -130,4 +130,5 @@ spring-cloud-alibaba@googlegroups.com，欢迎通过此邮件列表讨论与 spr ## 社区相关开源 -- [**Nepxion Discovery**] 集成Spring Cloud Alibaba、Nacos、Sentinel等阿里巴巴中间件，实现网关和服务的灰度发布、路由、权重、限流、熔断、降级、隔离、监控、追踪等功能的微服务开源解决。访问 [https://github.com/Nepxion](https://github.com/Nepxion) +**[Nepxion Discovery](https://github.com/Nepxion/Discovery)**：一款集成Spring Cloud Alibaba、Nacos、Sentinel等阿里巴巴中间件，实现网关和服务的灰度发布、路由、权重、限流、熔断、降级、隔离、监控、追踪等功能的微服务开源解决。使用指南 请参考 **[Nepxion Discovery Guide](https://github.com/Nepxion/DiscoveryGuide)**。 + From e01a781e10f12156fff269c28401a9c5e25a28ec Mon Sep 17 00:00:00 2001 From: Neptune <42354711+HaojunRen@users.noreply.github.com> Date: Mon, 4 Nov 2019 13:42:02 +0800 Subject: [PATCH 10/12] Update README-zh.md --- README-zh.md | 1 - 1 file changed, 1 deletion(-) diff --git a/README-zh.md b/README-zh.md index 1caaa7c40..958ca8136 100644 --- a/README-zh.md +++ b/README-zh.md @@ -131,4 +131,3 @@ spring-cloud-alibaba@googlegroups.com，欢迎通过此邮件列表讨论与 spr ## 社区相关开源 **[Nepxion Discovery](https://github.com/Nepxion/Discovery)**：一款集成Spring Cloud Alibaba、Nacos、Sentinel等阿里巴巴中间件，实现网关和服务的灰度发布、路由、权重、限流、熔断、降级、隔离、监控、追踪等功能的微服务开源解决。使用指南 请参考 **[Nepxion Discovery Guide](https://github.com/Nepxion/DiscoveryGuide)**。 - From b2825b275f8d77096dfd04c1426fcfeed264b66d Mon Sep 17 00:00:00 2001 From: tyq0010 <840667455@qq.com> Date: Tue, 5 Nov 2019 21:31:39 +0800 Subject: [PATCH 11/12] Update DubboServiceDiscoveryAutoConfiguration.java fix (DubboServiceDiscoveryAutoConfiguration does not set the group when subscribing to service #1043) --- .../DubboServiceDiscoveryAutoConfiguration.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/spring-cloud-alibaba-dubbo/src/main/java/com/alibaba/cloud/dubbo/autoconfigure/DubboServiceDiscoveryAutoConfiguration.java b/spring-cloud-alibaba-dubbo/src/main/java/com/alibaba/cloud/dubbo/autoconfigure/DubboServiceDiscoveryAutoConfiguration.java index b9ee12be9..e20fc2c00 100644 --- a/spring-cloud-alibaba-dubbo/src/main/java/com/alibaba/cloud/dubbo/autoconfigure/DubboServiceDiscoveryAutoConfiguration.java +++ b/spring-cloud-alibaba-dubbo/src/main/java/com/alibaba/cloud/dubbo/autoconfigure/DubboServiceDiscoveryAutoConfiguration.java @@ -505,14 +505,16 @@ public class DubboServiceDiscoveryAutoConfiguration { class NacosConfiguration { private final NamingService namingService; + private final NacosDiscoveryProperties nacosDiscoveryProperties; /** * the set of services is listening. */ private final Set listeningServices; - NacosConfiguration(NacosNamingManager nacosNamingManager) { + NacosConfiguration(NacosNamingManager nacosNamingManager, NacosDiscoveryProperties nacosDiscoveryProperties) { this.namingService = nacosNamingManager.getNamingService(); + this.nacosDiscoveryProperties = nacosDiscoveryProperties; this.listeningServices = new ConcurrentSkipListSet<>(); } @@ -537,7 +539,8 @@ public class DubboServiceDiscoveryAutoConfiguration { private void subscribeEventListener(String serviceName) { if (listeningServices.add(serviceName)) { try { - namingService.subscribe(serviceName, event -> { + String group = nacosDiscoveryProperties.getGroup(); + namingService.subscribe(serviceName, group, event -> { if (event instanceof NamingEvent) { NamingEvent namingEvent = (NamingEvent) event; List serviceInstances = hostToServiceInstanceList( From 62ad5de3e26deaffb42a0a311727f225558e173d Mon Sep 17 00:00:00 2001 From: zhaoyunxing92 <2385585770@qq.com> Date: Wed, 6 Nov 2019 16:16:30 +0800 Subject: [PATCH 12/12] [reset] --- .../com/alibaba/cloud/seata/web/SeataHandlerInterceptor.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/spring-cloud-alibaba-seata/src/main/java/com/alibaba/cloud/seata/web/SeataHandlerInterceptor.java b/spring-cloud-alibaba-seata/src/main/java/com/alibaba/cloud/seata/web/SeataHandlerInterceptor.java index da8dde252..dcc0b28c0 100644 --- a/spring-cloud-alibaba-seata/src/main/java/com/alibaba/cloud/seata/web/SeataHandlerInterceptor.java +++ b/spring-cloud-alibaba-seata/src/main/java/com/alibaba/cloud/seata/web/SeataHandlerInterceptor.java @@ -23,7 +23,6 @@ import io.seata.core.context.RootContext; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication; import org.springframework.util.StringUtils; import org.springframework.web.servlet.HandlerInterceptor; @@ -36,7 +35,6 @@ import org.springframework.web.servlet.HandlerInterceptor; * And clean up Seata information after servlet method invocation in * {@link org.springframework.web.servlet.HandlerInterceptor#afterCompletion(HttpServletRequest, HttpServletResponse, Object, Exception)} */ -@ConditionalOnWebApplication public class SeataHandlerInterceptor implements HandlerInterceptor { private static final Logger log = LoggerFactory