fix:使用HttpComponents时若不配置proxy password启动报错问题

Author: buaazyl

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

@@ -5,7 +5,6 @@
 import me.chanjar.weixin.channel.config.WxChannelConfig;
 import me.chanjar.weixin.channel.util.JsonUtils;
 import me.chanjar.weixin.common.util.http.HttpClientType;
-import me.chanjar.weixin.common.util.http.apache.ApacheBasicResponseHandler;
 import me.chanjar.weixin.common.util.http.hc.BasicResponseHandler;
 import me.chanjar.weixin.common.util.http.hc.DefaultHttpComponentsClientBuilder;
 import me.chanjar.weixin.common.util.http.hc.HttpComponentsClientBuilder;
@@ -41,7 +40,7 @@ public void initHttp() {
     apacheHttpClientBuilder.httpProxyHost(config.getHttpProxyHost())
       .httpProxyPort(config.getHttpProxyPort())
       .httpProxyUsername(config.getHttpProxyUsername())
-      .httpProxyPassword(config.getHttpProxyPassword().toCharArray());
+      .httpProxyPassword(config.getHttpProxyPassword() == null ? null : config.getHttpProxyPassword().toCharArray());
 
     if (config.getHttpProxyHost() != null && config.getHttpProxyPort() > 0) {
       this.httpProxy = new HttpHost(config.getHttpProxyHost(), config.getHttpProxyPort());

weixin-java-cp/src/main/java/me/chanjar/weixin/cp/api/impl/WxCpServiceHttpComponentsImpl.java

@@ -82,7 +82,8 @@ public void initHttp() {
     apacheHttpClientBuilder.httpProxyHost(this.configStorage.getHttpProxyHost())
       .httpProxyPort(this.configStorage.getHttpProxyPort())
       .httpProxyUsername(this.configStorage.getHttpProxyUsername())
-      .httpProxyPassword(this.configStorage.getHttpProxyPassword().toCharArray());
+      .httpProxyPassword(this.configStorage.getHttpProxyPassword() == null ? null :
+        this.configStorage.getHttpProxyPassword().toCharArray());
 
     if (this.configStorage.getHttpProxyHost() != null && this.configStorage.getHttpProxyPort() > 0) {
       this.httpProxy = new HttpHost(this.configStorage.getHttpProxyHost(), this.configStorage.getHttpProxyPort());

weixin-java-cp/src/main/java/me/chanjar/weixin/cp/corpgroup/service/impl/WxCpCgServiceHttpComponentsImpl.java

@@ -35,7 +35,8 @@ public void initHttp() {
     apacheHttpClientBuilder.httpProxyHost(this.configStorage.getHttpProxyHost())
       .httpProxyPort(this.configStorage.getHttpProxyPort())
       .httpProxyUsername(this.configStorage.getHttpProxyUsername())
-      .httpProxyPassword(this.configStorage.getHttpProxyPassword().toCharArray());
+      .httpProxyPassword(this.configStorage.getHttpProxyPassword() == null ? null :
+        this.configStorage.getHttpProxyPassword().toCharArray());
 
     if (this.configStorage.getHttpProxyHost() != null && this.configStorage.getHttpProxyPort() > 0) {
       this.httpProxy = new HttpHost(this.configStorage.getHttpProxyHost(), this.configStorage.getHttpProxyPort());

weixin-java-cp/src/main/java/me/chanjar/weixin/cp/tp/service/impl/WxCpTpServiceHttpComponentsImpl.java

@@ -10,7 +10,6 @@
 import me.chanjar.weixin.common.util.http.hc.DefaultHttpComponentsClientBuilder;
 import me.chanjar.weixin.common.util.http.hc.HttpComponentsClientBuilder;
 import me.chanjar.weixin.common.util.json.GsonParser;
-import me.chanjar.weixin.cp.config.WxCpTpConfigStorage;
 import me.chanjar.weixin.cp.constant.WxCpApiPathConsts;
 import org.apache.hc.client5.http.classic.methods.HttpPost;
 import org.apache.hc.client5.http.config.RequestConfig;
@@ -87,9 +86,10 @@ public void initHttp() {
     HttpComponentsClientBuilder apacheHttpClientBuilder = DefaultHttpComponentsClientBuilder.get();
 
     apacheHttpClientBuilder.httpProxyHost(this.configStorage.getHttpProxyHost())
-      .httpProxyPort(this.configStorage.getHttpProxyPort())
-      .httpProxyUsername(this.configStorage.getHttpProxyUsername())
-      .httpProxyPassword(this.configStorage.getHttpProxyPassword().toCharArray());
+            .httpProxyPort(this.configStorage.getHttpProxyPort())
+            .httpProxyUsername(this.configStorage.getHttpProxyUsername())
+            .httpProxyPassword(this.configStorage.getHttpProxyPassword() == null ? null :
+                    this.configStorage.getHttpProxyPassword().toCharArray());
 
     if (this.configStorage.getHttpProxyHost() != null && this.configStorage.getHttpProxyPort() > 0) {
       this.httpProxy = new HttpHost(this.configStorage.getHttpProxyHost(), this.configStorage.getHttpProxyPort());

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

@@ -51,7 +51,8 @@ public void initHttp() {
     apacheHttpClientBuilder.httpProxyHost(configStorage.getHttpProxyHost())
       .httpProxyPort(configStorage.getHttpProxyPort())
       .httpProxyUsername(configStorage.getHttpProxyUsername())
-      .httpProxyPassword(configStorage.getHttpProxyPassword().toCharArray());
+      .httpProxyPassword(configStorage.getHttpProxyPassword() == null ? null :
+        configStorage.getHttpProxyPassword().toCharArray());
 
     if (configStorage.getHttpProxyHost() != null && configStorage.getHttpProxyPort() > 0) {
       this.httpProxy = new HttpHost(configStorage.getHttpProxyHost(), configStorage.getHttpProxyPort());

weixin-java-qidian/src/main/java/me/chanjar/weixin/qidian/api/impl/WxQidianServiceHttpComponentsImpl.java

@@ -48,8 +48,10 @@ public void initHttp() {
     HttpComponentsClientBuilder apacheHttpClientBuilder = DefaultHttpComponentsClientBuilder.get();
 
     apacheHttpClientBuilder.httpProxyHost(configStorage.getHttpProxyHost())
-        .httpProxyPort(configStorage.getHttpProxyPort()).httpProxyUsername(configStorage.getHttpProxyUsername())
-        .httpProxyPassword(configStorage.getHttpProxyPassword().toCharArray());
+      .httpProxyPort(configStorage.getHttpProxyPort())
+      .httpProxyUsername(configStorage.getHttpProxyUsername())
+      .httpProxyPassword(configStorage.getHttpProxyPassword() == null ? null :
+        configStorage.getHttpProxyPassword().toCharArray());
 
     if (configStorage.getHttpProxyHost() != null && configStorage.getHttpProxyPort() > 0) {
       this.httpProxy = new HttpHost(configStorage.getHttpProxyHost(), configStorage.getHttpProxyPort());