From 54527c6d3d5b23bdd307e620a87feae53d82070b Mon Sep 17 00:00:00 2001
From: Administrator <Administrator@USER-20200709VB>
Date: Wed, 28 Oct 2020 21:44:22 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E4=BA=86kafka=E5=92=8Cfeign?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 mall-ebtp-cloud-feign-starter/pom.xml           | 12 ++++++++----
 .../starter/FeignStarterConfiguration.java      | 17 +++++++++++++++++
 .../resources/feign-configuration.properties    |  2 ++
 mall-ebtp-cloud-kafka-starter/pom.xml           |  8 ++++++++
 4 files changed, 35 insertions(+), 4 deletions(-)

diff --git a/mall-ebtp-cloud-feign-starter/pom.xml b/mall-ebtp-cloud-feign-starter/pom.xml
index 3b6814b..484fbff 100644
--- a/mall-ebtp-cloud-feign-starter/pom.xml
+++ b/mall-ebtp-cloud-feign-starter/pom.xml
@@ -16,9 +16,13 @@
 	<name>mall-ebtp-cloud-feign-starter</name>
 
 	<dependencies>
-		<dependency>
-			<groupId>org.springframework.cloud</groupId>
-			<artifactId>spring-cloud-starter-openfeign</artifactId>
-		</dependency>
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-starter-openfeign</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.github.openfeign</groupId>
+            <artifactId>feign-okhttp</artifactId>
+        </dependency>
 	</dependencies>
 </project>
diff --git a/mall-ebtp-cloud-feign-starter/src/main/java/com/chinaunicom/mall/ebtp/cloud/feign/starter/FeignStarterConfiguration.java b/mall-ebtp-cloud-feign-starter/src/main/java/com/chinaunicom/mall/ebtp/cloud/feign/starter/FeignStarterConfiguration.java
index 89a34bc..d7251d2 100644
--- a/mall-ebtp-cloud-feign-starter/src/main/java/com/chinaunicom/mall/ebtp/cloud/feign/starter/FeignStarterConfiguration.java
+++ b/mall-ebtp-cloud-feign-starter/src/main/java/com/chinaunicom/mall/ebtp/cloud/feign/starter/FeignStarterConfiguration.java
@@ -1,10 +1,27 @@
 package com.chinaunicom.mall.ebtp.cloud.feign.starter;
 
+import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.PropertySource;
 
+import feign.RequestInterceptor;
+import feign.okhttp.OkHttpClient;
+
 @Configuration
 @PropertySource("classpath:feign-configuration.properties")
 public class FeignStarterConfiguration {
 
+	@Bean
+	public OkHttpClient client() {
+		return new OkHttpClient();
+	}
+
+	@Bean
+	public RequestInterceptor requestInterceptor() {
+		return requestTemplate -> {
+			requestTemplate.header("user", "mall");
+			requestTemplate.header("password", "mall");
+		};
+	}
+
 }
diff --git a/mall-ebtp-cloud-feign-starter/src/main/resources/feign-configuration.properties b/mall-ebtp-cloud-feign-starter/src/main/resources/feign-configuration.properties
index e69de29..2f48da2 100644
--- a/mall-ebtp-cloud-feign-starter/src/main/resources/feign-configuration.properties
+++ b/mall-ebtp-cloud-feign-starter/src/main/resources/feign-configuration.properties
@@ -0,0 +1,2 @@
+# 默认开启熔断
+feign.hystrix.enabled=true
\ No newline at end of file
diff --git a/mall-ebtp-cloud-kafka-starter/pom.xml b/mall-ebtp-cloud-kafka-starter/pom.xml
index 532b333..6856232 100644
--- a/mall-ebtp-cloud-kafka-starter/pom.xml
+++ b/mall-ebtp-cloud-kafka-starter/pom.xml
@@ -16,9 +16,17 @@
 	<name>mall-ebtp-cloud-kafka-starter</name>
 
 	<dependencies>
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter</artifactId>
+		</dependency>
 		<dependency>
 			<groupId>org.springframework.kafka</groupId>
 			<artifactId>spring-kafka</artifactId>
 		</dependency>
+		<dependency>
+			<groupId>com.fasterxml.jackson.core</groupId>
+			<artifactId>jackson-databind</artifactId>
+		</dependency>
 	</dependencies>
 </project>
\ No newline at end of file