From b9ca048d1c2f47cb3e16953a320b0ddce94d6b02 Mon Sep 17 00:00:00 2001 From: "yadong.zhang" Date: Mon, 27 May 2019 15:15:51 +0800 Subject: [PATCH] =?UTF-8?q?:pencil2:=20=E4=BF=AE=E5=A4=8D=E9=83=A8?= =?UTF-8?q?=E5=88=86=E9=97=AE=E9=A2=98=EF=BC=8C=E8=AF=A6=E6=83=85=E8=A7=81?= =?UTF-8?q?update.md?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../me/zhyd/oauth/authorization/AuthorizationFactory.java | 2 +- src/main/java/me/zhyd/oauth/model/AuthSource.java | 2 +- src/main/java/me/zhyd/oauth/request/AuthAlipayRequest.java | 2 +- .../java/me/zhyd/oauth/request/AuthTencentCloudRequest.java | 4 ++-- src/main/java/me/zhyd/oauth/utils/UrlBuilder.java | 4 ++-- update.md | 2 ++ 6 files changed, 9 insertions(+), 7 deletions(-) diff --git a/src/main/java/me/zhyd/oauth/authorization/AuthorizationFactory.java b/src/main/java/me/zhyd/oauth/authorization/AuthorizationFactory.java index af23e13..83d33d8 100644 --- a/src/main/java/me/zhyd/oauth/authorization/AuthorizationFactory.java +++ b/src/main/java/me/zhyd/oauth/authorization/AuthorizationFactory.java @@ -63,7 +63,7 @@ public class AuthorizationFactory { AuthorizationFactory.register(AuthSource.OSCHINA, new OschinaAuthorization()); AuthorizationFactory.register(AuthSource.QQ, new QqAuthorization()); AuthorizationFactory.register(AuthSource.TAOBAO, new TaobaoAuthorization()); - AuthorizationFactory.register(AuthSource.TENCEN_CLOUD, new TencentCloudAuthorization()); + AuthorizationFactory.register(AuthSource.TENCENT_CLOUD, new TencentCloudAuthorization()); AuthorizationFactory.register(AuthSource.WECHAT, new WeChatAuthorization()); AuthorizationFactory.register(AuthSource.WEIBO, new WeiboAuthorization()); AuthorizationFactory.register(AuthSource.FACEBOOK, new FacebookAuthorization()); diff --git a/src/main/java/me/zhyd/oauth/model/AuthSource.java b/src/main/java/me/zhyd/oauth/model/AuthSource.java index ef94126..c259b06 100644 --- a/src/main/java/me/zhyd/oauth/model/AuthSource.java +++ b/src/main/java/me/zhyd/oauth/model/AuthSource.java @@ -16,7 +16,7 @@ public enum AuthSource { CSDN, CODING, OSCHINA, - TENCEN_CLOUD, + TENCENT_CLOUD, ALIPAY, TAOBAO, QQ, diff --git a/src/main/java/me/zhyd/oauth/request/AuthAlipayRequest.java b/src/main/java/me/zhyd/oauth/request/AuthAlipayRequest.java index dc5ec5b..4e2e952 100644 --- a/src/main/java/me/zhyd/oauth/request/AuthAlipayRequest.java +++ b/src/main/java/me/zhyd/oauth/request/AuthAlipayRequest.java @@ -71,7 +71,7 @@ public class AuthAlipayRequest extends BaseAuthRequest { city = response.getCity(); return AuthUser.builder() .uuid(response.getUserId()) - .username(response.getUserName()) + .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)) diff --git a/src/main/java/me/zhyd/oauth/request/AuthTencentCloudRequest.java b/src/main/java/me/zhyd/oauth/request/AuthTencentCloudRequest.java index 3f7729b..393bd2c 100644 --- a/src/main/java/me/zhyd/oauth/request/AuthTencentCloudRequest.java +++ b/src/main/java/me/zhyd/oauth/request/AuthTencentCloudRequest.java @@ -21,7 +21,7 @@ import me.zhyd.oauth.utils.UrlBuilder; public class AuthTencentCloudRequest extends BaseAuthRequest { public AuthTencentCloudRequest(AuthConfig config) { - super(config, AuthSource.TENCEN_CLOUD); + super(config, AuthSource.TENCENT_CLOUD); } @Override @@ -58,7 +58,7 @@ public class AuthTencentCloudRequest extends BaseAuthRequest { .email(object.getString("email")) .remark(object.getString("slogan")) .token(authToken) - .source(AuthSource.TENCEN_CLOUD) + .source(AuthSource.TENCENT_CLOUD) .build(); } } diff --git a/src/main/java/me/zhyd/oauth/utils/UrlBuilder.java b/src/main/java/me/zhyd/oauth/utils/UrlBuilder.java index 7bc9704..91ace18 100644 --- a/src/main/java/me/zhyd/oauth/utils/UrlBuilder.java +++ b/src/main/java/me/zhyd/oauth/utils/UrlBuilder.java @@ -65,7 +65,7 @@ public class UrlBuilder { private static final String WECHAT_REFRESH_TOKEN_PATTERN = "{0}?appid={1}&grant_type=refresh_token&refresh_token={2}"; private static final String WECHAT_USER_INFO_PATTERN = "{0}?access_token={1}&openid={2}&lang=zh_CN"; - private static final String TAOBAO_AUTHORIZE_PATTERN = "{0}?response_type=code&client_id={1}&redirect_uri={2}&state=&view=web"; + private static final String TAOBAO_AUTHORIZE_PATTERN = "{0}?response_type=code&client_id={1}&redirect_uri={2}&state={3}&view=web"; private static final String TAOBAO_ACCESS_TOKEN_PATTERN = "{0}?client_id={1}&client_secret={2}&code={3}&redirect_uri={4}&grant_type=authorization_code"; private static final String FACEBOOK_AUTHORIZE_PATTERN = "{0}?client_id={1}&redirect_uri={2}&state={3}&response_type=code&scope="; @@ -503,7 +503,7 @@ public class UrlBuilder { * @return full url */ public static String getTaobaoAuthorizeUrl(String clientId, String redirectUrl) { - return MessageFormat.format(TAOBAO_AUTHORIZE_PATTERN, ApiUrl.TAOBAO.authorize(), clientId, redirectUrl); + return MessageFormat.format(TAOBAO_AUTHORIZE_PATTERN, ApiUrl.TAOBAO.authorize(), clientId, redirectUrl, System.currentTimeMillis()); } /** diff --git a/update.md b/update.md index 00c7467..2cc4949 100644 --- a/update.md +++ b/update.md @@ -2,6 +2,8 @@ 1. 增加抖音和Linkedin的授权登陆 2. 修改部分图片命名 3. 优化部分代码 +4. 修复`AuthSource`中腾讯云开发平台的拼写错误：`TENCEN_CLOUD`->`TENCENT_CLOUD` +5. 修复支付宝登陆时用户名为空的问题 ### 2019/05/24 -- GitLab