From 334574dfe8a265a2eb802f7b2685cff78f5b0566 Mon Sep 17 00:00:00 2001
From: "Yangkai.Shen" <237497819@qq.com>
Date: Thu, 23 May 2019 18:51:22 +0800
Subject: [PATCH] =?UTF-8?q?:sparkles:=20=E6=B7=BB=E5=8A=A0=E7=94=A8?=
 =?UTF-8?q?=E6=88=B7=E5=9C=A8=E7=AC=AC=E4=B8=89=E6=96=B9=E7=B3=BB=E7=BB=9F?=
 =?UTF-8?q?=E4=B8=AD=E7=9A=84=E5=94=AF=E4=B8=80=E4=B8=BB=E9=94=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/me/zhyd/oauth/model/AuthUser.java            | 4 ++++
 src/main/java/me/zhyd/oauth/request/AuthQqRequest.java     | 1 +
 src/main/java/me/zhyd/oauth/request/AuthWeChatRequest.java | 4 ++--
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/main/java/me/zhyd/oauth/model/AuthUser.java b/src/main/java/me/zhyd/oauth/model/AuthUser.java
index 43d3714..f5d4ddf 100644
--- a/src/main/java/me/zhyd/oauth/model/AuthUser.java
+++ b/src/main/java/me/zhyd/oauth/model/AuthUser.java
@@ -24,4 +24,8 @@ public class AuthUser {
     private AuthUserGender gender;
     private AuthSource source;
     private AuthToken token;
+    /**
+     * 用户第三方系统的唯一id
+     */
+    private String uuid;
 }
diff --git a/src/main/java/me/zhyd/oauth/request/AuthQqRequest.java b/src/main/java/me/zhyd/oauth/request/AuthQqRequest.java
index 989172b..a7c0408 100644
--- a/src/main/java/me/zhyd/oauth/request/AuthQqRequest.java
+++ b/src/main/java/me/zhyd/oauth/request/AuthQqRequest.java
@@ -64,6 +64,7 @@ public class AuthQqRequest extends BaseAuthRequest {
                 .nickname(object.getString("nickname"))
                 .avatar(avatar)
                 .location(object.getString("province") + "-" + object.getString("city"))
+                .uuid(openId)
                 .gender(AuthUserGender.getRealGender(object.getString("gender")))
                 .token(authToken)
                 .source(AuthSource.QQ)
diff --git a/src/main/java/me/zhyd/oauth/request/AuthWeChatRequest.java b/src/main/java/me/zhyd/oauth/request/AuthWeChatRequest.java
index a52db17..1183e32 100644
--- a/src/main/java/me/zhyd/oauth/request/AuthWeChatRequest.java
+++ b/src/main/java/me/zhyd/oauth/request/AuthWeChatRequest.java
@@ -31,8 +31,7 @@ public class AuthWeChatRequest extends BaseAuthRequest {
         String accessTokenUrl = UrlBuilder.getWeChatAccessTokenUrl(config.getClientId(), config.getClientSecret(), code);
         HttpResponse response = HttpRequest.get(accessTokenUrl).execute();
         JSONObject object = JSONObject.parseObject(response.body());
-        if (!object.containsKey("access_token") || !object.containsKey("openid") || !object
-                .containsKey("refresh_token")) {
+        if (!object.containsKey("access_token") || !object.containsKey("openid") || !object.containsKey("refresh_token")) {
             throw new AuthException("Unable to get access_token or openid or refresh_token from wechat using code [" + code + "]");
         }
         return AuthToken.builder()
@@ -58,6 +57,7 @@ public class AuthWeChatRequest extends BaseAuthRequest {
                 .nickname(object.getString("nickname"))
                 .avatar(object.getString("headimgurl"))
                 .location(object.getString("country") + "-" + object.getString("province") + "-" + object.getString("city"))
+                .uuid(openId)
                 .gender(AuthUserGender.getRealGender(object.getString("sex")))
                 .token(authToken)
                 .source(AuthSource.WECHAT)
-- 
GitLab