From 7b4ba553ac51e995c3204bb754cf351bb6d4c95f Mon Sep 17 00:00:00 2001 From: Binary Wang Date: Sun, 31 Oct 2021 23:48:54 +0800 Subject: [PATCH] =?UTF-8?q?:art:=20#2331=20=E3=80=90=E5=85=AC=E4=BC=97?= =?UTF-8?q?=E5=8F=B7=E3=80=91=E3=80=90=E5=BC=80=E6=94=BE=E5=B9=B3=E5=8F=B0?= =?UTF-8?q?=E3=80=91=E6=A0=B9=E6=8D=AE=E5=BE=AE=E4=BF=A1=E5=B9=B3=E5=8F=B0?= =?UTF-8?q?=E7=94=A8=E6=88=B7=E4=BF=A1=E6=81=AF=E6=8E=A5=E5=8F=A3=E6=9C=80?= =?UTF-8?q?=E6=96=B0=E8=B0=83=E6=95=B4=E5=8E=BB=E6=8E=89=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=E7=B1=BB=E9=83=A8=E5=88=86=E6=97=A0=E7=94=A8?= =?UTF-8?q?=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../weixin/common/bean/WxOAuth2UserInfo.java | 17 ----------------- .../weixin/mp/bean/result/WxMpUser.java | 11 ----------- .../mp/util/json/WxMpUserGsonAdapter.java | 18 ------------------ 3 files changed, 46 deletions(-) diff --git a/weixin-java-common/src/main/java/me/chanjar/weixin/common/bean/WxOAuth2UserInfo.java b/weixin-java-common/src/main/java/me/chanjar/weixin/common/bean/WxOAuth2UserInfo.java index e64756002..69518b256 100644 --- a/weixin-java-common/src/main/java/me/chanjar/weixin/common/bean/WxOAuth2UserInfo.java +++ b/weixin-java-common/src/main/java/me/chanjar/weixin/common/bean/WxOAuth2UserInfo.java @@ -25,23 +25,6 @@ public class WxOAuth2UserInfo implements Serializable { * nickname 普通用户昵称 */ private String nickname; - /** - * sex 普通用户性别，1为男性，2为女性 - */ - private Integer sex; - /** - * city 普通用户个人资料填写的城市 - */ - private String city; - - /** - * province 普通用户个人资料填写的省份 - */ - private String province; - /** - * country 国家，如中国为CN - */ - private String country; /** * headimgurl 用户头像，最后一个数值代表正方形头像大小（有0、46、64、96、132数值可选，0代表640*640正方形头像）， * 用户没有头像时该项为空 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 index 4d22fab9e..6edf351d4 100644 --- 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 @@ -22,18 +22,7 @@ public class WxMpUser implements Serializable { private Boolean subscribe; private String openId; private String nickname; - /** - * 性别描述信息：男、女、未知等. - */ - private String sexDesc; - /** - * 性别表示：1，2等数字. - */ - private Integer sex; private String language; - private String city; - private String province; - private String country; private String headImgUrl; private Long subscribeTime; /** 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 index 910ae8c89..f3a20fbca 100644 --- 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 @@ -20,13 +20,10 @@ public class WxMpUserGsonAdapter implements JsonDeserializer { if (subscribe != null) { user.setSubscribe(!new Integer(0).equals(subscribe)); } - user.setCity(GsonHelper.getString(o, "city")); - user.setCountry(GsonHelper.getString(o, "country")); user.setHeadImgUrl(GsonHelper.getString(o, "headimgurl")); user.setLanguage(GsonHelper.getString(o, "language")); user.setNickname(GsonHelper.getString(o, "nickname")); user.setOpenId(GsonHelper.getString(o, "openid")); - user.setProvince(GsonHelper.getString(o, "province")); user.setSubscribeTime(GsonHelper.getLong(o, "subscribe_time")); user.setUnionId(GsonHelper.getString(o, "unionid")); user.setRemark(GsonHelper.getString(o, "remark")); @@ -37,21 +34,6 @@ public class WxMpUserGsonAdapter implements JsonDeserializer { user.setQrScene(GsonHelper.getString(o, "qr_scene")); user.setQrSceneStr(GsonHelper.getString(o, "qr_scene_str")); - Integer sex = GsonHelper.getInteger(o, "sex"); - if (sex != null) { - user.setSex(sex); - switch (sex) { - case 1: - user.setSexDesc("男"); - break; - case 2: - user.setSexDesc("女"); - break; - default: - user.setSexDesc("未知"); - } - - } return user; }