From 3984336a14feb65fec751dc5ab3bd58e13af1fef Mon Sep 17 00:00:00 2001 From: zkzlx Date: Tue, 26 May 2020 14:51:17 +0800 Subject: [PATCH 1/7] =?UTF-8?q?[issue=20#1418=20]shareIds=E5=92=8C?= =?UTF-8?q?=E6=8B=89=E5=8F=96nacos=E7=9A=84=E9=A1=BA=E5=BA=8F=E4=B8=8D?= =?UTF-8?q?=E5=AF=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/alibaba/cloud/nacos/NacosConfigProperties.java | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-nacos-config/src/main/java/com/alibaba/cloud/nacos/NacosConfigProperties.java b/spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-nacos-config/src/main/java/com/alibaba/cloud/nacos/NacosConfigProperties.java index 1eae17f4e..4827aebf1 100644 --- a/spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-nacos-config/src/main/java/com/alibaba/cloud/nacos/NacosConfigProperties.java +++ b/spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-nacos-config/src/main/java/com/alibaba/cloud/nacos/NacosConfigProperties.java @@ -22,7 +22,6 @@ import java.util.List; import java.util.Map; import java.util.Objects; import java.util.Properties; -import java.util.concurrent.ConcurrentHashMap; import java.util.regex.Matcher; import java.util.regex.Pattern; import java.util.stream.Collectors; @@ -487,8 +486,7 @@ public class NacosConfigProperties { List result = new ArrayList<>(); configList.stream() .collect(Collectors.groupingBy(cfg -> (cfg.getGroup() + cfg.getDataId()), - () -> new ConcurrentHashMap<>(new LinkedHashMap<>()), - Collectors.toList())) + LinkedHashMap::new, Collectors.toList())) .forEach((key, list) -> { list.stream() .reduce((a, b) -> new Config(a.getDataId(), a.getGroup(), From cf4fdaa3c8d21c6d4bb48ee33d0f6cf51f936f3b Mon Sep 17 00:00:00 2001 From: jy <977996067@qq.com> Date: Mon, 3 Aug 2020 17:52:34 +0800 Subject: [PATCH 2/7] Fix typo in NacosWatch --- .../main/java/com/alibaba/cloud/nacos/discovery/NacosWatch.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-nacos-discovery/src/main/java/com/alibaba/cloud/nacos/discovery/NacosWatch.java b/spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-nacos-discovery/src/main/java/com/alibaba/cloud/nacos/discovery/NacosWatch.java index d10ef0a52..b5dfc8e3a 100644 --- a/spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-nacos-discovery/src/main/java/com/alibaba/cloud/nacos/discovery/NacosWatch.java +++ b/spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-nacos-discovery/src/main/java/com/alibaba/cloud/nacos/discovery/NacosWatch.java @@ -74,7 +74,7 @@ public class NacosWatch implements ApplicationEventPublisherAware, SmartLifecycl private static ThreadPoolTaskScheduler getTaskScheduler() { ThreadPoolTaskScheduler taskScheduler = new ThreadPoolTaskScheduler(); - taskScheduler.setBeanName("Nacso-Watch-Task-Scheduler"); + taskScheduler.setBeanName("Nacos-Watch-Task-Scheduler"); taskScheduler.initialize(); return taskScheduler; } From 5bd3400e36176077c0910b2ebb0ad6ae3a805e22 Mon Sep 17 00:00:00 2001 From: Ahian Zhang Date: Thu, 6 Aug 2020 16:11:28 +0800 Subject: [PATCH 3/7] docs: update nacos-config.adoc --- .../src/main/asciidoc-zh/nacos-config.adoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 4c6f9b25e..4f7de3127 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 @@ -229,7 +229,7 @@ in develop-env enviroment; user name :nacos-config-yaml-update; age: 68 spring.profiles.active=product ---- -同时生产环境上 Nacos 需要添加对应 DataId 的基础配置。例如，在生成环境下的 Naocs 添加了DataId为：nacos-config-product.yaml的配置： +同时生产环境上 Nacos 需要添加对应 DataId 的基础配置。例如，在生产环境下的 Naocs 添加了DataId为：nacos-config-product.yaml的配置： [source,subs="normal"] ---- From 4fd7df8d95a20f649a819c2b84803c9b2512bea2 Mon Sep 17 00:00:00 2001 From: xsjk_chixiangen <18182238772m@sina.cn> Date: Mon, 10 Aug 2020 10:38:54 +0800 Subject: [PATCH 4/7] =?UTF-8?q?'=E4=BF=AE=E5=A4=8D=E5=AD=97=E6=AE=B5master?= =?UTF-8?q?Id=E5=88=A4=E6=96=ADbug'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sentinel/datasource/config/RedisDataSourceProperties.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-cloud-alibaba-starters/spring-cloud-alibaba-sentinel-datasource/src/main/java/com/alibaba/cloud/sentinel/datasource/config/RedisDataSourceProperties.java b/spring-cloud-alibaba-starters/spring-cloud-alibaba-sentinel-datasource/src/main/java/com/alibaba/cloud/sentinel/datasource/config/RedisDataSourceProperties.java index a5049660b..1d73e8ba1 100644 --- a/spring-cloud-alibaba-starters/spring-cloud-alibaba-sentinel-datasource/src/main/java/com/alibaba/cloud/sentinel/datasource/config/RedisDataSourceProperties.java +++ b/spring-cloud-alibaba-starters/spring-cloud-alibaba-sentinel-datasource/src/main/java/com/alibaba/cloud/sentinel/datasource/config/RedisDataSourceProperties.java @@ -93,7 +93,7 @@ public class RedisDataSourceProperties extends AbstractDataSourceProperties { "RedisDataSource channel can not be empty"); } - if (!StringUtils.isEmpty(masterId) && StringUtils.isEmpty(masterId)) { + if (StringUtils.isEmpty(masterId)) { throw new IllegalArgumentException( "RedisDataSource sentinel model，masterId can not be empty"); } From 915db3adec0d5e729dee214d1bac38b40beb0428 Mon Sep 17 00:00:00 2001 From: mercyblitz Date: Mon, 10 Aug 2020 16:02:28 +0800 Subject: [PATCH 5/7] Polish alibaba/spring-cloud-alibaba#1624 : Upgrading the Dubbo Spring Boot to be 2.7.8 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index e96ed3544..9833feb61 100644 --- a/pom.xml +++ b/pom.xml @@ -98,7 +98,7 @@ 1.7.25 - 2.7.6 + 2.7.8 4.0.1 From 1a368ee6f82e8a04cd8242d0068235338b3ea5de Mon Sep 17 00:00:00 2001 From: mercyblitz Date: Mon, 10 Aug 2020 16:04:01 +0800 Subject: [PATCH 6/7] Polish alibaba/spring-cloud-alibaba#1624 : [Infrastructure] Upgrading Alibaba's Spring Context Support to 1.0.9 --- 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 5228debe0..c7b9ec1e9 100644 --- a/spring-cloud-alibaba-dependencies/pom.xml +++ b/spring-cloud-alibaba-dependencies/pom.xml @@ -24,7 +24,7 @@ 1.2.0 1.2.1 0.8.0 - 1.0.6 + 1.0.9 2.2.1 From 098919807b3f3c2f68d908184f1a06a5f09e8970 Mon Sep 17 00:00:00 2001 From: mercyblitz Date: Mon, 10 Aug 2020 16:07:44 +0800 Subject: [PATCH 7/7] Polish alibaba/spring-cloud-alibaba#1611 : When openfeign and dubbo coexist, DubboServiceAutoConfiguration.primaryPropertyResolver configuration causes openfeign call to fail #728 --- .../DubboServiceAutoConfiguration.java | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/spring-cloud-alibaba-starters/spring-cloud-starter-dubbo/src/main/java/com/alibaba/cloud/dubbo/autoconfigure/DubboServiceAutoConfiguration.java b/spring-cloud-alibaba-starters/spring-cloud-starter-dubbo/src/main/java/com/alibaba/cloud/dubbo/autoconfigure/DubboServiceAutoConfiguration.java index 9de4a27d5..77764e900 100644 --- a/spring-cloud-alibaba-starters/spring-cloud-starter-dubbo/src/main/java/com/alibaba/cloud/dubbo/autoconfigure/DubboServiceAutoConfiguration.java +++ b/spring-cloud-alibaba-starters/spring-cloud-starter-dubbo/src/main/java/com/alibaba/cloud/dubbo/autoconfigure/DubboServiceAutoConfiguration.java @@ -24,15 +24,11 @@ import com.alibaba.cloud.dubbo.service.parameter.RequestBodyServiceParameterReso import com.alibaba.cloud.dubbo.service.parameter.RequestHeaderServiceParameterResolver; import com.alibaba.cloud.dubbo.service.parameter.RequestParamServiceParameterResolver; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.boot.context.properties.EnableConfigurationProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Import; -import org.springframework.context.annotation.Primary; -import org.springframework.core.env.Environment; -import org.springframework.core.env.PropertyResolver; /** * Spring Boot Auto-Configuration class for Dubbo Service. @@ -49,17 +45,6 @@ public class DubboServiceAutoConfiguration { return new DubboGenericServiceFactory(); } - /** - * Build a primary {@link PropertyResolver} bean to {@link Autowired @Autowired}. - * @param environment {@link Environment} - * @return alias bean for {@link Environment} - */ - @Bean - @Primary - public PropertyResolver primaryPropertyResolver(Environment environment) { - return environment; - } - @Configuration(proxyBeanMethods = false) @Import({ DubboGenericServiceExecutionContextFactory.class, RequestParamServiceParameterResolver.class,