From 1ced8d231bc822c9540812539cf9bc67533c98b7 Mon Sep 17 00:00:00 2001 From: Yin Qifang Date: Tue, 26 May 2020 17:19:28 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E9=94=99=E5=88=AB?= =?UTF-8?q?=E5=AD=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ”去 name“应该是”取 name“ --- .../src/main/asciidoc-zh/nacos-config.adoc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/spring-cloud-alibaba-docs/src/main/asciidoc-zh/nacos-config.adoc b/spring-cloud-alibaba-docs/src/main/asciidoc-zh/nacos-config.adoc index 4827d751a..4c6f9b25e 100644 --- a/spring-cloud-alibaba-docs/src/main/asciidoc-zh/nacos-config.adoc +++ b/spring-cloud-alibaba-docs/src/main/asciidoc-zh/nacos-config.adoc @@ -415,8 +415,8 @@ Endpoint 暴露的 json 中包含了三种属性: |=== |配置项 |Key |默认值 |说明 |服务端地址|`spring.cloud.nacos.config.server-addr`|| Nacos Server 启动监听的ip地址和端口 -|配置对应的 DataId|`spring.cloud.nacos.config.name`|| 先取 prefix，再去 name，最后取 spring.application.name -|配置对应的 DataId|`spring.cloud.nacos.config.prefix`|| 先取 prefix，再去 name，最后取 spring.application.name +|配置对应的 DataId|`spring.cloud.nacos.config.name`|| 先取 prefix，再取 name，最后取 spring.application.name +|配置对应的 DataId|`spring.cloud.nacos.config.prefix`|| 先取 prefix，再取 name，最后取 spring.application.name |配置内容编码|`spring.cloud.nacos.config.encode`||读取的配置内容对应的编码 |GROUP|`spring.cloud.nacos.config.group`|`DEFAULT_GROUP`|配置对应的组 |文件扩展名|`spring.cloud.nacos.config.fileExtension`|`properties`|配置项对应的文件扩展名，目前支持 properties 和 yaml(yml) From ec06f97aa0c9ea6a5b41cfaa8ae38e0200a0f8fe Mon Sep 17 00:00:00 2001 From: delicious <49525320+delicious-zen@users.noreply.github.com> Date: Tue, 2 Jun 2020 20:12:04 +0800 Subject: [PATCH 2/6] Update RocketMQMessageChannelBinder.java use AbstractMessageChannel.getInterceptors() to replace ChannelInterceptorAware.getChannelInterceptors() --- .../stream/binder/rocketmq/RocketMQMessageChannelBinder.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-cloud-alibaba-starters/spring-cloud-starter-stream-rocketmq/src/main/java/com/alibaba/cloud/stream/binder/rocketmq/RocketMQMessageChannelBinder.java b/spring-cloud-alibaba-starters/spring-cloud-starter-stream-rocketmq/src/main/java/com/alibaba/cloud/stream/binder/rocketmq/RocketMQMessageChannelBinder.java index b46acc9c8..01860e056 100644 --- a/spring-cloud-alibaba-starters/spring-cloud-starter-stream-rocketmq/src/main/java/com/alibaba/cloud/stream/binder/rocketmq/RocketMQMessageChannelBinder.java +++ b/spring-cloud-alibaba-starters/spring-cloud-starter-stream-rocketmq/src/main/java/com/alibaba/cloud/stream/binder/rocketmq/RocketMQMessageChannelBinder.java @@ -169,7 +169,7 @@ public class RocketMQMessageChannelBinder extends rocketMQTemplate, destination.getName(), producerGroup, producerProperties.getExtension().getTransactional(), instrumentationManager, producerProperties, - ((AbstractMessageChannel) channel).getChannelInterceptors().stream() + ((AbstractMessageChannel) channel).getInterceptors().stream() .filter(channelInterceptor -> channelInterceptor instanceof MessageConverterConfigurer.PartitioningInterceptor) .map(channelInterceptor -> ((MessageConverterConfigurer.PartitioningInterceptor) channelInterceptor)) .findFirst().orElse(null)); From 1e74332a0a470be983ea09d3484296080e6d35fd Mon Sep 17 00:00:00 2001 From: J-Cod3r Date: Sun, 7 Jun 2020 12:26:32 +0000 Subject: [PATCH 3/6] update nacos-discovery-example readme --- .../nacos-example/nacos-discovery-example/readme-zh.md | 2 +- .../nacos-example/nacos-discovery-example/readme.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/spring-cloud-alibaba-examples/nacos-example/nacos-discovery-example/readme-zh.md b/spring-cloud-alibaba-examples/nacos-example/nacos-discovery-example/readme-zh.md index 2140c5ea4..0ad0d23d9 100644 --- a/spring-cloud-alibaba-examples/nacos-example/nacos-discovery-example/readme-zh.md +++ b/spring-cloud-alibaba-examples/nacos-example/nacos-discovery-example/readme-zh.md @@ -30,7 +30,7 @@ public class ProviderApplication { public static void main(String[] args) { - SpringApplication.run(Application.class, args); + SpringApplication.run(ProviderApplication.class, args); } @RestController diff --git a/spring-cloud-alibaba-examples/nacos-example/nacos-discovery-example/readme.md b/spring-cloud-alibaba-examples/nacos-example/nacos-discovery-example/readme.md index 86469101b..656829be4 100644 --- a/spring-cloud-alibaba-examples/nacos-example/nacos-discovery-example/readme.md +++ b/spring-cloud-alibaba-examples/nacos-example/nacos-discovery-example/readme.md @@ -29,7 +29,7 @@ Before we start the demo, let's learn how to connect Nacos Config to a Spring Cl public class ProviderApplication { public static void main(String[] args) { - SpringApplication.run(Application.class, args); + SpringApplication.run(ProviderApplication.class, args); } @RestController From 3af1b5c51c48e3ec8425eb65aafa745e810e04c2 Mon Sep 17 00:00:00 2001 From: guerlab Date: Thu, 18 Jun 2020 23:16:27 +0800 Subject: [PATCH 4/6] fix potential NullPointerException --- .../alibaba/cloud/nacos/discovery/NacosServiceDiscovery.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-nacos-discovery/src/main/java/com/alibaba/cloud/nacos/discovery/NacosServiceDiscovery.java b/spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-nacos-discovery/src/main/java/com/alibaba/cloud/nacos/discovery/NacosServiceDiscovery.java index ffe73aaf1..0ae920f87 100644 --- a/spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-nacos-discovery/src/main/java/com/alibaba/cloud/nacos/discovery/NacosServiceDiscovery.java +++ b/spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-nacos-discovery/src/main/java/com/alibaba/cloud/nacos/discovery/NacosServiceDiscovery.java @@ -17,6 +17,7 @@ package com.alibaba.cloud.nacos.discovery; import java.util.ArrayList; +import java.util.Collections; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -92,7 +93,7 @@ public class NacosServiceDiscovery { metadata.put("nacos.weight", instance.getWeight() + ""); metadata.put("nacos.healthy", instance.isHealthy() + ""); metadata.put("nacos.cluster", instance.getClusterName() + ""); - metadata.putAll(instance.getMetadata()); + metadata.putAll(instance.getMetadata() != null ? instance.getMetadata() : Collections.emptyMap()); nacosServiceInstance.setMetadata(metadata); if (metadata.containsKey("secure")) { From 7667a05aefff18fb14b6c957bf340538e53b1134 Mon Sep 17 00:00:00 2001 From: guerlab Date: Fri, 19 Jun 2020 11:25:57 +0800 Subject: [PATCH 5/6] fix NacosServiceDiscovery NullPointerException --- .../alibaba/cloud/nacos/discovery/NacosServiceDiscovery.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-nacos-discovery/src/main/java/com/alibaba/cloud/nacos/discovery/NacosServiceDiscovery.java b/spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-nacos-discovery/src/main/java/com/alibaba/cloud/nacos/discovery/NacosServiceDiscovery.java index 0ae920f87..848abde9c 100644 --- a/spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-nacos-discovery/src/main/java/com/alibaba/cloud/nacos/discovery/NacosServiceDiscovery.java +++ b/spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-nacos-discovery/src/main/java/com/alibaba/cloud/nacos/discovery/NacosServiceDiscovery.java @@ -17,7 +17,6 @@ package com.alibaba.cloud.nacos.discovery; import java.util.ArrayList; -import java.util.Collections; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -93,7 +92,9 @@ public class NacosServiceDiscovery { metadata.put("nacos.weight", instance.getWeight() + ""); metadata.put("nacos.healthy", instance.isHealthy() + ""); metadata.put("nacos.cluster", instance.getClusterName() + ""); - metadata.putAll(instance.getMetadata() != null ? instance.getMetadata() : Collections.emptyMap()); + if (instance.getMetadata() != null) { + metadata.putAll(instance.getMetadata()); + } nacosServiceInstance.setMetadata(metadata); if (metadata.containsKey("secure")) { From 5078f355cab378bfd8fe4bcdf8789fb781fe5a63 Mon Sep 17 00:00:00 2001 From: yuhuangbin Date: Sun, 28 Jun 2020 10:03:36 +0800 Subject: [PATCH 6/6] fix dependency --- .../spring-cloud-starter-alibaba-sentinel/pom.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-sentinel/pom.xml b/spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-sentinel/pom.xml index 0bbd4cb6c..40dc3596a 100644 --- a/spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-sentinel/pom.xml +++ b/spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-sentinel/pom.xml @@ -153,6 +153,7 @@ com.fasterxml.jackson.dataformat jackson-dataformat-xml + true