Skip to content

D
discovery
Commit 50e9f92e by Nepxion
Options

升级Spring Cloud Alibaba版本到0.2.2.RELEASE

parent 4bf2cd9e
Showing with 50 additions and 32 deletions
discovery-plugin-framework-nacos/src/main/java/com/nepxion/discovery/plugin/framework/configuration/NacosLoadBalanceConfiguration.java
......@@ -11,6 +11,7 @@ package com.nepxion.discovery.plugin.framework.configuration;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.autoconfigure.AutoConfigureAfter;
import org.springframework.cloud.alibaba.nacos.NacosDiscoveryProperties;
import org.springframework.cloud.alibaba.nacos.ribbon.NacosRibbonClientConfiguration;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
......@@ -32,8 +33,8 @@ public class NacosLoadBalanceConfiguration {
private LoadBalanceListenerExecutor loadBalanceListenerExecutor;
@Bean
public ServerList<?> ribbonServerList(IClientConfig config) {
NacosServerListDecorator serverList = new NacosServerListDecorator();
public ServerList<?> ribbonServerList(IClientConfig config, NacosDiscoveryProperties nacosDiscoveryProperties) {
NacosServerListDecorator serverList = new NacosServerListDecorator(nacosDiscoveryProperties);
serverList.initWithNiwsConfig(config);
serverList.setEnvironment(environment);
serverList.setLoadBalanceListenerExecutor(loadBalanceListenerExecutor);
......
discovery-plugin-framework-nacos/src/main/java/com/nepxion/discovery/plugin/framework/context/NacosApplicationContextInitializer.java
......@@ -28,7 +28,9 @@ public class NacosApplicationContextInitializer extends PluginApplicationContext
if (bean instanceof NacosServiceRegistry) {
NacosServiceRegistry nacosServiceRegistry = (NacosServiceRegistry) bean;
return new NacosServiceRegistryDecorator(nacosServiceRegistry, applicationContext);
NacosDiscoveryProperties nacosDiscoveryProperties = applicationContext.getBean(NacosDiscoveryProperties.class);
return new NacosServiceRegistryDecorator(nacosDiscoveryProperties, nacosServiceRegistry, applicationContext);
} else if (bean instanceof NacosDiscoveryProperties) {
ConfigurableEnvironment environment = applicationContext.getEnvironment();
......
discovery-plugin-framework-nacos/src/main/java/com/nepxion/discovery/plugin/framework/decorator/NacosServerListDecorator.java
......@@ -11,6 +11,7 @@ package com.nepxion.discovery.plugin.framework.decorator;
import java.util.List;
import org.springframework.cloud.alibaba.nacos.NacosDiscoveryProperties;
import org.springframework.cloud.alibaba.nacos.ribbon.NacosServer;
import org.springframework.cloud.alibaba.nacos.ribbon.NacosServerList;
import org.springframework.core.env.ConfigurableEnvironment;
......@@ -23,12 +24,8 @@ public class NacosServerListDecorator extends NacosServerList {
private LoadBalanceListenerExecutor loadBalanceListenerExecutor;
public NacosServerListDecorator() {
super();
}
public NacosServerListDecorator(String serviceId) {
super(serviceId);
public NacosServerListDecorator(NacosDiscoveryProperties discoveryProperties) {
super(discoveryProperties);
}
@Override
......
discovery-plugin-framework-nacos/src/main/java/com/nepxion/discovery/plugin/framework/decorator/NacosServiceRegistryDecorator.java
......@@ -12,8 +12,9 @@ package com.nepxion.discovery.plugin.framework.decorator;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.BeansException;
import org.springframework.cloud.alibaba.nacos.registry.NacosRegistration;
import org.springframework.cloud.alibaba.nacos.NacosDiscoveryProperties;
import org.springframework.cloud.alibaba.nacos.registry.NacosServiceRegistry;
import org.springframework.cloud.client.serviceregistry.Registration;
import org.springframework.context.ConfigurableApplicationContext;
import org.springframework.core.env.ConfigurableEnvironment;
......@@ -27,14 +28,16 @@ public class NacosServiceRegistryDecorator extends NacosServiceRegistry {
private ConfigurableApplicationContext applicationContext;
private ConfigurableEnvironment environment;
public NacosServiceRegistryDecorator(NacosServiceRegistry serviceRegistry, ConfigurableApplicationContext applicationContext) {
public NacosServiceRegistryDecorator(NacosDiscoveryProperties nacosDiscoveryProperties, NacosServiceRegistry serviceRegistry, ConfigurableApplicationContext applicationContext) {
super(nacosDiscoveryProperties);
this.serviceRegistry = serviceRegistry;
this.applicationContext = applicationContext;
this.environment = applicationContext.getEnvironment();
}
@Override
public void register(NacosRegistration registration) {
public void register(Registration registration) {
Boolean registerControlEnabled = PluginContextAware.isRegisterControlEnabled(environment);
if (registerControlEnabled) {
try {
......@@ -49,7 +52,7 @@ public class NacosServiceRegistryDecorator extends NacosServiceRegistry {
}
@Override
public void deregister(NacosRegistration registration) {
public void deregister(Registration registration) {
Boolean registerControlEnabled = PluginContextAware.isRegisterControlEnabled(environment);
if (registerControlEnabled) {
try {
......@@ -64,7 +67,7 @@ public class NacosServiceRegistryDecorator extends NacosServiceRegistry {
}
@Override
public void setStatus(NacosRegistration registration, String status) {
public void setStatus(Registration registration, String status) {
Boolean registerControlEnabled = PluginContextAware.isRegisterControlEnabled(environment);
if (registerControlEnabled) {
try {
......@@ -79,7 +82,7 @@ public class NacosServiceRegistryDecorator extends NacosServiceRegistry {
}
@Override
public <T> T getStatus(NacosRegistration registration) {
public <T> T getStatus(Registration registration) {
return serviceRegistry.getStatus(registration);
}
......
discovery-springcloud-example-admin/pom.xml
......@@ -18,8 +18,8 @@
<properties>
<spring.cloud.version>Finchley.SR3</spring.cloud.version>
<spring.cloud.alibaba.version>0.2.1.RELEASE</spring.cloud.alibaba.version>
<spring.boot.admin.version>2.0.4</spring.boot.admin.version>
<spring.cloud.alibaba.version>0.2.2.RELEASE</spring.cloud.alibaba.version>
<spring.boot.admin.version>2.0.5</spring.boot.admin.version>
<java.version>1.8</java.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>
......
discovery-springcloud-example-console/pom.xml
......@@ -19,8 +19,8 @@
<properties>
<discovery.version>4.8.5.2</discovery.version>
<spring.cloud.version>Finchley.SR3</spring.cloud.version>
<spring.cloud.alibaba.version>0.2.1.RELEASE</spring.cloud.alibaba.version>
<spring.boot.admin.version>2.0.4</spring.boot.admin.version>
<spring.cloud.alibaba.version>0.2.2.RELEASE</spring.cloud.alibaba.version>
<spring.boot.admin.version>2.0.5</spring.boot.admin.version>
<java.version>1.8</java.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>
......
discovery-springcloud-example-gateway/pom.xml
......@@ -19,8 +19,8 @@
<properties>
<discovery.version>4.8.5.2</discovery.version>
<spring.cloud.version>Finchley.SR3</spring.cloud.version>
<spring.cloud.alibaba.version>0.2.1.RELEASE</spring.cloud.alibaba.version>
<spring.boot.admin.version>2.0.4</spring.boot.admin.version>
<spring.cloud.alibaba.version>0.2.2.RELEASE</spring.cloud.alibaba.version>
<spring.boot.admin.version>2.0.5</spring.boot.admin.version>
<java.version>1.8</java.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>
......
discovery-springcloud-example-service/pom.xml
......@@ -19,8 +19,8 @@
<properties>
<discovery.version>4.8.5.2</discovery.version>
<spring.cloud.version>Finchley.SR3</spring.cloud.version>
<spring.cloud.alibaba.version>0.2.1.RELEASE</spring.cloud.alibaba.version>
<spring.boot.admin.version>2.0.4</spring.boot.admin.version>
<spring.cloud.alibaba.version>0.2.2.RELEASE</spring.cloud.alibaba.version>
<spring.boot.admin.version>2.0.5</spring.boot.admin.version>
<java.version>1.8</java.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>
......
discovery-springcloud-example-service/src/main/java/com/nepxion/discovery/plugin/example/service/sentinel/MyRestTemplateBlockHandler.java
......@@ -11,18 +11,21 @@ package com.nepxion.discovery.plugin.example.service.sentinel;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.cloud.alibaba.sentinel.rest.SentinelClientHttpResponse;
import org.springframework.http.HttpRequest;
import org.springframework.http.client.ClientHttpRequestExecution;
import com.alibaba.csp.sentinel.slots.block.BlockException;
public class MyRestTemplateBlockHandler {
private static final Logger LOG = LoggerFactory.getLogger(MyRestTemplateBlockHandler.class);
public static String handleBlock(String value, BlockException e) {
LOG.info("Value={}", value);
public static SentinelClientHttpResponse handleBlock(HttpRequest request, byte[] body, ClientHttpRequestExecution execution, BlockException e) {
LOG.info("Sentinel RestTemplate Client Block Causes");
LOG.error("Sentinel RestTemplate Client Block Exception", e);
LOG.info("Sentinel Rule Limit App={}", e.getRuleLimitApp());
return "Sentinel RestTemplate Client Block Causes";
LOG.info("Sentinel Exception Name={}", e.getClass().getCanonicalName());
return new SentinelClientHttpResponse("Sentinel RestTemplate Client Block Causes");
}
}
\ No newline at end of file
discovery-springcloud-example-service/src/main/java/com/nepxion/discovery/plugin/example/service/sentinel/MyRestTemplateFallbackHandler.java
......@@ -11,11 +11,21 @@ package com.nepxion.discovery.plugin.example.service.sentinel;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.cloud.alibaba.sentinel.rest.SentinelClientHttpResponse;
import org.springframework.http.HttpRequest;
import org.springframework.http.client.ClientHttpRequestExecution;
import com.alibaba.csp.sentinel.slots.block.BlockException;
public class MyRestTemplateFallbackHandler {
private static final Logger LOG = LoggerFactory.getLogger(MyRestTemplateFallbackHandler.class);
public static void hanldleFallback() {
public static SentinelClientHttpResponse handleFallback(HttpRequest request, byte[] body, ClientHttpRequestExecution execution, BlockException e) {
LOG.info("Sentinel RestTemplate Client Fallback Causes");
LOG.error("Sentinel RestTemplate Client Fallback Exception", e);
LOG.info("Sentinel Rule Limit App={}", e.getRuleLimitApp());
LOG.info("Sentinel Exception Name={}", e.getClass().getCanonicalName());
return new SentinelClientHttpResponse("Sentinel RestTemplate Client Fallback Causes");
}
}
\ No newline at end of file
discovery-springcloud-example-zuul/pom.xml
......@@ -19,8 +19,8 @@
<properties>
<discovery.version>4.8.5.2</discovery.version>
<spring.cloud.version>Finchley.SR3</spring.cloud.version>
<spring.cloud.alibaba.version>0.2.1.RELEASE</spring.cloud.alibaba.version>
<spring.boot.admin.version>2.0.4</spring.boot.admin.version>
<spring.cloud.alibaba.version>0.2.2.RELEASE</spring.cloud.alibaba.version>
<spring.boot.admin.version>2.0.5</spring.boot.admin.version>
<java.version>1.8</java.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>
......
pom.xml
......@@ -56,12 +56,12 @@
<commons.io.version>2.5</commons.io.version>
<dom4j.version>1.6.1</dom4j.version>
<apollo.version>1.3.0</apollo.version>
<nacos.version>0.6.2</nacos.version>
<nacos.version>1.0.0</nacos.version>
<guava.version>27.0-jre</guava.version>
<caffeine.version>2.6.2</caffeine.version>
<swagger.version>2.7.0</swagger.version>
<spring.cloud.version>Finchley.SR3</spring.cloud.version>
<spring.cloud.alibaba.version>0.2.1.RELEASE</spring.cloud.alibaba.version>
<spring.cloud.alibaba.version>0.2.2.RELEASE</spring.cloud.alibaba.version>
<spring.boot.version>2.0.7.RELEASE</spring.boot.version>
<disruptor.version>3.3.7</disruptor.version>
<java.version>1.8</java.version>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment