修改部分序列化报错的BUG

Author: 许丹侠

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

@@ -549,7 +549,7 @@ public static void testBatchSend() {
                 pushPayloadList.add(builder2.build());
 
                 BatchPushResult result = jPushClient.batchSendPushByAlias(pushPayloadList);
-                LOG.info("batchSendPushByAlias param: {}, result: {}", pushPayloadList, result.getBatchPushResult());
+                LOG.info("batchSendPushByAlias param: {}, result: {}", pushPayloadList, new Gson().toJson(result.getBatchPushResult()));
             }
 
             {
@@ -573,7 +573,7 @@ public static void testBatchSend() {
                 pushPayloadList.add(builder2.build());
 
                 BatchPushResult result = jPushClient.batchSendPushByRegId(pushPayloadList);
-                LOG.info("batchSendPushByRegId param: {}, result: {}", pushPayloadList, result.getBatchPushResult());
+                LOG.info("batchSendPushByRegId param: {}, result: {}", pushPayloadList, new Gson().toJson(result.getBatchPushResult()));
             }
 
         } catch (APIConnectionException e) {

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

@@ -247,11 +247,13 @@ public BatchPushResult batchSendPush(String url, List<PushPayload> pushPayloadLi
         JsonObject pushPayLoadList = new JsonObject();
         // setting cid
         for (PushPayload payload : pushPayloadList) {
-            if (payload.getCid() != null && !payload.getCid().trim().isEmpty()) {
-                pushPayLoadList.add(payload.getCid(), payload.toJSON());
-                continue;
+            String cid = payload.getCid();
+            if (cid != null && !cid.trim().isEmpty()) {
+                payload.setCid(null);
+            } else {
+                cid = cidResult.cidlist.get(i++);
             }
-            pushPayLoadList.add(cidResult.cidlist.get(i++), payload.toJSON());
+            pushPayLoadList.add(cid, payload.toJSON());
         }
         contentJson.add("pushlist", pushPayLoadList);
 

src/main/java/cn/jpush/api/push/model/PushPayload.java

@@ -67,6 +67,11 @@ private PushPayload(Platform platform, Audience audience,
         this.target = target;
     }
 
+    public PushPayload setCid(String cid) {
+        this.cid = cid;
+        return this;
+    }
+
     public Platform getPlatform() {
         return platform;
     }