From 356a1bf826f60f27f5cd5d19d9f1842f8239375d Mon Sep 17 00:00:00 2001 From: "yadong.zhang" Date: Thu, 23 May 2019 18:55:14 +0800 Subject: [PATCH] =?UTF-8?q?:alien:=20=E5=A2=9E=E5=8A=A0uuid?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/me/zhyd/oauth/request/AuthGiteeRequest.java | 1 + src/main/java/me/zhyd/oauth/request/AuthGithubRequest.java | 1 + src/main/java/me/zhyd/oauth/request/AuthWeiboRequest.java | 5 +++-- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/main/java/me/zhyd/oauth/request/AuthGiteeRequest.java b/src/main/java/me/zhyd/oauth/request/AuthGiteeRequest.java index 9afcc43..9d6045c 100644 --- a/src/main/java/me/zhyd/oauth/request/AuthGiteeRequest.java +++ b/src/main/java/me/zhyd/oauth/request/AuthGiteeRequest.java @@ -43,6 +43,7 @@ public class AuthGiteeRequest extends BaseAuthRequest { String userInfo = response.body(); JSONObject object = JSONObject.parseObject(userInfo); return AuthUser.builder() + .uuid(object.getString("id")) .username(object.getString("login")) .avatar(object.getString("avatar_url")) .blog(object.getString("blog")) diff --git a/src/main/java/me/zhyd/oauth/request/AuthGithubRequest.java b/src/main/java/me/zhyd/oauth/request/AuthGithubRequest.java index dd73bc3..67afd37 100644 --- a/src/main/java/me/zhyd/oauth/request/AuthGithubRequest.java +++ b/src/main/java/me/zhyd/oauth/request/AuthGithubRequest.java @@ -46,6 +46,7 @@ public class AuthGithubRequest extends BaseAuthRequest { String userInfo = response.body(); JSONObject object = JSONObject.parseObject(userInfo); return AuthUser.builder() + .uuid(object.getString("id")) .username(object.getString("login")) .avatar(object.getString("avatar_url")) .blog(object.getString("blog")) diff --git a/src/main/java/me/zhyd/oauth/request/AuthWeiboRequest.java b/src/main/java/me/zhyd/oauth/request/AuthWeiboRequest.java index 7c6e92b..9f56dbe 100644 --- a/src/main/java/me/zhyd/oauth/request/AuthWeiboRequest.java +++ b/src/main/java/me/zhyd/oauth/request/AuthWeiboRequest.java @@ -48,8 +48,9 @@ public class AuthWeiboRequest extends BaseAuthRequest { protected AuthUser getUserInfo(AuthToken authToken) { String accessToken = authToken.getAccessToken(); String uid = authToken.getUid(); - HttpResponse response = HttpRequest.get(UrlBuilder.getWeiboUserInfoUrl(accessToken)) - .header("Authorization", "OAuth2 " + String.format("uid=%s&access_token=%s", uid, accessToken)) + String oauthParam = String.format("uid=%s&access_token=%s", uid, accessToken); + HttpResponse response = HttpRequest.get(UrlBuilder.getWeiboUserInfoUrl(oauthParam)) + .header("Authorization", "OAuth2 " + oauthParam) .header("API-RemoteIP", IpUtils.getIp()) .execute(); String userInfo = response.body(); -- GitLab