Merge pull request #55 from ZJUCJH/main

[feature] 1.鸿蒙离线支持payload;2.鸿蒙在线支持slotType;3.GtHttpClient支持设置maxConnTotal和maxConnPerRoute

Author: jianbin2001

CHANGES.md

@@ -1,5 +1,13 @@
 # Release Notes
 
+## 1.0.5.0
+
+### update
+
+* 鸿蒙厂商通道通知消息click_type新增支持payload
+* 鸿蒙个推通道通知消息支持设置通知渠道类型slotType
+* GtHttpClient支持设置maxConnTotal和maxConnPerRoute
+
 ## 1.0.4.0
 
 ### update

README.md

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

pom.xml

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

@@ -23,6 +23,7 @@
 import org.apache.http.util.EntityUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.util.StringUtils;
 
 import javax.net.ssl.SSLContext;
 import javax.net.ssl.TrustManager;
@@ -80,6 +81,17 @@ public GtHttpClient(int connectTimeout,
         builder.setDefaultRequestConfig(config)
                 .setConnectionTimeToLive(keepAliveSeconds, TimeUnit.SECONDS)
                 .useSystemProperties();
+
+        final String maxConnTotal = System.getProperty("http.client.maxConnTotal");
+        if (!StringUtils.isEmpty(maxConnTotal)) {
+            builder.setMaxConnTotal(Integer.parseInt(maxConnTotal));
+        }
+
+        final String maxConnPerRoute = System.getProperty("http.client.maxConnPerRoute");
+        if (!StringUtils.isEmpty(maxConnPerRoute)) {
+            builder.setMaxConnPerRoute(Integer.parseInt(maxConnPerRoute));
+        }
+
         this.httpclient = builder.build();
     }
 

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

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

@@ -30,6 +30,12 @@ public class GTNotification {
 
     @SerializedName("channel_level")
     private String channelLevel;
+
+    /**
+     * 鸿蒙通知渠道类型
+     */
+    @SerializedName("slot_type")
+    private String slotType;
     /**
      * @see CommonEnum.ClickTypeEnum
      * 点击通知后续动作,
@@ -183,6 +189,14 @@ public void setChannelLevel(String channelLevel) {
         this.channelLevel = channelLevel;
     }
 
+    public String getSlotType() {
+        return slotType;
+    }
+
+    public void setSlotType(String slotType) {
+        this.slotType = slotType;
+    }
+
     public String getClickType() {
         return clickType;
     }
@@ -291,6 +305,7 @@ public String toString() {
                 ", channelId='" + channelId + '\'' +
                 ", channelName='" + channelName + '\'' +
                 ", channelLevel='" + channelLevel + '\'' +
+                ", slotType='" + slotType + '\'' +
                 ", clickType='" + clickType + '\'' +
                 ", intent='" + intent + '\'' +
                 ", want='" + want + '\'' +

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

@@ -19,9 +19,10 @@ public class HarmonyNotification {
     /**
      * @see CommonEnum.HarmonyClickTypeEnum
      * 点击通知后续动作,
-     * 目前支持2种后续动作，
+     * 目前支持3种后续动作，
      * want：打开应用内特定页面，
      * startapp：打开应用首页
+     * payload：通知扩展消息
      */
     @SerializedName("click_type")
     private String clickType;
@@ -30,6 +31,11 @@ public class HarmonyNotification {
      * 示例：{"deviceId":"","bundleName":"com.getui.push","abilityName":"TestAbility","uri":"https://www.test.com:8080/push/test","action":"com.test.action","parameters":{"name":"Getui","age":12}}
      */
     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;
 
     public String getTitle() {
         return title;
@@ -71,14 +77,23 @@ public void setWant(String want) {
         this.want = want;
     }
 
+    public String getPayload() {
+        return payload;
+    }
+
+    public void setPayload(String payload) {
+        this.payload = payload;
+    }
+
     @Override
     public String toString() {
         return "HarmonyNotification{" +
-                "title='" + title + '\'' +
+                "want='" + want + '\'' +
+                ", title='" + title + '\'' +
                 ", body='" + body + '\'' +
                 ", category='" + category + '\'' +
                 ", clickType='" + clickType + '\'' +
-                ", want='" + want + '\'' +
+                ", payload='" + payload + '\'' +
                 '}';
     }
 }