fix

Author: zhangyixin

consulService1/build.gradle

@@ -2,5 +2,7 @@ dependencies {
     implementation 'org.springframework.boot:spring-boot-starter-web'
     implementation 'org.springframework.boot:spring-boot-starter-actuator'
     implementation 'org.springframework.cloud:spring-cloud-starter-consul-discovery'
+    implementation 'org.springframework.cloud:spring-cloud-starter-hystrix:1.4.7.RELEASE'
+    implementation 'org.springframework.cloud:spring-cloud-starter-feign:1.4.6.RELEASE'
 }
 

consulService1/src/main/java/com/xyz/ConsulClientApplication.java

@@ -2,8 +2,14 @@
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.cloud.client.circuitbreaker.EnableCircuitBreaker;
 import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
+import org.springframework.cloud.netflix.hystrix.EnableHystrix;
+import org.springframework.cloud.openfeign.EnableFeignClients;
 
+@EnableFeignClients
+@EnableHystrix
+@EnableCircuitBreaker
 @EnableDiscoveryClient
 @SpringBootApplication
 public class ConsulClientApplication {

consulService1/src/main/java/com/xyz/controller/HelloController.java

@@ -1,5 +1,7 @@
 package com.xyz.controller;
 
+import com.xyz.service.ConsulService2;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
@@ -9,11 +11,17 @@
 
 @RestController
 public class HelloController {
-
+    @Autowired
+    private ConsulService2 consulService2;
     @RequestMapping(method = RequestMethod.GET, value = "/hello")
     public Map<String, String> hello() {
         Map<String, String> map = new HashMap<>();
         map.put("text", "aaaaaaaaaa");
         return map;
     }
+
+    @RequestMapping(method = RequestMethod.GET, value = "/returnFromService2")
+    public Map<String, String> returnFromService2() {
+        return consulService2.returnFromService2();
+    }
 }

consulService1/src/main/java/com/xyz/service/ConsulService2.java

@@ -0,0 +1,14 @@
+package com.xyz.service;
+
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+
+import java.util.Map;
+
+@FeignClient(name = "consul-client", fallback = ConsulService2Hystrix.class)
+public interface ConsulService2 {
+
+    @RequestMapping(method = RequestMethod.GET, value = "/returnFromService2")
+    Map<String, String> returnFromService2();
+}

consulService1/src/main/java/com/xyz/service/ConsulService2Hystrix.java

@@ -0,0 +1,15 @@
+package com.xyz.service;
+
+import org.springframework.stereotype.Component;
+
+import java.util.HashMap;
+import java.util.Map;
+@Component
+public class ConsulService2Hystrix implements ConsulService2{
+    @Override
+    public Map<String, String> returnFromService2() {
+        Map<String, String> map = new HashMap<>();
+        map.put("text", "returnFromService2  eeeeeeeeeeeeeeeeeeeeeee");
+        return map;
+    }
+}

consulService1/src/main/resources/application.yml

@@ -1,5 +1,13 @@
 server:
   port: 8001
+management:
+  endpoints:
+    web:
+      exposure:
+        include: '*'
+feign:
+  hystrix:
+    enabled: true
 spring:
   cloud:
     consul:

consulService2/build.gradle

@@ -2,4 +2,5 @@ dependencies {
     implementation 'org.springframework.boot:spring-boot-starter-web'
     implementation 'org.springframework.boot:spring-boot-starter-actuator'
     implementation 'org.springframework.cloud:spring-cloud-starter-consul-discovery'
+    implementation 'org.springframework.cloud:spring-cloud-starter-hystrix:1.4.7.RELEASE'
 }

consulService2/src/main/java/com/xyz/controller/HelloController.java

@@ -16,4 +16,11 @@ public Map<String, String> hello() {
         map.put("text", "bbbbbbbbbbbb");
         return map;
     }
+
+    @RequestMapping(method = RequestMethod.GET, value = "/returnFromService2")
+    public Map<String, String> hello2() {
+        Map<String, String> map = new HashMap<>();
+        map.put("text", "returnFromService2");
+        return map;
+    }
 }

settings.gradle

@@ -21,4 +21,5 @@ include 'base'
 include 'gateway'
 include 'consulService1'
 include 'consulService2'
+include 'turbineDashboard'
 

turbineDashboard/build.gradle

@@ -0,0 +1,8 @@
+dependencies {
+    implementation "org.springframework.boot:spring-boot-starter-web"
+    implementation 'org.springframework.boot:spring-boot-starter-actuator'
+    implementation 'org.springframework.cloud:spring-cloud-starter-consul-discovery'
+    implementation 'org.springframework.cloud:spring-cloud-netflix-turbine'
+    implementation 'org.springframework.cloud:spring-cloud-starter-hystrix:1.4.7.RELEASE'
+    implementation 'org.springframework.cloud:spring-cloud-starter-hystrix-dashboard:1.4.7.RELEASE'
+}