Merge pull request #32 from xkcoding/extract-cache

抽取缓存接口

pom.xml

@@ -6,7 +6,7 @@
 
   <groupId>me.zhyd.oauth</groupId>
   <artifactId>JustAuth</artifactId>
-  <version>1.9.5</version>
+  <version>1.9.6-SNAPSHOT</version>
 
   <name>JustAuth</name>
   <url>https://gitee.com/yadong.zhang/JustAuth</url>
@@ -230,5 +230,36 @@
         </repository>
       </distributionManagement>
     </profile>
+    <!--私服-->
+    <profile>
+      <id>nexus</id>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-gpg-plugin</artifactId>
+            <version>${maven-gpg-version}</version>
+            <executions>
+              <execution>
+                <phase>verify</phase>
+                <goals>
+                  <goal>sign</goal>
+                </goals>
+              </execution>
+            </executions>
+          </plugin>
+        </plugins>
+      </build>
+      <distributionManagement>
+        <repository>
+          <id>xkcoding-nexus</id>
+          <url>https://nexus.xkcoding.com/repository/maven-releases/</url>
+        </repository>
+        <snapshotRepository>
+          <id>xkcoding-nexus</id>
+          <url>https://nexus.xkcoding.com/repository/maven-snapshots/</url>
+        </snapshotRepository>
+      </distributionManagement>
+    </profile>
   </profiles>
 </project>

src/main/java/me/zhyd/oauth/cache/AuthCacheScheduler.java

@@ -13,6 +13,9 @@ import java.util.concurrent.atomic.AtomicInteger;
  */
 public enum AuthCacheScheduler {
 
+    /**
+     * 当前实例
+     */
     INSTANCE;
 
     private AtomicInteger cacheTaskNumber = new AtomicInteger(1);

src/main/java/me/zhyd/oauth/cache/AuthDefaultStateCache.java

+package me.zhyd.oauth.cache;
+
+/**
+ * @author yadong.zhang (yadong.zhang0415(a)gmail.com)
+ * @version 1.0
+ * @since 1.8
+ */
+public enum AuthDefaultStateCache implements AuthStateCache {
+
+    /**
+     * 当前实例
+     */
+    INSTANCE;
+
+    private AuthCache authCache;
+
+    AuthDefaultStateCache() {
+        authCache = new AuthDefaultCache();
+    }
+
+    /**
+     * 存入缓存
+     *
+     * @param key   缓存key
+     * @param value 缓存内容
+     */
+    @Override
+    public void cache(String key, String value) {
+        authCache.set(key, value);
+    }
+
+    /**
+     * 存入缓存
+     *
+     * @param key     缓存key
+     * @param value   缓存内容
+     * @param timeout 指定缓存过期时间（毫秒）
+     */
+    @Override
+    public void cache(String key, String value, long timeout) {
+        authCache.set(key, value, timeout);
+    }
+
+    /**
+     * 获取缓存内容
+     *
+     * @param key 缓存key
+     * @return 缓存内容
+     */
+    @Override
+    public String get(String key) {
+        return authCache.get(key);
+    }
+
+    /**
+     * 是否存在key，如果对应key的value值已过期，也返回false
+     *
+     * @param key 缓存key
+     * @return true：存在key，并且value没过期；false：key不存在或者已过期
+     */
+    @Override
+    public boolean containsKey(String key) {
+        return authCache.containsKey(key);
+    }
+}

src/main/java/me/zhyd/oauth/cache/AuthStateCache.java

 package me.zhyd.oauth.cache;
 
 /**
- * @author yadong.zhang (yadong.zhang0415(a)gmail.com)
- * @version 1.0
- * @since 1.8
+ * <p>
+ * State缓存接口，方便用户扩展
+ * </p>
+ *
+ * @author yangkai.shen
+ * @date Created in 2019-08-02 10:55
  */
-public class AuthStateCache {
-    private static AuthCache authCache = new AuthDefaultCache();
-
+public interface AuthStateCache {
     /**
      * 存入缓存
      *
      * @param key   缓存key
      * @param value 缓存内容
      */
-    public static void cache(String key, String value) {
-        authCache.set(key, value);
-    }
+    void cache(String key, String value);
 
     /**
      * 存入缓存
@@ -25,9 +24,7 @@ public class AuthStateCache {
      * @param value   缓存内容
      * @param timeout 指定缓存过期时间（毫秒）
      */
-    public static void cache(String key, String value, long timeout) {
-        authCache.set(key, value, timeout);
-    }
+    void cache(String key, String value, long timeout);
 
     /**
      * 获取缓存内容
@@ -35,9 +32,7 @@ public class AuthStateCache {
      * @param key 缓存key
      * @return 缓存内容
      */
-    public static String get(String key) {
-        return authCache.get(key);
-    }
+    String get(String key);
 
     /**
      * 是否存在key，如果对应key的value值已过期，也返回false
@@ -45,7 +40,5 @@ public class AuthStateCache {
      * @param key 缓存key
      * @return true：存在key，并且value没过期；false：key不存在或者已过期
      */
-    public static boolean containsKey(String key) {
-        return authCache.containsKey(key);
-    }
+    boolean containsKey(String key);
 }

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

@@ -7,6 +7,7 @@ import com.alipay.api.request.AlipaySystemOauthTokenRequest;
 import com.alipay.api.request.AlipayUserInfoShareRequest;
 import com.alipay.api.response.AlipaySystemOauthTokenResponse;
 import com.alipay.api.response.AlipayUserInfoShareResponse;
+import me.zhyd.oauth.cache.AuthStateCache;
 import me.zhyd.oauth.config.AuthConfig;
 import me.zhyd.oauth.config.AuthSource;
 import me.zhyd.oauth.enums.AuthUserGender;
@@ -33,6 +34,12 @@ public class AuthAlipayRequest extends AuthDefaultRequest {
             .getAlipayPublicKey(), "RSA2");
     }
 
+    public AuthAlipayRequest(AuthConfig config, AuthStateCache authStateCache) {
+        super(config, AuthSource.ALIPAY, authStateCache);
+        this.alipayClient = new DefaultAlipayClient(AuthSource.ALIPAY.accessToken(), config.getClientId(), config.getClientSecret(), "json", "UTF-8", config
+            .getAlipayPublicKey(), "RSA2");
+    }
+
     @Override
     protected AuthToken getAccessToken(AuthCallback authCallback) {
         AlipaySystemOauthTokenRequest request = new AlipaySystemOauthTokenRequest();

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

@@ -3,12 +3,16 @@ package me.zhyd.oauth.request;
 import cn.hutool.http.HttpRequest;
 import cn.hutool.http.HttpResponse;
 import com.alibaba.fastjson.JSONObject;
+import me.zhyd.oauth.cache.AuthStateCache;
 import me.zhyd.oauth.config.AuthConfig;
 import me.zhyd.oauth.config.AuthSource;
 import me.zhyd.oauth.enums.AuthResponseStatus;
 import me.zhyd.oauth.enums.AuthUserGender;
 import me.zhyd.oauth.exception.AuthException;
-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.StringUtils;
 import me.zhyd.oauth.utils.UrlBuilder;
 
@@ -24,6 +28,10 @@ public class AuthBaiduRequest extends AuthDefaultRequest {
         super(config, AuthSource.BAIDU);
     }
 
+    public AuthBaiduRequest(AuthConfig config, AuthStateCache authStateCache) {
+        super(config, AuthSource.BAIDU, authStateCache);
+    }
+
     @Override
     protected AuthToken getAccessToken(AuthCallback authCallback) {
         HttpResponse response = doPostAuthorizationCode(authCallback.getCode());

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

@@ -2,6 +2,7 @@ package me.zhyd.oauth.request;
 
 import cn.hutool.http.HttpResponse;
 import com.alibaba.fastjson.JSONObject;
+import me.zhyd.oauth.cache.AuthStateCache;
 import me.zhyd.oauth.config.AuthConfig;
 import me.zhyd.oauth.config.AuthSource;
 import me.zhyd.oauth.enums.AuthUserGender;
@@ -23,6 +24,10 @@ public class AuthCodingRequest extends AuthDefaultRequest {
         super(config, AuthSource.CODING);
     }
 
+    public AuthCodingRequest(AuthConfig config, AuthStateCache authStateCache) {
+        super(config, AuthSource.CODING, authStateCache);
+    }
+
     @Override
     protected AuthToken getAccessToken(AuthCallback authCallback) {
         HttpResponse response = doGetAuthorizationCode(authCallback.getCode());

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

@@ -2,6 +2,7 @@ package me.zhyd.oauth.request;
 
 import cn.hutool.http.HttpResponse;
 import com.alibaba.fastjson.JSONObject;
+import me.zhyd.oauth.cache.AuthStateCache;
 import me.zhyd.oauth.config.AuthConfig;
 import me.zhyd.oauth.config.AuthSource;
 import me.zhyd.oauth.enums.AuthUserGender;
@@ -23,6 +24,10 @@ public class AuthCsdnRequest extends AuthDefaultRequest {
         super(config, AuthSource.CSDN);
     }
 
+    public AuthCsdnRequest(AuthConfig config, AuthStateCache authStateCache) {
+        super(config, AuthSource.CSDN, authStateCache);
+    }
+
     @Override
     protected AuthToken getAccessToken(AuthCallback authCallback) {
         HttpResponse response = doPostAuthorizationCode(authCallback.getCode());

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

@@ -3,6 +3,7 @@ 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;
 import me.zhyd.oauth.config.AuthSource;
@@ -28,10 +29,16 @@ import me.zhyd.oauth.utils.UuidUtils;
 public abstract class AuthDefaultRequest implements AuthRequest {
     protected AuthConfig config;
     protected AuthSource source;
+    protected AuthStateCache authStateCache;
 
     public AuthDefaultRequest(AuthConfig config, AuthSource source) {
+        this(config, source, AuthDefaultStateCache.INSTANCE);
+    }
+
+    public AuthDefaultRequest(AuthConfig config, AuthSource source, AuthStateCache authStateCache) {
         this.config = config;
         this.source = source;
+        this.authStateCache = authStateCache;
         if (!AuthChecker.isSupportedAuth(config, source)) {
             throw new AuthException(AuthResponseStatus.PARAMETER_INCOMPLETE);
         }
@@ -69,7 +76,7 @@ public abstract class AuthDefaultRequest implements AuthRequest {
     public AuthResponse login(AuthCallback authCallback) {
         try {
             AuthChecker.checkCode(source == AuthSource.ALIPAY ? authCallback.getAuth_code() : authCallback.getCode());
-            AuthChecker.checkState(authCallback.getState());
+            this.checkState(authCallback.getState());
 
             AuthToken authToken = this.getAccessToken(authCallback);
             AuthUser user = this.getUserInfo(authToken);
@@ -151,12 +158,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
@@ -189,7 +196,7 @@ public abstract class AuthDefaultRequest implements AuthRequest {
             state = UuidUtils.getUUID();
         }
         // 缓存state
-        AuthStateCache.cache(state, state);
+        authStateCache.cache(state, state);
         return state;
     }
 
@@ -254,4 +261,16 @@ public abstract class AuthDefaultRequest implements AuthRequest {
     protected HttpResponse doGetRevoke(AuthToken authToken) {
         return HttpRequest.get(revokeUrl(authToken)).execute();
     }
+
+
+    /**
+     * 校验回调传回的state
+     *
+     * @param state {@code state}一定不为空
+     */
+    protected void checkState(String state) {
+        if (StringUtils.isEmpty(state) || !authStateCache.containsKey(state)) {
+            throw new AuthException(AuthResponseStatus.ILLEGAL_REQUEST);
+        }
+    }
 }

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

@@ -4,6 +4,7 @@ import cn.hutool.http.HttpRequest;
 import cn.hutool.http.HttpResponse;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
+import me.zhyd.oauth.cache.AuthStateCache;
 import me.zhyd.oauth.config.AuthConfig;
 import me.zhyd.oauth.config.AuthSource;
 import me.zhyd.oauth.enums.AuthUserGender;
@@ -26,6 +27,10 @@ public class AuthDingTalkRequest extends AuthDefaultRequest {
         super(config, AuthSource.DINGTALK);
     }
 
+    public AuthDingTalkRequest(AuthConfig config, AuthStateCache authStateCache) {
+        super(config, AuthSource.DINGTALK, authStateCache);
+    }
+
     @Override
     protected AuthToken getAccessToken(AuthCallback authCallback) {
         return AuthToken.builder().accessCode(authCallback.getCode()).build();

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

@@ -3,12 +3,16 @@ package me.zhyd.oauth.request;
 import cn.hutool.http.HttpRequest;
 import cn.hutool.http.HttpResponse;
 import com.alibaba.fastjson.JSONObject;
+import me.zhyd.oauth.cache.AuthStateCache;
 import me.zhyd.oauth.config.AuthConfig;
 import me.zhyd.oauth.config.AuthSource;
 import me.zhyd.oauth.enums.AuthResponseStatus;
 import me.zhyd.oauth.enums.AuthUserGender;
 import me.zhyd.oauth.exception.AuthException;
-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;
 
 
@@ -24,6 +28,10 @@ public class AuthDouyinRequest extends AuthDefaultRequest {
         super(config, AuthSource.DOUYIN);
     }
 
+    public AuthDouyinRequest(AuthConfig config, AuthStateCache authStateCache) {
+        super(config, AuthSource.DOUYIN, authStateCache);
+    }
+
     @Override
     protected AuthToken getAccessToken(AuthCallback authCallback) {
         return this.getToken(accessTokenUrl(authCallback.getCode()));

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

@@ -2,6 +2,7 @@ package me.zhyd.oauth.request;
 
 import cn.hutool.http.HttpResponse;
 import com.alibaba.fastjson.JSONObject;
+import me.zhyd.oauth.cache.AuthStateCache;
 import me.zhyd.oauth.config.AuthConfig;
 import me.zhyd.oauth.config.AuthSource;
 import me.zhyd.oauth.enums.AuthUserGender;
@@ -23,6 +24,10 @@ public class AuthFacebookRequest extends AuthDefaultRequest {
         super(config, AuthSource.FACEBOOK);
     }
 
+    public AuthFacebookRequest(AuthConfig config, AuthStateCache authStateCache) {
+        super(config, AuthSource.FACEBOOK, authStateCache);
+    }
+
     @Override
     protected AuthToken getAccessToken(AuthCallback authCallback) {
         HttpResponse response = doPostAuthorizationCode(authCallback.getCode());

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

@@ -2,6 +2,7 @@ package me.zhyd.oauth.request;
 
 import cn.hutool.http.HttpResponse;
 import com.alibaba.fastjson.JSONObject;
+import me.zhyd.oauth.cache.AuthStateCache;
 import me.zhyd.oauth.config.AuthConfig;
 import me.zhyd.oauth.config.AuthSource;
 import me.zhyd.oauth.enums.AuthUserGender;
@@ -22,6 +23,10 @@ public class AuthGiteeRequest extends AuthDefaultRequest {
         super(config, AuthSource.GITEE);
     }
 
+    public AuthGiteeRequest(AuthConfig config, AuthStateCache authStateCache) {
+        super(config, AuthSource.GITEE, authStateCache);
+    }
+
     @Override
     protected AuthToken getAccessToken(AuthCallback authCallback) {
         HttpResponse response = doPostAuthorizationCode(authCallback.getCode());

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

@@ -2,6 +2,7 @@ package me.zhyd.oauth.request;
 
 import cn.hutool.http.HttpResponse;
 import com.alibaba.fastjson.JSONObject;
+import me.zhyd.oauth.cache.AuthStateCache;
 import me.zhyd.oauth.config.AuthConfig;
 import me.zhyd.oauth.config.AuthSource;
 import me.zhyd.oauth.enums.AuthUserGender;
@@ -25,6 +26,10 @@ public class AuthGithubRequest extends AuthDefaultRequest {
         super(config, AuthSource.GITHUB);
     }
 
+    public AuthGithubRequest(AuthConfig config, AuthStateCache authStateCache) {
+        super(config, AuthSource.GITHUB, authStateCache);
+    }
+
     @Override
     protected AuthToken getAccessToken(AuthCallback authCallback) {
         HttpResponse response = doPostAuthorizationCode(authCallback.getCode());

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

@@ -3,6 +3,7 @@ package me.zhyd.oauth.request;
 import cn.hutool.http.HttpRequest;
 import cn.hutool.http.HttpResponse;
 import com.alibaba.fastjson.JSONObject;
+import me.zhyd.oauth.cache.AuthStateCache;
 import me.zhyd.oauth.config.AuthConfig;
 import me.zhyd.oauth.config.AuthSource;
 import me.zhyd.oauth.enums.AuthUserGender;
@@ -24,6 +25,10 @@ public class AuthGoogleRequest extends AuthDefaultRequest {
         super(config, AuthSource.GOOGLE);
     }
 
+    public AuthGoogleRequest(AuthConfig config, AuthStateCache authStateCache) {
+        super(config, AuthSource.GOOGLE, authStateCache);
+    }
+
     @Override
     protected AuthToken getAccessToken(AuthCallback authCallback) {
         HttpResponse response = doPostAuthorizationCode(authCallback.getCode());

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

@@ -5,12 +5,16 @@ import cn.hutool.http.HttpResponse;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.alibaba.fastjson.JSONPath;
+import me.zhyd.oauth.cache.AuthStateCache;
 import me.zhyd.oauth.config.AuthConfig;
 import me.zhyd.oauth.config.AuthSource;
 import me.zhyd.oauth.enums.AuthResponseStatus;
 import me.zhyd.oauth.enums.AuthUserGender;
 import me.zhyd.oauth.exception.AuthException;
-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.StringUtils;
 import me.zhyd.oauth.utils.UrlBuilder;
 
@@ -27,6 +31,10 @@ public class AuthLinkedinRequest extends AuthDefaultRequest {
         super(config, AuthSource.LINKEDIN);
     }
 
+    public AuthLinkedinRequest(AuthConfig config, AuthStateCache authStateCache) {
+        super(config, AuthSource.LINKEDIN, authStateCache);
+    }
+
     @Override
     protected AuthToken getAccessToken(AuthCallback authCallback) {
         return this.getToken(accessTokenUrl(authCallback.getCode()));

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

@@ -4,6 +4,7 @@ import cn.hutool.core.util.StrUtil;
 import cn.hutool.http.HttpRequest;
 import cn.hutool.http.HttpResponse;
 import com.alibaba.fastjson.JSONObject;
+import me.zhyd.oauth.cache.AuthStateCache;
 import me.zhyd.oauth.config.AuthConfig;
 import me.zhyd.oauth.config.AuthSource;
 import me.zhyd.oauth.enums.AuthResponseStatus;
@@ -28,6 +29,10 @@ public class AuthMiRequest extends AuthDefaultRequest {
         super(config, AuthSource.MI);
     }
 
+    public AuthMiRequest(AuthConfig config, AuthStateCache authStateCache) {
+        super(config, AuthSource.MI, authStateCache);
+    }
+
     @Override
     protected AuthToken getAccessToken(AuthCallback authCallback) {
         return getToken(accessTokenUrl(authCallback.getCode()));

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

@@ -3,12 +3,16 @@ package me.zhyd.oauth.request;
 import cn.hutool.http.HttpRequest;
 import cn.hutool.http.HttpResponse;
 import com.alibaba.fastjson.JSONObject;
+import me.zhyd.oauth.cache.AuthStateCache;
 import me.zhyd.oauth.config.AuthConfig;
 import me.zhyd.oauth.config.AuthSource;
 import me.zhyd.oauth.enums.AuthResponseStatus;
 import me.zhyd.oauth.enums.AuthUserGender;
 import me.zhyd.oauth.exception.AuthException;
-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 static me.zhyd.oauth.utils.GlobalAuthUtil.parseQueryToMap;
@@ -24,6 +28,10 @@ public class AuthMicrosoftRequest extends AuthDefaultRequest {
         super(config, AuthSource.MICROSOFT);
     }
 
+    public AuthMicrosoftRequest(AuthConfig config, AuthStateCache authStateCache) {
+        super(config, AuthSource.MICROSOFT, authStateCache);
+    }
+
     @Override
     protected AuthToken getAccessToken(AuthCallback authCallback) {
         return getToken(accessTokenUrl(authCallback.getCode()));

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

@@ -2,6 +2,7 @@ package me.zhyd.oauth.request;
 
 import cn.hutool.http.HttpResponse;
 import com.alibaba.fastjson.JSONObject;
+import me.zhyd.oauth.cache.AuthStateCache;
 import me.zhyd.oauth.config.AuthConfig;
 import me.zhyd.oauth.config.AuthSource;
 import me.zhyd.oauth.enums.AuthUserGender;
@@ -23,6 +24,10 @@ public class AuthOschinaRequest extends AuthDefaultRequest {
         super(config, AuthSource.OSCHINA);
     }
 
+    public AuthOschinaRequest(AuthConfig config, AuthStateCache authStateCache) {
+        super(config, AuthSource.OSCHINA, authStateCache);
+    }
+
     @Override
     protected AuthToken getAccessToken(AuthCallback authCallback) {
         HttpResponse response = doPostAuthorizationCode(authCallback.getCode());

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

@@ -3,6 +3,7 @@ package me.zhyd.oauth.request;
 import cn.hutool.http.HttpRequest;
 import cn.hutool.http.HttpResponse;
 import com.alibaba.fastjson.JSONObject;
+import me.zhyd.oauth.cache.AuthStateCache;
 import me.zhyd.oauth.config.AuthConfig;
 import me.zhyd.oauth.enums.AuthUserGender;
 import me.zhyd.oauth.exception.AuthException;
@@ -29,6 +30,10 @@ public class AuthPinterestRequest extends AuthDefaultRequest {
         super(config, PINTEREST);
     }
 
+    public AuthPinterestRequest(AuthConfig config, AuthStateCache authStateCache) {
+        super(config, PINTEREST, authStateCache);
+    }
+
     @Override
     protected AuthToken getAccessToken(AuthCallback authCallback) {
         HttpResponse response = doPostAuthorizationCode(authCallback.getCode());

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

@@ -4,12 +4,16 @@ import cn.hutool.core.util.StrUtil;
 import cn.hutool.http.HttpRequest;
 import cn.hutool.http.HttpResponse;
 import com.alibaba.fastjson.JSONObject;
+import me.zhyd.oauth.cache.AuthStateCache;
 import me.zhyd.oauth.config.AuthConfig;
 import me.zhyd.oauth.config.AuthSource;
 import me.zhyd.oauth.enums.AuthResponseStatus;
 import me.zhyd.oauth.enums.AuthUserGender;
 import me.zhyd.oauth.exception.AuthException;
-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.GlobalAuthUtil;
 import me.zhyd.oauth.utils.StringUtils;
 import me.zhyd.oauth.utils.UrlBuilder;
@@ -28,6 +32,10 @@ public class AuthQqRequest extends AuthDefaultRequest {
         super(config, AuthSource.QQ);
     }
 
+    public AuthQqRequest(AuthConfig config, AuthStateCache authStateCache) {
+        super(config, AuthSource.QQ, authStateCache);
+    }
+
     @Override
     protected AuthToken getAccessToken(AuthCallback authCallback) {
         HttpResponse response = doGetAuthorizationCode(authCallback.getCode());
@@ -37,10 +45,7 @@ public class AuthQqRequest extends AuthDefaultRequest {
     @Override
     public AuthResponse refresh(AuthToken authToken) {
         HttpResponse response = HttpRequest.get(refreshTokenUrl(authToken.getRefreshToken())).execute();
-        return AuthResponse.builder()
-            .code(AuthResponseStatus.SUCCESS.getCode())
-            .data(getAuthToken(response))
-            .build();
+        return AuthResponse.builder().code(AuthResponseStatus.SUCCESS.getCode()).data(getAuthToken(response)).build();
     }
 
     @Override

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

@@ -4,10 +4,14 @@ import cn.hutool.http.HttpRequest;
 import cn.hutool.http.HttpResponse;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
+import me.zhyd.oauth.cache.AuthStateCache;
 import me.zhyd.oauth.config.AuthConfig;
 import me.zhyd.oauth.enums.AuthUserGender;
 import me.zhyd.oauth.exception.AuthException;
-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.util.Objects;
@@ -27,6 +31,10 @@ public class AuthRenrenRequest extends AuthDefaultRequest {
         super(config, RENREN);
     }
 
+    public AuthRenrenRequest(AuthConfig config, AuthStateCache authStateCache) {
+        super(config, RENREN, authStateCache);
+    }
+
     @Override
     protected AuthToken getAccessToken(AuthCallback authCallback) {
         return this.getToken(accessTokenUrl(authCallback.getCode()));

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

@@ -3,6 +3,7 @@ package me.zhyd.oauth.request;
 import cn.hutool.http.HttpRequest;
 import cn.hutool.http.HttpResponse;
 import com.alibaba.fastjson.JSONObject;
+import me.zhyd.oauth.cache.AuthStateCache;
 import me.zhyd.oauth.config.AuthConfig;
 import me.zhyd.oauth.enums.AuthUserGender;
 import me.zhyd.oauth.exception.AuthException;
@@ -26,6 +27,10 @@ public class AuthStackOverflowRequest extends AuthDefaultRequest {
         super(config, STACK_OVERFLOW);
     }
 
+    public AuthStackOverflowRequest(AuthConfig config, AuthStateCache authStateCache) {
+        super(config, STACK_OVERFLOW, authStateCache);
+    }
+
     @Override
     protected AuthToken getAccessToken(AuthCallback authCallback) {
         String accessTokenUrl = accessTokenUrl(authCallback.getCode());

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

@@ -2,6 +2,7 @@ package me.zhyd.oauth.request;
 
 import cn.hutool.http.HttpResponse;
 import com.alibaba.fastjson.JSONObject;
+import me.zhyd.oauth.cache.AuthStateCache;
 import me.zhyd.oauth.config.AuthConfig;
 import me.zhyd.oauth.config.AuthSource;
 import me.zhyd.oauth.enums.AuthUserGender;
@@ -24,6 +25,10 @@ public class AuthTaobaoRequest extends AuthDefaultRequest {
         super(config, AuthSource.TAOBAO);
     }
 
+    public AuthTaobaoRequest(AuthConfig config, AuthStateCache authStateCache) {
+        super(config, AuthSource.TAOBAO, authStateCache);
+    }
+
     @Override
     protected AuthToken getAccessToken(AuthCallback authCallback) {
         return AuthToken.builder().accessCode(authCallback.getCode()).build();

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

@@ -3,12 +3,16 @@ package me.zhyd.oauth.request;
 import cn.hutool.http.HttpRequest;
 import cn.hutool.http.HttpResponse;
 import com.alibaba.fastjson.JSONObject;
+import me.zhyd.oauth.cache.AuthStateCache;
 import me.zhyd.oauth.config.AuthConfig;
 import me.zhyd.oauth.config.AuthSource;
 import me.zhyd.oauth.enums.AuthResponseStatus;
 import me.zhyd.oauth.enums.AuthUserGender;
 import me.zhyd.oauth.exception.AuthException;
-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;
 
 /**
  * Teambition授权登录
@@ -22,6 +26,10 @@ public class AuthTeambitionRequest extends AuthDefaultRequest {
         super(config, AuthSource.TEAMBITION);
     }
 
+    public AuthTeambitionRequest(AuthConfig config, AuthStateCache authStateCache) {
+        super(config, AuthSource.TEAMBITION, authStateCache);
+    }
+
     /**
      * @param authCallback 回调返回的参数
      * @return 所有信息

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

@@ -2,6 +2,7 @@ package me.zhyd.oauth.request;
 
 import cn.hutool.http.HttpResponse;
 import com.alibaba.fastjson.JSONObject;
+import me.zhyd.oauth.cache.AuthStateCache;
 import me.zhyd.oauth.config.AuthConfig;
 import me.zhyd.oauth.config.AuthSource;
 import me.zhyd.oauth.enums.AuthUserGender;
@@ -23,6 +24,10 @@ public class AuthTencentCloudRequest extends AuthDefaultRequest {
         super(config, AuthSource.TENCENT_CLOUD);
     }
 
+    public AuthTencentCloudRequest(AuthConfig config, AuthStateCache authStateCache) {
+        super(config, AuthSource.TENCENT_CLOUD, authStateCache);
+    }
+
     @Override
     protected AuthToken getAccessToken(AuthCallback authCallback) {
         HttpResponse response = doGetAuthorizationCode(authCallback.getCode());

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

@@ -2,6 +2,7 @@ package me.zhyd.oauth.request;
 
 import cn.hutool.http.HttpResponse;
 import com.alibaba.fastjson.JSONObject;
+import me.zhyd.oauth.cache.AuthStateCache;
 import me.zhyd.oauth.config.AuthConfig;
 import me.zhyd.oauth.config.AuthSource;
 import me.zhyd.oauth.enums.AuthToutiaoErrorCode;
@@ -24,6 +25,10 @@ public class AuthToutiaoRequest extends AuthDefaultRequest {
         super(config, AuthSource.TOUTIAO);
     }
 
+    public AuthToutiaoRequest(AuthConfig config, AuthStateCache authStateCache) {
+        super(config, AuthSource.TOUTIAO, authStateCache);
+    }
+
     @Override
     protected AuthToken getAccessToken(AuthCallback authCallback) {
         HttpResponse response = doGetAuthorizationCode(authCallback.getCode());
@@ -119,8 +124,7 @@ public class AuthToutiaoRequest extends AuthDefaultRequest {
      */
     private void checkResponse(JSONObject object) {
         if (object.containsKey("error_code")) {
-            throw new AuthException(AuthToutiaoErrorCode.getErrorCode(object.getIntValue("error_code"))
-                .getDesc());
+            throw new AuthException(AuthToutiaoErrorCode.getErrorCode(object.getIntValue("error_code")).getDesc());
         }
     }
 }

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

@@ -3,12 +3,16 @@ package me.zhyd.oauth.request;
 import cn.hutool.http.HttpRequest;
 import cn.hutool.http.HttpResponse;
 import com.alibaba.fastjson.JSONObject;
+import me.zhyd.oauth.cache.AuthStateCache;
 import me.zhyd.oauth.config.AuthConfig;
 import me.zhyd.oauth.config.AuthSource;
 import me.zhyd.oauth.enums.AuthResponseStatus;
 import me.zhyd.oauth.enums.AuthUserGender;
 import me.zhyd.oauth.exception.AuthException;
-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;
 
 /**
@@ -22,6 +26,10 @@ public class AuthWeChatRequest extends AuthDefaultRequest {
         super(config, AuthSource.WECHAT);
     }
 
+    public AuthWeChatRequest(AuthConfig config, AuthStateCache authStateCache) {
+        super(config, AuthSource.WECHAT, authStateCache);
+    }
+
     /**
      * 微信的特殊性，此时返回的信息同时包含 openid 和 access_token
      *

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

@@ -3,6 +3,7 @@ package me.zhyd.oauth.request;
 import cn.hutool.http.HttpRequest;
 import cn.hutool.http.HttpResponse;
 import com.alibaba.fastjson.JSONObject;
+import me.zhyd.oauth.cache.AuthStateCache;
 import me.zhyd.oauth.config.AuthConfig;
 import me.zhyd.oauth.config.AuthSource;
 import me.zhyd.oauth.enums.AuthUserGender;
@@ -27,6 +28,10 @@ public class AuthWeiboRequest extends AuthDefaultRequest {
         super(config, AuthSource.WEIBO);
     }
 
+    public AuthWeiboRequest(AuthConfig config, AuthStateCache authStateCache) {
+        super(config, AuthSource.WEIBO, authStateCache);
+    }
+
     @Override
     protected AuthToken getAccessToken(AuthCallback authCallback) {
         HttpResponse response = doPostAuthorizationCode(authCallback.getCode());

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

@@ -66,15 +66,4 @@ public class AuthChecker {
             throw new AuthException(AuthResponseStatus.ILLEGAL_CODE);
         }
     }
-
-    /**
-     * 校验回调传回的state
-     *
-     * @param state {@code state}一定不为空
-     */
-    public static void checkState(String state) {
-        if (StringUtils.isEmpty(state) || !AuthStateCache.containsKey(state)) {
-            throw new AuthException(AuthResponseStatus.ILLEGAL_REQUEST);
-        }
-    }
 }

src/test/java/me/zhyd/oauth/cache/AuthStateCacheTest.java

@@ -9,24 +9,24 @@ public class AuthStateCacheTest {
 
     @Test
     public void cache1() throws InterruptedException {
-        AuthStateCache.cache("key", "value");
-        Assert.assertEquals(AuthStateCache.get("key"), "value");
+        AuthDefaultStateCache.INSTANCE.cache("key", "value");
+        Assert.assertEquals(AuthDefaultStateCache.INSTANCE.get("key"), "value");
 
         TimeUnit.MILLISECONDS.sleep(4);
-        Assert.assertEquals(AuthStateCache.get("key"), "value");
+        Assert.assertEquals(AuthDefaultStateCache.INSTANCE.get("key"), "value");
     }
 
     @Test
     public void cache2() throws InterruptedException {
-        AuthStateCache.cache("key", "value", 10);
-        Assert.assertEquals(AuthStateCache.get("key"), "value");
+        AuthDefaultStateCache.INSTANCE.cache("key", "value", 10);
+        Assert.assertEquals(AuthDefaultStateCache.INSTANCE.get("key"), "value");
 
         // 没过期
         TimeUnit.MILLISECONDS.sleep(5);
-        Assert.assertEquals(AuthStateCache.get("key"), "value");
+        Assert.assertEquals(AuthDefaultStateCache.INSTANCE.get("key"), "value");
 
         // 过期
         TimeUnit.MILLISECONDS.sleep(6);
-        Assert.assertNull(AuthStateCache.get("key"));
+        Assert.assertNull(AuthDefaultStateCache.INSTANCE.get("key"));
     }
 }