修改部分序列化报错的BUG

Author: 许丹侠

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

@@ -240,7 +240,7 @@ public BatchPushResult batchSendPush(String url, List<PushPayload> pushPayloadLi
 
         Gson gson = new Gson();
 
-        JsonObject json = new JsonObject();
+        JsonObject contentJson = new JsonObject();
 
         CIDResult cidResult = getCidList(pushPayloadList.size(), "push");
         int i = 0;
@@ -253,9 +253,9 @@ public BatchPushResult batchSendPush(String url, List<PushPayload> pushPayloadLi
             }
             pushPayLoadList.add(cidResult.cidlist.get(i++), payload.toJSON());
         }
-        json.add("pushlist", pushPayLoadList);
+        contentJson.add("pushlist", pushPayLoadList);
 
-        ResponseWrapper response = _httpClient.sendPost(url, getEncryptData(gson.toJson(json)));
+        ResponseWrapper response = _httpClient.sendPost(url, getEncryptData(gson.toJson(contentJson)));
 
         return BatchPushResult.fromResponse(response);
 

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

@@ -23,8 +23,6 @@ public class BatchPushResult extends BaseResult {
 
     private Map<String, PushResult> batchPushResult;
 
-    private Error error;
-
     public class PushResult {
         @Expose public long msg_id;
         @Expose public Error error;
@@ -58,17 +56,4 @@ public Map<String, PushResult> getBatchPushResult() {
         return batchPushResult;
     }
 
-    public BatchPushResult setBatchPushResult(Map<String, PushResult> batchPushResult) {
-        this.batchPushResult = batchPushResult;
-        return this;
-    }
-
-    @Override
-    public String toString() {
-        return "BatchPushResult{" +
-                "batchPushResult=" + batchPushResult +
-                ", error=" + error +
-                "} " + super.toString();
-    }
-
 }