修复QrCodeRequestExecutor类MimeType比较的bug

pom.xml

@@ -6,7 +6,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.github.binarywang</groupId>
   <artifactId>weixin-java-parent</artifactId>
-  <version>2.8.0</version>
+  <version>2.8.1</version>
   <packaging>pom</packaging>
   <name>WeiXin Java Tools - Parent</name>
   <description>微信公众号、企业号上级POM</description>

weixin-java-common/pom.xml

@@ -7,7 +7,7 @@
   <parent>
     <groupId>com.github.binarywang</groupId>
     <artifactId>weixin-java-parent</artifactId>
-    <version>2.8.0</version>
+    <version>2.8.1</version>
   </parent>
 
   <artifactId>weixin-java-common</artifactId>

weixin-java-cp/pom.xml

@@ -7,7 +7,7 @@
   <parent>
     <groupId>com.github.binarywang</groupId>
     <artifactId>weixin-java-parent</artifactId>
-    <version>2.8.0</version>
+    <version>2.8.1</version>
   </parent>
 
   <artifactId>weixin-java-cp</artifactId>

weixin-java-miniapp/pom.xml

@@ -7,7 +7,7 @@
   <parent>
     <groupId>com.github.binarywang</groupId>
     <artifactId>weixin-java-parent</artifactId>
-    <version>2.8.0</version>
+    <version>2.8.1</version>
   </parent>
   <artifactId>weixin-java-miniapp</artifactId>
   <name>WeiXin Java Tools - MiniApp</name>

weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/util/http/QrCodeRequestExecutor.java

@@ -1,13 +1,10 @@
 package cn.binarywang.wx.miniapp.util.http;
 
-import cn.binarywang.wx.miniapp.bean.WxMaQrcodeWrapper;
-import me.chanjar.weixin.common.bean.result.WxError;
-import me.chanjar.weixin.common.exception.WxErrorException;
-import me.chanjar.weixin.common.util.fs.FileUtils;
-import me.chanjar.weixin.common.util.http.RequestExecutor;
-import me.chanjar.weixin.common.util.http.RequestHttp;
-import me.chanjar.weixin.common.util.http.apache.InputStreamResponseHandler;
-import me.chanjar.weixin.common.util.http.apache.Utf8ResponseHandler;
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.UUID;
+
 import org.apache.http.Header;
 import org.apache.http.HttpHost;
 import org.apache.http.client.config.RequestConfig;
@@ -17,45 +14,48 @@
 import org.apache.http.entity.StringEntity;
 import org.apache.http.impl.client.CloseableHttpClient;
 
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.UUID;
+import cn.binarywang.wx.miniapp.bean.WxMaQrcodeWrapper;
+import me.chanjar.weixin.common.bean.result.WxError;
+import me.chanjar.weixin.common.exception.WxErrorException;
+import me.chanjar.weixin.common.util.fs.FileUtils;
+import me.chanjar.weixin.common.util.http.RequestExecutor;
+import me.chanjar.weixin.common.util.http.RequestHttp;
+import me.chanjar.weixin.common.util.http.apache.InputStreamResponseHandler;
+import me.chanjar.weixin.common.util.http.apache.Utf8ResponseHandler;
 
 /**
  * @author <a href="https://github.com/binarywang">Binary Wang</a>
  */
 public class QrCodeRequestExecutor implements RequestExecutor<File, WxMaQrcodeWrapper> {
-  protected RequestHttp<CloseableHttpClient, HttpHost> requestHttp;
-
-  public QrCodeRequestExecutor(RequestHttp requestHttp) {
-    this.requestHttp = requestHttp;
-  }
-
-  @Override
-  public File execute(String uri, WxMaQrcodeWrapper ticket) throws WxErrorException, IOException {
-    HttpPost httpPost = new HttpPost(uri);
-    if (requestHttp.getRequestHttpProxy() != null) {
-      httpPost
-        .setConfig(RequestConfig.custom()
-          .setProxy(requestHttp.getRequestHttpProxy())
-          .build()
-        );
+    protected RequestHttp<CloseableHttpClient, HttpHost> requestHttp;
+
+    public QrCodeRequestExecutor(RequestHttp requestHttp) {
+        this.requestHttp = requestHttp;
+    }
+
+    @Override
+    public File execute(String uri, WxMaQrcodeWrapper ticket) throws WxErrorException, IOException {
+        HttpPost httpPost = new HttpPost(uri);
+        if (requestHttp.getRequestHttpProxy() != null) {
+            httpPost.setConfig(
+                RequestConfig.custom().setProxy(requestHttp.getRequestHttpProxy()).build());
+    }
+        httpPost.setEntity(new StringEntity(ticket.toString()));
+
+        try (CloseableHttpResponse response = requestHttp.getRequestHttpClient().execute(httpPost);
+                InputStream inputStream = InputStreamResponseHandler.INSTANCE
+                    .handleResponse(response);) {
+            Header[] contentTypeHeader = response.getHeaders("Content-Type");
+            if (contentTypeHeader != null && contentTypeHeader.length > 0
+                && ContentType.APPLICATION_JSON.getMimeType()
+                    .equals(ContentType.parse(contentTypeHeader[0].getValue()).getMimeType())) {
+                String responseContent = Utf8ResponseHandler.INSTANCE.handleResponse(response);
+                throw new WxErrorException(WxError.fromJson(responseContent));
+            }
+
+            return FileUtils.createTmpFile(inputStream, UUID.randomUUID().toString(), "jpg");
+        } finally {
+            httpPost.releaseConnection();
     }
-    httpPost.setEntity(new StringEntity(ticket.toString()));
-
-    try (CloseableHttpResponse response = requestHttp.getRequestHttpClient().execute(httpPost);
-         InputStream inputStream = InputStreamResponseHandler.INSTANCE.handleResponse(response);) {
-      Header[] contentTypeHeader = response.getHeaders("Content-Type");
-      if (contentTypeHeader != null && contentTypeHeader.length > 0
-        && ContentType.APPLICATION_JSON.getMimeType().equals(contentTypeHeader[0].getValue())) {
-        String responseContent = Utf8ResponseHandler.INSTANCE.handleResponse(response);
-        throw new WxErrorException(WxError.fromJson(responseContent));
-      }
-
-      return FileUtils.createTmpFile(inputStream, UUID.randomUUID().toString(), "jpg");
-    } finally {
-      httpPost.releaseConnection();
     }
-  }
 }

weixin-java-mp/pom.xml

@@ -7,7 +7,7 @@
   <parent>
     <groupId>com.github.binarywang</groupId>
     <artifactId>weixin-java-parent</artifactId>
-    <version>2.8.0</version>
+    <version>2.8.1</version>
   </parent>
   <artifactId>weixin-java-mp</artifactId>
   <name>WeiXin Java Tools - MP</name>

weixin-java-pay/pom.xml

@@ -5,7 +5,7 @@
   <parent>
     <artifactId>weixin-java-parent</artifactId>
     <groupId>com.github.binarywang</groupId>
-    <version>2.8.0</version>
+    <version>2.8.1</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>