Merge pull request #37 from ZJUCJH/main

[feature] 1.厂商智能配额策略支持兜底;2.修复反参数据类型解析问题

Author: jianbin2001

CHANGES.md

@@ -1,5 +1,12 @@
 # Release Notes
 
+## 1.0.0.13
+
+### update
+
+* 厂商智能配额策略支持兜底
+* 修复反参数据类型解析问题
+
 ## 1.0.0.12
 
 ### update

README.md

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

pom.xml

@@ -7,7 +7,7 @@
     <groupId>com.getui.push</groupId>
     <artifactId>restful-sdk</artifactId>
     <packaging>jar</packaging>
-    <version>1.0.0.12</version>
+    <version>1.0.0.13</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/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.12";
+    String SDK_VERSION = "1.0.0.13";
     /**
      * 预置域名列表
      */

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

@@ -21,7 +21,7 @@ public class DefaultJson implements IJson {
     public static Gson createGson() {
         GsonBuilder gsonBuilder = new GsonBuilder();
         gsonBuilder.setFieldNamingPolicy(FieldNamingPolicy.LOWER_CASE_WITH_UNDERSCORES);
-        gsonBuilder.registerTypeAdapter(Map.class, new JsonDeserializer<StatisticDTO>() {
+        gsonBuilder.registerTypeAdapter(StatisticDTO.class, new JsonDeserializer<StatisticDTO>() {
             @Override
             public StatisticDTO deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context) throws JsonParseException {
                 StatisticDTO statisticDTO = new StatisticDTO();

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

@@ -37,6 +37,11 @@ public class Settings {
      */
     private Integer activeDays;
 
+    /**
+     * 厂商智能配额策略-是否需要兜底（离线消息到期时通过厂商通道下发），false表示不需要，true表示需要
+     */
+    private Boolean needBackup;
+
     public Integer getTtl() {
         return ttl;
     }
@@ -93,6 +98,14 @@ public void setActiveDays(Integer activeDays) {
         this.activeDays = activeDays;
     }
 
+    public Boolean getNeedBackup() {
+        return needBackup;
+    }
+
+    public void setNeedBackup(Boolean needBackup) {
+        this.needBackup = needBackup;
+    }
+
     @Override
     public String toString() {
         return "Settings{" +
@@ -103,6 +116,7 @@ public String toString() {
                 ", customCallback='" + customCallback + '\'' +
                 ", filterNotifyOff=" + filterNotifyOff +
                 ", activeDays=" + activeDays +
+                ", needBackup=" + needBackup +
                 '}';
     }
 }