From 90f8d01c565267b4bbae9aa9cc08a9264da655f4 Mon Sep 17 00:00:00 2001 From: "yadong.zhang" Date: Thu, 23 May 2019 19:29:33 +0800 Subject: [PATCH] =?UTF-8?q?:beers:=20=E5=A2=9E=E5=8A=A0=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E7=9A=84UUID?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/me/zhyd/oauth/request/AuthAlipayRequest.java | 4 ++++ src/main/java/me/zhyd/oauth/request/AuthBaiduRequest.java | 1 + src/main/java/me/zhyd/oauth/request/AuthCodingRequest.java | 1 + src/main/java/me/zhyd/oauth/request/AuthDingTalkRequest.java | 1 + src/main/java/me/zhyd/oauth/request/AuthOschinaRequest.java | 1 + src/main/java/me/zhyd/oauth/request/AuthTaobaoRequest.java | 1 + .../java/me/zhyd/oauth/request/AuthTencentCloudRequest.java | 1 + 7 files changed, 10 insertions(+) diff --git a/src/main/java/me/zhyd/oauth/request/AuthAlipayRequest.java b/src/main/java/me/zhyd/oauth/request/AuthAlipayRequest.java index 461d631..dc5ec5b 100644 --- a/src/main/java/me/zhyd/oauth/request/AuthAlipayRequest.java +++ b/src/main/java/me/zhyd/oauth/request/AuthAlipayRequest.java @@ -48,6 +48,9 @@ public class AuthAlipayRequest extends BaseAuthRequest { } return AuthToken.builder() .accessToken(response.getAccessToken()) + .uid(response.getUserId()) + .expireIn(Integer.parseInt(response.getExpiresIn())) + .refreshToken(response.getRefreshToken()) .build(); } @@ -67,6 +70,7 @@ public class AuthAlipayRequest extends BaseAuthRequest { String province = response.getProvince(), city = response.getCity(); return AuthUser.builder() + .uuid(response.getUserId()) .username(response.getUserName()) .nickname(response.getNickName()) .avatar(response.getAvatar()) diff --git a/src/main/java/me/zhyd/oauth/request/AuthBaiduRequest.java b/src/main/java/me/zhyd/oauth/request/AuthBaiduRequest.java index 11abfdf..7375625 100644 --- a/src/main/java/me/zhyd/oauth/request/AuthBaiduRequest.java +++ b/src/main/java/me/zhyd/oauth/request/AuthBaiduRequest.java @@ -47,6 +47,7 @@ public class AuthBaiduRequest extends BaseAuthRequest { throw new AuthException(errorCode.getDesc()); } return AuthUser.builder() + .uuid(object.getString("userid")) .username(object.getString("username")) .nickname(object.getString("username")) .gender(AuthUserGender.getRealGender(object.getString("sex"))) diff --git a/src/main/java/me/zhyd/oauth/request/AuthCodingRequest.java b/src/main/java/me/zhyd/oauth/request/AuthCodingRequest.java index 485e380..4dab0e0 100644 --- a/src/main/java/me/zhyd/oauth/request/AuthCodingRequest.java +++ b/src/main/java/me/zhyd/oauth/request/AuthCodingRequest.java @@ -47,6 +47,7 @@ public class AuthCodingRequest extends BaseAuthRequest { } object = object.getJSONObject("data"); return AuthUser.builder() + .uuid(object.getString("id")) .username(object.getString("name")) .avatar("https://coding.net/" + object.getString("avatar")) .blog("https://coding.net/" + object.getString("path")) diff --git a/src/main/java/me/zhyd/oauth/request/AuthDingTalkRequest.java b/src/main/java/me/zhyd/oauth/request/AuthDingTalkRequest.java index debb44d..f2ac937 100644 --- a/src/main/java/me/zhyd/oauth/request/AuthDingTalkRequest.java +++ b/src/main/java/me/zhyd/oauth/request/AuthDingTalkRequest.java @@ -51,6 +51,7 @@ public class AuthDingTalkRequest extends BaseAuthRequest { } object = object.getJSONObject("user_info"); return AuthUser.builder() + .uuid(object.getStr("openid")) .nickname(object.getStr("nick")) .username(object.getStr("nick")) .source(AuthSource.DINGTALK) diff --git a/src/main/java/me/zhyd/oauth/request/AuthOschinaRequest.java b/src/main/java/me/zhyd/oauth/request/AuthOschinaRequest.java index 1a419ac..488e96e 100644 --- a/src/main/java/me/zhyd/oauth/request/AuthOschinaRequest.java +++ b/src/main/java/me/zhyd/oauth/request/AuthOschinaRequest.java @@ -46,6 +46,7 @@ public class AuthOschinaRequest extends BaseAuthRequest { throw new AuthException(object.getString("error_description")); } return AuthUser.builder() + .uuid(object.getString("id")) .username(object.getString("name")) .nickname(object.getString("name")) .avatar(object.getString("avatar")) diff --git a/src/main/java/me/zhyd/oauth/request/AuthTaobaoRequest.java b/src/main/java/me/zhyd/oauth/request/AuthTaobaoRequest.java index 761aa6f..56420de 100644 --- a/src/main/java/me/zhyd/oauth/request/AuthTaobaoRequest.java +++ b/src/main/java/me/zhyd/oauth/request/AuthTaobaoRequest.java @@ -48,6 +48,7 @@ public class AuthTaobaoRequest extends BaseAuthRequest { String nick = GlobalAuthUtil.urlDecode(object.getString("taobao_user_nick")); return AuthUser.builder() + .uuid(object.getString("taobao_user_id")) .username(nick) .nickname(nick) .gender(AuthUserGender.UNKNOW) diff --git a/src/main/java/me/zhyd/oauth/request/AuthTencentCloudRequest.java b/src/main/java/me/zhyd/oauth/request/AuthTencentCloudRequest.java index 1681f15..3f7729b 100644 --- a/src/main/java/me/zhyd/oauth/request/AuthTencentCloudRequest.java +++ b/src/main/java/me/zhyd/oauth/request/AuthTencentCloudRequest.java @@ -47,6 +47,7 @@ public class AuthTencentCloudRequest extends BaseAuthRequest { } object = object.getJSONObject("data"); return AuthUser.builder() + .uuid(object.getString("id")) .username(object.getString("name")) .avatar("https://dev.tencent.com/" + object.getString("avatar")) .blog("https://dev.tencent.com/" + object.getString("path")) -- GitLab