Merge pull request #41 from LianjiaTech/develop

Develop

Author: chentianming11

README.md

@@ -42,7 +42,7 @@
 <dependency>
     <groupId>com.github.lianjiatech</groupId>
     <artifactId>retrofit-spring-boot-starter</artifactId>
-    <version>2.2.1</version>
+    <version>2.2.2</version>
 </dependency>
 ```
 
@@ -179,13 +179,15 @@ public interface HttpApi3 {
 
 ### 注解式拦截器
 
-很多时候，我们希望某个接口下的某些http请求执行统一的拦截处理逻辑。为了支持这个功能，`retrofit-spring-boot-starter`提供了**注解式拦截器**，同时做到了**基于url路径的匹配拦截**。使用的步骤主要分为2步：
+很多时候，我们希望某个接口下的某些http请求执行统一的拦截处理逻辑。为了支持这个功能，`retrofit-spring-boot-starter`提供了**注解式拦截器**，做到了**基于url路径的匹配拦截**。使用的步骤主要分为2步：
 
 1. 继承`BasePathMatchInterceptor`编写拦截处理器；
 2. 接口上使用`@Intercept`进行标注。
 
 下面以*给指定请求的url后面拼接timestamp时间戳*为例，介绍下如何使用注解式拦截器。
 
+> 如需配置多个拦截器，在接口上标注多个`@Intercept`注解即可！
+
 #### 继承`BasePathMatchInterceptor`编写拦截处理器
 
 ```java

README_EN.md

@@ -43,7 +43,7 @@
 <dependency>
     <groupId>com.github.lianjiatech</groupId>
     <artifactId>retrofit-spring-boot-starter</artifactId>
-    <version>2.2.1</version>
+    <version>2.2.2</version>
 </dependency>
 ```
 
@@ -181,6 +181,8 @@ In many cases, we hope that certain http requests in a certain interface execute
 1. Inherit `BasePathMatchInterceptor` and write interceptor processor;
 2. Mark the interface with `@Intercept`.
 
+> To configure multiple interceptors, just mark multiple `@Intercept` annotations on the interface!
+
 The following is an example of how to use annotation interceptors *by splicing timestamp after the URL of a specified request*.
 
 #### Inherit `BasePathMatchInterceptor` and write interceptor processor

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>com.github.lianjiatech</groupId>
     <artifactId>retrofit-spring-boot-starter</artifactId>
-    <version>2.2.1</version>
+    <version>2.2.2</version>
 
     <name>retrofit-spring-boot-starter</name>
     <description>retrofit-spring-boot-starter</description>

src/main/java/com/github/lianjiatech/retrofit/spring/boot/annotation/Intercept.java

@@ -13,8 +13,8 @@
  */
 @Retention(RetentionPolicy.RUNTIME)
 @Target(ElementType.TYPE)
-@Documented
 @InterceptMark
+@Repeatable(Intercepts.class)
 public @interface Intercept {
     /**
      * 拦截器匹配路径pattern

src/main/java/com/github/lianjiatech/retrofit/spring/boot/annotation/Intercepts.java

@@ -0,0 +1,13 @@
+package com.github.lianjiatech.retrofit.spring.boot.annotation;
+
+import java.lang.annotation.*;
+
+/**
+ * @author 陈添明
+ */
+@Retention(RetentionPolicy.RUNTIME)
+@Target(ElementType.TYPE)
+public @interface Intercepts {
+
+    Intercept[] value();
+}

src/main/java/com/github/lianjiatech/retrofit/spring/boot/core/RetrofitFactoryBean.java

@@ -1,8 +1,6 @@
 package com.github.lianjiatech.retrofit.spring.boot.core;
 
-import com.github.lianjiatech.retrofit.spring.boot.annotation.InterceptMark;
-import com.github.lianjiatech.retrofit.spring.boot.annotation.OkHttpClientBuilder;
-import com.github.lianjiatech.retrofit.spring.boot.annotation.RetrofitClient;
+import com.github.lianjiatech.retrofit.spring.boot.annotation.*;
 import com.github.lianjiatech.retrofit.spring.boot.config.RetrofitConfigBean;
 import com.github.lianjiatech.retrofit.spring.boot.config.RetrofitProperties;
 import com.github.lianjiatech.retrofit.spring.boot.degrade.*;
@@ -332,6 +330,12 @@ private List<Interceptor> findInterceptorByAnnotation(Class<?> retrofitClientInt
             if (annotationType.isAnnotationPresent(InterceptMark.class)) {
                 interceptAnnotations.add(classAnnotation);
             }
+            if (classAnnotation instanceof Intercepts) {
+                Intercept[] value = ((Intercepts) classAnnotation).value();
+                for (Intercept intercept : value) {
+                    interceptAnnotations.add(intercept);
+                }
+            }
         }
         for (Annotation interceptAnnotation : interceptAnnotations) {
             // 获取注解属性数据。Get annotation attribute data

src/test/java/com/github/lianjiatech/retrofit/spring/boot/test/http/HttpApi.java

@@ -6,6 +6,7 @@
 import com.github.lianjiatech.retrofit.spring.boot.test.entity.Result;
 import com.github.lianjiatech.retrofit.spring.boot.test.ex.TestErrorDecoder;
 import com.github.lianjiatech.retrofit.spring.boot.test.interceptor.Sign;
+import com.github.lianjiatech.retrofit.spring.boot.test.interceptor.TimeStamp2Interceptor;
 import com.github.lianjiatech.retrofit.spring.boot.test.interceptor.TimeStampInterceptor;
 import retrofit2.Call;
 import retrofit2.Response;
@@ -22,6 +23,7 @@
 @RetrofitClient(baseUrl = "${test.baseUrl}", poolName = "test1", errorDecoder = TestErrorDecoder.class)
 @Sign(accessKeyId = "${test.accessKeyId}", accessKeySecret = "${test.accessKeySecret}", exclude = {"/api/test/query"})
 @Intercept(handler = TimeStampInterceptor.class)
+@Intercept(handler = TimeStamp2Interceptor.class)
 public interface HttpApi {
 
     /**

src/test/java/com/github/lianjiatech/retrofit/spring/boot/test/interceptor/TimeStamp2Interceptor.java

@@ -0,0 +1,30 @@
+package com.github.lianjiatech.retrofit.spring.boot.test.interceptor;
+
+import com.github.lianjiatech.retrofit.spring.boot.interceptor.BasePathMatchInterceptor;
+import okhttp3.HttpUrl;
+import okhttp3.Request;
+import okhttp3.Response;
+import org.springframework.stereotype.Component;
+
+import java.io.IOException;
+
+/**
+ * @author 陈添明
+ */
+@Component
+public class TimeStamp2Interceptor extends BasePathMatchInterceptor {
+
+    @Override
+    public Response doIntercept(Chain chain) throws IOException {
+        Request request = chain.request();
+        HttpUrl url = request.url();
+        long timestamp = System.currentTimeMillis();
+        HttpUrl newUrl = url.newBuilder()
+                .addQueryParameter("timestamp2", String.valueOf(timestamp))
+                .build();
+        Request newRequest = request.newBuilder()
+                .url(newUrl)
+                .build();
+        return chain.proceed(newRequest);
+    }
+}