Commit f842ba5e by Nepxion

修正Hystrix

parent e0a937af
...@@ -6,12 +6,12 @@ package com.nepxion.discovery.plugin.example.gateway; ...@@ -6,12 +6,12 @@ package com.nepxion.discovery.plugin.example.gateway;
* <p>Copyright: Copyright (c) 2017-2050</p> * <p>Copyright: Copyright (c) 2017-2050</p>
* <p>Company: Nepxion</p> * <p>Company: Nepxion</p>
* @author Haojun Ren * @author Haojun Ren
* @author Ankeway
* @version 1.0 * @version 1.0
*/ */
import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.boot.builder.SpringApplicationBuilder; import org.springframework.boot.builder.SpringApplicationBuilder;
import org.springframework.cloud.client.circuitbreaker.EnableCircuitBreaker;
import org.springframework.cloud.client.discovery.EnableDiscoveryClient; import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Bean;
...@@ -20,7 +20,6 @@ import com.nepxion.discovery.plugin.strategy.gateway.filter.GatewayStrategyRoute ...@@ -20,7 +20,6 @@ import com.nepxion.discovery.plugin.strategy.gateway.filter.GatewayStrategyRoute
@SpringBootApplication @SpringBootApplication
@EnableDiscoveryClient @EnableDiscoveryClient
@EnableCircuitBreaker
public class DiscoveryApplicationGateway { public class DiscoveryApplicationGateway {
public static void main(String[] args) { public static void main(String[] args) {
new SpringApplicationBuilder(DiscoveryApplicationGateway.class).run(args); new SpringApplicationBuilder(DiscoveryApplicationGateway.class).run(args);
......
...@@ -21,6 +21,7 @@ spring.cloud.nacos.discovery.metadata.version=1.0 ...@@ -21,6 +21,7 @@ spring.cloud.nacos.discovery.metadata.version=1.0
management.server.port=5500 management.server.port=5500
# Spring cloud gateway config # Spring cloud gateway config
# 跟Hystrix会冲突。开启Hystrix后,下面项必须注释掉
# spring.cloud.gateway.discovery.locator.enabled=true # spring.cloud.gateway.discovery.locator.enabled=true
spring.cloud.gateway.discovery.locator.lowerCaseServiceId=true spring.cloud.gateway.discovery.locator.lowerCaseServiceId=true
spring.cloud.gateway.routes[0].id=discovery-springcloud-example-a spring.cloud.gateway.routes[0].id=discovery-springcloud-example-a
......
...@@ -23,4 +23,4 @@ management.server.port=5400 ...@@ -23,4 +23,4 @@ management.server.port=5400
# Zuul config # Zuul config
zuul.routes.discovery-springcloud-example-a.path=/discovery-springcloud-example-a/** zuul.routes.discovery-springcloud-example-a.path=/discovery-springcloud-example-a/**
zuul.routes.discovery-springcloud-example-a.serviceId=discovery-springcloud-example-a zuul.routes.discovery-springcloud-example-a.serviceId=discovery-springcloud-example-a
# zuul.ribbon-isolation-strategy=thread # zuul.ribbon-isolation-strategy=THREAD
\ No newline at end of file \ No newline at end of file
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