lxm_library_java/JustAuth
1
0
Fork 0
mirror of synced 2026-02-20 02:57:47 +08:00
Code Issues Projects Releases Wiki Activity

Merge pull request #18 from xkcoding/patch-5

Browse Source 
♻️ 修复小米回调错误问题 同时 支持微信获取 unionId
This commit is contained in:
yadong.zhang
2019-07-16 19:51:26 +08:00
committed by GitHub
parent 3b80e11824 8d1b329c63
commit a518e8c0cb
3 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/me/zhyd/oauth/request/AuthMiRequest.java
View File

@@ -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;
@@ -19,6 +20,7 @@ import java.text.MessageFormat;
* @version 1.5
* @since 1.5
*/
@Slf4j
public class AuthMiRequest extends BaseAuthRequest {
private static final String PREFIX = "&&&START&&&";
@@ -86,6 +88,8 @@ public class AuthMiRequest extends BaseAuthRequest {
if (!"error".equalsIgnoreCase(userEmailPhone.getString("result"))) {
JSONObject emailPhone = userEmailPhone.getJSONObject("data");
authUser.setEmail(emailPhone.getString("email"));
}else {
log.warn("小米开发平台暂时不对外开放用户手机及邮箱信息的获取");
}
return authUser;

5
src/main/java/me/zhyd/oauth/request/AuthWeChatRequest.java
View File

@@ -44,6 +44,11 @@ public class AuthWeChatRequest extends BaseAuthRequest {
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"))

2
src/main/java/me/zhyd/oauth/utils/UrlBuilder.java
View File

@@ -87,7 +87,7 @@ public class UrlBuilder {
private static final String MICROSOFT_USER_INFO_PATTERN = "{0}";
private static final String MICROSOFT_REFRESH_TOKEN_PATTERN = "{0}?client_id={1}&client_secret={2}&scope=user.read%20mail.read&redirect_uri={3}&refresh_token={4}&grant_type=refresh_token";
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";