Merge commit '3853c7ee4050e67b9211c385147444100aa69ee5' into develop

ukid · ukid · commit f48a6f9c0e9f · 2015-07-21T17:10:23.000+08:00
* commit '3853c7ee4050e67b9211c385147444100aa69ee5':
  upgrade to 1.1.9-SNAPSHOT
  upgrade to version 1.1.8
  个人信息缺少remark和groupId
diff --git a/README.md b/README.md
@@ -17,7 +17,7 @@ weixin-java-tools
 <dependency>
   <groupId>me.chanjar</groupId>
   <artifactId>weixin-java-mp</artifactId>
-  <version>1.1.8</version>
+  <version>1.1.9</version>
 </dependency>
 ```
 
@@ -27,7 +27,7 @@ weixin-java-tools
 <dependency>
   <groupId>me.chanjar</groupId>
   <artifactId>weixin-java-cp</artifactId>
-  <version>1.1.8</version>
+  <version>1.1.9</version>
 </dependency>
 ```
 
diff --git a/pom.xml b/pom.xml
@@ -5,7 +5,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>me.chanjar</groupId>
   <artifactId>weixin-java-parent</artifactId>
-  <version>1.1.8-SNAPSHOT</version>
+  <version>1.1.9-SNAPSHOT</version>
   <packaging>pom</packaging>
   <name>WeiXin Java Tools - Parent</name>
   <description>微信公众号、企业号上级POM</description>
diff --git a/weixin-java-common/pom.xml b/weixin-java-common/pom.xml
@@ -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-common</artifactId>
diff --git a/weixin-java-cp/pom.xml b/weixin-java-cp/pom.xml
@@ -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-cp</artifactId>
diff --git a/weixin-java-mp/pom.xml b/weixin-java-mp/pom.xml
@@ -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>
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
@@ -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 void setSexId(Integer sexId) {
     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 String toString() {
         ", headImgUrl='" + headImgUrl + '\'' +
         ", subscribeTime=" + subscribeTime +
         ", unionId='" + unionId + '\'' +
+        ", remark='" + remark + '\'' +
+        ", groupId='" + groupId + '\'' +
         '}';
   }
 }
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
@@ -30,6 +30,8 @@ public WxMpUser deserialize(JsonElement json, Type typeOfT, JsonDeserializationC
     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("男");
