fix: #172 based on PR #259

Author: chanjarster

pom.xml

@@ -44,6 +44,7 @@
     <httpclient.version>4.5</httpclient.version>
     <slf4j.version>1.7.10</slf4j.version>
     <logback.version>1.1.2</logback.version>
+    <jodd-http.version>3.6.7</jodd-http.version>
   </properties>
 
   <dependencies>
@@ -68,6 +69,11 @@
       <artifactId>httpmime</artifactId>
       <version>${httpclient.version}</version>
     </dependency>
+    <dependency>
+      <groupId>org.jodd</groupId>
+      <artifactId>jodd-http</artifactId>
+      <version>${jodd-http.version}</version>
+    </dependency>
     <dependency>
       <groupId>com.google.code.gson</groupId>
       <artifactId>gson</artifactId>

weixin-java-common/src/main/java/me/chanjar/weixin/common/util/http/JoddGetRequestExecutor.java

@@ -0,0 +1,55 @@
+package me.chanjar.weixin.common.util.http;
+
+import jodd.http.HttpRequest;
+import jodd.http.HttpResponse;
+import jodd.http.ProxyInfo;
+import jodd.http.net.SocketHttpConnectionProvider;
+import me.chanjar.weixin.common.bean.result.WxError;
+import me.chanjar.weixin.common.exception.WxErrorException;
+import org.apache.http.HttpHost;
+import org.apache.http.impl.client.CloseableHttpClient;
+
+import java.io.IOException;
+
+/**
+ * 简单的GET请求执行器，请求的参数是String, 返回的结果也是String
+ *
+ * @author Daniel Qian
+ */
+public class JoddGetRequestExecutor implements RequestExecutor<String, String> {
+
+    @Override
+    public String execute(CloseableHttpClient httpclient, HttpHost httpProxy, String uri,
+        String queryParam) throws WxErrorException, IOException {
+        if (queryParam != null) {
+            if (uri.indexOf('?') == -1) {
+                uri += '?';
+            }
+            uri += uri.endsWith("?") ? queryParam : '&' + queryParam;
+        }
+
+        SocketHttpConnectionProvider provider = new SocketHttpConnectionProvider();
+
+        if (httpProxy != null) {
+            ProxyInfo proxyInfoObj = new ProxyInfo(
+                ProxyInfo.ProxyType.HTTP,
+                httpProxy.getAddress().getHostAddress(),
+                httpProxy.getPort(), "", "");
+            provider.useProxy(proxyInfoObj);
+        }
+
+        HttpRequest request = HttpRequest.get(uri);
+        request.method("GET");
+        request.charset("UTF-8");
+
+        HttpResponse response = request.open(provider).send();
+        String result = response.bodyText();
+
+        WxError error = WxError.fromJson(result);
+        if (error.getErrorCode() != 0) {
+            throw new WxErrorException(error);
+        }
+        return result;
+    }
+
+}

weixin-java-common/src/main/java/me/chanjar/weixin/common/util/http/JoddPostRequestExecutor.java

@@ -0,0 +1,49 @@
+package me.chanjar.weixin.common.util.http;
+
+import jodd.http.HttpRequest;
+import jodd.http.HttpResponse;
+import jodd.http.ProxyInfo;
+import jodd.http.net.SocketHttpConnectionProvider;
+import me.chanjar.weixin.common.bean.result.WxError;
+import me.chanjar.weixin.common.exception.WxErrorException;
+import org.apache.http.HttpHost;
+import org.apache.http.impl.client.CloseableHttpClient;
+
+import java.io.IOException;
+
+/**
+ * 简单的POST请求执行器，请求的参数是String, 返回的结果也是String
+ *
+ * @author Edison Guo
+ */
+public class JoddPostRequestExecutor implements RequestExecutor<String, String> {
+
+    @Override
+    public String execute(CloseableHttpClient httpclient, HttpHost httpProxy, String uri,
+        String postEntity) throws WxErrorException, IOException {
+        SocketHttpConnectionProvider provider = new SocketHttpConnectionProvider();
+
+        if (httpProxy != null) {
+            ProxyInfo proxyInfoObj = new ProxyInfo(
+                ProxyInfo.ProxyType.HTTP,
+                httpProxy.getAddress().getHostAddress(),
+                httpProxy.getPort(), "", "");
+            provider.useProxy(proxyInfoObj);
+        }
+
+        HttpRequest request = HttpRequest.get(uri);
+        request.method("POST");
+        request.charset("UTF-8");
+        request.bodyText(postEntity);
+
+        HttpResponse response = request.open(provider).send();
+        String result = response.bodyText();
+
+        WxError error = WxError.fromJson(result);
+        if (error.getErrorCode() != 0) {
+            throw new WxErrorException(error);
+        }
+        return result;
+    }
+
+}

weixin-java-cp/src/main/java/me/chanjar/weixin/cp/api/WxCpServiceImpl.java

@@ -25,8 +25,8 @@
 import me.chanjar.weixin.common.util.http.MediaDownloadRequestExecutor;
 import me.chanjar.weixin.common.util.http.MediaUploadRequestExecutor;
 import me.chanjar.weixin.common.util.http.RequestExecutor;
-import me.chanjar.weixin.common.util.http.SimpleGetRequestExecutor;
-import me.chanjar.weixin.common.util.http.SimplePostRequestExecutor;
+import me.chanjar.weixin.common.util.http.JoddGetRequestExecutor;
+import me.chanjar.weixin.common.util.http.JoddPostRequestExecutor;
 import me.chanjar.weixin.common.util.http.URIUtil;
 import me.chanjar.weixin.common.util.json.GsonHelper;
 import me.chanjar.weixin.cp.bean.WxCpDepart;
@@ -156,7 +156,7 @@ public String getJsapiTicket(boolean forceRefresh) throws WxErrorException {
       synchronized (globalJsapiTicketRefreshLock) {
         if (wxCpConfigStorage.isJsapiTicketExpired()) {
           String url = "https://qyapi.weixin.qq.com/cgi-bin/get_jsapi_ticket";
-          String responseContent = execute(new SimpleGetRequestExecutor(), url, null);
+          String responseContent = execute(new JoddGetRequestExecutor(), url, null);
           JsonElement tmpJsonElement = Streams.parse(new JsonReader(new StringReader(responseContent)));
           JsonObject tmpJsonObject = tmpJsonElement.getAsJsonObject();
           String jsapiTicket = tmpJsonObject.get("ticket").getAsString();
@@ -256,7 +256,7 @@ public File mediaDownload(String media_id) throws WxErrorException {
   public Integer departCreate(WxCpDepart depart) throws WxErrorException {
     String url = "https://qyapi.weixin.qq.com/cgi-bin/department/create";
     String responseContent = execute(
-        new SimplePostRequestExecutor(),
+        new JoddPostRequestExecutor(),
         url,
         depart.toJson());
     JsonElement tmpJsonElement = Streams.parse(new JsonReader(new StringReader(responseContent)));
@@ -512,11 +512,11 @@ public String[] getCallbackIp() throws WxErrorException {
   }
 
   public String get(String url, String queryParam) throws WxErrorException {
-    return execute(new SimpleGetRequestExecutor(), url, queryParam);
+    return execute(new JoddGetRequestExecutor(), url, queryParam);
   }
 
   public String post(String url, String postData) throws WxErrorException {
-    return execute(new SimplePostRequestExecutor(), url, postData);
+    return execute(new JoddPostRequestExecutor(), url, postData);
   }
 
   /**
@@ -685,12 +685,5 @@ public void setTmpDirFile(File tmpDirFile) {
     this.tmpDirFile = tmpDirFile;
   }
 
-  public static void main(String[] args) {
-    Float a = 3.1f;
-    System.out.println(3.1d);
-    System.out.println(new BigDecimal(3.1d));
-    System.out.println(new BigDecimal(a));
-    System.out.println(a.toString());
-    System.out.println(a.doubleValue());
-  }
+
 }