@@ -27,6 +27,10 @@ public class WxCpUser implements Serializable { | |||||
private Gender gender; | private Gender gender; | ||||
private String email; | private String email; | ||||
private String avatar; | private String avatar; | ||||
/** | |||||
* 地址。长度最大128个字符 | |||||
*/ | |||||
private String address; | |||||
private String avatarMediaId; | private String avatarMediaId; | ||||
private Integer status; | private Integer status; | ||||
private Integer enable; | private Integer enable; | ||||
@@ -66,6 +66,7 @@ public class WxCpUserGsonAdapter implements JsonDeserializer<WxCpUser>, JsonSeri | |||||
user.setGender(Gender.fromCode(GsonHelper.getString(o, "gender"))); | user.setGender(Gender.fromCode(GsonHelper.getString(o, "gender"))); | ||||
user.setEmail(GsonHelper.getString(o, "email")); | user.setEmail(GsonHelper.getString(o, "email")); | ||||
user.setAvatar(GsonHelper.getString(o, "avatar")); | user.setAvatar(GsonHelper.getString(o, "avatar")); | ||||
user.setAddress(GsonHelper.getString(o, "address")); | |||||
user.setAvatarMediaId(GsonHelper.getString(o, "avatar_mediaid")); | user.setAvatarMediaId(GsonHelper.getString(o, "avatar_mediaid")); | ||||
user.setStatus(GsonHelper.getInteger(o, "status")); | user.setStatus(GsonHelper.getInteger(o, "status")); | ||||
user.setEnable(GsonHelper.getInteger(o, "enable")); | user.setEnable(GsonHelper.getInteger(o, "enable")); | ||||
@@ -186,6 +187,9 @@ public class WxCpUserGsonAdapter implements JsonDeserializer<WxCpUser>, JsonSeri | |||||
if (user.getAvatar() != null) { | if (user.getAvatar() != null) { | ||||
o.addProperty("avatar", user.getAvatar()); | o.addProperty("avatar", user.getAvatar()); | ||||
} | } | ||||
if (user.getAddress() != null) { | |||||
o.addProperty("address", user.getAddress()); | |||||
} | |||||
if (user.getAvatarMediaId() != null) { | if (user.getAvatarMediaId() != null) { | ||||
o.addProperty("avatar_mediaid", user.getAvatarMediaId()); | o.addProperty("avatar_mediaid", user.getAvatarMediaId()); | ||||
} | } | ||||
@@ -1,8 +1,7 @@ | |||||
package me.chanjar.weixin.cp.util.json; | package me.chanjar.weixin.cp.util.json; | ||||
import org.testng.annotations.*; | |||||
import me.chanjar.weixin.cp.bean.WxCpUser; | import me.chanjar.weixin.cp.bean.WxCpUser; | ||||
import org.testng.annotations.Test; | |||||
import static org.assertj.core.api.Assertions.assertThat; | import static org.assertj.core.api.Assertions.assertThat; | ||||
@@ -32,6 +31,7 @@ public class WxCpUserGsonAdapterTest { | |||||
" \"isleader\": 1,\n" + | " \"isleader\": 1,\n" + | ||||
" \"avatar\": \"http://wx.qlogo.cn/mmopen/ajNVdqHZLLA3WJ6DSZUfiakYe37PKnQhBIeOQBO4czqrnZDS79FH5Wm5m4X69TBicnHFlhiafvDwklOpZeXYQQ2icg/0\",\n" + | " \"avatar\": \"http://wx.qlogo.cn/mmopen/ajNVdqHZLLA3WJ6DSZUfiakYe37PKnQhBIeOQBO4czqrnZDS79FH5Wm5m4X69TBicnHFlhiafvDwklOpZeXYQQ2icg/0\",\n" + | ||||
" \"telephone\": \"020-123456\",\n" + | " \"telephone\": \"020-123456\",\n" + | ||||
" \"address\": \"广州市海珠区新港中路\"," + | |||||
" \"enable\": 1,\n" + | " \"enable\": 1,\n" + | ||||
" \"alias\": \"jackzhang\",\n" + | " \"alias\": \"jackzhang\",\n" + | ||||
" \"extattr\": {\n" + | " \"extattr\": {\n" + | ||||
@@ -82,7 +82,7 @@ public class WxCpUserGsonAdapterTest { | |||||
assertThat(user.getOrders()[0]).isEqualTo(1); | assertThat(user.getOrders()[0]).isEqualTo(1); | ||||
assertThat(user.getOrders()[1]).isEqualTo(2); | assertThat(user.getOrders()[1]).isEqualTo(2); | ||||
assertThat(user.getAddress()).isEqualTo("广州市海珠区新港中路"); | |||||
assertThat(user.getExternalAttrs()).isNotEmpty(); | assertThat(user.getExternalAttrs()).isNotEmpty(); | ||||
final WxCpUser.ExternalAttribute externalAttr1 = user.getExternalAttrs().get(0); | final WxCpUser.ExternalAttribute externalAttr1 = user.getExternalAttrs().get(0); | ||||