feat: update version to 5.2.13, add default OkHttpClient for API clients

Author: zhanq

README.md

@@ -15,13 +15,13 @@
 ## 1. 集成
 引入sdk包
 ```xml
-<!--以5.2.12版本为例-->
+<!--以5.2.13版本为例-->
 <dependencies>
         <!-- jiguang-sdk -->
         <dependency>
             <groupId>io.github.jpush</groupId>
             <artifactId>jiguang-sdk</artifactId>
-            <version>5.2.12</version>
+            <version>5.2.13</version>
         </dependency>
 </dependencies>
 ```

example-for-spring/pom.xml

@@ -13,7 +13,7 @@
 
     <groupId>io.github.jpush</groupId>
     <artifactId>example-for-spring</artifactId>
-    <version>5.2.12</version>
+    <version>5.2.13</version>
 
     <properties>
         <maven.compiler.source>8</maven.compiler.source>
@@ -26,7 +26,7 @@
         <dependency>
             <groupId>io.github.jpush</groupId>
             <artifactId>jiguang-sdk</artifactId>
-            <version>5.2.12</version>
+            <version>5.2.13</version>
         </dependency>
         <!-- lombok -->
         <dependency>

example-for-spring/src/main/java/cn/jiguang/app/config/JiguangApiConfig.java

@@ -2,19 +2,13 @@
 
 import cn.jiguang.sdk.api.*;
 import feign.Logger;
-import feign.Request;
-import feign.Retryer;
-import feign.okhttp.OkHttpClient;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
 import java.net.InetSocketAddress;
 import java.net.Proxy;
-import java.util.concurrent.TimeUnit;
-
-import static java.util.concurrent.TimeUnit.SECONDS;
 
 @Slf4j
 @Configuration

jiguang-sdk/pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>io.github.jpush</groupId>
     <artifactId>jiguang-sdk</artifactId>
-    <version>5.2.12</version>
+    <version>5.2.13</version>
     <packaging>jar</packaging>
 
     <name>Jiguang SDK</name>

jiguang-sdk/src/main/java/cn/jiguang/sdk/api/AdminApi.java

@@ -76,15 +76,19 @@ public Builder setLoggerLevel(@NonNull Logger.Level loggerLevel) {
         }
 
         public AdminApi build() {
-            Feign.Builder builder = Feign.builder()
-                    .requestInterceptor(new BasicAuthRequestInterceptor(devKey, devSecret))
+            Feign.Builder builder = Feign.builder();
+
+            builder.requestInterceptor(new BasicAuthRequestInterceptor(devKey, devSecret))
                     .encoder(new ApiEncoder())
                     .decoder(new ApiDecoder())
                     .errorDecoder(new ApiErrorDecoder())
                     .logger(new Slf4jLogger())
                     .logLevel(loggerLevel);
             if (client != null) {
                 builder.client(client);
+            } else {
+                okhttp3.OkHttpClient okHttpClient = new okhttp3.OkHttpClient().newBuilder().build();
+                builder.client(new feign.okhttp.OkHttpClient(okHttpClient));
             }
             if (options != null) {
                 builder.options(options);

jiguang-sdk/src/main/java/cn/jiguang/sdk/api/DeviceApi.java

@@ -132,6 +132,9 @@ public DeviceApi build() {
                     .logLevel(loggerLevel);
             if (client != null) {
                 builder.client(client);
+            } else {
+                okhttp3.OkHttpClient okHttpClient = new okhttp3.OkHttpClient().newBuilder().build();
+                builder.client(new feign.okhttp.OkHttpClient(okHttpClient));
             }
             if (options != null) {
                 builder.options(options);

jiguang-sdk/src/main/java/cn/jiguang/sdk/api/GroupPushApi.java

@@ -78,6 +78,9 @@ public GroupPushApi build() {
                     .logLevel(loggerLevel);
             if (client != null) {
                 builder.client(client);
+            } else {
+                okhttp3.OkHttpClient okHttpClient = new okhttp3.OkHttpClient().newBuilder().build();
+                builder.client(new feign.okhttp.OkHttpClient(okHttpClient));
             }
             if (options != null) {
                 builder.options(options);

jiguang-sdk/src/main/java/cn/jiguang/sdk/api/PushApi.java

@@ -188,6 +188,9 @@ public PushApi build() {
                     .logLevel(loggerLevel);
             if (client != null) {
                 builder.client(client);
+            } else {
+                okhttp3.OkHttpClient okHttpClient = new okhttp3.OkHttpClient().newBuilder().build();
+                builder.client(new feign.okhttp.OkHttpClient(okHttpClient));
             }
             if (options != null) {
                 builder.options(options);

jiguang-sdk/src/main/java/cn/jiguang/sdk/api/ReportApi.java

@@ -93,6 +93,9 @@ public ReportApi build() {
                     .logLevel(loggerLevel);
             if (client != null) {
                 builder.client(client);
+            } else {
+                okhttp3.OkHttpClient okHttpClient = new okhttp3.OkHttpClient().newBuilder().build();
+                builder.client(new feign.okhttp.OkHttpClient(okHttpClient));
             }
             if (options != null) {
                 builder.options(options);

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>io.github.jpush</groupId>
     <artifactId>jiguang-sdk-java</artifactId>
-    <version>5.2.12</version>
+    <version>5.2.13</version>
     <packaging>pom</packaging>
 
     <modules>