From ce5c43728969a22c683fd940140b84e57ce59312 Mon Sep 17 00:00:00 2001 From: "yadong.zhang" Date: Sat, 3 Aug 2019 09:49:49 +0800 Subject: [PATCH] =?UTF-8?q?:beers:=20=E8=A7=84=E8=8C=83=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E6=B3=A8=E9=87=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/me/zhyd/oauth/cache/AuthCacheConfig.java | 4 +--- .../me/zhyd/oauth/cache/AuthDefaultStateCache.java | 5 +++-- .../java/me/zhyd/oauth/cache/AuthStateCache.java | 2 +- src/main/java/me/zhyd/oauth/log/Log.java | 12 +++--------- .../me/zhyd/oauth/request/AuthDefaultRequest.java | 9 ++++----- .../java/me/zhyd/oauth/request/AuthMiRequest.java | 5 ++++- src/main/java/me/zhyd/oauth/utils/AuthChecker.java | 1 - 7 files changed, 16 insertions(+), 22 deletions(-) diff --git a/src/main/java/me/zhyd/oauth/cache/AuthCacheConfig.java b/src/main/java/me/zhyd/oauth/cache/AuthCacheConfig.java index 3a961fd..a4a22de 100644 --- a/src/main/java/me/zhyd/oauth/cache/AuthCacheConfig.java +++ b/src/main/java/me/zhyd/oauth/cache/AuthCacheConfig.java @@ -4,9 +4,7 @@ package me.zhyd.oauth.cache; * AuthCache配置类 * * @author yadong.zhang (yadong.zhang0415(a)gmail.com) - * @version 1.0 - * @date 2019/8/1 17:15 - * @since 1.8 + * @since 1.9.6 */ public class AuthCacheConfig { diff --git a/src/main/java/me/zhyd/oauth/cache/AuthDefaultStateCache.java b/src/main/java/me/zhyd/oauth/cache/AuthDefaultStateCache.java index eb0fe83..7dcf1eb 100644 --- a/src/main/java/me/zhyd/oauth/cache/AuthDefaultStateCache.java +++ b/src/main/java/me/zhyd/oauth/cache/AuthDefaultStateCache.java @@ -1,9 +1,10 @@ package me.zhyd.oauth.cache; /** + * 默认的state缓存实现 + * * @author yadong.zhang (yadong.zhang0415(a)gmail.com) - * @version 1.0 - * @since 1.8 + * @since 1.9.6 */ public enum AuthDefaultStateCache implements AuthStateCache { diff --git a/src/main/java/me/zhyd/oauth/cache/AuthStateCache.java b/src/main/java/me/zhyd/oauth/cache/AuthStateCache.java index 77a11e2..639202e 100644 --- a/src/main/java/me/zhyd/oauth/cache/AuthStateCache.java +++ b/src/main/java/me/zhyd/oauth/cache/AuthStateCache.java @@ -6,7 +6,7 @@ package me.zhyd.oauth.cache; *

* * @author yangkai.shen - * @date Created in 2019-08-02 10:55 + * @since 1.9.6 */ public interface AuthStateCache { /** diff --git a/src/main/java/me/zhyd/oauth/log/Log.java b/src/main/java/me/zhyd/oauth/log/Log.java index 2cd6c56..a6f54f9 100644 --- a/src/main/java/me/zhyd/oauth/log/Log.java +++ b/src/main/java/me/zhyd/oauth/log/Log.java @@ -11,15 +11,13 @@ import java.time.format.DateTimeFormatter; * 针对JustAuth提供的轻量级的日志打印工具 * * @author yadong.zhang (yadong.zhang0415(a)gmail.com) - * @version 1.0 - * @date 2019/8/1 17:14 * @see Log#debug(String) * @see Log#debug(String, Throwable) * @see Log#warn(String) * @see Log#warn(String, Throwable) * @see Log#error(String) * @see Log#error(String, Throwable) - * @since 1.8 + * @since 1.9.6 */ public class Log { @@ -111,9 +109,7 @@ public class Log { * 日志级别 * * @author yadong.zhang (yadong.zhang0415(a)gmail.com) - * @version 1.0 - * @date 2019/8/2 19:49 - * @since 1.8 + * @since 1.9.6 */ @Getter @AllArgsConstructor @@ -138,9 +134,7 @@ public class Log { * 日志配置 * * @author yadong.zhang (yadong.zhang0415(a)gmail.com) - * @version 1.0 - * @date 2019/8/1 17:14 - * @since 1.8 + * @since 1.9.6 */ static class Config { diff --git a/src/main/java/me/zhyd/oauth/request/AuthDefaultRequest.java b/src/main/java/me/zhyd/oauth/request/AuthDefaultRequest.java index 71fe680..fc26e64 100644 --- a/src/main/java/me/zhyd/oauth/request/AuthDefaultRequest.java +++ b/src/main/java/me/zhyd/oauth/request/AuthDefaultRequest.java @@ -2,7 +2,6 @@ package me.zhyd.oauth.request; import cn.hutool.http.HttpRequest; import cn.hutool.http.HttpResponse; -import lombok.extern.slf4j.Slf4j; import me.zhyd.oauth.cache.AuthDefaultStateCache; import me.zhyd.oauth.cache.AuthStateCache; import me.zhyd.oauth.config.AuthConfig; @@ -158,12 +157,12 @@ public abstract class AuthDefaultRequest implements AuthRequest { protected String refreshTokenUrl(String refreshToken) { return UrlBuilder.fromBaseUrl(source.refresh()) .queryParam("client_id", config.getClientId()) - .queryParam("client_secret", config.getClientSecret()) - .queryParam("refresh_token", refreshToken) + .queryParam("client_secret", config.getClientSecret()) + .queryParam("refresh_token", refreshToken) .queryParam("grant_type", "refresh_token") .queryParam("redirect_uri", config.getRedirectUri()) - .build(); -} + .build(); + } /** * 返回获取userInfo的url diff --git a/src/main/java/me/zhyd/oauth/request/AuthMiRequest.java b/src/main/java/me/zhyd/oauth/request/AuthMiRequest.java index 57b4960..f084ab9 100644 --- a/src/main/java/me/zhyd/oauth/request/AuthMiRequest.java +++ b/src/main/java/me/zhyd/oauth/request/AuthMiRequest.java @@ -11,7 +11,10 @@ import me.zhyd.oauth.enums.AuthResponseStatus; import me.zhyd.oauth.enums.AuthUserGender; import me.zhyd.oauth.exception.AuthException; import me.zhyd.oauth.log.Log; -import me.zhyd.oauth.model.*; +import me.zhyd.oauth.model.AuthCallback; +import me.zhyd.oauth.model.AuthResponse; +import me.zhyd.oauth.model.AuthToken; +import me.zhyd.oauth.model.AuthUser; import me.zhyd.oauth.utils.UrlBuilder; import java.text.MessageFormat; diff --git a/src/main/java/me/zhyd/oauth/utils/AuthChecker.java b/src/main/java/me/zhyd/oauth/utils/AuthChecker.java index 2b3b1de..770f960 100644 --- a/src/main/java/me/zhyd/oauth/utils/AuthChecker.java +++ b/src/main/java/me/zhyd/oauth/utils/AuthChecker.java @@ -1,6 +1,5 @@ package me.zhyd.oauth.utils; -import me.zhyd.oauth.cache.AuthStateCache; import me.zhyd.oauth.config.AuthConfig; import me.zhyd.oauth.config.AuthSource; import me.zhyd.oauth.enums.AuthResponseStatus; -- GitLab