[fix]

  1. 修改sdk设置长连接有效期单位

Author: liuyj

CHANGES.md

@@ -0,0 +1,23 @@
+# Release Notes
+
+## 1.0.0.5
+### Fix
+修复长连接单位错误问题 由分钟改为秒
+
+## 1.0.0.4
+### Features
+支持设置长连接有效期
+
+## 1.0.0.3
+### Features
+1. ios支持自定义参数
+
+### Fix
+1. 修复jdk11 json反序列化报错问题： ParameterizedTypeImpl 类找不到
+2. 修复jdk1.6 https证书错误问题
+3. 服务端返回500支持重试
+4. 修复首次鉴权失败后空指针异常
+
+## 1.0.0.2
+### Features
+1. 支持设置httpclient最大连接数，解决并发大时获取连接慢问题

README.md

@@ -22,7 +22,7 @@
     <dependency>
         <groupId>com.getui.push</groupId>
         <artifactId>restful-sdk</artifactId>
-        <version>1.0.0.4</version>
+        <version>1.0.0.5</version>
     </dependency>
 ```
 

pom.xml

@@ -7,7 +7,7 @@
     <groupId>com.getui.push</groupId>
     <artifactId>restful-sdk</artifactId>
     <packaging>jar</packaging>
-    <version>1.0.0.4</version>
+    <version>1.0.0.5</version>
     <url>https://github.com/GetuiLaboratory/getui-pushapi-java-client-v2</url>
     <name>Getui Push API Java Client</name>
     <description>Getui's officially supported Java client library for accessing Getui APIs.</description>

src/main/java/com/getui/push/v2/sdk/GtApiConfiguration.java

@@ -66,9 +66,10 @@ public class GtApiConfiguration {
      */
     private int maxHttpTryTime = 1;
     /**
-     * 保持长连接的时长，默认10分钟
+     * 保持长连接的时长，默认10s，最大{@link #MAX_KEEP_ALIVE_SECONDS}
      */
-    private long keepAliveMinutes = 10;
+    private long keepAliveSeconds = 10;
+    final long MAX_KEEP_ALIVE_SECONDS = 30;
 
     /**
      * http请求时是否需要信任https
@@ -187,12 +188,37 @@ public void setMaxHttpTryTime(int maxHttpTryTime) {
         this.maxHttpTryTime = maxHttpTryTime;
     }
 
+    public long getKeepAliveSeconds() {
+        return keepAliveSeconds;
+    }
+
+    public void setKeepAliveSeconds(long keepAliveSeconds) {
+        if (keepAliveSeconds > MAX_KEEP_ALIVE_SECONDS) {
+            this.keepAliveSeconds = MAX_KEEP_ALIVE_SECONDS;
+        } else {
+            this.keepAliveSeconds = keepAliveSeconds;
+        }
+    }
+
+    /**
+     * replaced by <code>getKeepAliveSeconds()</code>.
+     * will be removed in the next version
+     *
+     * @return
+     */
+    @Deprecated
     public long getKeepAliveMinutes() {
-        return keepAliveMinutes;
+        return 0;
     }
 
+    /**
+     * replaced by <code>setKeepAliveSeconds()</code>.
+     * will be removed in the next version
+     *
+     * @param keepAliveMinutes
+     */
+    @Deprecated
     public void setKeepAliveMinutes(long keepAliveMinutes) {
-        this.keepAliveMinutes = keepAliveMinutes;
     }
 
     public GtHttpProxyConfig getProxyConfig() {

src/main/java/com/getui/push/v2/sdk/common/http/GtHttpClient.java

@@ -36,7 +36,7 @@ public class GtHttpClient {
     private int maxHttpTryTime;
     CloseableHttpClient httpclient;
 
-    public GtHttpClient(int connectTimeout, int soTimeout, int maxHttpTryTime, long keepAliveMinutes, GtHttpProxyConfig proxyConfig, boolean trustSSL) {
+    public GtHttpClient(int connectTimeout, int soTimeout, int maxHttpTryTime, long keepAliveSeconds, GtHttpProxyConfig proxyConfig, boolean trustSSL) {
         if (connectTimeout <= 0) {
             throw new IllegalArgumentException("connectTimeout must be > 0.");
         }
@@ -65,7 +65,7 @@ public GtHttpClient(int connectTimeout, int soTimeout, int maxHttpTryTime, long
                 .setMaxRedirects(0)
                 .build();
         builder.setDefaultRequestConfig(config)
-                .setConnectionTimeToLive(keepAliveMinutes, TimeUnit.MINUTES)
+                .setConnectionTimeToLive(keepAliveSeconds, TimeUnit.SECONDS)
                 .useSystemProperties();
         this.httpclient = builder.build();
     }

src/main/java/com/getui/push/v2/sdk/core/client/DefaultApiClient.java

@@ -131,7 +131,7 @@ private DefaultApiClient(GtApiConfiguration apiConfiguration, IJson json) {
 
         this.httpManager = new HttpManager(apiConfiguration.getConnectTimeout(),
                 apiConfiguration.getSoTimeout(), apiConfiguration.getMaxHttpTryTime(),
-                apiConfiguration.getKeepAliveMinutes(), apiConfiguration.getProxyConfig(),
+                apiConfiguration.getKeepAliveSeconds(), apiConfiguration.getProxyConfig(),
                 apiConfiguration.isTrustSSL());
 
         this.hostManager = new HostManager(apiConfiguration, this.httpManager);