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 remote-tracking branch 'upstream/master'

Browse Source
This commit is contained in:
fangjian0423 2018-12-19 22:55:15 +08:00
commit aaa68a04d5
4 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
spring-cloud-alibaba-dependencies/pom.xml
View File

@ -19,7 +19,8 @@
<properties> <properties>
<sentinel.version>1.4.0</sentinel.version> <sentinel.version>1.4.0</sentinel.version>
<oss.version>3.1.0</oss.version> <oss.version>3.1.0</oss.version>
<nacos.version>0.6.1</nacos.version> <nacos.client.version>0.6.2</nacos.client.version>
<nacos.config.version>0.6.1</nacos.config.version>
<acm.version>1.0.8</acm.version> <acm.version>1.0.8</acm.version>
<ans.version>1.0.1</ans.version> <ans.version>1.0.1</ans.version>
<aliyun.sdk.version>4.0.1</aliyun.sdk.version> <aliyun.sdk.version>4.0.1</aliyun.sdk.version>
@ -74,13 +75,13 @@
<dependency> <dependency>
<groupId>com.alibaba.nacos</groupId> <groupId>com.alibaba.nacos</groupId>
<artifactId>nacos-client</artifactId> <artifactId>nacos-client</artifactId>
<version>${nacos.version}</version> <version>${nacos.client.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.alibaba.nacos</groupId> <groupId>com.alibaba.nacos</groupId>
<artifactId>nacos-config</artifactId> <artifactId>nacos-config</artifactId>
<version>${nacos.version}</version> <version>${nacos.config.version}</version>
</dependency> </dependency>
<!-- Apache RocketMQ --> <!-- Apache RocketMQ -->

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

@ -267,6 +267,10 @@ public class NacosConfigProperties {
this.extConfig = extConfig; this.extConfig = extConfig;
} }
public void setName(String name) {
this.name = name;
}
public void setActiveProfiles(String[] activeProfiles) { public void setActiveProfiles(String[] activeProfiles) {
this.activeProfiles = activeProfiles; this.activeProfiles = activeProfiles;
} }

4
spring-cloud-alibaba-nacos-config/src/test/java/org/springframework/cloud/alibaba/nacos/NacosConfigAutoConfigurationTests.java
View File

@ -47,9 +47,9 @@ public class NacosConfigAutoConfigurationTests {
NacosConfigBootstrapConfiguration.class, NacosConfigBootstrapConfiguration.class,
NacosConfigAutoConfiguration.class, TestConfiguration.class) NacosConfigAutoConfiguration.class, TestConfiguration.class)
.web(WebApplicationType.NONE) .web(WebApplicationType.NONE)
.run("--spring.application.name=myapp", .run("--spring.cloud.nacos.config.name=myapp",
"--spring.cloud.config.enabled=true", "--spring.cloud.config.enabled=true",
"--spring.cloud.nacos.config.server-addr=127.0.0.1:8080", "--spring.cloud.nacos.config.server-addr=127.0.0.1:8848",
"--spring.cloud.nacos.config.prefix=test"); "--spring.cloud.nacos.config.prefix=test");
} }

4
spring-cloud-alibaba-nacos-config/src/test/java/org/springframework/cloud/alibaba/nacos/NacosConfigBootstrapConfigurationTests.java
View File

@ -43,9 +43,9 @@ public class NacosConfigBootstrapConfigurationTests {
public void setUp() throws Exception { public void setUp() throws Exception {
this.context = new SpringApplicationBuilder( this.context = new SpringApplicationBuilder(
NacosConfigBootstrapConfiguration.class).web(WebApplicationType.NONE).run( NacosConfigBootstrapConfiguration.class).web(WebApplicationType.NONE).run(
"--spring.application.name=myapp", "--spring.cloud.nacos.config.name=myapp",
"--spring.cloud.config.enabled=true", "--spring.cloud.config.enabled=true",
"--spring.cloud.nacos.config.server-addr=127.0.0.1:8080", "--spring.cloud.nacos.config.server-addr=127.0.0.1:8848",
"--spring.cloud.nacos.config.prefix=test"); "--spring.cloud.nacos.config.prefix=test");
} }