study/Spring-Cloud-Alibaba
1
0
Fork 0
mirror of https://gitee.com/mirrors/Spring-Cloud-Alibaba.git synced 2021-06-26 13:25:11 +08:00
Code Issues Releases Wiki Activity

git commit -m "Fix Incorrect letter , fixes #147"

Browse Source
This commit is contained in:
gaoyunpeng 2018-12-28 15:01:36 +08:00
parent c524df1124
commit 669e6b93b6
1 changed files with 148 additions and 149 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
spring-cloud-alibaba-nacos-config/src/main/java/org/springframework/cloud/alibaba/nacos/client/NacosPropertySourceLocator.java
View File

@ -45,7 +45,7 @@ public class NacosPropertySourceLocator implements PropertySourceLocator {
private static final String NACOS_PROPERTY_SOURCE_NAME = "NACOS"; private static final String NACOS_PROPERTY_SOURCE_NAME = "NACOS";
private static final String SEP1 = "-"; private static final String SEP1 = "-";
private static final String DOT = "."; private static final String DOT = ".";
private static final String SHARED_CONFIG_SEPRATOR_CHAR = "[,]"; private static final String SHARED_CONFIG_SEPARATOR_CHAR = "[,]";
private static final List<String> SUPPORT_FILE_EXTENSION = Arrays.asList("properties", private static final List<String> SUPPORT_FILE_EXTENSION = Arrays.asList("properties",
"yaml", "yml"); "yaml", "yml");
@ -171,14 +171,12 @@ public class NacosPropertySourceLocator implements PropertySourceLocator {
NacosPropertySource ps; NacosPropertySource ps;
if (!isRefreshable) { if (!isRefreshable) {
ps = NacosPropertySourceRepository.getNacosPropertySource(dataId); ps = NacosPropertySourceRepository.getNacosPropertySource(dataId);
} } else {
else {
ps = nacosPropertySourceBuilder.build(dataId, group, fileExtension, true); ps = nacosPropertySourceBuilder.build(dataId, group, fileExtension, true);
} }
composite.addFirstPropertySource(ps); composite.addFirstPropertySource(ps);
} } else {
else {
NacosPropertySource ps = nacosPropertySourceBuilder.build(dataId, group, NacosPropertySource ps = nacosPropertySourceBuilder.build(dataId, group,
fileExtension, isRefreshable); fileExtension, isRefreshable);
composite.addFirstPropertySource(ps); composite.addFirstPropertySource(ps);
@ -187,7 +185,8 @@ public class NacosPropertySourceLocator implements PropertySourceLocator {
private static void checkDataIdFileExtension(String[] sharedDataIdArry) { private static void checkDataIdFileExtension(String[] sharedDataIdArry) {
StringBuilder stringBuilder = new StringBuilder(); StringBuilder stringBuilder = new StringBuilder();
outline: for (int i = 0; i < sharedDataIdArry.length; i++) { outline:
for (int i = 0; i < sharedDataIdArry.length; i++) {
for (String fileExtension : SUPPORT_FILE_EXTENSION) { for (String fileExtension : SUPPORT_FILE_EXTENSION) {
if (sharedDataIdArry[i].indexOf(fileExtension) > 0) { if (sharedDataIdArry[i].indexOf(fileExtension) > 0) {
continue outline; continue outline;