From 4c1fdfc62d5131baf4b9ead975ce2a060e9c0ad2 Mon Sep 17 00:00:00 2001
From: "yadong.zhang" <yadong.zhang0415@gmail.com>
Date: Tue, 16 Jul 2019 19:49:18 +0800
Subject: [PATCH] =?UTF-8?q?:twisted=5Frightwards=5Farrows:=20=E6=89=8B?=
 =?UTF-8?q?=E5=8A=A8=E5=90=88=E5=B9=B6PR=20#18=20=E5=88=B0dev=E5=88=86?=
 =?UTF-8?q?=E6=94=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/me/zhyd/oauth/request/AuthMiRequest.java     | 4 ++++
 src/main/java/me/zhyd/oauth/request/AuthWeChatRequest.java | 5 +++++
 src/main/java/me/zhyd/oauth/url/AuthMiUrlBuilder.java      | 2 +-
 3 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/main/java/me/zhyd/oauth/request/AuthMiRequest.java b/src/main/java/me/zhyd/oauth/request/AuthMiRequest.java
index 3903a95..27ad736 100644
--- a/src/main/java/me/zhyd/oauth/request/AuthMiRequest.java
+++ b/src/main/java/me/zhyd/oauth/request/AuthMiRequest.java
@@ -4,6 +4,7 @@ import cn.hutool.core.util.StrUtil;
 import cn.hutool.http.HttpRequest;
 import cn.hutool.http.HttpResponse;
 import com.alibaba.fastjson.JSONObject;
+import lombok.extern.slf4j.Slf4j;
 import me.zhyd.oauth.config.AuthConfig;
 import me.zhyd.oauth.config.AuthSource;
 import me.zhyd.oauth.exception.AuthException;
@@ -20,6 +21,7 @@ import java.text.MessageFormat;
  * @version 1.5
  * @since 1.5
  */
+@Slf4j
 public class AuthMiRequest extends AuthDefaultRequest {
     private static final String PREFIX = "&&&START&&&";
 
@@ -90,6 +92,8 @@ public class AuthMiRequest extends AuthDefaultRequest {
         if (!"error".equalsIgnoreCase(userEmailPhone.getString("result"))) {
             JSONObject emailPhone = userEmailPhone.getJSONObject("data");
             authUser.setEmail(emailPhone.getString("email"));
+        } else {
+            log.warn("小米开发平台暂时不对外开放用户手机及邮箱信息的获取");
         }
 
         return authUser;
diff --git a/src/main/java/me/zhyd/oauth/request/AuthWeChatRequest.java b/src/main/java/me/zhyd/oauth/request/AuthWeChatRequest.java
index 7f7cb16..82a1662 100644
--- a/src/main/java/me/zhyd/oauth/request/AuthWeChatRequest.java
+++ b/src/main/java/me/zhyd/oauth/request/AuthWeChatRequest.java
@@ -48,6 +48,11 @@ public class AuthWeChatRequest extends AuthDefaultRequest {
         this.checkResponse(object);
 
         String location = String.format("%s-%s-%s", object.getString("country"), object.getString("province"), object.getString("city"));
+
+        if (object.containsKey("unionid")){
+            authToken.setUnionId(object.getString("unionid"));
+        }
+
         return AuthUser.builder()
                 .username(object.getString("nickname"))
                 .nickname(object.getString("nickname"))
diff --git a/src/main/java/me/zhyd/oauth/url/AuthMiUrlBuilder.java b/src/main/java/me/zhyd/oauth/url/AuthMiUrlBuilder.java
index 728cf72..deae372 100644
--- a/src/main/java/me/zhyd/oauth/url/AuthMiUrlBuilder.java
+++ b/src/main/java/me/zhyd/oauth/url/AuthMiUrlBuilder.java
@@ -16,7 +16,7 @@ import java.text.MessageFormat;
  */
 public class AuthMiUrlBuilder extends AuthDefaultUrlBuilder {
 
-    private static final String MI_AUTHORIZE_PATTERN = "{0}?client_id={1}&redirect_uri={2}&response_type=code&scope=1%203%204%206&state={3}&skip_confirm=false";
+    private static final String MI_AUTHORIZE_PATTERN = "{0}?client_id={1}&redirect_uri={2}&response_type=code&scope=user/profile%20user/openIdV2%20user/phoneAndEmail&state={3}&skip_confirm=false";
     private static final String MI_ACCESS_TOKEN_PATTERN = "{0}?client_id={1}&client_secret={2}&redirect_uri={3}&code={4}&grant_type=authorization_code";
     private static final String MI_USER_INFO_PATTERN = "{0}?clientId={1}&token={2}";
     private static final String MI_REFRESH_TOKEN_PATTERN = "{0}?client_id={1}&client_secret={2}&redirect_uri={3}&refresh_token={4}&grant_type=refresh_token";
-- 
GitLab