diff --git a/CHANGELOGS.md b/CHANGELOGS.md
index 25e584545c9dab6386bc7103173c4bcaa4c55cfb..21998052110d0cc2ebfda2a6ddbdb69c0d83d51c 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 810c48403c630dd6049e35249967feaabdf079bb..88aeb1597ca815aa3e454eeb49a51350dad9c3b7 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 c367da75ae8a33b7bd562ef845db934b623ea88f..4e6caeb2b6ed654df39f68171c98add740f1f17f 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 30a88ea45a4fcfa9d53f8c344af1e86e6b76d1ef..15b989e398fc758a6cb9c266029c22acc050c5cb 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 7de4b7fb64dc323702829403d4085c247efb0d96..5be60163aac0545d5f8ff4f66aabd079f4c7fe9d 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 1e7ba7f680afabcba44ef1f7d8f3f0fd20e9a718..d06950673225a441db20942f8395e8299483e75d 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 9865a02ca2cd79230a0757ca630122dda9192e0d..01e7e08527af334c23f889ccba388e39eb8607d9 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 6cb651f7d1019b325cfa0f609170d09d4306ef42..9d4f98fee246131f22c40f72480a7cb68217e61a 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