修复用户标签id类型不一致的问题 binarywang#175

binarywang · binarywang · commit 0ff63ba3cbce · 2017-04-10T11:14:20.000+08:00
diff --git a/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/json/GsonHelper.java b/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/json/GsonHelper.java
@@ -9,13 +9,13 @@
 package me.chanjar.weixin.common.util.json;
 
 
-import java.util.List;
-
 import com.google.common.collect.Lists;
 import com.google.gson.JsonArray;
 import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
 
+import java.util.List;
+
 
 public class GsonHelper {
 
@@ -130,6 +130,20 @@ public static Integer[] getIntArray(JsonObject o, String string) {
     return result.toArray(new Integer[0]);
   }
 
+  public static Long[] getLongArray(JsonObject o, String string) {
+    JsonArray jsonArray = getAsJsonArray(o.getAsJsonArray(string));
+    if (jsonArray == null) {
+      return null;
+    }
+
+    List<Long> result = Lists.newArrayList();
+    for (int i = 0; i < jsonArray.size(); i++) {
+      result.add(jsonArray.get(i).getAsLong());
+    }
+
+    return result.toArray(new Long[0]);
+  }
+
   public static JsonArray getAsJsonArray(JsonElement element) {
     return element == null ? null : element.getAsJsonArray();
   }
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/result/WxMpUser.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/result/WxMpUser.java
@@ -32,7 +32,7 @@ public class WxMpUser implements Serializable {
   private Integer sexId;
   private String remark;
   private Integer groupId;
-  private Integer[] tagIds;
+  private Long[] tagIds;
 
   public Boolean getSubscribe() {
     return this.subscribe;
@@ -150,11 +150,11 @@ public void setGroupId(Integer groupId) {
     this.groupId = groupId;
   }
 
-  public Integer[] getTagIds() {
+  public Long[] getTagIds() {
     return this.tagIds;
   }
 
-  public void setTagIds(Integer[] tagIds) {
+  public void setTagIds(Long[] tagIds) {
     this.tagIds = tagIds;
   }
 
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/json/WxMpUserGsonAdapter.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/json/WxMpUserGsonAdapter.java
@@ -36,7 +36,7 @@ public WxMpUser deserialize(JsonElement json, Type typeOfT, JsonDeserializationC
     Integer sexId = GsonHelper.getInteger(o, "sex");
     wxMpUser.setRemark(GsonHelper.getString(o, "remark"));
     wxMpUser.setGroupId(GsonHelper.getInteger(o, "groupid"));
-    wxMpUser.setTagIds(GsonHelper.getIntArray(o, "tagid_list"));
+    wxMpUser.setTagIds(GsonHelper.getLongArray(o, "tagid_list"));
     wxMpUser.setSexId(sexId);
     if (new Integer(1).equals(sexId)) {
       wxMpUser.setSex("男");

Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ public class WxMpUser implements Serializable {`
`32`	`32`	`private Integer sexId;`
`33`	`33`	`private String remark;`
`34`	`34`	`private Integer groupId;`
`35`		`- private Integer[] tagIds;`
	`35`	`+ private Long[] tagIds;`
`36`	`36`
`37`	`37`	`public Boolean getSubscribe() {`
`38`	`38`	`return this.subscribe;`
`@@ -150,11 +150,11 @@ public void setGroupId(Integer groupId) {`
`150`	`150`	`this.groupId = groupId;`
`151`	`151`	`}`
`152`	`152`
`153`		`- public Integer[] getTagIds() {`
	`153`	`+ public Long[] getTagIds() {`
`154`	`154`	`return this.tagIds;`
`155`	`155`	`}`
`156`	`156`
`157`		`- public void setTagIds(Integer[] tagIds) {`
	`157`	`+ public void setTagIds(Long[] tagIds) {`
`158`	`158`	`this.tagIds = tagIds;`
`159`	`159`	`}`
`160`	`160`