admin/JustAuth
1
0
Fork 0
mirror of https://gitee.com/yadong.zhang/JustAuth.git synced 2026-01-07 19:31:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source 
# Conflicts:
#	src/main/java/me/zhyd/oauth/request/AuthAlipayRequest.java
#	src/main/java/me/zhyd/oauth/request/AuthQqRequest.java
This commit is contained in:
yadong.zhang 2019-06-19 10:04:47 +08:00
commit 458de3840d
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/me/zhyd/oauth/request/AuthQqRequest.java
View File

@ -90,6 +90,7 @@ public class AuthQqRequest extends BaseAuthRequest {
authToken.setUnionId(object.getString("unionid"));
return authToken.getOpenId();
}
throw new AuthException("Invalid openId");
throw new AuthException("request error");
}
}

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

@ -58,7 +58,7 @@ public class UrlBuilder {
private static final String QQ_ACCESS_TOKEN_PATTERN = "{0}?client_id={1}&client_secret={2}&grant_type=authorization_code&code={3}&redirect_uri={4}";
private static final String QQ_USER_INFO_PATTERN = "{0}?oauth_consumer_key={1}&access_token={2}&openid={3}";
private static final String QQ_AUTHORIZE_PATTERN = "{0}?client_id={1}&response_type=code&redirect_uri={2}&state={3}";
private static final String QQ_OPENID_PATTERN = "{0}?access_token={1}";
private static final String QQ_OPENID_PATTERN = "{0}?access_token={1}&unionid=1";
private static final String WECHAT_AUTHORIZE_PATTERN = "{0}?appid={1}&redirect_uri={2}&response_type=code&scope=snsapi_login&state={3}#wechat_redirect";
private static final String WECHAT_ACCESS_TOKEN_PATTERN = "{0}?appid={1}&secret={2}&code={3}&grant_type=authorization_code";