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

Fixes #32 support fileExtension yaml and yml

Browse Source
This commit is contained in:
亦盏 2018-10-09 20:29:45 +08:00
parent 52a0c6f9de
commit 7aae272318
1 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -28,6 +28,8 @@ import com.alibaba.nacos.api.exception.NacosException;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.config.YamlPropertiesFactoryBean;
import org.springframework.core.io.ByteArrayResource;
import org.springframework.util.StringUtils; import org.springframework.util.StringUtils;
/** /**
@ -83,11 +85,22 @@ public class NacosPropertySourceBuilder {
data = configService.getConfig(dataId, group, timeout); data = configService.getConfig(dataId, group, timeout);
// todo add content type yaml support // todo add content type yaml support
if (!StringUtils.isEmpty(data)) { if (!StringUtils.isEmpty(data)) {
Properties properties = new Properties();
logger.info(String.format("Loading nacos data, dataId: '%s', group: '%s'", logger.info(String.format("Loading nacos data, dataId: '%s', group: '%s'",
dataId, group)); dataId, group));
properties.load(new StringReader(data));
return properties; if (fileExtension.equalsIgnoreCase("properties")) {
Properties properties = new Properties();
properties.load(new StringReader(data));
return properties;
}
else if (fileExtension.equalsIgnoreCase("yaml")
|| fileExtension.equalsIgnoreCase("yml")) {
YamlPropertiesFactoryBean yamlFactory = new YamlPropertiesFactoryBean();
yamlFactory.setResources(new ByteArrayResource(data.getBytes()));
return yamlFactory.getObject();
}
} }
} }
catch (NacosException e) { catch (NacosException e) {