diff --git a/spring-cloud-alibaba-nacos-config/src/main/java/com/alibaba/cloud/nacos/NacosConfigAutoConfiguration.java b/spring-cloud-alibaba-nacos-config/src/main/java/com/alibaba/cloud/nacos/NacosConfigAutoConfiguration.java index 05acc40f..4ff6ce17 100644 --- a/spring-cloud-alibaba-nacos-config/src/main/java/com/alibaba/cloud/nacos/NacosConfigAutoConfiguration.java +++ b/spring-cloud-alibaba-nacos-config/src/main/java/com/alibaba/cloud/nacos/NacosConfigAutoConfiguration.java @@ -63,14 +63,9 @@ public class NacosConfigAutoConfiguration { @Bean public NacosContextRefresher nacosContextRefresher( NacosConfigManager nacosConfigManager, - NacosRefreshProperties nacosRefreshProperties, NacosRefreshHistory nacosRefreshHistory) { - // Compatible with older configurations - if (nacosConfigManager.getNacosConfigProperties().isRefreshEnabled() - && null != nacosRefreshProperties - && !nacosRefreshProperties.isEnabled()) { - nacosConfigManager.getNacosConfigProperties().setRefreshEnabled(false); - } + // Consider that it is not necessary to be compatible with the previous configuration + // and use the new configuration if necessary. return new NacosContextRefresher(nacosConfigManager, nacosRefreshHistory); } diff --git a/spring-cloud-alibaba-nacos-config/src/main/java/com/alibaba/cloud/nacos/NacosConfigManager.java b/spring-cloud-alibaba-nacos-config/src/main/java/com/alibaba/cloud/nacos/NacosConfigManager.java index 510dabf4..e27b3e06 100644 --- a/spring-cloud-alibaba-nacos-config/src/main/java/com/alibaba/cloud/nacos/NacosConfigManager.java +++ b/spring-cloud-alibaba-nacos-config/src/main/java/com/alibaba/cloud/nacos/NacosConfigManager.java @@ -51,8 +51,10 @@ public class NacosConfigManager { if (Objects.isNull(service)) { synchronized (NacosConfigManager.class) { try { - service = NacosFactory.createConfigService( - nacosConfigProperties.assembleConfigServiceProperties()); + if (Objects.isNull(service)) { + service = NacosFactory.createConfigService( + nacosConfigProperties.assembleConfigServiceProperties()); + } } catch (NacosException e) { log.error(e.getMessage()); diff --git a/spring-cloud-alibaba-nacos-config/src/main/java/com/alibaba/cloud/nacos/NacosPropertySourceRepository.java b/spring-cloud-alibaba-nacos-config/src/main/java/com/alibaba/cloud/nacos/NacosPropertySourceRepository.java index 718515ff..ac391bad 100644 --- a/spring-cloud-alibaba-nacos-config/src/main/java/com/alibaba/cloud/nacos/NacosPropertySourceRepository.java +++ b/spring-cloud-alibaba-nacos-config/src/main/java/com/alibaba/cloud/nacos/NacosPropertySourceRepository.java @@ -76,7 +76,8 @@ public final class NacosPropertySourceRepository { } public static String getMapKey(String dataId, String group) { - return String.format("%s$%s", String.valueOf(dataId), String.valueOf(group)); + return String.join(NacosConfigProperties.COMMAS, String.valueOf(dataId), + String.valueOf(group)); } } diff --git a/spring-cloud-alibaba-nacos-config/src/main/java/com/alibaba/cloud/nacos/client/NacosPropertySource.java b/spring-cloud-alibaba-nacos-config/src/main/java/com/alibaba/cloud/nacos/client/NacosPropertySource.java index 997fd378..2d83fa5d 100644 --- a/spring-cloud-alibaba-nacos-config/src/main/java/com/alibaba/cloud/nacos/client/NacosPropertySource.java +++ b/spring-cloud-alibaba-nacos-config/src/main/java/com/alibaba/cloud/nacos/client/NacosPropertySource.java @@ -19,6 +19,8 @@ package com.alibaba.cloud.nacos.client; import java.util.Date; import java.util.Map; +import com.alibaba.cloud.nacos.NacosConfigProperties; + import org.springframework.core.env.MapPropertySource; /** @@ -49,7 +51,7 @@ public class NacosPropertySource extends MapPropertySource { NacosPropertySource(String group, String dataId, Map source, Date timestamp, boolean isRefreshable) { - super(String.format("%s#%s", dataId, group), source); + super(String.join(NacosConfigProperties.COMMAS, dataId, group), source); this.group = group; this.dataId = dataId; this.timestamp = timestamp; diff --git a/spring-cloud-alibaba-nacos-config/src/main/java/com/alibaba/cloud/nacos/refresh/NacosRefreshHistory.java b/spring-cloud-alibaba-nacos-config/src/main/java/com/alibaba/cloud/nacos/refresh/NacosRefreshHistory.java index bf8cc0d6..7fcd4be0 100644 --- a/spring-cloud-alibaba-nacos-config/src/main/java/com/alibaba/cloud/nacos/refresh/NacosRefreshHistory.java +++ b/spring-cloud-alibaba-nacos-config/src/main/java/com/alibaba/cloud/nacos/refresh/NacosRefreshHistory.java @@ -26,10 +26,15 @@ import java.util.Date; import java.util.LinkedList; import java.util.Map; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + import org.springframework.util.StringUtils; public class NacosRefreshHistory { + private final static Logger log = LoggerFactory.getLogger(NacosRefreshHistory.class); + private static final int MAX_SIZE = 20; private final LinkedList records = new LinkedList<>(); @@ -43,7 +48,8 @@ public class NacosRefreshHistory { try { md = MessageDigest.getInstance("MD5"); } - catch (NoSuchAlgorithmException ignored) { + catch (NoSuchAlgorithmException e) { + log.error("failed to initialize MessageDigest : ", e); } } diff --git a/spring-cloud-alibaba-nacos-config/src/main/resources/META-INF/additional-spring-configuration-metadata.json b/spring-cloud-alibaba-nacos-config/src/main/resources/META-INF/additional-spring-configuration-metadata.json index f5c0ba19..2856a506 100644 --- a/spring-cloud-alibaba-nacos-config/src/main/resources/META-INF/additional-spring-configuration-metadata.json +++ b/spring-cloud-alibaba-nacos-config/src/main/resources/META-INF/additional-spring-configuration-metadata.json @@ -3,6 +3,7 @@ { "name": "spring.cloud.nacos.server-addr", "type": "java.lang.String", + "defaultValue": "localhost:8848", "description": "nacos server address." }, {