🎨 #4067 恢复默认 HTTP 客户端兼容性，避免非 Starter 手动集成时因默认引入 HttpClient5 导致的问题

Author: binarywang

pom.xml

@@ -162,7 +162,7 @@
         <version>4.12.0</version>
         <scope>provided</scope>
       </dependency>
-      <!-- HttpClient 5.x - 默认依赖（推荐使用） -->
+      <!-- HttpClient 5.x - 可选依赖，显式使用 HttpComponents 实现时需要 -->
       <dependency>
         <groupId>org.apache.httpcomponents.client5</groupId>
         <artifactId>httpclient5</artifactId>

weixin-java-channel/pom.xml

@@ -32,12 +32,10 @@
     <dependency>
       <groupId>org.apache.httpcomponents</groupId>
       <artifactId>httpclient</artifactId>
-      <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.httpcomponents</groupId>
       <artifactId>httpmime</artifactId>
-      <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.httpcomponents.client5</groupId>

weixin-java-channel/src/main/java/me/chanjar/weixin/channel/api/impl/WxChannelServiceImpl.java

@@ -8,7 +8,7 @@
  * @author <a href="https://github.com/lixize">Zeyes</a>
  */
 @Slf4j
-public class WxChannelServiceImpl extends WxChannelServiceHttpComponentsImpl {
+public class WxChannelServiceImpl extends WxChannelServiceHttpClientImpl {
 
   public WxChannelServiceImpl() {
   }

weixin-java-common/pom.xml

@@ -24,17 +24,17 @@
       <artifactId>okhttp</artifactId>
       <scope>provided</scope>
     </dependency>
-    <!-- HttpClient 5.x - 默认依赖（推荐使用） -->
+    <!-- HttpClient 5.x - 可选依赖，显式使用 HttpComponents 实现时需要 -->
     <dependency>
       <groupId>org.apache.httpcomponents.client5</groupId>
       <artifactId>httpclient5</artifactId>
+      <scope>provided</scope>
     </dependency>
 
     <!-- HttpClient 4.x - 默认依赖（为了保持向后兼容） -->
     <dependency>
       <groupId>org.apache.httpcomponents</groupId>
       <artifactId>httpclient</artifactId>
-      <scope>provided</scope>
       <exclusions>
         <exclusion>
           <artifactId>commons-logging</artifactId>
@@ -45,7 +45,6 @@
     <dependency>
       <groupId>org.apache.httpcomponents</groupId>
       <artifactId>httpmime</artifactId>
-      <scope>provided</scope>
     </dependency>
 
     <dependency>

weixin-java-cp/pom.xml

@@ -33,7 +33,6 @@
     <dependency>
       <groupId>org.apache.httpcomponents</groupId>
       <artifactId>httpclient</artifactId>
-      <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.httpcomponents.client5</groupId>

weixin-java-miniapp/pom.xml

@@ -34,12 +34,10 @@
     <dependency>
       <groupId>org.apache.httpcomponents</groupId>
       <artifactId>httpclient</artifactId>
-      <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.httpcomponents</groupId>
       <artifactId>httpmime</artifactId>
-      <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.httpcomponents.client5</groupId>

weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/api/impl/WxMaServiceImpl.java

@@ -6,6 +6,6 @@
  * @author <a href="https://github.com/binarywang">Binary Wang</a>
  */
 @Slf4j
-public class WxMaServiceImpl extends WxMaServiceHttpComponentsImpl {
+public class WxMaServiceImpl extends WxMaServiceHttpClientImpl {
 
 }

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

weixin-java-mp/pom.xml

@@ -34,12 +34,10 @@
     <dependency>
       <groupId>org.apache.httpcomponents</groupId>
       <artifactId>httpclient</artifactId>
-      <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.httpcomponents</groupId>
       <artifactId>httpmime</artifactId>
-      <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.httpcomponents.client5</groupId>

weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/WxMpServiceImpl.java

@@ -2,11 +2,11 @@
 
 /**
  * <pre>
- * 默认接口实现类，使用apache httpClient 5实现
+ * 默认接口实现类，使用 Apache HttpClient 4 实现.
  * Created by Binary Wang on 2017-5-27.
  * </pre>
  *
  * @author <a href="https://github.com/binarywang">Binary Wang</a>
  */
-public class WxMpServiceImpl extends WxMpServiceHttpComponentsImpl {
+public class WxMpServiceImpl extends WxMpServiceHttpClientImpl {
 }