🔀 合并Gitee上的pr

README.md

@@ -64,7 +64,7 @@ JustAuth，如你所见，它仅仅是一个**第三方授权登录**的**工具
 <dependency>
     <groupId>me.zhyd.oauth</groupId>
     <artifactId>JustAuth</artifactId>
-    <version>1.6.1-beta</version>
+    <version>1.7.0</version>
 </dependency>
 ```
 - 调用api

src/main/java/me/zhyd/oauth/config/AuthSource.java

@@ -317,12 +317,12 @@ public enum AuthSource {
 
         @Override
         public String accessToken() {
-            return "https://open.douyin.com/oauth/access_token";
+            return "https://open.douyin.com/oauth/access_token/";
         }
 
         @Override
         public String userInfo() {
-            return "https://open.douyin.com/oauth/userinfo";
+            return "https://open.douyin.com/oauth/userinfo/";
         }
 
         @Override

src/main/java/me/zhyd/oauth/request/AuthBaiduRequest.java

@@ -24,8 +24,7 @@ public class AuthBaiduRequest extends BaseAuthRequest {
 
     @Override
     protected AuthToken getAccessToken(String code) {
-        String accessTokenUrl = UrlBuilder.getBaiduAccessTokenUrl(config.getClientId(), config.getClientSecret(), code, config
+        String accessTokenUrl = UrlBuilder.getBaiduAccessTokenUrl(config.getClientId(), config.getClientSecret(), code, config.getRedirectUri());
-                .getRedirectUri());
         HttpResponse response = HttpRequest.post(accessTokenUrl).execute();
         JSONObject accessTokenObject = JSONObject.parseObject(response.body());
         AuthBaiduErrorCode errorCode = AuthBaiduErrorCode.getErrorCode(accessTokenObject.getString("error"));

src/main/java/me/zhyd/oauth/request/AuthDouyinRequest.java

@@ -36,16 +36,18 @@ public class AuthDouyinRequest extends BaseAuthRequest {
     protected AuthUser getUserInfo(AuthToken authToken) {
         String accessToken = authToken.getAccessToken();
         String openId = authToken.getOpenId();
-        HttpResponse response = HttpRequest.get(UrlBuilder.getDouyinUserInfoUrl(accessToken, openId)).execute();
+        String url = UrlBuilder.getDouyinUserInfoUrl(accessToken, openId);
+        HttpResponse response = HttpRequest.get(url).execute();
         JSONObject object = JSONObject.parseObject(response.body());
 
         JSONObject userInfoObject = this.checkResponse(object);
 
         return AuthUser.builder()
-                .uuid(userInfoObject.getString("open_id"))
+                .uuid(userInfoObject.getString("union_id"))
                 .username(userInfoObject.getString("nickname"))
                 .nickname(userInfoObject.getString("nickname"))
                 .avatar(userInfoObject.getString("avatar"))
+                .remark(userInfoObject.getString("description"))
                 .gender(AuthUserGender.UNKNOW)
                 .token(authToken)
                 .source(AuthSource.DOUYIN)

src/main/java/me/zhyd/oauth/utils/UrlBuilder.java

@@ -73,7 +73,7 @@ public class UrlBuilder {
     private static final String FACEBOOK_USER_INFO_PATTERN = "{0}?access_token={1}&fields=id,name,birthday,gender,hometown,email,devices,picture.width(400)";
 
     private static final String DOUYIN_AUTHORIZE_PATTERN = "{0}?client_key={1}&redirect_uri={2}&state={3}&response_type=code&scope=user_info";
-    private static final String DOUYIN_ACCESS_TOKEN_PATTERN = "{0}?client_id={1}&client_secret={2}&code={3}&grant_type=authorization_code";
+    private static final String DOUYIN_ACCESS_TOKEN_PATTERN = "{0}?client_key={1}&client_secret={2}&code={3}&grant_type=authorization_code";
     private static final String DOUYIN_USER_INFO_PATTERN = "{0}?access_token={1}&open_id={2}";
     private static final String DOUYIN_REFRESH_TOKEN_PATTERN = "{0}?client_key={1}&refresh_token={2}&grant_type=refresh_token";
 

update.md

@@ -1,5 +1,6 @@
 ### 2019/06/19
 1. 合并[xkcoding](https://github.com/xkcoding)提交的[PR](https://github.com/zhangyd-c/JustAuth/pull/14)，重构了部分代码，jar包由原来的`130+kb`优化到现在的`110+kb`
+2. 合并[skqing](https://gitee.com/skqing)提交的[PR](https://gitee.com/yadong.zhang/JustAuth/pulls/3)， 解决抖音登录失败问题 
 
 ### 2019/06/18 
 1. 解决Issue [#IY2HW](https://gitee.com/yadong.zhang/JustAuth/issues/IY2HW)