From b77de0bd0c12dd70e69d850f99131ba5b2906e86 Mon Sep 17 00:00:00 2001
From: ngcly <531237716@qq.com>
Date: Tue, 10 Aug 2021 12:28:56 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BF=98=E5=8E=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/me/zhyd/oauth/config/AuthConfig.java    | 11 -----------
 .../java/me/zhyd/oauth/request/AuthAlipayRequest.java |  8 ++++++--
 2 files changed, 6 insertions(+), 13 deletions(-)

diff --git a/src/main/java/me/zhyd/oauth/config/AuthConfig.java b/src/main/java/me/zhyd/oauth/config/AuthConfig.java
index e00e742..38f4ccc 100644
--- a/src/main/java/me/zhyd/oauth/config/AuthConfig.java
+++ b/src/main/java/me/zhyd/oauth/config/AuthConfig.java
@@ -155,7 +155,6 @@ public class AuthConfig {
      * @since 1.16.0
      */
     private String authServerId;
-
     /**
      * 忽略校验 {@code redirectUri} 参数，默认不开启。当 {@code ignoreCheckRedirectUri} 为 {@code true} 时，
      * {@link me.zhyd.oauth.utils.AuthChecker#checkConfig(AuthConfig, AuthSource)} 将不会校验 {@code redirectUri} 的合法性。
@@ -164,16 +163,6 @@ public class AuthConfig {
      */
     private boolean ignoreCheckRedirectUri;
 
-    /**
-     * 代理地址
-     */
-    private String proxyHost;
-
-    /**
-     * 代理端口号
-     */
-    private Integer proxyPort;
-
     /**
      * 适配 builder 模式 set 值的情况
      *
diff --git a/src/main/java/me/zhyd/oauth/request/AuthAlipayRequest.java b/src/main/java/me/zhyd/oauth/request/AuthAlipayRequest.java
index 031bc96..e411645 100644
--- a/src/main/java/me/zhyd/oauth/request/AuthAlipayRequest.java
+++ b/src/main/java/me/zhyd/oauth/request/AuthAlipayRequest.java
@@ -21,6 +21,8 @@ import me.zhyd.oauth.model.AuthUser;
 import me.zhyd.oauth.utils.StringUtils;
 import me.zhyd.oauth.utils.UrlBuilder;
 
+import java.net.InetSocketAddress;
+
 /**
  * 支付宝登录
  *
@@ -39,9 +41,11 @@ public class AuthAlipayRequest extends AuthDefaultRequest {
 
     public AuthAlipayRequest(AuthConfig config, AuthStateCache authStateCache) {
         super(config, AuthDefaultSource.ALIPAY, authStateCache);
-        if (StringUtils.isNotEmpty(config.getProxyHost()) && config.getProxyPort() != null) {
+        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", config.getAlipayPublicKey(), "RSA2", config.getProxyHost(), config.getProxyPort());
+                "json", "UTF-8", config.getAlipayPublicKey(), "RSA2", address.getHostName(), address.getPort());
         } else {
             this.alipayClient = new DefaultAlipayClient(AuthDefaultSource.ALIPAY.accessToken(), config.getClientId(), config.getClientSecret(),
                 "json", "UTF-8", config.getAlipayPublicKey(), "RSA2");
-- 
GitLab