Merge pull request #36 from ZJUCJH/main

[feature] 1.支持厂商智能配额策略;2.支持通知关闭过滤

Author: jianbin2001

CHANGES.md

@@ -1,5 +1,12 @@
 # Release Notes
 
+## 1.0.0.12
+
+### update
+
+* 支持厂商智能配额策略
+* 支持通知关闭过滤
+
 ## 1.0.0.11
 
 ### update

README.md

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

pom.xml

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

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

@@ -25,6 +25,18 @@ public class Settings {
      */
     private String customCallback;
 
+    /**
+     * 是否过滤关闭通知用户
+     * false表示不过滤，true表示过滤
+     */
+    private Boolean filterNotifyOff;
+
+    /**
+     * 厂商智能配额策略-用户连续活跃天数
+     * 单位天，限制3 ~ 15天之间
+     */
+    private Integer activeDays;
+
     public Integer getTtl() {
         return ttl;
     }
@@ -65,14 +77,32 @@ public void setCustomCallback(String customCallback) {
         this.customCallback = customCallback;
     }
 
+    public Boolean getFilterNotifyOff() {
+        return filterNotifyOff;
+    }
+
+    public void setFilterNotifyOff(Boolean filterNotifyOff) {
+        this.filterNotifyOff = filterNotifyOff;
+    }
+
+    public Integer getActiveDays() {
+        return activeDays;
+    }
+
+    public void setActiveDays(Integer activeDays) {
+        this.activeDays = activeDays;
+    }
+
     @Override
     public String toString() {
         return "Settings{" +
                 "ttl=" + ttl +
                 ", strategy=" + strategy +
                 ", speed=" + speed +
                 ", scheduleTime=" + scheduleTime +
-                ", customCallback=" + customCallback +
+                ", customCallback='" + customCallback + '\'' +
+                ", filterNotifyOff=" + filterNotifyOff +
+                ", activeDays=" + activeDays +
                 '}';
     }
 }