diff --git a/src/main/java/me/zhyd/oauth/request/AuthAlipayRequest.java b/src/main/java/me/zhyd/oauth/request/AuthAlipayRequest.java index 77f5ce0e38bf02b21ae839a4c26c9beac8e2e6f9..e43d76f4443b145f48e7382d8f8a892c6482ff4e 100644 --- a/src/main/java/me/zhyd/oauth/request/AuthAlipayRequest.java +++ b/src/main/java/me/zhyd/oauth/request/AuthAlipayRequest.java @@ -15,7 +15,6 @@ import me.zhyd.oauth.model.AuthToken; import me.zhyd.oauth.model.AuthUser; import me.zhyd.oauth.model.AuthUserGender; import me.zhyd.oauth.url.AlipayUrlBuilder; -import me.zhyd.oauth.url.entity.AuthAuthorizeEntity; import me.zhyd.oauth.utils.StringUtils; /** @@ -86,16 +85,4 @@ public class AuthAlipayRequest extends BaseAuthRequest { .source(AuthSource.ALIPAY) .build(); } - - /** - * 返回认证url，可自行跳转页面 - * - * @return 返回授权地址 - */ - @Override - public String authorize() { - return this.urlBuilder.getAuthorizeUrl(AuthAuthorizeEntity.builder() - .config(config) - .build()); - } } diff --git a/src/main/java/me/zhyd/oauth/request/AuthBaiduRequest.java b/src/main/java/me/zhyd/oauth/request/AuthBaiduRequest.java index 144f769fb056750a9c444423ee69af4bcba41235..cb96f4b4d5dce7aff80754839e50ac5f07489ed4 100644 --- a/src/main/java/me/zhyd/oauth/request/AuthBaiduRequest.java +++ b/src/main/java/me/zhyd/oauth/request/AuthBaiduRequest.java @@ -10,7 +10,6 @@ import me.zhyd.oauth.exception.AuthException; import me.zhyd.oauth.model.*; import me.zhyd.oauth.url.BaiduUrlBuilder; import me.zhyd.oauth.url.entity.AuthAccessTokenEntity; -import me.zhyd.oauth.url.entity.AuthAuthorizeEntity; import me.zhyd.oauth.url.entity.AuthRevokeEntity; import me.zhyd.oauth.url.entity.AuthUserInfoEntity; @@ -69,18 +68,6 @@ public class AuthBaiduRequest extends BaseAuthRequest { .build(); } - /** - * 返回认证url，可自行跳转页面 - * - * @return 返回授权地址 - */ - @Override - public String authorize() { - return this.urlBuilder.getAuthorizeUrl(AuthAuthorizeEntity.builder() - .config(config) - .build()); - } - @Override public AuthResponse revoke(AuthToken authToken) { String accessToken = authToken.getAccessToken(); diff --git a/src/main/java/me/zhyd/oauth/request/AuthCodingRequest.java b/src/main/java/me/zhyd/oauth/request/AuthCodingRequest.java index e262d32cf560cab7fdba1b368b23555d3c7cc97e..ade26cdf9e73e2a208e413f956d52063c2c442e2 100644 --- a/src/main/java/me/zhyd/oauth/request/AuthCodingRequest.java +++ b/src/main/java/me/zhyd/oauth/request/AuthCodingRequest.java @@ -12,7 +12,6 @@ import me.zhyd.oauth.model.AuthUser; import me.zhyd.oauth.model.AuthUserGender; import me.zhyd.oauth.url.CodingUrlBuilder; import me.zhyd.oauth.url.entity.AuthAccessTokenEntity; -import me.zhyd.oauth.url.entity.AuthAuthorizeEntity; import me.zhyd.oauth.url.entity.AuthUserInfoEntity; /** @@ -73,16 +72,4 @@ public class AuthCodingRequest extends BaseAuthRequest { .source(AuthSource.CODING) .build(); } - - /** - * 返回认证url，可自行跳转页面 - * - * @return 返回授权地址 - */ - @Override - public String authorize() { - return this.urlBuilder.getAuthorizeUrl(AuthAuthorizeEntity.builder() - .config(config) - .build()); - } } diff --git a/src/main/java/me/zhyd/oauth/request/AuthCsdnRequest.java b/src/main/java/me/zhyd/oauth/request/AuthCsdnRequest.java index 292149d57d7b4f63f119387216d9ecb7dcb83765..770f4bc0bf51b2becdfc8c449df63164c330ff9c 100644 --- a/src/main/java/me/zhyd/oauth/request/AuthCsdnRequest.java +++ b/src/main/java/me/zhyd/oauth/request/AuthCsdnRequest.java @@ -12,7 +12,6 @@ import me.zhyd.oauth.model.AuthUser; import me.zhyd.oauth.model.AuthUserGender; import me.zhyd.oauth.url.CsdnUrlBuilder; import me.zhyd.oauth.url.entity.AuthAccessTokenEntity; -import me.zhyd.oauth.url.entity.AuthAuthorizeEntity; import me.zhyd.oauth.url.entity.AuthUserInfoEntity; /** @@ -63,16 +62,4 @@ public class AuthCsdnRequest extends BaseAuthRequest { .source(AuthSource.CSDN) .build(); } - - /** - * 返回认证url，可自行跳转页面 - * - * @return 返回授权地址 - */ - @Override - public String authorize() { - return this.urlBuilder.getAuthorizeUrl(AuthAuthorizeEntity.builder() - .config(config) - .build()); - } } diff --git a/src/main/java/me/zhyd/oauth/request/AuthDingTalkRequest.java b/src/main/java/me/zhyd/oauth/request/AuthDingTalkRequest.java index 7eb90bb6e55823f11063e5583d53b32f825daea4..ef59d562f89e2e939b2ff70ae6090dda52eea3a5 100644 --- a/src/main/java/me/zhyd/oauth/request/AuthDingTalkRequest.java +++ b/src/main/java/me/zhyd/oauth/request/AuthDingTalkRequest.java @@ -13,7 +13,6 @@ import me.zhyd.oauth.model.AuthToken; import me.zhyd.oauth.model.AuthUser; import me.zhyd.oauth.model.AuthUserGender; import me.zhyd.oauth.url.DingtalkUrlBuilder; -import me.zhyd.oauth.url.entity.AuthAuthorizeEntity; import me.zhyd.oauth.url.entity.AuthUserInfoEntity; import me.zhyd.oauth.utils.GlobalAuthUtil; @@ -69,16 +68,4 @@ public class AuthDingTalkRequest extends BaseAuthRequest { .token(token) .build(); } - - /** - * 返回认证url，可自行跳转页面 - * - * @return 返回授权地址 - */ - @Override - public String authorize() { - return this.urlBuilder.getAuthorizeUrl(AuthAuthorizeEntity.builder() - .config(config) - .build()); - } } diff --git a/src/main/java/me/zhyd/oauth/request/AuthDouyinRequest.java b/src/main/java/me/zhyd/oauth/request/AuthDouyinRequest.java index 7e87b92da6e297c2750a9a9e51641691fa51df15..f5b37e31e5c55f3aa1057630eae550943980acae 100644 --- a/src/main/java/me/zhyd/oauth/request/AuthDouyinRequest.java +++ b/src/main/java/me/zhyd/oauth/request/AuthDouyinRequest.java @@ -9,7 +9,6 @@ import me.zhyd.oauth.exception.AuthException; import me.zhyd.oauth.model.*; import me.zhyd.oauth.url.DouyinUrlBuilder; import me.zhyd.oauth.url.entity.AuthAccessTokenEntity; -import me.zhyd.oauth.url.entity.AuthAuthorizeEntity; import me.zhyd.oauth.url.entity.AuthRefreshTokenEntity; import me.zhyd.oauth.url.entity.AuthUserInfoEntity; @@ -61,18 +60,6 @@ public class AuthDouyinRequest extends BaseAuthRequest { .build(); } - /** - * 返回认证url，可自行跳转页面 - * - * @return 返回授权地址 - */ - @Override - public String authorize() { - return this.urlBuilder.getAuthorizeUrl(AuthAuthorizeEntity.builder() - .config(config) - .build()); - } - @Override public AuthResponse refresh(AuthToken oldToken) { String refreshTokenUrl = this.urlBuilder.getRefreshUrl(AuthRefreshTokenEntity.builder() diff --git a/src/main/java/me/zhyd/oauth/request/AuthFacebookRequest.java b/src/main/java/me/zhyd/oauth/request/AuthFacebookRequest.java index 4db331ae5fc17d69a6fad6b73f04e90994682e08..cbeccfff5648de98ca2c00ce2a5d60922db7a7b7 100644 --- a/src/main/java/me/zhyd/oauth/request/AuthFacebookRequest.java +++ b/src/main/java/me/zhyd/oauth/request/AuthFacebookRequest.java @@ -12,7 +12,6 @@ import me.zhyd.oauth.model.AuthUser; import me.zhyd.oauth.model.AuthUserGender; import me.zhyd.oauth.url.FacebookUrlBuilder; import me.zhyd.oauth.url.entity.AuthAccessTokenEntity; -import me.zhyd.oauth.url.entity.AuthAuthorizeEntity; import me.zhyd.oauth.url.entity.AuthUserInfoEntity; /** @@ -79,16 +78,4 @@ public class AuthFacebookRequest extends BaseAuthRequest { .source(AuthSource.FACEBOOK) .build(); } - - /** - * 返回认证url，可自行跳转页面 - * - * @return 返回授权地址 - */ - @Override - public String authorize() { - return this.urlBuilder.getAuthorizeUrl(AuthAuthorizeEntity.builder() - .config(config) - .build()); - } } diff --git a/src/main/java/me/zhyd/oauth/request/AuthGiteeRequest.java b/src/main/java/me/zhyd/oauth/request/AuthGiteeRequest.java index 68eb429dd62437c75982ba945bf73c7730aa6f49..dbfd7fd0509959e4769bfcb5e64e352fdeb85d21 100644 --- a/src/main/java/me/zhyd/oauth/request/AuthGiteeRequest.java +++ b/src/main/java/me/zhyd/oauth/request/AuthGiteeRequest.java @@ -12,7 +12,6 @@ import me.zhyd.oauth.model.AuthUser; import me.zhyd.oauth.model.AuthUserGender; import me.zhyd.oauth.url.GiteeUrlBuilder; import me.zhyd.oauth.url.entity.AuthAccessTokenEntity; -import me.zhyd.oauth.url.entity.AuthAuthorizeEntity; import me.zhyd.oauth.url.entity.AuthUserInfoEntity; /** @@ -65,16 +64,4 @@ public class AuthGiteeRequest extends BaseAuthRequest { .source(AuthSource.GITEE) .build(); } - - /** - * 返回认证url，可自行跳转页面 - * - * @return 返回授权地址 - */ - @Override - public String authorize() { - return this.urlBuilder.getAuthorizeUrl(AuthAuthorizeEntity.builder() - .config(config) - .build()); - } } diff --git a/src/main/java/me/zhyd/oauth/request/AuthGithubRequest.java b/src/main/java/me/zhyd/oauth/request/AuthGithubRequest.java index 242f7e670a610398de1881f08485887788fcd274..c0d0029e07d0282c3a9ad198064fd1297dfef532 100644 --- a/src/main/java/me/zhyd/oauth/request/AuthGithubRequest.java +++ b/src/main/java/me/zhyd/oauth/request/AuthGithubRequest.java @@ -12,7 +12,6 @@ import me.zhyd.oauth.model.AuthUser; import me.zhyd.oauth.model.AuthUserGender; import me.zhyd.oauth.url.GithubUrlBuilder; import me.zhyd.oauth.url.entity.AuthAccessTokenEntity; -import me.zhyd.oauth.url.entity.AuthAuthorizeEntity; import me.zhyd.oauth.url.entity.AuthUserInfoEntity; import me.zhyd.oauth.utils.GlobalAuthUtil; @@ -68,16 +67,4 @@ public class AuthGithubRequest extends BaseAuthRequest { .source(AuthSource.GITHUB) .build(); } - - /** - * 返回认证url，可自行跳转页面 - * - * @return 返回授权地址 - */ - @Override - public String authorize() { - return this.urlBuilder.getAuthorizeUrl(AuthAuthorizeEntity.builder() - .config(config) - .build()); - } } diff --git a/src/main/java/me/zhyd/oauth/request/AuthGoogleRequest.java b/src/main/java/me/zhyd/oauth/request/AuthGoogleRequest.java index bc45d37ddd5be284b49c2e31a41c0c9b1b2bbd5a..e66ac99335515539150300e914f668ff65368ac4 100644 --- a/src/main/java/me/zhyd/oauth/request/AuthGoogleRequest.java +++ b/src/main/java/me/zhyd/oauth/request/AuthGoogleRequest.java @@ -12,7 +12,6 @@ import me.zhyd.oauth.model.AuthUser; import me.zhyd.oauth.model.AuthUserGender; import me.zhyd.oauth.url.GoogleUrlBuilder; import me.zhyd.oauth.url.entity.AuthAccessTokenEntity; -import me.zhyd.oauth.url.entity.AuthAuthorizeEntity; import me.zhyd.oauth.url.entity.AuthUserInfoEntity; /** @@ -71,16 +70,4 @@ public class AuthGoogleRequest extends BaseAuthRequest { .source(AuthSource.GOOGLE) .build(); } - - /** - * 返回认证url，可自行跳转页面 - * - * @return 返回授权地址 - */ - @Override - public String authorize() { - return this.urlBuilder.getAuthorizeUrl(AuthAuthorizeEntity.builder() - .config(config) - .build()); - } } diff --git a/src/main/java/me/zhyd/oauth/request/AuthLinkedinRequest.java b/src/main/java/me/zhyd/oauth/request/AuthLinkedinRequest.java index 756aeaaf9fc9f29c697c3a6d0f6a54318938fe39..2ace891749965517f2eda2d0e8a0af47884bb7ff 100644 --- a/src/main/java/me/zhyd/oauth/request/AuthLinkedinRequest.java +++ b/src/main/java/me/zhyd/oauth/request/AuthLinkedinRequest.java @@ -10,7 +10,6 @@ import me.zhyd.oauth.exception.AuthException; import me.zhyd.oauth.model.*; import me.zhyd.oauth.url.LinkedinUrlBuilder; import me.zhyd.oauth.url.entity.AuthAccessTokenEntity; -import me.zhyd.oauth.url.entity.AuthAuthorizeEntity; import me.zhyd.oauth.url.entity.AuthRefreshTokenEntity; import me.zhyd.oauth.url.entity.AuthUserInfoEntity; import me.zhyd.oauth.utils.StringUtils; @@ -92,18 +91,6 @@ public class AuthLinkedinRequest extends BaseAuthRequest { .build(); } - /** - * 返回认证url，可自行跳转页面 - * - * @return 返回授权地址 - */ - @Override - public String authorize() { - return this.urlBuilder.getAuthorizeUrl(AuthAuthorizeEntity.builder() - .config(config) - .build()); - } - private String getUserEmail(String accessToken) { String email = null; HttpResponse emailResponse = HttpRequest.get("https://api.linkedin.com/v2/emailAddress?q=members&projection=(elements*(handle~))") diff --git a/src/main/java/me/zhyd/oauth/request/AuthMiRequest.java b/src/main/java/me/zhyd/oauth/request/AuthMiRequest.java index 265b6491520be52fb233507e4a50f072c1c85bd0..3d4db87b428ac282ad9f98d33fe1be808a4126b1 100644 --- a/src/main/java/me/zhyd/oauth/request/AuthMiRequest.java +++ b/src/main/java/me/zhyd/oauth/request/AuthMiRequest.java @@ -10,7 +10,6 @@ import me.zhyd.oauth.exception.AuthException; import me.zhyd.oauth.model.*; import me.zhyd.oauth.url.MiUrlBuilder; import me.zhyd.oauth.url.entity.AuthAccessTokenEntity; -import me.zhyd.oauth.url.entity.AuthAuthorizeEntity; import me.zhyd.oauth.url.entity.AuthRefreshTokenEntity; import me.zhyd.oauth.url.entity.AuthUserInfoEntity; @@ -101,18 +100,6 @@ public class AuthMiRequest extends BaseAuthRequest { return authUser; } - /** - * 返回认证url，可自行跳转页面 - * - * @return 返回授权地址 - */ - @Override - public String authorize() { - return this.urlBuilder.getAuthorizeUrl(AuthAuthorizeEntity.builder() - .config(config) - .build()); - } - /** * 刷新access token （续期） * diff --git a/src/main/java/me/zhyd/oauth/request/AuthMicrosoftRequest.java b/src/main/java/me/zhyd/oauth/request/AuthMicrosoftRequest.java index 9c3d5548d07bbefa784e4dda9504ada6931e2e8c..70626f24cf1b36eb054e3813eb9295ac0b196bcc 100644 --- a/src/main/java/me/zhyd/oauth/request/AuthMicrosoftRequest.java +++ b/src/main/java/me/zhyd/oauth/request/AuthMicrosoftRequest.java @@ -10,7 +10,6 @@ import me.zhyd.oauth.exception.AuthException; import me.zhyd.oauth.model.*; import me.zhyd.oauth.url.MicrosoftUrlBuilder; import me.zhyd.oauth.url.entity.AuthAccessTokenEntity; -import me.zhyd.oauth.url.entity.AuthAuthorizeEntity; import me.zhyd.oauth.url.entity.AuthRefreshTokenEntity; import me.zhyd.oauth.url.entity.AuthUserInfoEntity; @@ -95,18 +94,6 @@ public class AuthMicrosoftRequest extends BaseAuthRequest { .build(); } - /** - * 返回认证url，可自行跳转页面 - * - * @return 返回授权地址 - */ - @Override - public String authorize() { - return this.urlBuilder.getAuthorizeUrl(AuthAuthorizeEntity.builder() - .config(config) - .build()); - } - /** * 刷新access token （续期） * diff --git a/src/main/java/me/zhyd/oauth/request/AuthOschinaRequest.java b/src/main/java/me/zhyd/oauth/request/AuthOschinaRequest.java index 07c069c2596eb6344679f491dc2218e00e25944c..0e7dd12febbab28940604fc1b0daa56c8760af69 100644 --- a/src/main/java/me/zhyd/oauth/request/AuthOschinaRequest.java +++ b/src/main/java/me/zhyd/oauth/request/AuthOschinaRequest.java @@ -12,7 +12,6 @@ import me.zhyd.oauth.model.AuthUser; import me.zhyd.oauth.model.AuthUserGender; import me.zhyd.oauth.url.OschinaUrlBuilder; import me.zhyd.oauth.url.entity.AuthAccessTokenEntity; -import me.zhyd.oauth.url.entity.AuthAuthorizeEntity; import me.zhyd.oauth.url.entity.AuthUserInfoEntity; /** @@ -70,16 +69,4 @@ public class AuthOschinaRequest extends BaseAuthRequest { .source(AuthSource.OSCHINA) .build(); } - - /** - * 返回认证url，可自行跳转页面 - * - * @return 返回授权地址 - */ - @Override - public String authorize() { - return this.urlBuilder.getAuthorizeUrl(AuthAuthorizeEntity.builder() - .config(config) - .build()); - } } diff --git a/src/main/java/me/zhyd/oauth/request/AuthQqRequest.java b/src/main/java/me/zhyd/oauth/request/AuthQqRequest.java index 49b00a54e533dd49e811bad0718c6f3d33bd3ff2..b083d9d09c2443b5493554267cc6202f3190ec00 100644 --- a/src/main/java/me/zhyd/oauth/request/AuthQqRequest.java +++ b/src/main/java/me/zhyd/oauth/request/AuthQqRequest.java @@ -13,7 +13,6 @@ import me.zhyd.oauth.model.AuthUser; import me.zhyd.oauth.model.AuthUserGender; import me.zhyd.oauth.url.QqUrlBuilder; import me.zhyd.oauth.url.entity.AuthAccessTokenEntity; -import me.zhyd.oauth.url.entity.AuthAuthorizeEntity; import me.zhyd.oauth.url.entity.AuthUserInfoEntity; import me.zhyd.oauth.utils.GlobalAuthUtil; import me.zhyd.oauth.utils.StringUtils; @@ -83,18 +82,6 @@ public class AuthQqRequest extends BaseAuthRequest { .build(); } - /** - * 返回认证url，可自行跳转页面 - * - * @return 返回授权地址 - */ - @Override - public String authorize() { - return this.urlBuilder.getAuthorizeUrl(AuthAuthorizeEntity.builder() - .config(config) - .build()); - } - private String getOpenId(AuthToken authToken) { String accessToken = authToken.getAccessToken(); HttpResponse response = HttpRequest.get(this.urlBuilder.getOpenIdUrl(accessToken, config.isUnionId())).execute(); diff --git a/src/main/java/me/zhyd/oauth/request/AuthTaobaoRequest.java b/src/main/java/me/zhyd/oauth/request/AuthTaobaoRequest.java index c1016e090cdf09446e7fe2492d579b740d192915..f5bfa88fb6edf164f4adc46d509691feb402c4c1 100644 --- a/src/main/java/me/zhyd/oauth/request/AuthTaobaoRequest.java +++ b/src/main/java/me/zhyd/oauth/request/AuthTaobaoRequest.java @@ -12,7 +12,6 @@ import me.zhyd.oauth.model.AuthUser; import me.zhyd.oauth.model.AuthUserGender; import me.zhyd.oauth.url.TaobaoUrlBuilder; import me.zhyd.oauth.url.entity.AuthAccessTokenEntity; -import me.zhyd.oauth.url.entity.AuthAuthorizeEntity; import me.zhyd.oauth.utils.GlobalAuthUtil; /** @@ -60,16 +59,4 @@ public class AuthTaobaoRequest extends BaseAuthRequest { .source(AuthSource.TAOBAO) .build(); } - - /** - * 返回认证url，可自行跳转页面 - * - * @return 返回授权地址 - */ - @Override - public String authorize() { - return this.urlBuilder.getAuthorizeUrl(AuthAuthorizeEntity.builder() - .config(config) - .build()); - } } diff --git a/src/main/java/me/zhyd/oauth/request/AuthTencentCloudRequest.java b/src/main/java/me/zhyd/oauth/request/AuthTencentCloudRequest.java index 75fcc409d66a3971d69cae62a4c5bf38c4ccb179..9fa09806dbcfa8e9bf9382231b2182a4f87073a3 100644 --- a/src/main/java/me/zhyd/oauth/request/AuthTencentCloudRequest.java +++ b/src/main/java/me/zhyd/oauth/request/AuthTencentCloudRequest.java @@ -12,7 +12,6 @@ import me.zhyd.oauth.model.AuthUser; import me.zhyd.oauth.model.AuthUserGender; import me.zhyd.oauth.url.TencentCloudUrlBuilder; import me.zhyd.oauth.url.entity.AuthAccessTokenEntity; -import me.zhyd.oauth.url.entity.AuthAuthorizeEntity; import me.zhyd.oauth.url.entity.AuthUserInfoEntity; /** @@ -72,16 +71,4 @@ public class AuthTencentCloudRequest extends BaseAuthRequest { .source(AuthSource.TENCENT_CLOUD) .build(); } - - /** - * 返回认证url，可自行跳转页面 - * - * @return 返回授权地址 - */ - @Override - public String authorize() { - return this.urlBuilder.getAuthorizeUrl(AuthAuthorizeEntity.builder() - .config(config) - .build()); - } } diff --git a/src/main/java/me/zhyd/oauth/request/AuthToutiaoRequest.java b/src/main/java/me/zhyd/oauth/request/AuthToutiaoRequest.java index f5f9b3d015ea75e22157bb1a223b3f1561eebb08..580c6d6a30da3bc6ab99464df9034689ab4856f8 100644 --- a/src/main/java/me/zhyd/oauth/request/AuthToutiaoRequest.java +++ b/src/main/java/me/zhyd/oauth/request/AuthToutiaoRequest.java @@ -13,7 +13,6 @@ import me.zhyd.oauth.model.AuthUser; import me.zhyd.oauth.model.AuthUserGender; import me.zhyd.oauth.url.ToutiaoUrlBuilder; import me.zhyd.oauth.url.entity.AuthAccessTokenEntity; -import me.zhyd.oauth.url.entity.AuthAuthorizeEntity; import me.zhyd.oauth.url.entity.AuthUserInfoEntity; /** @@ -78,16 +77,4 @@ public class AuthToutiaoRequest extends BaseAuthRequest { .source(AuthSource.TOUTIAO) .build(); } - - /** - * 返回认证url，可自行跳转页面 - * - * @return 返回授权地址 - */ - @Override - public String authorize() { - return this.urlBuilder.getAuthorizeUrl(AuthAuthorizeEntity.builder() - .config(config) - .build()); - } } diff --git a/src/main/java/me/zhyd/oauth/request/AuthWeChatRequest.java b/src/main/java/me/zhyd/oauth/request/AuthWeChatRequest.java index c3d3a5e89c5b85497ba5ad40c23bad5fec15572a..f59e5771224642c73b33141b0cf726f043184700 100644 --- a/src/main/java/me/zhyd/oauth/request/AuthWeChatRequest.java +++ b/src/main/java/me/zhyd/oauth/request/AuthWeChatRequest.java @@ -9,7 +9,6 @@ import me.zhyd.oauth.exception.AuthException; import me.zhyd.oauth.model.*; import me.zhyd.oauth.url.WechatUrlBuilder; import me.zhyd.oauth.url.entity.AuthAccessTokenEntity; -import me.zhyd.oauth.url.entity.AuthAuthorizeEntity; import me.zhyd.oauth.url.entity.AuthRefreshTokenEntity; import me.zhyd.oauth.url.entity.AuthUserInfoEntity; @@ -66,18 +65,6 @@ public class AuthWeChatRequest extends BaseAuthRequest { .build(); } - /** - * 返回认证url，可自行跳转页面 - * - * @return 返回授权地址 - */ - @Override - public String authorize() { - return this.urlBuilder.getAuthorizeUrl(AuthAuthorizeEntity.builder() - .config(config) - .build()); - } - @Override public AuthResponse refresh(AuthToken oldToken) { String refreshTokenUrl = this.urlBuilder.getRefreshUrl(AuthRefreshTokenEntity.builder() diff --git a/src/main/java/me/zhyd/oauth/request/AuthWeiboRequest.java b/src/main/java/me/zhyd/oauth/request/AuthWeiboRequest.java index 5129df0afd556271387b2020852854f15d6f9c03..e028299609d4f238f544e4fcd45c831a2c5d9f48 100644 --- a/src/main/java/me/zhyd/oauth/request/AuthWeiboRequest.java +++ b/src/main/java/me/zhyd/oauth/request/AuthWeiboRequest.java @@ -12,7 +12,6 @@ import me.zhyd.oauth.model.AuthUser; import me.zhyd.oauth.model.AuthUserGender; import me.zhyd.oauth.url.WeiboUrlBuilder; import me.zhyd.oauth.url.entity.AuthAccessTokenEntity; -import me.zhyd.oauth.url.entity.AuthAuthorizeEntity; import me.zhyd.oauth.url.entity.AuthUserInfoEntity; import me.zhyd.oauth.utils.IpUtils; import me.zhyd.oauth.utils.StringUtils; @@ -81,16 +80,4 @@ public class AuthWeiboRequest extends BaseAuthRequest { .source(AuthSource.WEIBO) .build(); } - - /** - * 返回认证url，可自行跳转页面 - * - * @return 返回授权地址 - */ - @Override - public String authorize() { - return this.urlBuilder.getAuthorizeUrl(AuthAuthorizeEntity.builder() - .config(config) - .build()); - } } diff --git a/src/main/java/me/zhyd/oauth/request/BaseAuthRequest.java b/src/main/java/me/zhyd/oauth/request/BaseAuthRequest.java index 4dde76e84e46a6ac51c6cdd61eab10a3e01c63fc..f6765e5841da757de3833faad207aac747b7c985 100644 --- a/src/main/java/me/zhyd/oauth/request/BaseAuthRequest.java +++ b/src/main/java/me/zhyd/oauth/request/BaseAuthRequest.java @@ -9,6 +9,7 @@ import me.zhyd.oauth.model.AuthResponse; import me.zhyd.oauth.model.AuthToken; import me.zhyd.oauth.model.AuthUser; import me.zhyd.oauth.url.AbstractUrlBuilder; +import me.zhyd.oauth.url.entity.AuthAuthorizeEntity; import me.zhyd.oauth.utils.AuthChecker; /** @@ -69,5 +70,9 @@ public abstract class BaseAuthRequest implements AuthRequest { * @return 返回授权地址 */ @Override - public abstract String authorize(); + public String authorize() { + return this.urlBuilder.getAuthorizeUrl(AuthAuthorizeEntity.builder() + .config(config) + .build()); + } }