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

Merge pull request #1094 from yuhuangbin/issue#980

Browse Source 
Add default values for some configuration items
This commit is contained in:
Mercy Ma 2019-12-11 11:01:48 +08:00 committed by GitHub
commit b1c0c1aa12
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
spring-cloud-alibaba-nacos-config/src/main/java/com/alibaba/cloud/nacos/NacosConfigProperties.java
View File

@ -81,7 +81,7 @@ public class NacosConfigProperties {
.resolvePlaceholders("${spring.cloud.nacos.config.server-addr:}"); .resolvePlaceholders("${spring.cloud.nacos.config.server-addr:}");
if (StringUtils.isEmpty(serverAddr)) { if (StringUtils.isEmpty(serverAddr)) {
serverAddr = environment serverAddr = environment
.resolvePlaceholders("${spring.cloud.nacos.server-addr:}"); .resolvePlaceholders("${spring.cloud.nacos.server-addr:localhost:8848}");
} }
this.setServerAddr(serverAddr); this.setServerAddr(serverAddr);
} }

1
spring-cloud-alibaba-nacos-config/src/main/resources/META-INF/additional-spring-configuration-metadata.json
View File

@ -3,6 +3,7 @@
{ {
"name": "spring.cloud.nacos.server-addr", "name": "spring.cloud.nacos.server-addr",
"type": "java.lang.String", "type": "java.lang.String",
"defaultValue": "localhost:8848",
"description": "nacos server address." "description": "nacos server address."
}, },
{ {

2
spring-cloud-alibaba-nacos-discovery/src/main/java/com/alibaba/cloud/nacos/NacosDiscoveryProperties.java
View File

@ -431,7 +431,7 @@ public class NacosDiscoveryProperties {
.resolvePlaceholders("${spring.cloud.nacos.discovery.server-addr:}"); .resolvePlaceholders("${spring.cloud.nacos.discovery.server-addr:}");
if (StringUtils.isEmpty(serverAddr)) { if (StringUtils.isEmpty(serverAddr)) {
serverAddr = env serverAddr = env
.resolvePlaceholders("${spring.cloud.nacos.server-addr:}"); .resolvePlaceholders("${spring.cloud.nacos.server-addr:localhost:8848}");
} }
this.setServerAddr(serverAddr); this.setServerAddr(serverAddr);
} }

1
spring-cloud-alibaba-nacos-discovery/src/main/resources/META-INF/additional-spring-configuration-metadata.json
View File

@ -2,6 +2,7 @@
{ {
"name": "spring.cloud.nacos.server-addr", "name": "spring.cloud.nacos.server-addr",
"type": "java.lang.String", "type": "java.lang.String",
"defaultValue": "localhost:8848",
"description": "nacos server address." "description": "nacos server address."
}, },
{ {

6
spring-cloud-alibaba-sentinel-datasource/src/main/java/com/alibaba/cloud/sentinel/datasource/config/NacosDataSourceProperties.java
View File

@ -54,11 +54,7 @@ public class NacosDataSourceProperties extends AbstractDataSourceProperties {
public void preCheck(String dataSourceName) { public void preCheck(String dataSourceName) {
if (StringUtils.isEmpty(serverAddr)) { if (StringUtils.isEmpty(serverAddr)) {
serverAddr = this.getEnv().getProperty( serverAddr = this.getEnv().getProperty(
"spring.cloud.sentinel.datasource.nacos.server-addr", ""); "spring.cloud.sentinel.datasource.nacos.server-addr", "localhost:8848");
if (StringUtils.isEmpty(serverAddr)) {
throw new IllegalArgumentException(
"NacosDataSource server-addr is empty");
}
} }
} }