Merge pull request #5 from muzhongyu/main

[feature]1、ios增加apns-collapse-id和thread-id

Author: smartboat

README.md

@@ -15,14 +15,14 @@
 
 
 ## 安装依赖
-### 通过[Maven](https://mvnrepository.com/)来管理项目依赖
+### 通过[Maven](https://mvnrepository.com/artifact/com.getui.push/restful-sdk)来管理项目依赖
 推荐通过Maven来管理项目依赖，您只需在项目的`pom.xml`文件中声明如下依赖
 
 ```xml
     <dependency>
         <groupId>com.getui.push</groupId>
         <artifactId>restful-sdk</artifactId>
-        <version>1.0.0.0</version>
+        <version>you can find the version number in Maven</version>
     </dependency>
 ```
 
@@ -52,7 +52,6 @@ public class TestCreatApi {
         PushApi pushApi = apiHelper.creatApi(PushApi.class);
         }
     }
-}
 ```
 
 ##### 使用示例：**推送API**_根据cid进行单推

pom.xml

@@ -7,7 +7,7 @@
     <groupId>com.getui.push</groupId>
     <artifactId>restful-sdk</artifactId>
     <packaging>jar</packaging>
-    <version>1.0.0.0</version>
+    <version>1.0.0.1</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>
@@ -124,6 +124,52 @@
                     </execution>
                 </executions>
             </plugin>
+            <!-- GPG -->
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-gpg-plugin</artifactId>
+                <version>1.5</version>
+                <executions>
+                    <execution>
+                        <phase>verify</phase>
+                        <goals>
+                            <goal>sign</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+            <!-- Javadoc -->
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-javadoc-plugin</artifactId>
+                <version>2.9.1</version>
+                <configuration>
+                    <aggregate>true</aggregate>
+                    <charset>UTF-8</charset>
+                    <encoding>UTF-8</encoding>
+                    <docencoding>UTF-8</docencoding>
+                    <additionalparam>-Xdoclint:none</additionalparam>
+                </configuration>
+                <executions>
+                    <execution>
+                        <id>attach-javadocs</id>
+                        <goals>
+                            <goal>jar</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
         </plugins>
     </build>
+
+    <distributionManagement>
+        <snapshotRepository>
+            <id>sonatype-nexus-snapshots</id>
+            <url>https://oss.sonatype.org/content/repositories/snapshots</url>
+        </snapshotRepository>
+        <repository>
+            <id>sonatype-nexus-staging</id>
+            <url>https://oss.sonatype.org/service/local/staging/deploy/maven2</url>
+        </repository>
+    </distributionManagement>
 </project>

src/main/java/com/getui/push/v2/sdk/api/UserApi.java

@@ -57,7 +57,7 @@ public interface UserApi {
      * @return
      */
     @GtDelete(uri = "/user/alias")
-    ApiResult<QueryCidResDTO> batchUnbindAlias(@GtBodyParam CidAliasListDTO cidAliasListDTO);
+    ApiResult<Void> batchUnbindAlias(@GtBodyParam CidAliasListDTO cidAliasListDTO);
 
     /**
      * 解绑所有别名
@@ -66,7 +66,7 @@ public interface UserApi {
      * @return
      */
     @GtDelete(uri = "/user/alias")
-    ApiResult<QueryCidResDTO> unbindAllAlias(@GtPathParam String alias);
+    ApiResult<Void> unbindAllAlias(@GtPathParam String alias);
 
     /**
      * 一个用户绑定一批标签
@@ -151,6 +151,6 @@ public interface UserApi {
      * @return
      */
     @GtPost(uri = "/user/count/")
-    ApiResult<Void> queryUser(@GtBodyParam ConditionListDTO conditionListDTO);
+    ApiResult<Map<String, Integer>> queryUser(@GtBodyParam ConditionListDTO conditionListDTO);
 
 }

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

@@ -26,6 +26,12 @@ public class Aps {
      */
     private String category;
 
+    /**
+     * ios的远程通知通过该属性对通知进行分组，仅支持iOS 12.0以上版本
+     */
+    @SerializedName("thread-id")
+    private String threadId;
+
     public Alert getAlert() {
         return alert;
     }
@@ -58,13 +64,22 @@ public void setCategory(String category) {
         this.category = category;
     }
 
+    public String getThreadId() {
+        return threadId;
+    }
+
+    public void setThreadId(String threadId) {
+        this.threadId = threadId;
+    }
+
     @Override
     public String toString() {
         return "Aps{" +
                 "alert=" + alert +
                 ", contentAvailable=" + contentAvailable +
                 ", sound='" + sound + '\'' +
                 ", category='" + category + '\'' +
+                ", threadId='" + threadId + '\'' +
                 '}';
     }
 }

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

@@ -34,6 +34,12 @@ public class IosDTO {
      */
     private List<Multimedia> multimedia;
 
+    /**
+     * 使用相同的apns-collapse-id可以覆盖之前的消息
+     */
+    @SerializedName("apns-collapse-id")
+    private String apnsCollapseId;
+
     public IosDTO addMultimedia(Multimedia multimedia) {
         if (multimedia == null) {
             return this;
@@ -85,6 +91,14 @@ public void setMultimedia(List<Multimedia> multimedia) {
         this.multimedia = multimedia;
     }
 
+    public String getApnsCollapseId() {
+        return apnsCollapseId;
+    }
+
+    public void setApnsCollapseId(String apnsCollapseId) {
+        this.apnsCollapseId = apnsCollapseId;
+    }
+
     @Override
     public String toString() {
         return "IosDTO{" +
@@ -93,6 +107,7 @@ public String toString() {
                 ", autoBadge='" + autoBadge + '\'' +
                 ", payload='" + payload + '\'' +
                 ", multimedia=" + multimedia +
+                ", apnsCollapseId='" + apnsCollapseId + '\'' +
                 '}';
     }
 }

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

@@ -105,13 +105,13 @@ public void queryCidByAlias() {
     public void batchUnboundAlias() {
         CidAliasListDTO cidAliasListDTO = new CidAliasListDTO();
         cidAliasListDTO.add(new CidAliasListDTO.CidAlias(cid, "alias"));
-        ApiResult<QueryCidResDTO> apiResult = userApi.batchUnbindAlias(cidAliasListDTO);
+        ApiResult<Void> apiResult = userApi.batchUnbindAlias(cidAliasListDTO);
         System.out.println(apiResult);
     }
 
     @Test
     public void unboundAllAlias() {
-        ApiResult<QueryCidResDTO> apiResult = userApi.unbindAllAlias("alias");
+        ApiResult<Void> apiResult = userApi.unbindAllAlias("alias");
         System.out.println(apiResult);
     }