From d9ab1b0f98b43b73ffd790fa229d61a5f72ff4a9 Mon Sep 17 00:00:00 2001 From: Binary Wang Date: Fri, 10 Jul 2026 22:09:59 +0800 Subject: [PATCH] =?UTF-8?q?:art:=20#4067=20=E6=81=A2=E5=A4=8D=E9=BB=98?= =?UTF-8?q?=E8=AE=A4=20HTTP=20=E5=AE=A2=E6=88=B7=E7=AB=AF=E5=85=BC?= =?UTF-8?q?=E5=AE=B9=E6=80=A7=EF=BC=8C=E9=81=BF=E5=85=8D=E9=9D=9E=20Starte?= =?UTF-8?q?r=20=E6=89=8B=E5=8A=A8=E9=9B=86=E6=88=90=E6=97=B6=E5=9B=A0?= =?UTF-8?q?=E9=BB=98=E8=AE=A4=E5=BC=95=E5=85=A5=20HttpClient5=20=E5=AF=BC?= =?UTF-8?q?=E8=87=B4=E7=9A=84=E9=97=AE=E9=A2=98?= 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 fb6907abe..93206d3cd 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 f8eb264ed..fff1deb37 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 ccd4eafc7..6f2c349f3 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 @@ import lombok.extern.slf4j.Slf4j; * @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 7338b04cd..5877bd85b 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 71fe527d1..37464655e 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 5a8bc5516..67b93ec42 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 d0820a0c2..16478f841 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 @@ import lombok.extern.slf4j.Slf4j; * @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 afb7f7212..ff022f50a 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.bean.WxAccessTokenEntity; 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 class WxMaServiceImplTest { @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 1c3b4239b..f5522736e 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 7cef64e57..0498c23e8 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 @@ package me.chanjar.weixin.mp.api.impl; /** * 
- * 默认接口实现类，使用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 5e33d0f28..2c59bd4f5 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 83e831df7..c807ccdf9 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 @@ package me.chanjar.weixin.open.api.impl; /** * @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 4316bafa4..77246536a 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 @@ package com.github.binarywang.wxpay.service.impl; /** * 
- * 微信支付接口请求实现类，默认使用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 7dff396de..c61d27ef7 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 567efd7ad..ad5e16209 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 2e1314b3b..e063f9235 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 @@ package me.chanjar.weixin.qidian.api.impl; /** * 
- * 默认接口实现类，使用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 { }