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

[pr #1531]Improved nacos configuration parsing

Browse Source
This commit is contained in:
zkzlx 2020-08-03 14:22:15 +08:00
parent d96b0759f4
commit 1710d827fb
1 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-nacos-config/src/main/java/com/alibaba/cloud/nacos/parser/NacosDataParserHandler.java
View File

@ -82,7 +82,7 @@ public final class NacosDataParserHandler {
} }
NacosByteArrayResource nacosByteArrayResource = new NacosByteArrayResource( NacosByteArrayResource nacosByteArrayResource = new NacosByteArrayResource(
configValue.getBytes(), configName); configValue.getBytes(), configName);
nacosByteArrayResource.setFilename(configName + DOT + extension); nacosByteArrayResource.setFilename(getFileName(configName , extension));
List<PropertySource<?>> propertySourceList = propertySourceLoader List<PropertySource<?>> propertySourceList = propertySourceLoader
.load(configName, nacosByteArrayResource); .load(configName, nacosByteArrayResource);
if (CollectionUtils.isEmpty(propertySourceList)) { if (CollectionUtils.isEmpty(propertySourceList)) {
@ -135,6 +135,23 @@ public final class NacosDataParserHandler {
return DEFAULT_EXTENSION; return DEFAULT_EXTENSION;
} }
private String getFileName(String name,String extension){
if(StringUtils.isEmpty(extension)){
return name;
}
if (StringUtils.isEmpty(name)) {
return extension;
}
int idx = name.lastIndexOf(DOT);
if (idx > 0 && idx < name.length() - 1) {
String ext = name.substring(idx + 1);
if(extension.equalsIgnoreCase(ext)){
return name;
}
}
return name + DOT + extension;
}
public static NacosDataParserHandler getInstance() { public static NacosDataParserHandler getInstance() {
return ParserHandler.HANDLER; return ParserHandler.HANDLER;
} }