From b99c10fadddc47436b8fb17ada1d175f521ba91d Mon Sep 17 00:00:00 2001 From: flystar32 Date: Mon, 17 Dec 2018 16:14:05 +0800 Subject: [PATCH] sync code format from 1.x --- .../cloud/alibaba/nacos/NacosConfigProperties.java | 9 +++++++++ .../alibaba/nacos/client/NacosPropertySourceLocator.java | 1 + .../alibaba/nacos/refresh/NacosContextRefresher.java | 1 + 3 files changed, 11 insertions(+) diff --git a/spring-cloud-alibaba-nacos-config/src/main/java/org/springframework/cloud/alibaba/nacos/NacosConfigProperties.java b/spring-cloud-alibaba-nacos-config/src/main/java/org/springframework/cloud/alibaba/nacos/NacosConfigProperties.java index eaa9dfa64..19d5721f8 100644 --- a/spring-cloud-alibaba-nacos-config/src/main/java/org/springframework/cloud/alibaba/nacos/NacosConfigProperties.java +++ b/spring-cloud-alibaba-nacos-config/src/main/java/org/springframework/cloud/alibaba/nacos/NacosConfigProperties.java @@ -272,8 +272,17 @@ public class NacosConfigProperties { } public static class Config { + /** + * the data id of extended configuration + */ private String dataId; + /** + * the group of extended configuration, the default value is DEFAULT_GROUP + */ private String group = "DEFAULT_GROUP"; + /** + * whether to support dynamic refresh, the default does not support . + */ private boolean refresh = false; public String getDataId() { diff --git a/spring-cloud-alibaba-nacos-config/src/main/java/org/springframework/cloud/alibaba/nacos/client/NacosPropertySourceLocator.java b/spring-cloud-alibaba-nacos-config/src/main/java/org/springframework/cloud/alibaba/nacos/client/NacosPropertySourceLocator.java index 6bc45ae4d..68b1981dd 100644 --- a/spring-cloud-alibaba-nacos-config/src/main/java/org/springframework/cloud/alibaba/nacos/client/NacosPropertySourceLocator.java +++ b/spring-cloud-alibaba-nacos-config/src/main/java/org/springframework/cloud/alibaba/nacos/client/NacosPropertySourceLocator.java @@ -33,6 +33,7 @@ import com.alibaba.nacos.api.config.ConfigService; /** * @author xiaojing + * @author pbting */ @Order(0) public class NacosPropertySourceLocator implements PropertySourceLocator { diff --git a/spring-cloud-alibaba-nacos-config/src/main/java/org/springframework/cloud/alibaba/nacos/refresh/NacosContextRefresher.java b/spring-cloud-alibaba-nacos-config/src/main/java/org/springframework/cloud/alibaba/nacos/refresh/NacosContextRefresher.java index 86b7b2a46..4574ede25 100644 --- a/spring-cloud-alibaba-nacos-config/src/main/java/org/springframework/cloud/alibaba/nacos/refresh/NacosContextRefresher.java +++ b/spring-cloud-alibaba-nacos-config/src/main/java/org/springframework/cloud/alibaba/nacos/refresh/NacosContextRefresher.java @@ -96,6 +96,7 @@ public class NacosContextRefresher if (refreshProperties.isEnabled()) { for (NacosPropertySource nacosPropertySource : nacosPropertySourceRepository .getAll()) { + if (!nacosPropertySource.isRefreshable()) { continue; }