Merge commit '3853c7ee4050e67b9211c385147444100aa69ee5' into develop

* commit '3853c7ee4050e67b9211c385147444100aa69ee5':
  upgrade to 1.1.9-SNAPSHOT
  upgrade to version 1.1.8
  个人信息缺少remark和groupId
This commit is contained in:
ukid
2015-07-21 17:10:23 +08:00
7 changed files with 25 additions and 6 deletions

View File

@@ -6,7 +6,7 @@
<parent>
<groupId>me.chanjar</groupId>
<artifactId>weixin-java-parent</artifactId>
<version>1.1.8-SNAPSHOT</version>
<version>1.1.9-SNAPSHOT</version>
</parent>
<artifactId>weixin-java-mp</artifactId>
<name>WeiXin Java Tools - MP</name>

View File

@@ -23,6 +23,8 @@ public class WxMpUser implements Serializable {
protected Long subscribeTime;
protected String unionId;
protected Integer sexId;
protected String remark;
protected Integer groupId;
public Boolean getSubscribe() {
return subscribe;
@@ -103,6 +105,19 @@ public class WxMpUser implements Serializable {
this.sexId = sexId;
}
public String getRemark() {
return remark;
}
public void setRemark(String remark) {
this.remark = remark;
}
public Integer getGroupId() {
return groupId;
}
public void setGroupId(Integer groupId) {
this.groupId = groupId;
}
public static WxMpUser fromJson(String json) {
return WxMpGsonBuilder.INSTANCE.create().fromJson(json, WxMpUser.class);
}
@@ -121,6 +136,8 @@ public class WxMpUser implements Serializable {
", headImgUrl='" + headImgUrl + '\'' +
", subscribeTime=" + subscribeTime +
", unionId='" + unionId + '\'' +
", remark='" + remark + '\'' +
", groupId='" + groupId + '\'' +
'}';
}
}

View File

@@ -30,6 +30,8 @@ public class WxMpUserGsonAdapter implements JsonDeserializer<WxMpUser> {
wxMpUser.setSubscribeTime(GsonHelper.getLong(o, "subscribe_time"));
wxMpUser.setUnionId(GsonHelper.getString(o, "unionid"));
Integer sexId = GsonHelper.getInteger(o, "sex");
wxMpUser.setRemark(GsonHelper.getString(o, "remark"));
wxMpUser.setGroupId(GsonHelper.getInteger(o, "groupid"));
wxMpUser.setSexId(sexId);
if(new Integer(1).equals(sexId)) {
wxMpUser.setSex("");