Merge branch 'dev'

Author: coderqianlq

eureka-customer/pom.xml

@@ -68,6 +68,27 @@
             <artifactId>spring-cloud-starter-config</artifactId>
         </dependency>
 
+
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-starter-bus-amqp</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-actuator</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework.retry</groupId>
+            <artifactId>spring-retry</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-aop</artifactId>
+        </dependency>
+
         <!-- 引入Mybatis依赖 -->
         <dependency>
             <groupId>org.mybatis.spring.boot</groupId>

eureka-customer/src/main/java/com/coderqian/eurekacustomer/controller/TestController.java

@@ -6,6 +6,7 @@
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
+import org.springframework.cloud.context.config.annotation.RefreshScope;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
@@ -19,11 +20,15 @@
  * 测试类
  */
 
+@RefreshScope
 @RestController
 @RequestMapping(value = "/test")
 @Api(value = "测试", description = "测试模块", position = 1)
 public class TestController {
 
+    @Value("${profile}")
+    private String profile;
+
     @Autowired
     private TestService testService;
 
@@ -50,4 +55,10 @@ public BaseResult testBaseResult(@RequestParam(value = "text") String text) {
     public BaseResult testMybatis(@RequestParam("id") String id) {
         return testService.testMybatis(id);
     }
+
+    @ApiOperation(value = "测试消息总线", notes = "测试消息总线")
+    @RequestMapping(value = "/bus", method = RequestMethod.GET)
+    public String testBus() {
+        return profile;
+    }
 }

eureka-customer/src/main/resources/bootstrap.properties

@@ -5,3 +5,10 @@ spring.cloud.config.profile=master
 spring.cloud.config.label=
 spring.cloud.config.uri=http://127.0.0.1:1201/
 
+spring.rabbitmq.host=127.0.0.1
+spring.rabbitmq.port=5672
+spring.rabbitmq.username=guest
+spring.rabbitmq.password=guest
+management.security.enabled=false
+
+#management.endpoints.web.exposure.include=bus-refresh

feign-server/src/main/java/com/coderqian/feginserver/configuration/FeignServerConfiguration.java

@@ -4,6 +4,7 @@
 import feign.Feign;
 import feign.hystrix.HystrixFeign;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -21,6 +22,7 @@ public class FeignServerConfiguration {
 
     @Bean
     @Scope("prototype")
+    @ConditionalOnMissingBean
     @ConditionalOnProperty(name = "feign.hystrix.enabled", matchIfMissing = true)
     public Feign.Builder feignBuilder() {
         return Feign.builder();