适配分组推送中新返回的groupMsgId参数

Author: yutaipu

README.md

@@ -18,13 +18,13 @@
 ## 安装
 
 ### maven 方式
-将下边的依赖条件放到你项目的 maven pom.xml 文件里。v3.3.10 为例，最新版本请看[Release页面](https://github.com/jpush/jpush-api-java-client/releases)
+将下边的依赖条件放到你项目的 maven pom.xml 文件里。v3.4.6 为例，最新版本请看[Release页面](https://github.com/jpush/jpush-api-java-client/releases)
 
 ```Java
 <dependency>
     <groupId>cn.jpush.api</groupId>
     <artifactId>jpush-client</artifactId>
-    <version>3.3.10</version>
+    <version>3.4.6</version>
 </dependency>
 ```
 ### jar 包方式
@@ -45,7 +45,7 @@
     <dependency>
         <groupId>cn.jpush.api</groupId>
         <artifactId>jiguang-common</artifactId>
-        <version>1.1.4</version>
+        <version>1.1.8</version>
     </dependency>
     <dependency>
         <groupId>io.netty</groupId>

example/main/java/cn/jpush/api/examples/PushExample.java

@@ -10,6 +10,7 @@
 import cn.jpush.api.JPushClient;
 import cn.jpush.api.push.CIDResult;
 import cn.jpush.api.push.GroupPushClient;
+import cn.jpush.api.push.GroupPushResult;
 import cn.jpush.api.push.PushResult;
 import cn.jpush.api.push.model.*;
 import cn.jpush.api.push.model.audience.Audience;
@@ -227,7 +228,8 @@ public void testSendGroupPush() {
         GroupPushClient groupPushClient = new GroupPushClient(GROUP_MASTER_SECRET, GROUP_PUSH_KEY);
         final PushPayload payload = buildPushObject_android_and_ios();
         try {
-            Map<String, PushResult> result = groupPushClient.sendGroupPush(payload);
+            GroupPushResult groupPushResult = groupPushClient.sendGroupPush(payload);
+            Map<String, PushResult> result = groupPushResult.getAppResultMap();
             for (Map.Entry<String, PushResult> entry : result.entrySet()) {
                 PushResult pushResult = entry.getValue();
                 PushResult.Error error = pushResult.error;

pom.xml

@@ -3,7 +3,7 @@
 
 	<groupId>cn.jpush.api</groupId>
 	<artifactId>jpush-client</artifactId>
-	<version>3.4.6-SNAPSHOT</version>
+	<version>3.4.7-SNAPSHOT</version>
 	<packaging>jar</packaging>
 	<url>https://github.com/jpush/jpush-api-java-client</url>
 	<name>JPush API Java Client</name>

src/main/java/cn/jpush/api/push/GroupPushClient.java

@@ -15,6 +15,9 @@
 import cn.jpush.api.push.model.EncryptPushPayload;
 import cn.jpush.api.push.model.PushPayload;
 import com.google.gson.Gson;
+import com.google.gson.JsonElement;
+import com.google.gson.JsonObject;
+import com.google.gson.JsonParser;
 import com.google.gson.reflect.TypeToken;
 
 import java.util.Map;
@@ -29,6 +32,8 @@ public class GroupPushClient {
     private String _groupPushPath;
     private String _encryptType;
     private Gson _gson = new Gson();
+    private JsonParser _jsonParser = new JsonParser();
+
 
     public GroupPushClient(String groupMasterSecret, String groupKey) {
         this(groupMasterSecret, groupKey, null, ClientConfig.getInstance());
@@ -43,11 +48,17 @@ public GroupPushClient(String groupMasterSecret, String groupKey, HttpProxy prox
         this._httpClient = new NativeHttpClient(authCode, proxy, conf);
     }
 
-    public Map<String, PushResult> sendGroupPush(PushPayload pushPayload) throws APIConnectionException, APIRequestException {
+    public GroupPushResult sendGroupPush(PushPayload pushPayload) throws APIConnectionException, APIRequestException {
         Preconditions.checkArgument(! (null == pushPayload), "pushPayload should not be null");
         ResponseWrapper response = _httpClient.sendPost(_baseUrl + _groupPushPath, getEncryptData(pushPayload));
-        return  _gson.fromJson(response.responseContent,
-                new TypeToken<Map<String, PushResult>>(){}.getType());
+        // 2020-8-6 兼容分组推送新返回的group_msgid结构
+        JsonObject responseJson = _jsonParser.parse(response.responseContent).getAsJsonObject();
+        String groupMsgIdKey = "group_msgid";
+        JsonElement _groupMsgId = responseJson.get(groupMsgIdKey);
+        String groupMsgId = null != _groupMsgId ? _groupMsgId.getAsString() : "";
+        responseJson.remove(groupMsgIdKey);
+        Map<String, PushResult> result = _gson.fromJson(responseJson, new TypeToken<Map<String, PushResult>>(){}.getType());
+        return new GroupPushResult(groupMsgId, result);
     }
 
     /**

src/main/java/cn/jpush/api/push/GroupPushResult.java

@@ -0,0 +1,38 @@
+package cn.jpush.api.push;
+
+import java.util.Map;
+
+/**
+ * @author tp
+ * @since 2020/8/6
+ */
+public class GroupPushResult {
+
+    private Map<String, PushResult> appResultMap;
+
+    private String groupMsgId;
+
+    public GroupPushResult() {
+    }
+
+    public GroupPushResult(String groupMsgId, Map<String, PushResult> appResultMap) {
+        this.groupMsgId = groupMsgId;
+        this.appResultMap = appResultMap;
+    }
+
+    public Map<String, PushResult> getAppResultMap() {
+        return appResultMap;
+    }
+
+    public void setAppResultMap(Map<String, PushResult> appResultMap) {
+        this.appResultMap = appResultMap;
+    }
+
+    public String getGroupMsgId() {
+        return groupMsgId;
+    }
+
+    public void setGroupMsgId(String groupMsgId) {
+        this.groupMsgId = groupMsgId;
+    }
+}

src/test/java/cn/jpush/api/push/GroupPushClientTest.java

@@ -24,7 +24,8 @@ public void testSendGroupPush() {
         GroupPushClient groupPushClient = new GroupPushClient(GROUP_MASTER_SECRET, GROUP_PUSH_KEY);
         final PushPayload payload = buildPushObject_android();
         try {
-            Map<String, PushResult> result = groupPushClient.sendGroupPush(payload);
+            GroupPushResult groupPushresult = groupPushClient.sendGroupPush(payload);
+            Map<String, PushResult> result = groupPushresult.getAppResultMap();
             for (Map.Entry<String, PushResult> entry : result.entrySet()) {
                 PushResult pushResult = entry.getValue();
                 PushResult.Error error = pushResult.error;