@@ -1,15 +1,15 @@ | |||||
package me.chanjar.weixin.cp.bean; | package me.chanjar.weixin.cp.bean; | ||||
import java.io.Serializable; | |||||
import java.util.ArrayList; | |||||
import java.util.List; | |||||
import lombok.AllArgsConstructor; | import lombok.AllArgsConstructor; | ||||
import lombok.Builder; | import lombok.Builder; | ||||
import lombok.Data; | import lombok.Data; | ||||
import lombok.NoArgsConstructor; | import lombok.NoArgsConstructor; | ||||
import me.chanjar.weixin.cp.util.json.WxCpGsonBuilder; | import me.chanjar.weixin.cp.util.json.WxCpGsonBuilder; | ||||
import java.io.Serializable; | |||||
import java.util.ArrayList; | |||||
import java.util.List; | |||||
/** | /** | ||||
* 微信用户信息. | * 微信用户信息. | ||||
* | * | ||||
@@ -28,6 +28,7 @@ public class WxCpUser implements Serializable { | |||||
private String email; | private String email; | ||||
private String avatar; | private String avatar; | ||||
private String thumbAvatar; | private String thumbAvatar; | ||||
/** | /** | ||||
* 地址。长度最大128个字符 | * 地址。长度最大128个字符 | ||||
*/ | */ | ||||
@@ -35,6 +36,10 @@ public class WxCpUser implements Serializable { | |||||
private String avatarMediaId; | private String avatarMediaId; | ||||
private Integer status; | private Integer status; | ||||
private Integer enable; | private Integer enable; | ||||
/** | |||||
* 别名;第三方仅通讯录应用可获取 | |||||
*/ | |||||
private String alias; | |||||
private Integer isLeader; | private Integer isLeader; | ||||
/** | /** | ||||
* is_leader_in_dept. | * is_leader_in_dept. | ||||
@@ -71,6 +71,7 @@ public class WxCpUserGsonAdapter implements JsonDeserializer<WxCpUser>, JsonSeri | |||||
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")); | ||||
user.setAlias(GsonHelper.getString(o, "alias")); | |||||
user.setIsLeader(GsonHelper.getInteger(o, "isleader")); | user.setIsLeader(GsonHelper.getInteger(o, "isleader")); | ||||
user.setIsLeaderInDept(GsonHelper.getIntArray(o, "is_leader_in_dept")); | user.setIsLeaderInDept(GsonHelper.getIntArray(o, "is_leader_in_dept")); | ||||
user.setHideMobile(GsonHelper.getInteger(o, "hide_mobile")); | user.setHideMobile(GsonHelper.getInteger(o, "hide_mobile")); | ||||
@@ -203,6 +204,9 @@ public class WxCpUserGsonAdapter implements JsonDeserializer<WxCpUser>, JsonSeri | |||||
if (user.getEnable() != null) { | if (user.getEnable() != null) { | ||||
o.addProperty("enable", user.getEnable()); | o.addProperty("enable", user.getEnable()); | ||||
} | } | ||||
if (user.getAlias() != null) { | |||||
o.addProperty("alias", user.getAlias()); | |||||
} | |||||
if (user.getIsLeader() != null) { | if (user.getIsLeader() != null) { | ||||
o.addProperty("isleader", user.getIsLeader()); | o.addProperty("isleader", user.getIsLeader()); | ||||
} | } | ||||
@@ -83,6 +83,7 @@ public class WxCpUserGsonAdapterTest { | |||||
assertThat(user.getOrders()[1]).isEqualTo(2); | assertThat(user.getOrders()[1]).isEqualTo(2); | ||||
assertThat(user.getAddress()).isEqualTo("广州市海珠区新港中路"); | assertThat(user.getAddress()).isEqualTo("广州市海珠区新港中路"); | ||||
assertThat(user.getAlias()).isEqualTo("jackzhang"); | |||||
assertThat(user.getExternalAttrs()).isNotEmpty(); | assertThat(user.getExternalAttrs()).isNotEmpty(); | ||||
final WxCpUser.ExternalAttribute externalAttr1 = user.getExternalAttrs().get(0); | final WxCpUser.ExternalAttribute externalAttr1 = user.getExternalAttrs().get(0); | ||||
@@ -102,6 +103,7 @@ public class WxCpUserGsonAdapterTest { | |||||
assertThat(externalAttr3.getAppid()).isEqualTo("wx8bd80126147df384"); | assertThat(externalAttr3.getAppid()).isEqualTo("wx8bd80126147df384"); | ||||
assertThat(externalAttr3.getPagePath()).isEqualTo("/index"); | assertThat(externalAttr3.getPagePath()).isEqualTo("/index"); | ||||
assertThat(externalAttr3.getTitle()).isEqualTo("my miniprogram"); | assertThat(externalAttr3.getTitle()).isEqualTo("my miniprogram"); | ||||
} | } | ||||
@Test | @Test | ||||