🔖 Release version 1.16.0

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

README.en-US.md

@@ -6,7 +6,7 @@
 </p>
 <p align="center">
 	<a target="_blank" href="https://search.maven.org/search?q=JustAuth">
-		<img src="https://img.shields.io/badge/Maven%20Central-1.15.9-blue" ></img>
+		<img src="https://img.shields.io/badge/Maven%20Central-1.16.0-blue" ></img>
 	</a>
 	<a target="_blank" href="https://gitee.com/yadong.zhang/JustAuth/blob/master/LICENSE">
 		<img src="https://img.shields.io/apm/l/vim-mode.svg?color=yellow" ></img>
@@ -15,7 +15,7 @@
 		<img src="https://img.shields.io/badge/JDK-1.8+-green.svg" ></img>
 	</a>
 	<a target="_blank" href="https://apidoc.gitee.com/yadong.zhang/JustAuth/" title="API文档">
-		<img src="https://img.shields.io/badge/Api%20Docs-1.15.9-orange" ></img>
+		<img src="https://img.shields.io/badge/Api%20Docs-1.16.0-orange" ></img>
 	</a>
 	<a target="_blank" href="https://justauth.wiki" title="参考文档">
 		<img src="https://img.shields.io/badge/Docs-latest-blueviolet.svg" ></img>
@@ -97,7 +97,7 @@ These artifacts are available from Maven Central:
 <dependency>
     <groupId>me.zhyd.oauth</groupId>
     <artifactId>JustAuth</artifactId>
-    <version>1.15.9</version>
+    <version>1.16.0</version>
 </dependency>
 ```
 - Using JustAuth

README.md

@@ -6,7 +6,7 @@
 </p>
 <p align="center">
 	<a target="_blank" href="https://search.maven.org/search?q=JustAuth">
-		<img src="https://img.shields.io/badge/Maven%20Central-1.15.9-blue" ></img>
+		<img src="https://img.shields.io/badge/Maven%20Central-1.16.0-blue" ></img>
 	</a>
 	<a target="_blank" href="https://gitee.com/yadong.zhang/JustAuth/blob/master/LICENSE">
 		<img src="https://img.shields.io/apm/l/vim-mode.svg?color=yellow" ></img>
@@ -15,7 +15,7 @@
 		<img src="https://img.shields.io/badge/JDK-1.8+-green.svg" ></img>
 	</a>
 	<a target="_blank" href="https://apidoc.gitee.com/yadong.zhang/JustAuth/" title="API文档">
-		<img src="https://img.shields.io/badge/Api%20Docs-1.15.9-orange" ></img>
+		<img src="https://img.shields.io/badge/Api%20Docs-1.16.0-orange" ></img>
 	</a>
 	<a target="_blank" href="https://justauth.wiki" title="参考文档">
 		<img src="https://img.shields.io/badge/Docs-latest-blueviolet.svg" ></img>
@@ -107,7 +107,7 @@ JustAuth 集成了诸如：Github、Gitee、支付宝、新浪微博、微信、
 <dependency>
     <groupId>me.zhyd.oauth</groupId>
     <artifactId>JustAuth</artifactId>
-    <version>1.15.9</version>
+    <version>1.16.0</version>
 </dependency>
 ```
 - 调用api

bin/version.txt

@@ -1 +1 @@
-1.15.9
+1.16.0

pom.xml

@@ -6,7 +6,7 @@
 
   <groupId>me.zhyd.oauth</groupId>
   <artifactId>JustAuth</artifactId>
-  <version>1.15.9</version>
+  <version>1.16.0</version>
 
   <name>JustAuth</name>
   <url>https://gitee.com/yadong.zhang/JustAuth</url>

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;
     }
 }

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 final int code;
-    private String msg;
+    private final String msg;
 }
 

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"))
+            .accessToken(accessTokenObject.getString("access_token"))
-                .expireIn(accessTokenObject.getIntValue("expires_in"))
+            .expireIn(accessTokenObject.getIntValue("expires_in"))
-                .tokenType(accessTokenObject.getString("token_type"))
+            .tokenType(accessTokenObject.getString("token_type"))
-                .idToken(accessTokenObject.getString("id_token"))
+            .idToken(accessTokenObject.getString("id_token"))
-                .refreshToken(accessTokenObject.getString("refresh_token"))
+            .refreshToken(accessTokenObject.getString("refresh_token"))
-                .build();
+            .build();
     }
 
     @Override