From cd324cc7c13ac0047043dd858f1074409b0ea31b Mon Sep 17 00:00:00 2001 From: "yadong.zhang" Date: Sat, 13 Mar 2021 23:15:22 +0800 Subject: [PATCH] :bookmark: Release version 1.16.0 --- CHANGELOGS.md | 7 +++++++ README.en-US.md | 6 +++--- README.md | 6 +++--- bin/version.txt | 2 +- pom.xml | 2 +- .../me/zhyd/oauth/config/JustAuthLogConfig.java | 9 +++++---- .../me/zhyd/oauth/enums/AuthResponseStatus.java | 5 +++-- .../me/zhyd/oauth/request/AuthAliyunRequest.java | 13 ++++++------- 8 files changed, 29 insertions(+), 21 deletions(-) diff --git a/CHANGELOGS.md b/CHANGELOGS.md index 25e5845..2199805 100644 --- a/CHANGELOGS.md +++ b/CHANGELOGS.md @@ -1,5 +1,12 @@ ## 1.15.9 +### 2021/3/13 + +- 集成 Amazon 平台（[www.amazon.com](https://www.amazon.com)）的登录 +- 修改 `AuthFacebookScope` 中的默认 scope，解决 justauth-demo 项目中使用 facebook 报错的问题 +- 升级 facebook 的 api 到 v10.0 版本 +- 优化部分代码 + ### 2021/1/1 - 发布 v1.15.9 diff --git a/README.en-US.md b/README.en-US.md index 810c484..88aeb15 100644 --- a/README.en-US.md +++ b/README.en-US.md @@ -6,7 +6,7 @@

- + @@ -15,7 +15,7 @@ - + @@ -97,7 +97,7 @@ These artifacts are available from Maven Central: me.zhyd.oauth JustAuth - 1.15.9 + 1.16.0 ``` - Using JustAuth diff --git a/README.md b/README.md index c367da7..4e6caeb 100644 --- a/README.md +++ b/README.md @@ -6,7 +6,7 @@

- + @@ -15,7 +15,7 @@ - + @@ -107,7 +107,7 @@ JustAuth 集成了诸如：Github、Gitee、支付宝、新浪微博、微信、 me.zhyd.oauth JustAuth - 1.15.9 + 1.16.0 ``` - 调用api diff --git a/bin/version.txt b/bin/version.txt index 30a88ea..15b989e 100644 --- a/bin/version.txt +++ b/bin/version.txt @@ -1 +1 @@ -1.15.9 +1.16.0 diff --git a/pom.xml b/pom.xml index 7de4b7f..5be6016 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ me.zhyd.oauth JustAuth - 1.15.9 + 1.16.0 JustAuth https://gitee.com/yadong.zhang/JustAuth diff --git a/src/main/java/me/zhyd/oauth/config/JustAuthLogConfig.java b/src/main/java/me/zhyd/oauth/config/JustAuthLogConfig.java index 1e7ba7f..d069506 100644 --- a/src/main/java/me/zhyd/oauth/config/JustAuthLogConfig.java +++ b/src/main/java/me/zhyd/oauth/config/JustAuthLogConfig.java @@ -4,30 +4,31 @@ import me.zhyd.oauth.log.Log; /** * JustAuth 日志配置类 + * * @author HeJin - * @date 2021/1/9 20:28 */ public class JustAuthLogConfig { /** * 设置日志级别 + * * @param level 日志级别 */ - public static void setLevel(Log.Level level){ + public static void setLevel(Log.Level level) { Log.Config.level = level; } /** * 关闭日志 */ - public static void disable(){ + public static void disable() { Log.Config.enable = false; } /** * 开启日志 */ - public static void enable(){ + public static void enable() { Log.Config.enable = true; } } diff --git a/src/main/java/me/zhyd/oauth/enums/AuthResponseStatus.java b/src/main/java/me/zhyd/oauth/enums/AuthResponseStatus.java index 9865a02..01e7e08 100644 --- a/src/main/java/me/zhyd/oauth/enums/AuthResponseStatus.java +++ b/src/main/java/me/zhyd/oauth/enums/AuthResponseStatus.java @@ -28,9 +28,10 @@ public enum AuthResponseStatus { ILLEGAL_CODE(5008, "Illegal code"), ILLEGAL_STATUS(5009, "Illegal state"), REQUIRED_REFRESH_TOKEN(5010, "The refresh token is required; it must not be null"), + ILLEGAL_TOKEN(5011, "Invalid token"), ; - private int code; - private String msg; + private final int code; + private final String msg; } diff --git a/src/main/java/me/zhyd/oauth/request/AuthAliyunRequest.java b/src/main/java/me/zhyd/oauth/request/AuthAliyunRequest.java index 6cb651f..9d4f98f 100644 --- a/src/main/java/me/zhyd/oauth/request/AuthAliyunRequest.java +++ b/src/main/java/me/zhyd/oauth/request/AuthAliyunRequest.java @@ -8,7 +8,6 @@ import me.zhyd.oauth.enums.AuthUserGender; import me.zhyd.oauth.model.AuthCallback; import me.zhyd.oauth.model.AuthToken; import me.zhyd.oauth.model.AuthUser; -import me.zhyd.oauth.utils.UrlBuilder; /** * 阿里云登录 @@ -31,12 +30,12 @@ public class AuthAliyunRequest extends AuthDefaultRequest { String response = doPostAuthorizationCode(authCallback.getCode()); JSONObject accessTokenObject = JSONObject.parseObject(response); return AuthToken.builder() - .accessToken(accessTokenObject.getString("access_token")) - .expireIn(accessTokenObject.getIntValue("expires_in")) - .tokenType(accessTokenObject.getString("token_type")) - .idToken(accessTokenObject.getString("id_token")) - .refreshToken(accessTokenObject.getString("refresh_token")) - .build(); + .accessToken(accessTokenObject.getString("access_token")) + .expireIn(accessTokenObject.getIntValue("expires_in")) + .tokenType(accessTokenObject.getString("token_type")) + .idToken(accessTokenObject.getString("id_token")) + .refreshToken(accessTokenObject.getString("refresh_token")) + .build(); } @Override -- GitLab