From a3108caccf9063adb2832ad63f27cfb4a7f759cb Mon Sep 17 00:00:00 2001 From: "yadong.zhang" Date: Sat, 16 Oct 2021 19:11:24 +0800 Subject: [PATCH] =?UTF-8?q?:bug:=20=E4=BF=AE=E5=A4=8D=20alipay=20=E7=99=BB?= =?UTF-8?q?=E5=BD=95=E5=A4=B1=E8=B4=A5=E7=9A=84=20BUG?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../zhyd/oauth/request/AuthAlipayRequest.java | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/src/main/java/me/zhyd/oauth/request/AuthAlipayRequest.java b/src/main/java/me/zhyd/oauth/request/AuthAlipayRequest.java index 5b6de86..98acc0e 100644 --- a/src/main/java/me/zhyd/oauth/request/AuthAlipayRequest.java +++ b/src/main/java/me/zhyd/oauth/request/AuthAlipayRequest.java @@ -41,6 +41,8 @@ public class AuthAlipayRequest extends AuthDefaultRequest { private final AlipayClient alipayClient; + private static final String GATEWAY = "https://openapi.alipay.com/gateway.do"; + /** * @see AuthAlipayRequest#AuthAlipayRequest(me.zhyd.oauth.config.AuthConfig, java.lang.String) * @deprecated 请使用带有"alipayPublicKey"参数的构造方法 @@ -78,8 +80,8 @@ public class AuthAlipayRequest extends AuthDefaultRequest { public AuthAlipayRequest(AuthConfig config, String alipayPublicKey) { super(config, AuthDefaultSource.ALIPAY); this.alipayPublicKey = determineAlipayPublicKey(alipayPublicKey, config); - this.alipayClient = new DefaultAlipayClient(AuthDefaultSource.ALIPAY.accessToken(), config.getClientId(), config.getClientSecret(), "json", "UTF-8", alipayPublicKey, "RSA2"); check(config); + this.alipayClient = new DefaultAlipayClient(GATEWAY, config.getClientId(), config.getClientSecret(), "json", "UTF-8", this.alipayPublicKey, "RSA2"); } /** @@ -92,16 +94,16 @@ public class AuthAlipayRequest extends AuthDefaultRequest { public AuthAlipayRequest(AuthConfig config, String alipayPublicKey, AuthStateCache authStateCache) { super(config, AuthDefaultSource.ALIPAY, authStateCache); this.alipayPublicKey = determineAlipayPublicKey(alipayPublicKey, config); + check(config); if (config.getHttpConfig() != null && config.getHttpConfig().getProxy() != null && config.getHttpConfig().getProxy().address() instanceof InetSocketAddress) { InetSocketAddress address = (InetSocketAddress) config.getHttpConfig().getProxy().address(); - this.alipayClient = new DefaultAlipayClient(AuthDefaultSource.ALIPAY.accessToken(), config.getClientId(), config.getClientSecret(), - "json", "UTF-8", alipayPublicKey, "RSA2", address.getHostName(), address.getPort()); + this.alipayClient = new DefaultAlipayClient(GATEWAY, config.getClientId(), config.getClientSecret(), + "json", "UTF-8", this.alipayPublicKey, "RSA2", address.getHostName(), address.getPort()); } else { - this.alipayClient = new DefaultAlipayClient(AuthDefaultSource.ALIPAY.accessToken(), config.getClientId(), config.getClientSecret(), - "json", "UTF-8", alipayPublicKey, "RSA2"); + this.alipayClient = new DefaultAlipayClient(GATEWAY, config.getClientId(), config.getClientSecret(), + "json", "UTF-8", this.alipayPublicKey, "RSA2"); } - check(config); } /** @@ -114,9 +116,9 @@ public class AuthAlipayRequest extends AuthDefaultRequest { public AuthAlipayRequest(AuthConfig config, String alipayPublicKey, AuthStateCache authStateCache, String proxyHost, Integer proxyPort) { super(config, AuthDefaultSource.ALIPAY, authStateCache); this.alipayPublicKey = determineAlipayPublicKey(alipayPublicKey, config); - this.alipayClient = new DefaultAlipayClient(AuthDefaultSource.ALIPAY.accessToken(), config.getClientId(), config.getClientSecret(), - "json", "UTF-8", alipayPublicKey, "RSA2", proxyHost, proxyPort); check(config); + this.alipayClient = new DefaultAlipayClient(GATEWAY, config.getClientId(), config.getClientSecret(), + "json", "UTF-8", this.alipayPublicKey, "RSA2", proxyHost, proxyPort); } private String determineAlipayPublicKey(String alipayPublicKey, AuthConfig config) { -- GitLab