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 #496 and #497

Browse Source
This commit is contained in:
flystar32
2019-03-27 17:00:30 +08:00
parent 97a77d5c2b
commit c932e03e36
6 changed files with 75 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
spring-cloud-alibaba-nacos-config/src/main/java/org/springframework/cloud/alibaba/nacos/NacosConfigProperties.java
View File

@@ -36,6 +36,7 @@ import static com.alibaba.nacos.api.PropertyKeyConst.CLUSTER_NAME;
import static com.alibaba.nacos.api.PropertyKeyConst.CONTEXT_PATH;
import static com.alibaba.nacos.api.PropertyKeyConst.ENCODE;
import static com.alibaba.nacos.api.PropertyKeyConst.ENDPOINT;
import static com.alibaba.nacos.api.PropertyKeyConst.ENDPOINT_PORT;
import static com.alibaba.nacos.api.PropertyKeyConst.NAMESPACE;
import static com.alibaba.nacos.api.PropertyKeyConst.SECRET_KEY;
import static com.alibaba.nacos.api.PropertyKeyConst.SERVER_ADDR;
@@ -90,6 +91,12 @@ public class NacosConfigProperties {
*/
private String endpoint;
/**
* endpoint port for Nacos, the domain port of a service, through which the server
* address can be dynamically obtained.
*/
private String endpointPort;
/**
* namespace, separation configuration of different environments.
*/
@@ -265,6 +272,14 @@ public class NacosConfigProperties {
this.name = name;
}
public String getEndpointPort() {
return endpointPort;
}
public void setEndpointPort(String endpointPort) {
this.endpointPort = endpointPort;
}
public static class Config {
/**
* the data id of extended configuration
@@ -310,11 +325,12 @@ public class NacosConfigProperties {
+ ", encode='" + encode + '\'' + ", group='" + group + '\'' + ", prefix='"
+ prefix + '\'' + ", fileExtension='" + fileExtension + '\''
+ ", timeout=" + timeout + ", endpoint='" + endpoint + '\''
+ ", namespace='" + namespace + '\'' + ", accessKey='" + accessKey + '\''
+ ", secretKey='" + secretKey + '\'' + ", contextPath='" + contextPath
+ '\'' + ", clusterName='" + clusterName + '\'' + ", name='" + name + '\''
+ ", sharedDataids='" + sharedDataids + '\'' + ", refreshableDataids='"
+ refreshableDataids + '\'' + ", extConfig=" + extConfig + '}';
+ ", endpointPort='" + endpointPort + '\'' + ", namespace='" + namespace
+ '\'' + ", accessKey='" + accessKey + '\'' + ", secretKey='" + secretKey
+ '\'' + ", contextPath='" + contextPath + '\'' + ", clusterName='"
+ clusterName + '\'' + ", name='" + name + '\'' + ", sharedDataids='"
+ sharedDataids + '\'' + ", refreshableDataids='" + refreshableDataids
+ '\'' + ", extConfig=" + extConfig + '}';
}
public ConfigService configServiceInstance() {
@@ -332,6 +348,7 @@ public class NacosConfigProperties {
properties.put(CONTEXT_PATH, Objects.toString(this.contextPath, ""));
properties.put(CLUSTER_NAME, Objects.toString(this.clusterName, ""));
properties.put(ENDPOINT, Objects.toString(this.endpoint, ""));
properties.put(ENDPOINT_PORT, Objects.toString(this.endpointPort, ""));
try {
configService = NacosFactory.createConfigService(properties);
return configService;

8
spring-cloud-alibaba-nacos-config/src/test/java/org/springframework/cloud/alibaba/nacos/NacosConfigurationTests.java
View File

@@ -60,6 +60,7 @@ import org.springframework.test.context.junit4.SpringRunner;
"spring.application.name=myTestService1", "spring.profiles.active=dev,test",
"spring.cloud.nacos.config.server-addr=127.0.0.1:8848",
"spring.cloud.nacos.config.endpoint=test-endpoint",
"spring.cloud.nacos.config.endpoint-port=8081",
"spring.cloud.nacos.config.namespace=test-namespace",
"spring.cloud.nacos.config.encode=utf-8",
"spring.cloud.nacos.config.timeout=1000",
@@ -153,6 +154,7 @@ public class NacosConfigurationTests {
checkoutNacosConfigServerAddr();
checkoutNacosConfigEndpoint();
checkoutNacosConfigEndpointPort();
checkoutNacosConfigNamespace();
checkoutNacosConfigClusterName();
checkoutNacosConfigAccessKey();
@@ -181,6 +183,12 @@ public class NacosConfigurationTests {
}
private void checkoutNacosConfigEndpointPort() {
assertEquals("NacosConfigProperties endpoint port is wrong", "8081",
properties.getEndpointPort());
}
private void checkoutNacosConfigNamespace() {
assertEquals("NacosConfigProperties namespace is wrong", "test-namespace",
properties.getNamespace());