完善feign和sentinel的集成

Author: zhoutaoo

auth/authentication-server/src/main/java/com/springboot/cloud/auth/authentication/provider/ResourceProviderFallback.java

@@ -2,10 +2,12 @@
 
 import com.springboot.cloud.sysadmin.organization.entity.po.Resource;
 import com.springboot.cloud.common.core.entity.vo.Result;
+import org.springframework.stereotype.Component;
 
 import java.util.HashSet;
 import java.util.Set;
 
+@Component
 public class ResourceProviderFallback implements ResourceProvider {
     @Override
     public Result<Set<Resource>> resources() {

auth/authentication-server/src/main/resources/application.yml

@@ -13,24 +13,27 @@ spring:
     url: jdbc:${DATASOURCE_DBTYPE:mysql}://${DATASOURCE_HOST:localhost}:${DATASOURCE_PORT:3306}/sc_auth?characterEncoding=UTF-8&useUnicode=true&useSSL=false
     username: ${DATASOURCE_USERNAME:root}
     password: ${DATASOURCE_PASSWORD:root123}
-
   zipkin:
     enabled: true
     sender:
       type: rabbit
   sleuth:
     sampler:
       probability: 1.0
-
   mvc:
     throw-exception-if-no-handler-found: true
-
   #jwt的密钥
   security:
     oauth2:
       jwt:
         signingKey: 123456
 
+feign:
+  sentinel:
+    enabled: true
+  okhttp:
+    enabled: true
+
 logging:
   level:
     org.springframework.web: debug
@@ -50,3 +53,4 @@ management:
 mybatis:
   configuration:
     map-underscore-to-camel-case: true
+

auth/authorization-server/src/main/java/com/springboot/auth/authorization/provider/OrganizationProviderFallback.java

@@ -3,10 +3,12 @@
 import com.springboot.auth.authorization.entity.Role;
 import com.springboot.auth.authorization.entity.User;
 import com.springboot.cloud.common.core.entity.vo.Result;
+import org.springframework.stereotype.Component;
 
 import java.util.HashSet;
 import java.util.Set;
 
+@Component
 public class OrganizationProviderFallback implements OrganizationProvider {
 
     @Override

auth/authorization-server/src/main/resources/application.yml

@@ -41,6 +41,12 @@ logging:
   file:
     max-size: 1GB
 
+feign:
+  sentinel:
+    enabled: true
+  okhttp:
+    enabled: true
+
 management:
   endpoints:
     web:

demos/consumer-feign/src/main/resources/application.yml

@@ -1,23 +1,9 @@
-server:
-  port: 8041
-
 spring:
-  application:
-    name: feign-consumer
-  cloud:
-    nacos:
-      discovery:
-        server-addr: ${REGISTER_HOST:localhost}:${REGISTER_PORT:8848}
-    sentinel:
-      transport:
-        dashboard: ${SENTINEL_DASHBOARD_HOST:localhost}:${SENTINEL_DASHBOARD_PORT:8021}
-
   rabbitmq:
     host: ${RABBIT_MQ_HOST:localhost}
     port: ${RABBIT_MQ_PORT:5672}
     username: ${RABBIT_MQ_USERNAME:guest}
     password: ${RABBIT_MQ_PASSWORD:guest}
-
   zipkin:
     sender:
       type: rabbit
@@ -29,7 +15,6 @@ spring:
       enabled: true
       processor:
         enabled: true
-
   mvc:
     throw-exception-if-no-handler-found: true
   servlet:
@@ -46,6 +31,12 @@ logging:
   file:
     max-size: 1GB
 
+feign:
+  sentinel:
+    enabled: true
+  okhttp:
+    enabled: true
+
 management:
   endpoints:
     web:

demos/consumer-feign/src/main/resources/bootstrap.yml

@@ -0,0 +1,18 @@
+server:
+  port: 8041
+spring:
+  application:
+    name: feign-consumer
+  cloud:
+    nacos:
+      discovery:
+        server-addr: ${REGISTER_HOST:localhost}:${REGISTER_PORT:8848}
+      config:
+        server-addr: ${REGISTER_HOST:localhost}:${REGISTER_PORT:8848}
+        file-extension: yml
+    sentinel:
+      transport:
+        dashboard: ${SENTINEL_DASHBOARD_HOST:localhost}:${SENTINEL_DASHBOARD_PORT:8021}
+    bus:
+      trace:
+        enabled: true

demos/consumer-ribbon/src/main/resources/application.yml

@@ -1,31 +1,16 @@
-server:
-  port: 8020
-
 spring:
-  application:
-    name: ribbon-consumer
-  cloud:
-    nacos:
-      discovery:
-        server-addr: ${REGISTER_HOST:localhost}:${REGISTER_PORT:8848}
-    sentinel:
-      transport:
-        dashboard: ${SENTINEL_DASHBOARD_HOST:localhost}:${SENTINEL_DASHBOARD_PORT:8021}
-
   rabbitmq:
     host: ${RABBIT_MQ_HOST:localhost}
     port: ${RABBIT_MQ_PORT:5672}
     username: ${RABBIT_MQ_USERNAME:guest}
     password: ${RABBIT_MQ_PASSWORD:guest}
-
   zipkin:
     enabled: true
     sender:
       type: rabbit
   sleuth:
     sampler:
       probability: 1.0
-
   mvc:
     throw-exception-if-no-handler-found: true
   servlet:

demos/consumer-ribbon/src/main/resources/bootstrap.yml

@@ -0,0 +1,18 @@
+server:
+  port: 8020
+spring:
+  application:
+    name: ribbon-consumer
+  cloud:
+    nacos:
+      discovery:
+        server-addr: ${REGISTER_HOST:localhost}:${REGISTER_PORT:8848}
+      config:
+        server-addr: ${REGISTER_HOST:localhost}:${REGISTER_PORT:8848}
+        file-extension: yml
+    sentinel:
+      transport:
+        dashboard: ${SENTINEL_DASHBOARD_HOST:localhost}:${SENTINEL_DASHBOARD_PORT:8021}
+    bus:
+      trace:
+        enabled: true

demos/producer-jpa/src/main/resources/application.yml

@@ -1,17 +1,4 @@
-server:
-  port: 9002
-
 spring:
-  application:
-    name: producer-jpa
-  cloud:
-    nacos:
-      discovery:
-        server-addr: ${REGISTER_HOST:localhost}:${REGISTER_PORT:8848}
-    sentinel:
-      transport:
-        dashboard: ${SENTINEL_DASHBOARD_HOST:localhost}:${SENTINEL_DASHBOARD_PORT:8021}
-
   rabbitmq:
     host: ${RABBIT_MQ_HOST:localhost}
     port: ${RABBIT_MQ_PORT:5672}
@@ -26,15 +13,13 @@ spring:
     url: jdbc:${DATASOURCE_DBTYPE:mysql}://${DATASOURCE_HOST:localhost}:${DATASOURCE_PORT:3306}/sc_product?characterEncoding=UTF-8&useUnicode=true&useSSL=false
     username: ${DATASOURCE_USERNAME:root}
     password: ${DATASOURCE_PASSWORD:root123}
-
   zipkin:
     enabled: true
     sender:
       type: rabbit
   sleuth:
     sampler:
       probability: 1.0
-
   mvc:
     throw-exception-if-no-handler-found: true
   servlet:

demos/producer-jpa/src/main/resources/bootstrap.yml

@@ -0,0 +1,18 @@
+server:
+  port: 9002
+spring:
+  application:
+    name: producer-jpa
+  cloud:
+    nacos:
+      discovery:
+        server-addr: ${REGISTER_HOST:localhost}:${REGISTER_PORT:8848}
+      config:
+        server-addr: ${REGISTER_HOST:localhost}:${REGISTER_PORT:8848}
+        file-extension: yml
+    sentinel:
+      transport:
+        dashboard: ${SENTINEL_DASHBOARD_HOST:localhost}:${SENTINEL_DASHBOARD_PORT:8021}
+    bus:
+      trace:
+        enabled: true

demos/producer/src/main/resources/application.yml

@@ -20,15 +20,13 @@ spring:
     url: jdbc:${DATASOURCE_DBTYPE:mysql}://${DATASOURCE_HOST:localhost}:${DATASOURCE_PORT:3306}/sc_product?characterEncoding=UTF-8&useUnicode=true&useSSL=false
     username: ${DATASOURCE_USERNAME:root}
     password: ${DATASOURCE_PASSWORD:root123}
-
   zipkin:
     enabled: true
     sender:
       type: rabbit
   sleuth:
     sampler:
       probability: 1.0
-
   mvc:
     throw-exception-if-no-handler-found: true
   servlet: