mirror of
https://gitee.com/mirrors/Spring-Cloud-Alibaba.git
synced 2021-06-26 13:25:11 +08:00
Add default values for some configuration items
This commit is contained in:
parent
e4a4e7f288
commit
224ef57307
@ -80,7 +80,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);
|
||||||
}
|
}
|
||||||
|
@ -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."
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
@ -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);
|
||||||
}
|
}
|
||||||
|
@ -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."
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
@ -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");
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user