Merge pull request #1 from coderqianlq/dev

 feat(Hystrix熔断器): 初步继承Hystrix熔断器

Author: coderqianlq

dubbo-api/pom.xml

@@ -25,12 +25,13 @@
 	<dependencies>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter</artifactId>
+			<artifactId>spring-boot-starter-web</artifactId>
 		</dependency>
 
 		<dependency>
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter-web</artifactId>
+			<groupId>io.swagger</groupId>
+			<artifactId>swagger-annotations</artifactId>
+			<version>1.5.20</version>
 		</dependency>
 	</dependencies>
 

dubbo-api/src/main/java/com/coderqian/dubboapi/service/TestService.java

@@ -3,7 +3,7 @@
 /**
  * @author qianliqing
  * @date 2018/11/29 1:55 PM
- * email: qianliqing@hyperchain.com
+ * email: qianlq0824@gmail.com
  */
 
 public interface TestService {

dubbo-consumer/pom.xml

@@ -20,6 +20,7 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <java.version>1.8</java.version>
+        <spring-cloud.version>Finchley.RELEASE</spring-cloud.version>
     </properties>
 
     <dependencies>
@@ -34,8 +35,26 @@
             <artifactId>spring-boot-starter-web</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-starter-netflix-hystrix</artifactId>
+            <version>2.0.1.RELEASE</version>
+        </dependency>
     </dependencies>
 
+
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>org.springframework.cloud</groupId>
+                <artifactId>spring-cloud-dependencies</artifactId>
+                <version>${spring-cloud.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+
     <build>
         <plugins>
             <plugin>
@@ -45,5 +64,4 @@
         </plugins>
     </build>
 
-
 </project>

dubbo-consumer/src/main/java/com/coderqian/dubboconsumer/controller/TestController.java

@@ -2,14 +2,15 @@
 
 import com.alibaba.dubbo.config.annotation.Reference;
 import com.coderqian.dubboapi.service.TestService;
+import com.netflix.hystrix.contrib.javanica.annotation.HystrixCommand;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
 
 /**
  * @author qianliqing
  * @date 2018/11/29 1:52 PM
- * email: qianliqing@hyperchain.com
+ * email: qianlq0824@gmail.com
  */
 
 @RestController
@@ -19,8 +20,13 @@ public class TestController {
     @Reference
     private TestService testService;
 
+    @HystrixCommand(fallbackMethod = "testError")
     @RequestMapping(value = "/hello", method = RequestMethod.GET)
     public String test(String text) {
         return testService.test(text);
     }
+
+    private String testError(String text) {
+        return "失败" + text;
+    }
 }

dubbo-consumer/src/main/resources/application.properties

@@ -7,6 +7,9 @@ dubbo.application.id=dubbo-customer
 dubbo.application.name=dubbo-customer
 # 注册中心
 dubbo.registry.address=zookeeper://127.0.0.1:2181
+dubbo.registry.timeout=60000
+dubbo.registry.group=dubbo
+dubbo.registry.check=false
 
 # 生产者提供的协议id
 dubbo.protocol.id=dubbo-provider

dubbo-consumer/src/main/resources/dubbo/dubbo-customer.xml

@@ -9,7 +9,7 @@ http://code.alibabatech.com/schema/dubbo/dubbo.xsd">
     <dubbo:application name="dubbo-customer"/>
 
     <!-- 注册中心配置，使用zookeeper注册中心暴露服务地址 -->
-    <dubbo:registry address="zookeeper://127.0.0.1:2181" timeout="60000" group="dubbo"/>
+    <dubbo:registry address="zookeeper://127.0.0.1:2181" timeout="60000" group="dubbo" check="false"/>
 
     <!-- 关闭服务消费方所有服务的启动检查。dubbo缺省会在启动时检查依赖的服务是否可用，不可用时会抛出异常，阻止Spring初始化完成 -->
     <dubbo:consumer check="false"/>

dubbo-provider/pom.xml

@@ -20,6 +20,7 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <java.version>1.8</java.version>
+        <spring-cloud.version>Finchley.RELEASE</spring-cloud.version>
     </properties>
 
     <dependencies>
@@ -34,6 +35,13 @@
             <artifactId>spring-boot-starter-actuator</artifactId>
         </dependency>
 
+        <!-- Hystrix依赖 -->
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-starter-netflix-hystrix</artifactId>
+            <version>2.0.1.RELEASE</version>
+        </dependency>
+
         <dependency>
             <groupId>org.apache.zookeeper</groupId>
             <artifactId>zookeeper</artifactId>
@@ -71,6 +79,18 @@
         </dependency>
     </dependencies>
 
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>org.springframework.cloud</groupId>
+                <artifactId>spring-cloud-dependencies</artifactId>
+                <version>${spring-cloud.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+
     <build>
         <plugins>
             <plugin>
@@ -80,5 +100,4 @@
         </plugins>
     </build>
 
-
 </project>

dubbo-provider/src/main/java/com/coderqian/dubboprovider/DubboProviderApplication.java

@@ -3,8 +3,10 @@
 import com.alibaba.dubbo.config.spring.context.annotation.EnableDubbo;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.cloud.netflix.hystrix.EnableHystrix;
 
 @EnableDubbo
+@EnableHystrix
 @SpringBootApplication
 //@ImportResource({"classpath:dubbo/dubbo-provider.xml"})
 public class DubboProviderApplication {

dubbo-provider/src/main/java/com/coderqian/dubboprovider/service/impl/TestServiceImpl.java

@@ -2,18 +2,25 @@
 
 import com.alibaba.dubbo.config.annotation.Service;
 import com.coderqian.dubboapi.service.TestService;
+import com.netflix.hystrix.contrib.javanica.annotation.HystrixCommand;
+import com.netflix.hystrix.contrib.javanica.annotation.HystrixProperty;
+import io.swagger.annotations.ApiParam;
 
 /**
  * @author qianliqing
  * @date 2018/11/29 12:53 PM
- * email: qianliqing@hyperchain.com
+ * email: qianlq0824@gmail.com
  */
 
 @Service
 public class TestServiceImpl implements TestService {
 
+    @HystrixCommand(commandProperties = {
+            @HystrixProperty(name = "circuitBreaker.requestVolumeThreshold", value = "3"),
+            @HystrixProperty(name = "execution.isolation.thread.timeoutInMilliseconds", value = "2000")
+    })
     @Override
-    public String test(String text) {
+    public String test(@ApiParam(value = "测试数据", required = true) String text) {
         return text;
     }
 }

dubbo-provider/src/main/resources/application.properties

@@ -7,8 +7,14 @@ dubbo.application.id=dubbo-provider
 dubbo.application.name=dubbo-provider
 # 注册中心
 dubbo.registry.address=zookeeper://127.0.0.1:2181
+dubbo.registry.timeout=60000
+dubbo.registry.group=dubbo
+dubbo.registry.check=false
+
 dubbo.server=true
 # 生产者暴露给消费者协议
 dubbo.protocol.name=dubbo
 # 生产者暴露给消费者端口
-dubbo.protocol.port=20880
+dubbo.protocol.port=20880
+
+logging.config=classpath:log4j2.xml