From f139e6d357755961c209a61b476b09a1b60eeff4 Mon Sep 17 00:00:00 2001 From: Binary Wang Date: Tue, 7 Jul 2026 17:39:59 +0800 Subject: [PATCH] =?UTF-8?q?=E6=81=A2=E5=A4=8D=E9=BB=98=E8=AE=A4=20HTTP=20?= =?UTF-8?q?=E5=AE=A2=E6=88=B7=E7=AB=AF=E5=85=BC=E5=AE=B9=E6=80=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 2 +- weixin-java-channel/pom.xml | 2 -- .../weixin/channel/api/impl/WxChannelServiceImpl.java | 2 +- weixin-java-common/pom.xml | 5 ++--- weixin-java-cp/pom.xml | 1 - weixin-java-miniapp/pom.xml | 2 -- .../cn/binarywang/wx/miniapp/api/impl/WxMaServiceImpl.java | 2 +- .../binarywang/wx/miniapp/api/impl/WxMaServiceImplTest.java | 3 +++ weixin-java-mp/pom.xml | 2 -- .../java/me/chanjar/weixin/mp/api/impl/WxMpServiceImpl.java | 4 ++-- weixin-java-open/pom.xml | 2 -- .../me/chanjar/weixin/open/api/impl/WxOpenServiceImpl.java | 2 +- .../binarywang/wxpay/service/impl/WxPayServiceImpl.java | 4 ++-- .../wxpay/service/impl/BaseWxPayServiceImplTest.java | 5 +++++ weixin-java-qidian/pom.xml | 1 - .../chanjar/weixin/qidian/api/impl/WxQidianServiceImpl.java | 4 ++-- 16 files changed, 20 insertions(+), 23 deletions(-) diff --git a/pom.xml b/pom.xml index fb6907abe5..93206d3cd6 100644 --- a/pom.xml +++ b/pom.xml @@ -162,7 +162,7 @@ 4.12.0 provided - + org.apache.httpcomponents.client5 httpclient5 diff --git a/weixin-java-channel/pom.xml b/weixin-java-channel/pom.xml index f8eb264ed6..fff1deb372 100644 --- a/weixin-java-channel/pom.xml +++ b/weixin-java-channel/pom.xml @@ -32,12 +32,10 @@ org.apache.httpcomponents httpclient - provided org.apache.httpcomponents httpmime - provided org.apache.httpcomponents.client5 diff --git a/weixin-java-channel/src/main/java/me/chanjar/weixin/channel/api/impl/WxChannelServiceImpl.java b/weixin-java-channel/src/main/java/me/chanjar/weixin/channel/api/impl/WxChannelServiceImpl.java index ccd4eafc79..6f2c349f3f 100644 --- a/weixin-java-channel/src/main/java/me/chanjar/weixin/channel/api/impl/WxChannelServiceImpl.java +++ b/weixin-java-channel/src/main/java/me/chanjar/weixin/channel/api/impl/WxChannelServiceImpl.java @@ -8,7 +8,7 @@ * @author Zeyes */ @Slf4j -public class WxChannelServiceImpl extends WxChannelServiceHttpComponentsImpl { +public class WxChannelServiceImpl extends WxChannelServiceHttpClientImpl { public WxChannelServiceImpl() { } diff --git a/weixin-java-common/pom.xml b/weixin-java-common/pom.xml index 7338b04cd9..5877bd85be 100644 --- a/weixin-java-common/pom.xml +++ b/weixin-java-common/pom.xml @@ -24,17 +24,17 @@ okhttp provided - + org.apache.httpcomponents.client5 httpclient5 + provided org.apache.httpcomponents httpclient - provided commons-logging @@ -45,7 +45,6 @@ org.apache.httpcomponents httpmime - provided diff --git a/weixin-java-cp/pom.xml b/weixin-java-cp/pom.xml index 71fe527d1a..37464655e0 100644 --- a/weixin-java-cp/pom.xml +++ b/weixin-java-cp/pom.xml @@ -33,7 +33,6 @@ org.apache.httpcomponents httpclient - provided org.apache.httpcomponents.client5 diff --git a/weixin-java-miniapp/pom.xml b/weixin-java-miniapp/pom.xml index 5a8bc55162..67b93ec42c 100644 --- a/weixin-java-miniapp/pom.xml +++ b/weixin-java-miniapp/pom.xml @@ -34,12 +34,10 @@ org.apache.httpcomponents httpclient - provided org.apache.httpcomponents httpmime - provided org.apache.httpcomponents.client5 diff --git a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/api/impl/WxMaServiceImpl.java b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/api/impl/WxMaServiceImpl.java index d0820a0c2e..16478f8411 100644 --- a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/api/impl/WxMaServiceImpl.java +++ b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/api/impl/WxMaServiceImpl.java @@ -6,6 +6,6 @@ * @author Binary Wang */ @Slf4j -public class WxMaServiceImpl extends WxMaServiceHttpComponentsImpl { +public class WxMaServiceImpl extends WxMaServiceHttpClientImpl { } diff --git a/weixin-java-miniapp/src/test/java/cn/binarywang/wx/miniapp/api/impl/WxMaServiceImplTest.java b/weixin-java-miniapp/src/test/java/cn/binarywang/wx/miniapp/api/impl/WxMaServiceImplTest.java index afb7f7212d..ff022f50a2 100644 --- a/weixin-java-miniapp/src/test/java/cn/binarywang/wx/miniapp/api/impl/WxMaServiceImplTest.java +++ b/weixin-java-miniapp/src/test/java/cn/binarywang/wx/miniapp/api/impl/WxMaServiceImplTest.java @@ -11,6 +11,7 @@ import me.chanjar.weixin.common.error.WxError; import me.chanjar.weixin.common.error.WxErrorException; import me.chanjar.weixin.common.error.WxMpErrorMsgEnum; +import me.chanjar.weixin.common.util.http.HttpClientType; import me.chanjar.weixin.common.util.http.RequestExecutor; import org.apache.commons.lang3.StringUtils; import org.mockito.Mockito; @@ -118,6 +119,8 @@ public void testGetRequestHttpProxy() { @Test public void testGetRequestType() { + assertThat(new WxMaServiceImpl().getRequestType()).isEqualTo(HttpClientType.APACHE_HTTP); + assertThat(new WxMaServiceHttpComponentsImpl().getRequestType()).isEqualTo(HttpClientType.HTTP_COMPONENTS); } @Test diff --git a/weixin-java-mp/pom.xml b/weixin-java-mp/pom.xml index 1c3b4239b5..f5522736ed 100644 --- a/weixin-java-mp/pom.xml +++ b/weixin-java-mp/pom.xml @@ -34,12 +34,10 @@ org.apache.httpcomponents httpclient - provided org.apache.httpcomponents httpmime - provided org.apache.httpcomponents.client5 diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/WxMpServiceImpl.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/WxMpServiceImpl.java index 7cef64e576..0498c23e81 100644 --- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/WxMpServiceImpl.java +++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/WxMpServiceImpl.java @@ -2,11 +2,11 @@ /** * 
- * 默认接口实现类，使用apache httpClient 5实现
+ * 默认接口实现类，使用 Apache HttpClient 4 实现.
  * Created by Binary Wang on 2017-5-27.
  *
* * @author Binary Wang */ -public class WxMpServiceImpl extends WxMpServiceHttpComponentsImpl { +public class WxMpServiceImpl extends WxMpServiceHttpClientImpl { } diff --git a/weixin-java-open/pom.xml b/weixin-java-open/pom.xml index 5e33d0f280..2c59bd4f55 100644 --- a/weixin-java-open/pom.xml +++ b/weixin-java-open/pom.xml @@ -51,12 +51,10 @@ org.apache.httpcomponents httpclient - provided org.apache.httpcomponents httpmime - provided org.apache.httpcomponents.client5 diff --git a/weixin-java-open/src/main/java/me/chanjar/weixin/open/api/impl/WxOpenServiceImpl.java b/weixin-java-open/src/main/java/me/chanjar/weixin/open/api/impl/WxOpenServiceImpl.java index 83e831df70..c807ccdf99 100644 --- a/weixin-java-open/src/main/java/me/chanjar/weixin/open/api/impl/WxOpenServiceImpl.java +++ b/weixin-java-open/src/main/java/me/chanjar/weixin/open/api/impl/WxOpenServiceImpl.java @@ -3,6 +3,6 @@ /** * @author 007 */ -public class WxOpenServiceImpl extends WxOpenServiceHttpComponentsImpl { +public class WxOpenServiceImpl extends WxOpenServiceApacheHttpClientImpl { } diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/impl/WxPayServiceImpl.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/impl/WxPayServiceImpl.java index 4316bafa40..77246536a9 100644 --- a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/impl/WxPayServiceImpl.java +++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/impl/WxPayServiceImpl.java @@ -2,11 +2,11 @@ /** * 
- * 微信支付接口请求实现类，默认使用Apache HttpClient 5实现
+ * 微信支付接口请求实现类，默认使用 Apache HttpClient 4 实现.
  * Created by Binary Wang on 2017-7-8.
  *
* * @author Binary Wang */ -public class WxPayServiceImpl extends WxPayServiceHttpComponentsImpl { +public class WxPayServiceImpl extends WxPayServiceApacheHttpImpl { } diff --git a/weixin-java-pay/src/test/java/com/github/binarywang/wxpay/service/impl/BaseWxPayServiceImplTest.java b/weixin-java-pay/src/test/java/com/github/binarywang/wxpay/service/impl/BaseWxPayServiceImplTest.java index 7dff396de5..c61d27ef76 100644 --- a/weixin-java-pay/src/test/java/com/github/binarywang/wxpay/service/impl/BaseWxPayServiceImplTest.java +++ b/weixin-java-pay/src/test/java/com/github/binarywang/wxpay/service/impl/BaseWxPayServiceImplTest.java @@ -59,6 +59,11 @@ public class BaseWxPayServiceImplTest { @Inject private WxPayService payService; + @Test + public void testDefaultImplUsesApacheHttpClient() { + assertThat(new WxPayServiceImpl()).isInstanceOf(WxPayServiceApacheHttpImpl.class); + } + /** * Test method for {@link WxPayService#unifiedOrder(WxPayUnifiedOrderRequest)}. * diff --git a/weixin-java-qidian/pom.xml b/weixin-java-qidian/pom.xml index 567efd7adb..ad5e162090 100644 --- a/weixin-java-qidian/pom.xml +++ b/weixin-java-qidian/pom.xml @@ -34,7 +34,6 @@ org.apache.httpcomponents httpclient - provided org.apache.httpcomponents.client5 diff --git a/weixin-java-qidian/src/main/java/me/chanjar/weixin/qidian/api/impl/WxQidianServiceImpl.java b/weixin-java-qidian/src/main/java/me/chanjar/weixin/qidian/api/impl/WxQidianServiceImpl.java index 2e1314b3b1..e063f9235b 100644 --- a/weixin-java-qidian/src/main/java/me/chanjar/weixin/qidian/api/impl/WxQidianServiceImpl.java +++ b/weixin-java-qidian/src/main/java/me/chanjar/weixin/qidian/api/impl/WxQidianServiceImpl.java @@ -2,11 +2,11 @@ /** * 
- * 默认接口实现类，使用apache httpClient 5实现
+ * 默认接口实现类，使用 Apache HttpClient 4 实现.
  * Created by Binary Wang on 2017-5-27.
  *
* * @author Binary Wang */ -public class WxQidianServiceImpl extends WxQidianServiceHttpComponentsImpl { +public class WxQidianServiceImpl extends WxQidianServiceHttpClientImpl { }