From c0dd700b0aaa396a51bb5e416073e57b1e425200 Mon Sep 17 00:00:00 2001 From: "yadong.zhang" Date: Tue, 18 Jun 2019 19:27:11 +0800 Subject: [PATCH] =?UTF-8?q?:art:=20=E8=A7=A3=E5=86=B3Issue=20#IY2OH?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 2 +- src/main/java/me/zhyd/oauth/request/AuthAlipayRequest.java | 5 ++++- src/main/java/me/zhyd/oauth/request/AuthCodingRequest.java | 1 + src/main/java/me/zhyd/oauth/request/AuthQqRequest.java | 4 +++- src/main/java/me/zhyd/oauth/request/AuthWeChatRequest.java | 4 +++- update.md | 4 ++++ 6 files changed, 16 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index dfca999..f411c40 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ me.zhyd.oauth JustAuth - 1.6.0-beta + 1.6.1-beta JustAuth https://gitee.com/yadong.zhang/JustAuth diff --git a/src/main/java/me/zhyd/oauth/request/AuthAlipayRequest.java b/src/main/java/me/zhyd/oauth/request/AuthAlipayRequest.java index 4e2e952..521cdd4 100644 --- a/src/main/java/me/zhyd/oauth/request/AuthAlipayRequest.java +++ b/src/main/java/me/zhyd/oauth/request/AuthAlipayRequest.java @@ -67,14 +67,17 @@ public class AuthAlipayRequest extends BaseAuthRequest { if (!response.isSuccess()) { throw new AuthException(response.getSubMsg()); } + String province = response.getProvince(), city = response.getCity(); + String location = String.format("%s %s", StringUtils.isEmpty(province) ? "" : province, StringUtils.isEmpty(city) ? "" : city); + return AuthUser.builder() .uuid(response.getUserId()) .username(StringUtils.isEmpty(response.getUserName()) ? response.getNickName() : response.getUserName()) .nickname(response.getNickName()) .avatar(response.getAvatar()) - .location(String.format("%s %s", StringUtils.isEmpty(province) ? "" : province, StringUtils.isEmpty(city) ? "" : city)) + .location(location) .gender(AuthUserGender.getRealGender(response.getGender())) .token(authToken) .source(AuthSource.ALIPAY) diff --git a/src/main/java/me/zhyd/oauth/request/AuthCodingRequest.java b/src/main/java/me/zhyd/oauth/request/AuthCodingRequest.java index 4dab0e0..08f397a 100644 --- a/src/main/java/me/zhyd/oauth/request/AuthCodingRequest.java +++ b/src/main/java/me/zhyd/oauth/request/AuthCodingRequest.java @@ -45,6 +45,7 @@ public class AuthCodingRequest extends BaseAuthRequest { if (object.getIntValue("code") != 0) { throw new AuthException(object.getString("msg")); } + object = object.getJSONObject("data"); return AuthUser.builder() .uuid(object.getString("id")) diff --git a/src/main/java/me/zhyd/oauth/request/AuthQqRequest.java b/src/main/java/me/zhyd/oauth/request/AuthQqRequest.java index a7c0408..868e56e 100644 --- a/src/main/java/me/zhyd/oauth/request/AuthQqRequest.java +++ b/src/main/java/me/zhyd/oauth/request/AuthQqRequest.java @@ -59,11 +59,13 @@ public class AuthQqRequest extends BaseAuthRequest { if (StringUtils.isEmpty(avatar)) { avatar = object.getString("figureurl_qq_1"); } + + String location = String.format("%s-%s", object.getString("province"), object.getString("city")); return AuthUser.builder() .username(object.getString("nickname")) .nickname(object.getString("nickname")) .avatar(avatar) - .location(object.getString("province") + "-" + object.getString("city")) + .location(location) .uuid(openId) .gender(AuthUserGender.getRealGender(object.getString("gender"))) .token(authToken) diff --git a/src/main/java/me/zhyd/oauth/request/AuthWeChatRequest.java b/src/main/java/me/zhyd/oauth/request/AuthWeChatRequest.java index 5e85674..6dd4d31 100644 --- a/src/main/java/me/zhyd/oauth/request/AuthWeChatRequest.java +++ b/src/main/java/me/zhyd/oauth/request/AuthWeChatRequest.java @@ -42,11 +42,12 @@ public class AuthWeChatRequest extends BaseAuthRequest { this.checkResponse(object); + String location = String.format("%s-%s-%s", object.getString("country"), object.getString("province"), object.getString("city")); return AuthUser.builder() .username(object.getString("nickname")) .nickname(object.getString("nickname")) .avatar(object.getString("headimgurl")) - .location(object.getString("country") + "-" + object.getString("province") + "-" + object.getString("city")) + .location(location) .uuid(openId) .gender(AuthUserGender.getRealGender(object.getString("sex"))) .token(authToken) @@ -73,6 +74,7 @@ public class AuthWeChatRequest extends BaseAuthRequest { throw new AuthException(object.getIntValue("errcode"), object.getString("errmsg")); } } + /** * 获取token，适用于获取access_token和刷新token * diff --git a/update.md b/update.md index 7c85527..c9966bc 100644 --- a/update.md +++ b/update.md @@ -1,3 +1,7 @@ +### 2019/06/18 +1. 解决Issue [#IY2HW](https://gitee.com/yadong.zhang/JustAuth/issues/IY2HW) +1. 解决Issue [#IY2OH](https://gitee.com/yadong.zhang/JustAuth/issues/IY2OH) + ### 2019/06/06 1. 增加今日头条的授权登陆 2. 发布1.6.0-beta版本，今日头条开发者暂时不能认证， 所以无法做测试，等测试通过后，正式发布release版本 -- GitLab