修复全局请求头设置无效的问题

pom.xml

@@ -4,7 +4,7 @@
 
     <groupId>com.yhyzgn.http</groupId>
     <artifactId>pigeon</artifactId>
-    <version>1.2.6</version>
+    <version>1.2.7</version>
     <name>Pigeon</name>
     <description>Java http proxy.</description>
     <url>/~https://github.com/yhyzgn/Pigeon</url>

src/main/java/com/yhy/http/pigeon/Pigeon.java

@@ -3,9 +3,10 @@
 import com.yhy.http.pigeon.adapter.CallAdapter;
 import com.yhy.http.pigeon.converter.Converter;
 import com.yhy.http.pigeon.http.HttpMethod;
-import com.yhy.http.pigeon.offer.GuavaCallAdapter;
-import com.yhy.http.pigeon.offer.HttpLoggerInterceptor;
-import com.yhy.http.pigeon.offer.JacksonConverter;
+import com.yhy.http.pigeon.internal.GuavaCallAdapter;
+import com.yhy.http.pigeon.internal.HeaderInterceptor;
+import com.yhy.http.pigeon.internal.HttpLoggerInterceptor;
+import com.yhy.http.pigeon.internal.JacksonConverter;
 import okhttp3.*;
 
 import javax.net.ssl.HostnameVerifier;
@@ -37,7 +38,7 @@ public class Pigeon {
     private final HostnameVerifier sslHostnameVerifier;
     private final List<Interceptor> netInterceptors;
     private final List<Interceptor> interceptors;
-    private final Map<String, Object> headers;
+    private final Map<String, String> headers;
     private final List<CallAdapter.Factory> callFactories;
     private final List<Converter.Factory> converterFactories;
     private final OkHttpClient.Builder client;
@@ -67,7 +68,7 @@ public List<Interceptor> interceptors() {
         return interceptors;
     }
 
-    public Map<String, Object> headers() {
+    public Map<String, String> headers() {
         return headers;
     }
 
@@ -222,7 +223,7 @@ public static class Builder {
         private HttpUrl host;
         private final List<Interceptor> netInterceptors = new ArrayList<>();
         private final List<Interceptor> interceptors = new ArrayList<>();
-        private final Map<String, Object> headers = new HashMap<>();
+        private final Map<String, String> headers = new HashMap<>();
         private final List<CallAdapter.Factory> adapterFactories = new ArrayList<>();
         private final List<Converter.Factory> converterFactories = new ArrayList<>();
         private OkHttpClient.Builder client;
@@ -252,7 +253,7 @@ public Builder netInterceptor(Interceptor interceptor) {
             return this;
         }
 
-        public Builder header(String name, Object value) {
+        public Builder header(String name, String value) {
             this.headers.put(name, value);
             return this;
         }
@@ -302,6 +303,9 @@ public Pigeon build() {
             // 默认Adapter和Converter需要添加在最前面，后边需要从后往前查找
             adapterFactories.add(0, new GuavaCallAdapter());
             converterFactories.add(0, new JacksonConverter());
+
+            // 公共请求头拦截器
+            netInterceptors.add(new HeaderInterceptor(headers));
             if (logging) {
                 netInterceptors.add(new HttpLoggerInterceptor());
             }

src/main/java/com/yhy/http/pigeon/offer/GsonConverter.java → src/main/java/com/yhy/http/pigeon/internal/GsonConverter.java

@@ -1,4 +1,4 @@
-package com.yhy.http.pigeon.offer;
+package com.yhy.http.pigeon.internal;
 
 import com.google.gson.Gson;
 import com.google.gson.JsonIOException;

src/main/java/com/yhy/http/pigeon/offer/GuavaCallAdapter.java → src/main/java/com/yhy/http/pigeon/internal/GuavaCallAdapter.java

@@ -1,4 +1,4 @@
-package com.yhy.http.pigeon.offer;
+package com.yhy.http.pigeon.internal;
 
 import com.google.common.util.concurrent.AbstractFuture;
 import com.google.common.util.concurrent.ListenableFuture;

src/main/java/com/yhy/http/pigeon/internal/HeaderInterceptor.java

@@ -0,0 +1,44 @@
+package com.yhy.http.pigeon.internal;
+
+import okhttp3.Headers;
+import okhttp3.Interceptor;
+import okhttp3.Request;
+import okhttp3.Response;
+import org.jetbrains.annotations.NotNull;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.io.IOException;
+import java.util.Map;
+
+/**
+ * author : 颜洪毅
+ * e-mail : yhyzgn@gmail.com
+ * time   : 2020-08-29 19:40
+ * version: 1.0.0
+ * desc   : 公共请求头专用拦截器
+ */
+public class HeaderInterceptor implements Interceptor {
+    private final static Logger LOGGER = LoggerFactory.getLogger(HeaderInterceptor.class);
+
+    private final Map<String, String> headers;
+
+    public HeaderInterceptor(Map<String, String> headers) {
+        this.headers = headers;
+    }
+
+    @NotNull
+    @Override
+    public Response intercept(@NotNull Chain chain) throws IOException {
+        Request original = chain.request();
+        // 重建 request 并注入 全局请求头
+        Headers.Builder builder = original.headers().newBuilder();
+        headers.forEach((name, value) -> {
+            LOGGER.debug("Setting global request header: {} = {}", name, value);
+            builder.set(name, value);
+        });
+        Request request = original.newBuilder().headers(builder.build()).build();
+        // 继续请求
+        return chain.proceed(request);
+    }
+}

src/main/java/com/yhy/http/pigeon/offer/HttpLoggerInterceptor.java → src/main/java/com/yhy/http/pigeon/internal/HttpLoggerInterceptor.java

@@ -1,4 +1,4 @@
-package com.yhy.http.pigeon.offer;
+package com.yhy.http.pigeon.internal;
 
 import com.yhy.http.pigeon.common.Invocation;
 import com.yhy.http.pigeon.common.SystemClock;

src/main/java/com/yhy/http/pigeon/offer/JacksonConverter.java → src/main/java/com/yhy/http/pigeon/internal/JacksonConverter.java

@@ -1,4 +1,4 @@
-package com.yhy.http.pigeon.offer;
+package com.yhy.http.pigeon.internal;
 
 import com.fasterxml.jackson.core.JsonGenerator;
 import com.fasterxml.jackson.databind.DeserializationFeature;

src/main/java/com/yhy/http/pigeon/offer/StringResponseConverter.java → src/main/java/com/yhy/http/pigeon/internal/StringResponseConverter.java

@@ -1,4 +1,4 @@
-package com.yhy.http.pigeon.offer;
+package com.yhy.http.pigeon.internal;
 
 import com.yhy.http.pigeon.Pigeon;
 import com.yhy.http.pigeon.converter.Converter;

src/test/java/pigeon/get/ApiTester.java

@@ -1,8 +1,8 @@
 package pigeon.get;
 
 import com.yhy.http.pigeon.Pigeon;
-import com.yhy.http.pigeon.offer.StringResponseConverter;
 import pigeon.Rmt;
+import pigeon.interceptor.TestInterceptor;
 
 import java.io.IOException;
 import java.util.HashMap;
@@ -19,7 +19,7 @@ public class ApiTester {
 
     public static void main(String[] args) throws IOException {
 //        Pigeon pigeon = new Pigeon.Builder().host("http://localhost:8080/dbs/test").addConverterFactory(new StringResponseConverter()).build();
-        Pigeon pigeon = new Pigeon.Builder().host("https://t-tio.ybsjyyn.com/reporter/api/debug").build();
+        Pigeon pigeon = new Pigeon.Builder().host("https://t-tio.ybsjyyn.com/reporter/api/debug").header("XX", "asdfasdf").build();
         Api api = pigeon.create(Api.class);
 
 //        String test = api.test();

src/test/java/pigeon/interceptor/TestInterceptor.java

@@ -1,6 +1,6 @@
 package pigeon.interceptor;
 
-import com.yhy.http.pigeon.offer.HttpLoggerInterceptor;
+import com.yhy.http.pigeon.internal.HttpLoggerInterceptor;
 import okhttp3.Interceptor;
 import okhttp3.Response;
 import org.jetbrains.annotations.NotNull;
@@ -17,7 +17,7 @@
  * desc   :
  */
 public class TestInterceptor implements Interceptor {
-    private final static Logger LOGGER = LoggerFactory.getLogger(HttpLoggerInterceptor.class);
+    private final static Logger LOGGER = LoggerFactory.getLogger(TestInterceptor.class);
 
     @NotNull
     @Override