[update] 1.支持安卓厂商消息撤回;2.HTTPS协议更换(SSLv3 -> TLSv1.2)

Change-Id: I547e5c8c5de0a8486f574c928007b948c1dd3dd7

Author: 陈嘉豪

CHANGES.md

@@ -1,5 +1,12 @@
 # Release Notes
 
+## 1.0.0.11
+
+### update
+
+* 支持安卓厂商消息撤回
+* HTTPS协议更换(SSLv3 -> TLSv1.2)
+
 ## 1.0.0.10
 
 ### update

README.md

@@ -21,9 +21,9 @@
 ```xml
     <dependency>
         <groupId>com.getui.push</groupId>
-        <artifactId>restful-sdk</artifactId>
-        <version>1.0.0.10</version>
-    </dependency>
+    <artifactId>restful-sdk</artifactId>
+    <version>1.0.0.11</version>
+</dependency>
 ```
 
 ## 快速开始

pom.xml

@@ -7,7 +7,7 @@
     <groupId>com.getui.push</groupId>
     <artifactId>restful-sdk</artifactId>
     <packaging>jar</packaging>
-    <version>1.0.0.10</version>
+    <version>1.0.0.11</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/common/http/GtHttpClient.java

@@ -102,7 +102,7 @@ public String execute(String url, String method, Map<String, Object> headers, St
 
     public static SSLContext createSSLContext() {
         try {
-            SSLContext sslContext = SSLContext.getInstance("SSLv3");
+            SSLContext sslContext = SSLContext.getInstance("TLSv1.2");
             X509TrustManager trustManager = new X509TrustManager() {
                 @Override
                 public void checkClientTrusted(X509Certificate[] x509Certificates, String s) throws CertificateException {

src/main/java/com/getui/push/v2/sdk/core/Configs.java

@@ -13,7 +13,7 @@ public interface Configs {
 
     String HEADER_DOMAIN_HASH_KEY = "domainHash";
     String HEADER_OPEN_STABLE_DOMAIN = "openStableDomain";
-    String SDK_VERSION = "1.0.0.10";
+    String SDK_VERSION = "1.0.0.11";
     /**
      * 预置域名列表
      */

src/main/java/com/getui/push/v2/sdk/dto/req/message/android/ThirdRevokeBean.java

@@ -0,0 +1,23 @@
+package com.getui.push.v2.sdk.dto.req.message.android;
+
+public class ThirdRevokeBean {
+    /**
+     * 需要撤回的taskId
+     */
+    private String oldTaskId;
+
+    public String getOldTaskId() {
+        return oldTaskId;
+    }
+
+    public void setOldTaskId(String oldTaskId) {
+        this.oldTaskId = oldTaskId;
+    }
+
+    @Override
+    public String toString() {
+        return "ThirdRevokeBean{" +
+                "oldTaskId='" + oldTaskId + '\'' +
+                '}';
+    }
+}

src/main/java/com/getui/push/v2/sdk/dto/req/message/android/Ups.java

@@ -21,6 +21,11 @@ public class Ups {
      */
     private Map<String, Map<String, Object>> options;
 
+    /**
+     * 撤回消息时使用
+     */
+    private ThirdRevokeBean revoke;
+
     public ThirdNotification getNotification() {
         return notification;
     }
@@ -63,12 +68,21 @@ public void addOption(String constraint, String key, Object value) {
         map.put(key, value);
     }
 
+    public ThirdRevokeBean getRevoke() {
+        return revoke;
+    }
+
+    public void setRevoke(ThirdRevokeBean revoke) {
+        this.revoke = revoke;
+    }
+
     @Override
     public String toString() {
         return "Ups{" +
                 "notification=" + notification +
                 ", transmission='" + transmission + '\'' +
-                ", options='" + options + '\'' +
+                ", options=" + options +
+                ", revoke=" + revoke +
                 '}';
     }
 }

src/test/java/com/getui/push/v2/sdk/api/StatisticApiTest.java

@@ -8,7 +8,6 @@
 import com.getui.push.v2.sdk.dto.res.PushCountDTO;
 import com.getui.push.v2.sdk.dto.res.statistic.StatisticDTO;
 import com.getui.push.v2.sdk.dto.res.statistic.UserStatisticDTO;
-import com.google.common.collect.Sets;
 import org.junit.Before;
 import org.junit.Test;
 
@@ -80,7 +79,7 @@ public void queryPushCountData() {
     @Test
     public void queryPushTaskDetailData() {
         final ApiResult<Map<String, Map<String, StatisticDTO>>> result = pushApi.queryPushTaskDetailData(
-                Sets.newHashSet("taskId1", "taskId2")
+                Utils.newHashSet("taskId1", "taskId2")
         );
         System.out.println(result);
     }