Compare commits

..

No commits in common. "master" and "0.3.0-RC" have entirely different histories.

2 changed files with 8 additions and 5 deletions

View File

@ -95,6 +95,13 @@ public class NacosConfigApplicationContextInitializer
configLoader.addListenerIfAutoRefreshed();
}
}
final ConfigurableListableBeanFactory factory = context.getBeanFactory();
if (!factory
.containsSingleton(NacosBeanUtils.GLOBAL_NACOS_PROPERTIES_BEAN_NAME)) {
factory.registerSingleton(NacosBeanUtils.GLOBAL_NACOS_PROPERTIES_BEAN_NAME,
configLoader.getGlobalProperties());
}
}
private boolean enable() {

View File

@ -23,7 +23,6 @@ import java.util.List;
import java.util.ListIterator;
import java.util.Properties;
import java.util.function.Function;
import java.util.stream.Collectors;
import com.alibaba.boot.nacos.config.properties.NacosConfigProperties;
import com.alibaba.nacos.api.config.ConfigService;
@ -43,7 +42,6 @@ import static com.alibaba.nacos.spring.util.NacosUtils.buildDefaultPropertySourc
/**
* @author <a href="mailto:liaochunyhm@live.com">liaochuntao</a>
* @author <a href="mailto:guofuyinan@gmail.com">guofuyinan</a>
* @since 0.2.3
*/
public class NacosConfigLoader {
@ -115,9 +113,7 @@ public class NacosConfigLoader {
final String ids = environment
.resolvePlaceholders(nacosConfigProperties.getDataIds());
if(StringUtils.hasText(ids)){
dataIds.addAll(Arrays.stream(ids.split(","))
.filter(StringUtils::hasText)
.collect(Collectors.toList()));
dataIds.addAll(Arrays.asList(ids.split(",")));
}
}
else {