mirror of
https://gitee.com/mirrors/Spring-Cloud-Alibaba.git
synced 2021-06-26 13:25:11 +08:00
Merge remote-tracking branch 'upstream/master'
# Conflicts: # spring-cloud-alibaba-nacos-config/src/main/java/org/springframework/cloud/alibaba/nacos/client/NacosPropertySourceLocator.java
This commit is contained in:
commit
8a4a92f03b
@ -50,7 +50,7 @@ Spring Cloud 使用 Maven 来构建,最快的使用方式是将本项目clone
|
|||||||
## 如何使用
|
## 如何使用
|
||||||
|
|
||||||
### 如何引入依赖
|
### 如何引入依赖
|
||||||
项目已经发布了第一个版本,版本 0.2.0.RELEASE 对应的是 Spring Cloud Finchley 版本,版本 0.1.0.RELEASE 对应的是 Spring Cloud Edgware 版本。
|
项目的最新版本是 0.2.1.RELEASE 和 0.1.1.RELEASE,版本 0.2.1.RELEASE 对应的是 Spring Cloud Finchley 版本,版本 0.1.1.RELEASE 对应的是 Spring Cloud Edgware 版本。
|
||||||
|
|
||||||
如果需要使用已发布的版本,在 `dependencyManagement` 中添加如下配置。
|
如果需要使用已发布的版本,在 `dependencyManagement` 中添加如下配置。
|
||||||
|
|
||||||
@ -59,7 +59,7 @@ Spring Cloud 使用 Maven 来构建,最快的使用方式是将本项目clone
|
|||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.springframework.cloud</groupId>
|
<groupId>org.springframework.cloud</groupId>
|
||||||
<artifactId>spring-cloud-alibaba-dependencies</artifactId>
|
<artifactId>spring-cloud-alibaba-dependencies</artifactId>
|
||||||
<version>0.2.0.RELEASE</version>
|
<version>0.2.1.RELEASE</version>
|
||||||
<type>pom</type>
|
<type>pom</type>
|
||||||
<scope>import</scope>
|
<scope>import</scope>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
@ -171,12 +171,14 @@ public class NacosPropertySourceLocator implements PropertySourceLocator {
|
|||||||
NacosPropertySource ps;
|
NacosPropertySource ps;
|
||||||
if (!isRefreshable) {
|
if (!isRefreshable) {
|
||||||
ps = NacosPropertySourceRepository.getNacosPropertySource(dataId);
|
ps = NacosPropertySourceRepository.getNacosPropertySource(dataId);
|
||||||
} else {
|
}
|
||||||
|
else {
|
||||||
ps = nacosPropertySourceBuilder.build(dataId, group, fileExtension, true);
|
ps = nacosPropertySourceBuilder.build(dataId, group, fileExtension, true);
|
||||||
}
|
}
|
||||||
|
|
||||||
composite.addFirstPropertySource(ps);
|
composite.addFirstPropertySource(ps);
|
||||||
} else {
|
}
|
||||||
|
else {
|
||||||
NacosPropertySource ps = nacosPropertySourceBuilder.build(dataId, group,
|
NacosPropertySource ps = nacosPropertySourceBuilder.build(dataId, group,
|
||||||
fileExtension, isRefreshable);
|
fileExtension, isRefreshable);
|
||||||
composite.addFirstPropertySource(ps);
|
composite.addFirstPropertySource(ps);
|
||||||
@ -185,8 +187,7 @@ public class NacosPropertySourceLocator implements PropertySourceLocator {
|
|||||||
|
|
||||||
private static void checkDataIdFileExtension(String[] sharedDataIdArry) {
|
private static void checkDataIdFileExtension(String[] sharedDataIdArry) {
|
||||||
StringBuilder stringBuilder = new StringBuilder();
|
StringBuilder stringBuilder = new StringBuilder();
|
||||||
outline:
|
outline: for (int i = 0; i < sharedDataIdArry.length; i++) {
|
||||||
for (int i = 0; i < sharedDataIdArry.length; i++) {
|
|
||||||
for (String fileExtension : SUPPORT_FILE_EXTENSION) {
|
for (String fileExtension : SUPPORT_FILE_EXTENSION) {
|
||||||
if (sharedDataIdArry[i].indexOf(fileExtension) > 0) {
|
if (sharedDataIdArry[i].indexOf(fileExtension) > 0) {
|
||||||
continue outline;
|
continue outline;
|
||||||
|
@ -16,7 +16,6 @@
|
|||||||
|
|
||||||
package org.springframework.cloud.alibaba.nacos;
|
package org.springframework.cloud.alibaba.nacos;
|
||||||
|
|
||||||
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
|
|
||||||
import org.springframework.boot.autoconfigure.AutoConfigureBefore;
|
import org.springframework.boot.autoconfigure.AutoConfigureBefore;
|
||||||
import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
|
import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
|
||||||
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
|
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
|
||||||
@ -27,6 +26,7 @@ import org.springframework.cloud.alibaba.nacos.registry.NacosRegistration;
|
|||||||
import org.springframework.cloud.alibaba.nacos.registry.NacosServiceRegistry;
|
import org.springframework.cloud.alibaba.nacos.registry.NacosServiceRegistry;
|
||||||
import org.springframework.cloud.client.serviceregistry.AutoServiceRegistrationAutoConfiguration;
|
import org.springframework.cloud.client.serviceregistry.AutoServiceRegistrationAutoConfiguration;
|
||||||
import org.springframework.cloud.client.serviceregistry.AutoServiceRegistrationProperties;
|
import org.springframework.cloud.client.serviceregistry.AutoServiceRegistrationProperties;
|
||||||
|
import org.springframework.context.ApplicationContext;
|
||||||
import org.springframework.context.annotation.Bean;
|
import org.springframework.context.annotation.Bean;
|
||||||
import org.springframework.context.annotation.Configuration;
|
import org.springframework.context.annotation.Configuration;
|
||||||
|
|
||||||
@ -50,8 +50,10 @@ public class NacosDiscoveryAutoConfiguration {
|
|||||||
|
|
||||||
@Bean
|
@Bean
|
||||||
@ConditionalOnBean(AutoServiceRegistrationProperties.class)
|
@ConditionalOnBean(AutoServiceRegistrationProperties.class)
|
||||||
public NacosRegistration nacosRegistration() {
|
public NacosRegistration nacosRegistration(
|
||||||
return new NacosRegistration();
|
NacosDiscoveryProperties nacosDiscoveryProperties,
|
||||||
|
ApplicationContext context) {
|
||||||
|
return new NacosRegistration(nacosDiscoveryProperties, context);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Bean
|
@Bean
|
||||||
|
@ -20,7 +20,6 @@ import com.alibaba.nacos.api.naming.pojo.Instance;
|
|||||||
import com.alibaba.nacos.api.naming.pojo.ListView;
|
import com.alibaba.nacos.api.naming.pojo.ListView;
|
||||||
import org.slf4j.Logger;
|
import org.slf4j.Logger;
|
||||||
import org.slf4j.LoggerFactory;
|
import org.slf4j.LoggerFactory;
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
|
||||||
import org.springframework.cloud.client.ServiceInstance;
|
import org.springframework.cloud.client.ServiceInstance;
|
||||||
import org.springframework.cloud.client.discovery.DiscoveryClient;
|
import org.springframework.cloud.client.discovery.DiscoveryClient;
|
||||||
|
|
||||||
@ -36,9 +35,12 @@ public class NacosDiscoveryClient implements DiscoveryClient {
|
|||||||
.getLogger(NacosDiscoveryClient.class);
|
.getLogger(NacosDiscoveryClient.class);
|
||||||
public static final String DESCRIPTION = "Spring Cloud Nacos Discovery Client";
|
public static final String DESCRIPTION = "Spring Cloud Nacos Discovery Client";
|
||||||
|
|
||||||
@Autowired
|
|
||||||
private NacosDiscoveryProperties discoveryProperties;
|
private NacosDiscoveryProperties discoveryProperties;
|
||||||
|
|
||||||
|
public NacosDiscoveryClient(NacosDiscoveryProperties discoveryProperties) {
|
||||||
|
this.discoveryProperties = discoveryProperties;
|
||||||
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public String description() {
|
public String description() {
|
||||||
return DESCRIPTION;
|
return DESCRIPTION;
|
||||||
|
@ -32,8 +32,9 @@ import org.springframework.context.annotation.Configuration;
|
|||||||
public class NacosDiscoveryClientAutoConfiguration {
|
public class NacosDiscoveryClientAutoConfiguration {
|
||||||
|
|
||||||
@Bean
|
@Bean
|
||||||
public DiscoveryClient nacosDiscoveryClient() {
|
public DiscoveryClient nacosDiscoveryClient(
|
||||||
return new NacosDiscoveryClient();
|
NacosDiscoveryProperties discoveryProperties) {
|
||||||
|
return new NacosDiscoveryClient(discoveryProperties);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Bean
|
@Bean
|
||||||
|
@ -26,7 +26,6 @@ import com.alibaba.nacos.api.naming.pojo.ServiceInfo;
|
|||||||
|
|
||||||
import org.slf4j.Logger;
|
import org.slf4j.Logger;
|
||||||
import org.slf4j.LoggerFactory;
|
import org.slf4j.LoggerFactory;
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
|
||||||
import org.springframework.boot.actuate.endpoint.annotation.Endpoint;
|
import org.springframework.boot.actuate.endpoint.annotation.Endpoint;
|
||||||
import org.springframework.boot.actuate.endpoint.annotation.ReadOperation;
|
import org.springframework.boot.actuate.endpoint.annotation.ReadOperation;
|
||||||
import org.springframework.cloud.alibaba.nacos.NacosDiscoveryProperties;
|
import org.springframework.cloud.alibaba.nacos.NacosDiscoveryProperties;
|
||||||
@ -41,9 +40,12 @@ public class NacosDiscoveryEndpoint {
|
|||||||
private static final Logger LOGGER = LoggerFactory
|
private static final Logger LOGGER = LoggerFactory
|
||||||
.getLogger(NacosDiscoveryEndpoint.class);
|
.getLogger(NacosDiscoveryEndpoint.class);
|
||||||
|
|
||||||
@Autowired
|
|
||||||
private NacosDiscoveryProperties nacosDiscoveryProperties;
|
private NacosDiscoveryProperties nacosDiscoveryProperties;
|
||||||
|
|
||||||
|
public NacosDiscoveryEndpoint(NacosDiscoveryProperties nacosDiscoveryProperties) {
|
||||||
|
this.nacosDiscoveryProperties = nacosDiscoveryProperties;
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @return nacos discovery endpoint
|
* @return nacos discovery endpoint
|
||||||
*/
|
*/
|
||||||
|
@ -20,7 +20,7 @@ import org.springframework.boot.actuate.autoconfigure.endpoint.condition.Conditi
|
|||||||
import org.springframework.boot.actuate.endpoint.annotation.Endpoint;
|
import org.springframework.boot.actuate.endpoint.annotation.Endpoint;
|
||||||
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
|
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
|
||||||
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
|
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
|
||||||
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
|
import org.springframework.cloud.alibaba.nacos.NacosDiscoveryProperties;
|
||||||
import org.springframework.context.annotation.Bean;
|
import org.springframework.context.annotation.Bean;
|
||||||
import org.springframework.context.annotation.Configuration;
|
import org.springframework.context.annotation.Configuration;
|
||||||
|
|
||||||
@ -34,8 +34,9 @@ public class NacosDiscoveryEndpointAutoConfiguration {
|
|||||||
@Bean
|
@Bean
|
||||||
@ConditionalOnMissingBean
|
@ConditionalOnMissingBean
|
||||||
@ConditionalOnEnabledEndpoint
|
@ConditionalOnEnabledEndpoint
|
||||||
public NacosDiscoveryEndpoint nacosDiscoveryEndpoint() {
|
public NacosDiscoveryEndpoint nacosDiscoveryEndpoint(
|
||||||
return new NacosDiscoveryEndpoint();
|
NacosDiscoveryProperties nacosDiscoveryProperties) {
|
||||||
|
return new NacosDiscoveryEndpoint(nacosDiscoveryProperties);
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@ -18,7 +18,6 @@ package org.springframework.cloud.alibaba.nacos.registry;
|
|||||||
|
|
||||||
import org.slf4j.Logger;
|
import org.slf4j.Logger;
|
||||||
import org.slf4j.LoggerFactory;
|
import org.slf4j.LoggerFactory;
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
|
||||||
import org.springframework.cloud.client.serviceregistry.AbstractAutoServiceRegistration;
|
import org.springframework.cloud.client.serviceregistry.AbstractAutoServiceRegistration;
|
||||||
import org.springframework.cloud.client.serviceregistry.AutoServiceRegistrationProperties;
|
import org.springframework.cloud.client.serviceregistry.AutoServiceRegistrationProperties;
|
||||||
import org.springframework.cloud.client.serviceregistry.ServiceRegistry;
|
import org.springframework.cloud.client.serviceregistry.ServiceRegistry;
|
||||||
@ -33,7 +32,6 @@ public class NacosAutoServiceRegistration
|
|||||||
private static final Logger LOGGER = LoggerFactory
|
private static final Logger LOGGER = LoggerFactory
|
||||||
.getLogger(NacosAutoServiceRegistration.class);
|
.getLogger(NacosAutoServiceRegistration.class);
|
||||||
|
|
||||||
@Autowired
|
|
||||||
private NacosRegistration registration;
|
private NacosRegistration registration;
|
||||||
|
|
||||||
public NacosAutoServiceRegistration(
|
public NacosAutoServiceRegistration(
|
||||||
|
@ -17,7 +17,6 @@
|
|||||||
package org.springframework.cloud.alibaba.nacos.registry;
|
package org.springframework.cloud.alibaba.nacos.registry;
|
||||||
|
|
||||||
import org.springframework.cloud.alibaba.nacos.NacosDiscoveryProperties;
|
import org.springframework.cloud.alibaba.nacos.NacosDiscoveryProperties;
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
|
||||||
import org.springframework.cloud.client.DefaultServiceInstance;
|
import org.springframework.cloud.client.DefaultServiceInstance;
|
||||||
import org.springframework.cloud.client.ServiceInstance;
|
import org.springframework.cloud.client.ServiceInstance;
|
||||||
import org.springframework.cloud.client.discovery.ManagementServerPortUtils;
|
import org.springframework.cloud.client.discovery.ManagementServerPortUtils;
|
||||||
@ -42,12 +41,16 @@ public class NacosRegistration implements Registration, ServiceInstance {
|
|||||||
private static final String MANAGEMENT_CONTEXT_PATH = "management.context-path";
|
private static final String MANAGEMENT_CONTEXT_PATH = "management.context-path";
|
||||||
private static final String MANAGEMENT_ADDRESS = "management.address";
|
private static final String MANAGEMENT_ADDRESS = "management.address";
|
||||||
|
|
||||||
@Autowired
|
|
||||||
private NacosDiscoveryProperties nacosDiscoveryProperties;
|
private NacosDiscoveryProperties nacosDiscoveryProperties;
|
||||||
|
|
||||||
@Autowired
|
|
||||||
private ApplicationContext context;
|
private ApplicationContext context;
|
||||||
|
|
||||||
|
public NacosRegistration(NacosDiscoveryProperties nacosDiscoveryProperties,
|
||||||
|
ApplicationContext context) {
|
||||||
|
this.nacosDiscoveryProperties = nacosDiscoveryProperties;
|
||||||
|
this.context = context;
|
||||||
|
}
|
||||||
|
|
||||||
@PostConstruct
|
@PostConstruct
|
||||||
public void init() {
|
public void init() {
|
||||||
|
|
||||||
|
@ -19,6 +19,7 @@ package org.springframework.cloud.alibaba.nacos.ribbon;
|
|||||||
import com.netflix.client.config.IClientConfig;
|
import com.netflix.client.config.IClientConfig;
|
||||||
import com.netflix.loadbalancer.ServerList;
|
import com.netflix.loadbalancer.ServerList;
|
||||||
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
|
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
|
||||||
|
import org.springframework.cloud.alibaba.nacos.NacosDiscoveryProperties;
|
||||||
import org.springframework.context.annotation.Bean;
|
import org.springframework.context.annotation.Bean;
|
||||||
import org.springframework.context.annotation.Configuration;
|
import org.springframework.context.annotation.Configuration;
|
||||||
|
|
||||||
@ -32,8 +33,8 @@ public class NacosRibbonClientConfiguration {
|
|||||||
|
|
||||||
@Bean
|
@Bean
|
||||||
@ConditionalOnMissingBean
|
@ConditionalOnMissingBean
|
||||||
public ServerList<?> ribbonServerList(IClientConfig config) {
|
public ServerList<?> ribbonServerList(IClientConfig config, NacosDiscoveryProperties nacosDiscoveryProperties) {
|
||||||
NacosServerList serverList = new NacosServerList();
|
NacosServerList serverList = new NacosServerList(nacosDiscoveryProperties);
|
||||||
serverList.initWithNiwsConfig(config);
|
serverList.initWithNiwsConfig(config);
|
||||||
return serverList;
|
return serverList;
|
||||||
}
|
}
|
||||||
|
@ -18,7 +18,6 @@ package org.springframework.cloud.alibaba.nacos.ribbon;
|
|||||||
|
|
||||||
import com.netflix.client.config.IClientConfig;
|
import com.netflix.client.config.IClientConfig;
|
||||||
import com.netflix.loadbalancer.AbstractServerList;
|
import com.netflix.loadbalancer.AbstractServerList;
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
|
||||||
import org.springframework.cloud.alibaba.nacos.NacosDiscoveryProperties;
|
import org.springframework.cloud.alibaba.nacos.NacosDiscoveryProperties;
|
||||||
|
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
@ -32,7 +31,6 @@ import com.alibaba.nacos.api.naming.pojo.Instance;
|
|||||||
*/
|
*/
|
||||||
public class NacosServerList extends AbstractServerList<NacosServer> {
|
public class NacosServerList extends AbstractServerList<NacosServer> {
|
||||||
|
|
||||||
@Autowired
|
|
||||||
private NacosDiscoveryProperties discoveryProperties;
|
private NacosDiscoveryProperties discoveryProperties;
|
||||||
|
|
||||||
private String serviceId;
|
private String serviceId;
|
||||||
@ -40,8 +38,8 @@ public class NacosServerList extends AbstractServerList<NacosServer> {
|
|||||||
public NacosServerList() {
|
public NacosServerList() {
|
||||||
}
|
}
|
||||||
|
|
||||||
public NacosServerList(String serviceId) {
|
public NacosServerList(NacosDiscoveryProperties discoveryProperties) {
|
||||||
this.serviceId = serviceId;
|
this.discoveryProperties = discoveryProperties;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
@ -39,7 +39,7 @@ public class NacosDiscoveryAutoConfigurationTests {
|
|||||||
AutoConfigurations.of(NacosDiscoveryTestConfiguration.class,
|
AutoConfigurations.of(NacosDiscoveryTestConfiguration.class,
|
||||||
NacosDiscoveryAutoConfiguration.class,
|
NacosDiscoveryAutoConfiguration.class,
|
||||||
NacosDiscoveryClientAutoConfiguration.class))
|
NacosDiscoveryClientAutoConfiguration.class))
|
||||||
.withPropertyValues("spring.cloud.nacos.discovery.server-addr=127.0.0.1:8080")
|
.withPropertyValues("spring.cloud.nacos.discovery.server-addr=127.0.0.1:8848")
|
||||||
.withPropertyValues("spring.cloud.nacos.discovery.port=18080")
|
.withPropertyValues("spring.cloud.nacos.discovery.port=18080")
|
||||||
.withPropertyValues("spring.cloud.nacos.discovery.service=myapp");
|
.withPropertyValues("spring.cloud.nacos.discovery.service=myapp");
|
||||||
|
|
||||||
@ -49,7 +49,7 @@ public class NacosDiscoveryAutoConfigurationTests {
|
|||||||
NacosDiscoveryProperties properties = context
|
NacosDiscoveryProperties properties = context
|
||||||
.getBean(NacosDiscoveryProperties.class);
|
.getBean(NacosDiscoveryProperties.class);
|
||||||
assertThat(properties.getPort()).isEqualTo(18080);
|
assertThat(properties.getPort()).isEqualTo(18080);
|
||||||
assertThat(properties.getServerAddr()).isEqualTo("127.0.0.1:8080");
|
assertThat(properties.getServerAddr()).isEqualTo("127.0.0.1:8848");
|
||||||
assertThat(properties.getService()).isEqualTo("myapp");
|
assertThat(properties.getService()).isEqualTo("myapp");
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
@ -25,7 +25,7 @@ public class NacosRibbonClientConfigurationTests {
|
|||||||
NacosRibbonClientConfiguration.class,
|
NacosRibbonClientConfiguration.class,
|
||||||
NacosDiscoveryClientAutoConfiguration.class,
|
NacosDiscoveryClientAutoConfiguration.class,
|
||||||
RibbonNacosAutoConfiguration.class))
|
RibbonNacosAutoConfiguration.class))
|
||||||
.withPropertyValues("spring.cloud.nacos.discovery.server-addr=127.0.0.1:8080")
|
.withPropertyValues("spring.cloud.nacos.discovery.server-addr=127.0.0.1:8848")
|
||||||
.withPropertyValues("spring.cloud.nacos.discovery.port=18080")
|
.withPropertyValues("spring.cloud.nacos.discovery.port=18080")
|
||||||
.withPropertyValues("spring.cloud.nacos.discovery.service=myapp");
|
.withPropertyValues("spring.cloud.nacos.discovery.service=myapp");
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user