Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@
<simple-http.version>1.0.5</simple-http.version>
<lombok-version>1.18.30</lombok-version>
<junit-version>4.13.2</junit-version>
<fastjson-version>1.2.83</fastjson-version>
<fastjson-version>2.0.52</fastjson-version>
<alipay-sdk-version>4.17.5.ALL</alipay-sdk-version>
<jacoco-version>0.8.2</jacoco-version>
<jwt.version>0.12.3</jwt.version>
Expand All @@ -86,8 +86,8 @@
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.alibaba</groupId>
<artifactId>fastjson</artifactId>
<groupId>com.alibaba.fastjson2</groupId>
<artifactId>fastjson2</artifactId>
<version>${fastjson-version}</version>
</dependency>
<dependency>
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/me/zhyd/oauth/model/AuthUser.java
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package me.zhyd.oauth.model;

import com.alibaba.fastjson.JSONObject;
import com.alibaba.fastjson2.JSONObject;
import lombok.*;
import me.zhyd.oauth.enums.AuthUserGender;
import java.io.Serializable;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package me.zhyd.oauth.request;

import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.alibaba.fastjson2.JSON;
import com.alibaba.fastjson2.JSONObject;
import me.zhyd.oauth.cache.AuthStateCache;
import me.zhyd.oauth.config.AuthConfig;
import me.zhyd.oauth.config.AuthSource;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package me.zhyd.oauth.request;

import com.alibaba.fastjson.JSONObject;
import com.alibaba.fastjson2.JSONObject;
import com.xkcoding.http.support.HttpHeader;
import com.xkcoding.http.util.MapUtil;
import me.zhyd.oauth.cache.AuthStateCache;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package me.zhyd.oauth.request;

import com.alibaba.fastjson.JSONObject;
import com.alibaba.fastjson2.JSONObject;
import me.zhyd.oauth.cache.AuthStateCache;
import me.zhyd.oauth.config.AuthConfig;
import me.zhyd.oauth.config.AuthSource;
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/me/zhyd/oauth/request/AuthAfDianRequest.java
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package me.zhyd.oauth.request;

import com.alibaba.fastjson.JSONObject;
import com.alibaba.fastjson2.JSONObject;
import me.zhyd.oauth.cache.AuthStateCache;
import me.zhyd.oauth.config.AuthConfig;
import me.zhyd.oauth.config.AuthDefaultSource;
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/me/zhyd/oauth/request/AuthAlipayRequest.java
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package me.zhyd.oauth.request;

import com.alibaba.fastjson.JSONObject;
import com.alibaba.fastjson2.JSONObject;
import com.alipay.api.AlipayApiException;
import com.alipay.api.AlipayClient;
import com.alipay.api.DefaultAlipayClient;
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/me/zhyd/oauth/request/AuthAliyunRequest.java
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package me.zhyd.oauth.request;

import com.alibaba.fastjson.JSONObject;
import com.alibaba.fastjson2.JSONObject;
import me.zhyd.oauth.cache.AuthStateCache;
import me.zhyd.oauth.config.AuthConfig;
import me.zhyd.oauth.config.AuthDefaultSource;
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/me/zhyd/oauth/request/AuthAmazonRequest.java
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package me.zhyd.oauth.request;

import com.alibaba.fastjson.JSONObject;
import com.alibaba.fastjson2.JSONObject;
import com.xkcoding.http.constants.Constants;
import com.xkcoding.http.support.HttpHeader;
import com.xkcoding.http.util.UrlUtil;
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/me/zhyd/oauth/request/AuthAppleRequest.java
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package me.zhyd.oauth.request;

import com.alibaba.fastjson.JSONObject;
import com.alibaba.fastjson2.JSONObject;
import io.jsonwebtoken.Jwts;
import io.jsonwebtoken.impl.security.AbstractJwk;
import lombok.Data;
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/me/zhyd/oauth/request/AuthBaiduRequest.java
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package me.zhyd.oauth.request;

import com.alibaba.fastjson.JSONObject;
import com.alibaba.fastjson2.JSONObject;
import me.zhyd.oauth.cache.AuthStateCache;
import me.zhyd.oauth.config.AuthConfig;
import me.zhyd.oauth.config.AuthDefaultSource;
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/me/zhyd/oauth/request/AuthCodingRequest.java
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package me.zhyd.oauth.request;

import com.alibaba.fastjson.JSONObject;
import com.alibaba.fastjson2.JSONObject;
import me.zhyd.oauth.cache.AuthStateCache;
import me.zhyd.oauth.config.AuthConfig;
import me.zhyd.oauth.config.AuthDefaultSource;
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/me/zhyd/oauth/request/AuthCsdnRequest.java
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package me.zhyd.oauth.request;

import com.alibaba.fastjson.JSONObject;
import com.alibaba.fastjson2.JSONObject;
import me.zhyd.oauth.cache.AuthStateCache;
import me.zhyd.oauth.config.AuthConfig;
import me.zhyd.oauth.config.AuthDefaultSource;
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/me/zhyd/oauth/request/AuthDouyinRequest.java
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package me.zhyd.oauth.request;

import com.alibaba.fastjson.JSONObject;
import com.alibaba.fastjson2.JSONObject;
import me.zhyd.oauth.cache.AuthStateCache;
import me.zhyd.oauth.config.AuthConfig;
import me.zhyd.oauth.config.AuthDefaultSource;
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/me/zhyd/oauth/request/AuthElemeRequest.java
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package me.zhyd.oauth.request;

import com.alibaba.fastjson.JSONObject;
import com.alibaba.fastjson2.JSONObject;
import me.zhyd.oauth.utils.HttpUtils;
import com.xkcoding.http.constants.Constants;
import com.xkcoding.http.support.HttpHeader;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package me.zhyd.oauth.request;

import com.alibaba.fastjson.JSONObject;
import com.alibaba.fastjson2.JSONObject;
import me.zhyd.oauth.cache.AuthStateCache;
import me.zhyd.oauth.config.AuthConfig;
import me.zhyd.oauth.config.AuthDefaultSource;
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/me/zhyd/oauth/request/AuthFeishuRequest.java
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package me.zhyd.oauth.request;

import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.alibaba.fastjson2.JSON;
import com.alibaba.fastjson2.JSONObject;
import com.xkcoding.http.support.HttpHeader;
import me.zhyd.oauth.cache.AuthStateCache;
import me.zhyd.oauth.config.AuthConfig;
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/me/zhyd/oauth/request/AuthFigmaRequest.java
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package me.zhyd.oauth.request;

import com.alibaba.fastjson.JSONObject;
import com.alibaba.fastjson2.JSONObject;
import com.xkcoding.http.support.HttpHeader;
import me.zhyd.oauth.cache.AuthStateCache;
import me.zhyd.oauth.config.AuthConfig;
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/me/zhyd/oauth/request/AuthGiteeRequest.java
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package me.zhyd.oauth.request;

import com.alibaba.fastjson.JSONObject;
import com.alibaba.fastjson2.JSONObject;
import me.zhyd.oauth.cache.AuthStateCache;
import me.zhyd.oauth.config.AuthConfig;
import me.zhyd.oauth.config.AuthDefaultSource;
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/me/zhyd/oauth/request/AuthGithubRequest.java
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package me.zhyd.oauth.request;

import com.alibaba.fastjson.JSONObject;
import com.alibaba.fastjson2.JSONObject;
import com.xkcoding.http.support.HttpHeader;
import me.zhyd.oauth.cache.AuthStateCache;
import me.zhyd.oauth.config.AuthConfig;
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/me/zhyd/oauth/request/AuthGitlabRequest.java
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package me.zhyd.oauth.request;

import com.alibaba.fastjson.JSONObject;
import com.alibaba.fastjson2.JSONObject;
import me.zhyd.oauth.cache.AuthStateCache;
import me.zhyd.oauth.config.AuthConfig;
import me.zhyd.oauth.config.AuthDefaultSource;
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/me/zhyd/oauth/request/AuthGoogleRequest.java
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package me.zhyd.oauth.request;

import com.alibaba.fastjson.JSONObject;
import com.alibaba.fastjson2.JSONObject;
import me.zhyd.oauth.utils.HttpUtils;
import com.xkcoding.http.support.HttpHeader;
import me.zhyd.oauth.cache.AuthStateCache;
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/me/zhyd/oauth/request/AuthHuaweiRequest.java
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package me.zhyd.oauth.request;

import com.alibaba.fastjson.JSONObject;
import com.alibaba.fastjson2.JSONObject;
import me.zhyd.oauth.cache.AuthStateCache;
import me.zhyd.oauth.config.AuthConfig;
import me.zhyd.oauth.config.AuthDefaultSource;
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/me/zhyd/oauth/request/AuthJdRequest.java
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package me.zhyd.oauth.request;

import com.alibaba.fastjson.JSONObject;
import com.alibaba.fastjson2.JSONObject;
import me.zhyd.oauth.cache.AuthStateCache;
import me.zhyd.oauth.config.AuthConfig;
import me.zhyd.oauth.config.AuthDefaultSource;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package me.zhyd.oauth.request;

import com.alibaba.fastjson.JSONObject;
import com.alibaba.fastjson2.JSONObject;
import me.zhyd.oauth.cache.AuthStateCache;
import me.zhyd.oauth.config.AuthConfig;
import me.zhyd.oauth.config.AuthDefaultSource;
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/me/zhyd/oauth/request/AuthLineRequest.java
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package me.zhyd.oauth.request;

import com.alibaba.fastjson.JSONObject;
import com.alibaba.fastjson2.JSONObject;
import com.xkcoding.http.support.HttpHeader;
import me.zhyd.oauth.cache.AuthStateCache;
import me.zhyd.oauth.config.AuthConfig;
Expand Down
6 changes: 3 additions & 3 deletions src/main/java/me/zhyd/oauth/request/AuthLinkedinRequest.java
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package me.zhyd.oauth.request;

import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.alibaba.fastjson.JSONPath;
import com.alibaba.fastjson2.JSONArray;
import com.alibaba.fastjson2.JSONObject;
import com.alibaba.fastjson2.JSONPath;
import com.xkcoding.http.constants.Constants;
import com.xkcoding.http.support.HttpHeader;
import me.zhyd.oauth.cache.AuthStateCache;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package me.zhyd.oauth.request;

import com.alibaba.fastjson.JSONObject;
import com.alibaba.fastjson2.JSONObject;
import me.zhyd.oauth.cache.AuthStateCache;
import me.zhyd.oauth.config.AuthConfig;
import me.zhyd.oauth.config.AuthDefaultSource;
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/me/zhyd/oauth/request/AuthMiRequest.java
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package me.zhyd.oauth.request;

import com.alibaba.fastjson.JSONObject;
import com.alibaba.fastjson2.JSONObject;
import com.xkcoding.http.constants.Constants;
import me.zhyd.oauth.cache.AuthStateCache;
import me.zhyd.oauth.config.AuthConfig;
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/me/zhyd/oauth/request/AuthOktaRequest.java
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package me.zhyd.oauth.request;

import com.alibaba.fastjson.JSONObject;
import com.alibaba.fastjson2.JSONObject;
import com.xkcoding.http.support.HttpHeader;
import me.zhyd.oauth.cache.AuthStateCache;
import me.zhyd.oauth.config.AuthConfig;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package me.zhyd.oauth.request;

import com.alibaba.fastjson.JSONObject;
import com.alibaba.fastjson2.JSONObject;
import me.zhyd.oauth.cache.AuthStateCache;
import me.zhyd.oauth.config.AuthConfig;
import me.zhyd.oauth.config.AuthDefaultSource;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package me.zhyd.oauth.request;

import com.alibaba.fastjson.JSONObject;
import com.alibaba.fastjson2.JSONObject;
import me.zhyd.oauth.cache.AuthStateCache;
import me.zhyd.oauth.config.AuthConfig;
import me.zhyd.oauth.enums.AuthUserGender;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package me.zhyd.oauth.request;

import com.alibaba.fastjson.JSONObject;
import com.alibaba.fastjson2.JSONObject;
import me.zhyd.oauth.cache.AuthStateCache;
import me.zhyd.oauth.config.AuthConfig;
import me.zhyd.oauth.config.AuthDefaultSource;
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/me/zhyd/oauth/request/AuthQqRequest.java
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package me.zhyd.oauth.request;

import com.alibaba.fastjson.JSONObject;
import com.alibaba.fastjson2.JSONObject;
import me.zhyd.oauth.cache.AuthStateCache;
import me.zhyd.oauth.config.AuthConfig;
import me.zhyd.oauth.config.AuthDefaultSource;
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/me/zhyd/oauth/request/AuthRenrenRequest.java
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package me.zhyd.oauth.request;

import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.alibaba.fastjson2.JSONArray;
import com.alibaba.fastjson2.JSONObject;
import com.xkcoding.http.util.UrlUtil;
import me.zhyd.oauth.cache.AuthStateCache;
import me.zhyd.oauth.config.AuthConfig;
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/me/zhyd/oauth/request/AuthSlackRequest.java
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package me.zhyd.oauth.request;

import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.alibaba.fastjson2.JSONArray;
import com.alibaba.fastjson2.JSONObject;
import com.xkcoding.http.support.HttpHeader;
import me.zhyd.oauth.cache.AuthStateCache;
import me.zhyd.oauth.config.AuthConfig;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package me.zhyd.oauth.request;

import com.alibaba.fastjson.JSONObject;
import com.alibaba.fastjson2.JSONObject;
import com.xkcoding.http.constants.Constants;
import com.xkcoding.http.support.HttpHeader;
import com.xkcoding.http.util.MapUtil;
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/me/zhyd/oauth/request/AuthTaobaoRequest.java
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package me.zhyd.oauth.request;

import com.alibaba.fastjson.JSONObject;
import com.alibaba.fastjson2.JSONObject;
import me.zhyd.oauth.cache.AuthStateCache;
import me.zhyd.oauth.config.AuthConfig;
import me.zhyd.oauth.config.AuthDefaultSource;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package me.zhyd.oauth.request;

import com.alibaba.fastjson.JSONObject;
import com.alibaba.fastjson2.JSONObject;
import me.zhyd.oauth.utils.HttpUtils;
import com.xkcoding.http.support.HttpHeader;
import me.zhyd.oauth.cache.AuthStateCache;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package me.zhyd.oauth.request;

import com.alibaba.fastjson.JSONObject;
import com.alibaba.fastjson2.JSONObject;
import me.zhyd.oauth.cache.AuthStateCache;
import me.zhyd.oauth.config.AuthConfig;
import me.zhyd.oauth.config.AuthDefaultSource;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package me.zhyd.oauth.request;

import com.alibaba.fastjson.JSONObject;
import com.alibaba.fastjson2.JSONObject;
import com.xkcoding.http.constants.Constants;
import com.xkcoding.http.support.HttpHeader;
import com.xkcoding.http.util.MapUtil;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package me.zhyd.oauth.request;

import com.alibaba.fastjson.JSONObject;
import com.alibaba.fastjson2.JSONObject;
import me.zhyd.oauth.cache.AuthStateCache;
import me.zhyd.oauth.config.AuthConfig;
import me.zhyd.oauth.config.AuthDefaultSource;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package me.zhyd.oauth.request;

import com.alibaba.fastjson.JSONObject;
import com.alibaba.fastjson2.JSONObject;
import me.zhyd.oauth.cache.AuthStateCache;
import me.zhyd.oauth.config.AuthConfig;
import me.zhyd.oauth.config.AuthDefaultSource;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package me.zhyd.oauth.request;

import com.alibaba.fastjson.JSONObject;
import com.alibaba.fastjson2.JSONObject;
import me.zhyd.oauth.utils.HttpUtils;
import me.zhyd.oauth.cache.AuthStateCache;
import me.zhyd.oauth.config.AuthConfig;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package me.zhyd.oauth.request;

import com.alibaba.fastjson.JSONObject;
import com.alibaba.fastjson.annotation.JSONField;
import com.alibaba.fastjson2.JSONObject;
import com.alibaba.fastjson2.annotation.JSONField;
import lombok.Data;
import me.zhyd.oauth.cache.AuthStateCache;
import me.zhyd.oauth.config.AuthConfig;
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/me/zhyd/oauth/request/AuthWeiboRequest.java
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package me.zhyd.oauth.request;

import com.alibaba.fastjson.JSONObject;
import com.alibaba.fastjson2.JSONObject;
import com.xkcoding.http.support.HttpHeader;
import me.zhyd.oauth.cache.AuthStateCache;
import me.zhyd.oauth.config.AuthConfig;
Expand Down
Loading