Merge pull request #56 from ZJUCJH/main

[feature] 1.鸿蒙厂商通道通知消息支持自定义消息、消息覆盖和消息撤回;2.关闭CloseableHttpClient内默认的重试机制

Author: jianbin2001

CHANGES.md

@@ -1,5 +1,12 @@
 # Release Notes
 
+## 1.0.6.0
+
+### update
+
+* 鸿蒙厂商通道通知消息支持自定义消息、消息覆盖和消息撤回
+* 关闭CloseableHttpClient内默认的重试机制
+
 ## 1.0.5.0
 
 ### update
@@ -41,7 +48,8 @@
 * 重试支持切换域名
 * 支持设置接口维度的超时时间
 * 修改默认的连接超时时间，60s改为10s
-* 内部异常，会拼接到apiResult的msg上，eg. 原来接口超时返回`{"code":5000, "message":"http error::5000"}`，修改后返回`{"code":5000, "message":"http error:Read timed out::5000"}
+* 内部异常，会拼接到apiResult的msg上，eg. 原来接口超时返回`{"code":5000, "message":"http error::5000"}`，修改后返回`{"
+  code":5000, "message":"http error:Read timed out::5000"}
 
 ## 1.0.0.17
 

README.md

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

pom.xml

@@ -7,7 +7,7 @@
     <groupId>com.getui.push</groupId>
     <artifactId>restful-sdk</artifactId>
     <packaging>jar</packaging>
-    <version>1.0.5.0</version>
+    <version>1.0.6.0</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

@@ -16,10 +16,7 @@
 import org.apache.http.client.methods.*;
 import org.apache.http.entity.ContentType;
 import org.apache.http.entity.StringEntity;
-import org.apache.http.impl.client.BasicCredentialsProvider;
-import org.apache.http.impl.client.CloseableHttpClient;
-import org.apache.http.impl.client.HttpClientBuilder;
-import org.apache.http.impl.client.HttpClients;
+import org.apache.http.impl.client.*;
 import org.apache.http.util.EntityUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -58,6 +55,8 @@ public GtHttpClient(int connectTimeout,
         }
         this.maxHttpTryTime = maxHttpTryTime;
         final HttpClientBuilder builder = HttpClients.custom();
+        // 关闭CloseableHttpClient内默认的重试机制
+        builder.setRetryHandler(new DefaultHttpRequestRetryHandler(0, false));
         if (proxyConfig != null && Utils.isNotEmpty(proxyConfig.getHost())) {
             if (Utils.isNotEmpty(proxyConfig.getUsername())) {
                 CredentialsProvider credsProvider = new BasicCredentialsProvider();

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.5.0";
+    String SDK_VERSION = "1.0.6.0";
     /**
      * 预置域名列表
      */

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

@@ -0,0 +1,40 @@
+package com.getui.push.v2.sdk.dto.req.message;
+
+public class CustomBean {
+    /**
+     * 消息类型
+     * subscribe：授权订阅消息（仅支持toSingle推送API）
+     * form_update：卡片刷新消息（仅支持toSingle推送API）
+     * live_view：实况窗消息
+     * voip_call：VoIP呼叫消息
+     */
+    private String type;
+    /**
+     * 相应消息类型指定请求体的JSON字符串
+     */
+    private String payload;
+
+    public String getType() {
+        return type;
+    }
+
+    public void setType(String type) {
+        this.type = type;
+    }
+
+    public String getPayload() {
+        return payload;
+    }
+
+    public void setPayload(String payload) {
+        this.payload = payload;
+    }
+
+    @Override
+    public String toString() {
+        return "CustomBean{" +
+                "type='" + type + '\'' +
+                ", payload='" + payload + '\'' +
+                '}';
+    }
+}

src/main/java/com/getui/push/v2/sdk/dto/req/message/harmony/HarmonyDTO.java

@@ -1,19 +1,30 @@
 package com.getui.push.v2.sdk.dto.req.message.harmony;
 
+import com.getui.push.v2.sdk.dto.req.message.CustomBean;
+import com.getui.push.v2.sdk.dto.req.message.android.ThirdRevokeBean;
+
 import java.util.HashMap;
 import java.util.Map;
 
 public class HarmonyDTO {
 
     /**
-     * 通知消息内容，与transmission 二选一，两个都填写时报错
+     * 通知消息内容，与transmission、custom、revoke四选一，都填写时报错。
+     * 若希望客户端离线时，直接在系统通知栏中展示通知栏消息，推荐使用此参数。
      */
     private HarmonyNotification notification;
     /**
-     * 透传消息内容，与notification 二选一，两个都填写时报错，长度 ≤ 3072
+     * 透传消息内容，与notification、custom、revoke四选一，都填写时报错，长度 ≤ 3072字
      */
     private String transmission;
-
+    /**
+     * 自定义消息内容，与notification、custom、revoke四选一，都填写时报错。
+     */
+    private Map<String, CustomBean> custom;
+    /**
+     * 撤回消息时使用
+     */
+    private ThirdRevokeBean revoke;
     /**
      * 第三方厂商扩展内容
      */
@@ -35,6 +46,22 @@ public void setTransmission(String transmission) {
         this.transmission = transmission;
     }
 
+    public Map<String, CustomBean> getCustom() {
+        return custom;
+    }
+
+    public void setCustom(Map<String, CustomBean> custom) {
+        this.custom = custom;
+    }
+
+    public ThirdRevokeBean getRevoke() {
+        return revoke;
+    }
+
+    public void setRevoke(ThirdRevokeBean revoke) {
+        this.revoke = revoke;
+    }
+
     public Map<String, Map<String, Object>> getOptions() {
         return options;
     }
@@ -66,6 +93,8 @@ public String toString() {
         return "HarmonyDTO{" +
                 "notification=" + notification +
                 ", transmission='" + transmission + '\'' +
+                ", custom=" + custom +
+                ", revoke=" + revoke +
                 ", options=" + options +
                 '}';
     }

src/main/java/com/getui/push/v2/sdk/dto/req/message/harmony/HarmonyNotification.java

@@ -32,11 +32,17 @@ public class HarmonyNotification {
      */
     private String want;
     /**
-     * 鸿蒙平台通知扩展消息（消息分类category参数必填，且设置“EXPRESS”，发送通知扩展消息前请先申请开通对应的消息自分类权益）
-     * <a href="https://developer.huawei.com/consumer/cn/doc/harmonyos-guides/push-noti-classification-0000001727885246#section0965171625420">自分类权益申请</a>
+     * 鸿蒙平台通知扩展消息的额外数据，传递给应用的数据，应用根据数据自行处理相关逻辑
      */
     private String payload;
 
+    /**
+     * 消息覆盖使用，两条消息的notify_id相同，新的消息会覆盖老的消息
+     * 范围：[0, 2147483647]（如果要使用鸿蒙华为的消息撤回功能，此参数必填）
+     */
+    @SerializedName("notify_id")
+    private String notifyId;
+
     public String getTitle() {
         return title;
     }
@@ -85,15 +91,24 @@ public void setPayload(String payload) {
         this.payload = payload;
     }
 
+    public String getNotifyId() {
+        return notifyId;
+    }
+
+    public void setNotifyId(String notifyId) {
+        this.notifyId = notifyId;
+    }
+
     @Override
     public String toString() {
         return "HarmonyNotification{" +
-                "want='" + want + '\'' +
-                ", title='" + title + '\'' +
+                "title='" + title + '\'' +
                 ", body='" + body + '\'' +
                 ", category='" + category + '\'' +
                 ", clickType='" + clickType + '\'' +
+                ", want='" + want + '\'' +
                 ", payload='" + payload + '\'' +
+                ", notifyId='" + notifyId + '\'' +
                 '}';
     }
 }