From 35f83e394c04fc75f1bebc79cb869bdfa008f337 Mon Sep 17 00:00:00 2001 From: Ken Liu Date: Wed, 3 Jan 2024 08:39:00 +0800 Subject: [PATCH] Fix #3314, set default nacos server address when `spring.config.import` enabled. (#3508) * fix #3314, set default nacos server address when config.import enabled. --- .../alibaba/cloud/nacos/NacosConfigProperties.java | 11 ++++++++--- 1 file changed, 8 insertions(+), 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 30bed4e10..ad6d69bb8 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 @@ -89,6 +89,11 @@ public class NacosConfigProperties { */ public static final String DEFAULT_NAMESPACE = "public"; + /** + * Nacos default server and port. + */ + public static final String DEFAULT_ADDRESS = "127.0.0.1:8848"; + private static final Pattern PATTERN = Pattern.compile("-(\\w)"); private static final Logger log = LoggerFactory @@ -452,7 +457,7 @@ public class NacosConfigProperties { public String getSharedDataids() { return null == getSharedConfigs() ? null : getSharedConfigs().stream().map(Config::getDataId) - .collect(Collectors.joining(COMMAS)); + .collect(Collectors.joining(COMMAS)); } /** @@ -482,7 +487,7 @@ public class NacosConfigProperties { public String getRefreshableDataids() { return null == getSharedConfigs() ? null : getSharedConfigs().stream().filter(Config::isRefresh) - .map(Config::getDataId).collect(Collectors.joining(COMMAS)); + .map(Config::getDataId).collect(Collectors.joining(COMMAS)); } /** @@ -561,7 +566,7 @@ public class NacosConfigProperties { */ public Properties assembleConfigServiceProperties() { Properties properties = new Properties(); - properties.put(SERVER_ADDR, Objects.toString(this.serverAddr, "")); + properties.put(SERVER_ADDR, Objects.toString(this.serverAddr, DEFAULT_ADDRESS)); properties.put(USERNAME, Objects.toString(this.username, "")); properties.put(PASSWORD, Objects.toString(this.password, "")); properties.put(ENCODE, Objects.toString(this.encode, ""));