From 7494de9d4f90c0f0a9df5940fdd20b2dafb7d478 Mon Sep 17 00:00:00 2001
From: Binary Wang <a@binarywang.com>
Date: Sat, 14 Dec 2024 00:30:42 +0800
Subject: [PATCH] =?UTF-8?q?:art:=20#3438=20=E3=80=90=E4=BC=81=E4=B8=9A?=
 =?UTF-8?q?=E5=BE=AE=E4=BF=A1=E3=80=91=E7=AC=AC=E4=B8=89=E6=96=B9=E5=BA=94?=
 =?UTF-8?q?=E7=94=A8=E5=BC=80=E5=8F=91=E8=8E=B7=E5=8F=96=E7=99=BB=E5=BD=95?=
 =?UTF-8?q?/=E8=AE=BF=E9=97=AE=E7=94=A8=E6=88=B7=E8=BA=AB=E4=BB=BD?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E8=BF=94=E5=9B=9E=E5=AD=97=E6=AE=B5=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../weixin/cp/bean/WxCpTpUserInfo.java        | 23 ++++++++-----------
 .../weixin/cp/tp/service/WxCpTpService.java   |  4 +++-
 2 files changed, 12 insertions(+), 15 deletions(-)

diff --git a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/WxCpTpUserInfo.java b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/WxCpTpUserInfo.java
index c6664fd0a..9837acff3 100644
--- a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/WxCpTpUserInfo.java
+++ b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/WxCpTpUserInfo.java
@@ -13,31 +13,24 @@ import me.chanjar.weixin.cp.util.json.WxCpGsonBuilder;
 @Data
 @EqualsAndHashCode(callSuper = true)
 public class WxCpTpUserInfo extends WxCpBaseResp {
-
   private static final long serialVersionUID = -5028321625140879571L;
 
   /**
    * 用户所属企业的corpid
    */
-  @SerializedName("CorpId")
+  @SerializedName("corpid")
   private String corpId;
 
   /**
    * 用户在企业内的UserID，如果该企业与第三方应用有授权关系时，返回明文UserId，否则返回密文UserId
    */
-  @SerializedName("UserId")
+  @SerializedName("userid")
   private String userId;
 
-  /**
-   * 手机设备号(由企业微信在安装时随机生成，删除重装会改变，升级不受影响)
-   */
-  @SerializedName("DeviceId")
-  private String deviceId;
-
   /**
    * 成员票据，最大为512字节。
    * scope为snsapi_userinfo或snsapi_privateinfo，且用户在应用可见范围之内时返回此参数。
-   * 后续利用该参数可以获取用户信息或敏感信息，参见:https://work.weixin.qq.com/api/doc/90001/90143/91122
+   * 后续利用该参数可以获取用户信息或敏感信息，参见:<a href="https://work.weixin.qq.com/api/doc/90001/90143/91122">...</a>
    */
   @SerializedName("user_ticket")
   private String userTicket;
@@ -54,6 +47,12 @@ public class WxCpTpUserInfo extends WxCpBaseResp {
   @SerializedName("open_userid")
   private String openUserId;
 
+  /**
+   非企业成员的标识，对当前服务商唯一
+   */
+  @SerializedName("openid")
+  private String openid;
+
   /**
    * From json wx cp tp user info.
    *
@@ -64,8 +63,4 @@ public class WxCpTpUserInfo extends WxCpBaseResp {
     return WxCpGsonBuilder.create().fromJson(json, WxCpTpUserInfo.class);
   }
 
-  public String toJson() {
-    return WxCpGsonBuilder.create().toJson(this);
-  }
-
 }
diff --git a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/tp/service/WxCpTpService.java b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/tp/service/WxCpTpService.java
index 286f2e967..5c433c0b4 100644
--- a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/tp/service/WxCpTpService.java
+++ b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/tp/service/WxCpTpService.java
@@ -371,7 +371,9 @@ public interface WxCpTpService {
 
   /**
    * <pre>
-   * 获取访问用户身份
+   * 获取登录/访问用户身份
+   * 1、<a href="https://developer.work.weixin.qq.com/document/path/91121">网页授权登录对应的文档</a>
+   * 2、<a href="https://developer.work.weixin.qq.com/document/path/98179">企业微信web登录对应的文档</a>
    * </pre>
    *
    * @param code the code