Merge commit '8d950286588c2784b75f88a72132ace4ef987c4d' into develop

* commit '8d950286588c2784b75f88a72132ace4ef987c4d':
  fix: IDEA 导入的时候总是会将编译level变成5.0的问题
  #165 #167
  #165 MediaDownloadRequestExecutor出错后就没有办法下载了
  upgrade version 1.1.8-SNAPSHOT
  update
  upgrade to 1.1.7

README.md

@@ -17,7 +17,7 @@ weixin-java-tools
 <dependency>
   <groupId>me.chanjar</groupId>
   <artifactId>weixin-java-mp</artifactId>
-  <version>1.1.6</version>
+  <version>1.1.8</version>
 </dependency>
 ```
 
@@ -27,7 +27,7 @@ weixin-java-tools
 <dependency>
   <groupId>me.chanjar</groupId>
   <artifactId>weixin-java-cp</artifactId>
-  <version>1.1.6</version>
+  <version>1.1.8</version>
 </dependency>
 ```
 

pom.xml

@@ -5,7 +5,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>me.chanjar</groupId>
   <artifactId>weixin-java-parent</artifactId>
-  <version>1.1.7-SNAPSHOT</version>
+  <version>1.1.8-SNAPSHOT</version>
   <packaging>pom</packaging>
   <name>WeiXin Java Tools - Parent</name>
   <description>微信公众号、企业号上级POM</description>
@@ -225,6 +225,16 @@
           <goals>deploy</goals>
         </configuration>
       </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <version>2.3.2</version>
+        <configuration>
+          <source>1.7</source>
+          <target>1.7</target>
+          <encoding>UTF-8</encoding>
+        </configuration>
+      </plugin>
     </plugins>
   </build>
 

weixin-java-common/pom.xml

@@ -6,7 +6,7 @@
   <parent>
     <groupId>me.chanjar</groupId>
     <artifactId>weixin-java-parent</artifactId>
-    <version>1.1.7-SNAPSHOT</version>
+    <version>1.1.8-SNAPSHOT</version>
   </parent>
 
   <artifactId>weixin-java-common</artifactId>

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

@@ -53,26 +53,29 @@ public class MediaDownloadRequestExecutor implements RequestExecutor<File, Strin
       httpGet.setConfig(config);
     }
 
-    CloseableHttpResponse response = httpclient.execute(httpGet);
+    try (CloseableHttpResponse response = httpclient.execute(httpGet)) {
 
-    Header[] contentTypeHeader = response.getHeaders("Content-Type");
+      Header[] contentTypeHeader = response.getHeaders("Content-Type");
-    if (contentTypeHeader != null && contentTypeHeader.length > 0) {
+      if (contentTypeHeader != null && contentTypeHeader.length > 0) {
-      // 下载媒体文件出错
+        // 下载媒体文件出错
-      if (ContentType.TEXT_PLAIN.getMimeType().equals(contentTypeHeader[0].getValue())) {
+        if (ContentType.TEXT_PLAIN.getMimeType().equals(contentTypeHeader[0].getValue())) {
-        String responseContent = Utf8ResponseHandler.INSTANCE.handleResponse(response);
+          String responseContent = Utf8ResponseHandler.INSTANCE.handleResponse(response);
-        throw new WxErrorException(WxError.fromJson(responseContent));
+          throw new WxErrorException(WxError.fromJson(responseContent));
+        }
       }
+      InputStream inputStream = InputStreamResponseHandler.INSTANCE.handleResponse(response);
+
+      // 视频文件不支持下载
+      String fileName = getFileName(response);
+      if (StringUtils.isBlank(fileName)) {
+        return null;
+      }
+      String[] name_ext = fileName.split("\\.");
+      File localFile = FileUtils.createTmpFile(inputStream, name_ext[0], name_ext[1], tmpDirFile);
+      return localFile;
+
     }
-    InputStream inputStream = InputStreamResponseHandler.INSTANCE.handleResponse(response);
+
-    
-    // 视频文件不支持下载
-    String fileName = getFileName(response);
-    if (StringUtils.isBlank(fileName)) {
-      return null;
-    }
-    String[] name_ext = fileName.split("\\.");
-    File localFile = FileUtils.createTmpFile(inputStream, name_ext[0], name_ext[1], tmpDirFile);
-    return localFile;
   }
 
   protected String getFileName(CloseableHttpResponse response) {

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

@@ -39,13 +39,14 @@ public class MediaUploadRequestExecutor implements RequestExecutor<WxMediaUpload
       httpPost.setEntity(entity);
       httpPost.setHeader("Content-Type", ContentType.MULTIPART_FORM_DATA.toString());
     }
-    CloseableHttpResponse response = httpclient.execute(httpPost);
+    try (CloseableHttpResponse response = httpclient.execute(httpPost)) {
-    String responseContent = Utf8ResponseHandler.INSTANCE.handleResponse(response);
+      String responseContent = Utf8ResponseHandler.INSTANCE.handleResponse(response);
-    WxError error = WxError.fromJson(responseContent);
+      WxError error = WxError.fromJson(responseContent);
-    if (error.getErrorCode() != 0) {
+      if (error.getErrorCode() != 0) {
-      throw new WxErrorException(error);
+        throw new WxErrorException(error);
+      }
+      return WxMediaUploadResult.fromJson(responseContent);
     }
-    return WxMediaUploadResult.fromJson(responseContent);
   }
 
 }

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

@@ -33,13 +33,14 @@ public class SimpleGetRequestExecutor implements RequestExecutor<String, String>
       httpGet.setConfig(config);
     }
 
-    CloseableHttpResponse response = httpclient.execute(httpGet);
+    try (CloseableHttpResponse response = httpclient.execute(httpGet)) {
-    String responseContent = Utf8ResponseHandler.INSTANCE.handleResponse(response);
+      String responseContent = Utf8ResponseHandler.INSTANCE.handleResponse(response);
-    WxError error = WxError.fromJson(responseContent);
+      WxError error = WxError.fromJson(responseContent);
-    if (error.getErrorCode() != 0) {
+      if (error.getErrorCode() != 0) {
-      throw new WxErrorException(error);
+        throw new WxErrorException(error);
+      }
+      return responseContent;
     }
-    return responseContent;
   }
 
 }

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

@@ -40,13 +40,14 @@ public class SimplePostRequestExecutor implements RequestExecutor<String, String
       httpPost.setEntity(entity);
     }
 
-    CloseableHttpResponse response = httpclient.execute(httpPost);
+    try (CloseableHttpResponse response = httpclient.execute(httpPost)) {
-    String responseContent = Utf8ResponseHandler.INSTANCE.handleResponse(response);
+      String responseContent = Utf8ResponseHandler.INSTANCE.handleResponse(response);
-    WxError error = WxError.fromJson(responseContent);
+      WxError error = WxError.fromJson(responseContent);
-    if (error.getErrorCode() != 0) {
+      if (error.getErrorCode() != 0) {
-      throw new WxErrorException(error);
+        throw new WxErrorException(error);
+      }
+      return responseContent;
     }
-    return responseContent;
   }
 
 }

weixin-java-cp/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>me.chanjar</groupId>
         <artifactId>weixin-java-parent</artifactId>
-        <version>1.1.7-SNAPSHOT</version>
+        <version>1.1.8-SNAPSHOT</version>
     </parent>
 
     <artifactId>weixin-java-cp</artifactId>

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

@@ -117,8 +117,10 @@ public class WxCpServiceImpl implements WxCpService {
               httpGet.setConfig(config);
             }
             CloseableHttpClient httpclient = getHttpclient();
-            CloseableHttpResponse response = httpclient.execute(httpGet);
+            String resultContent = null;
-            String resultContent = new BasicResponseHandler().handleResponse(response);
+            try (CloseableHttpResponse response = httpclient.execute(httpGet)) {
+              resultContent = new BasicResponseHandler().handleResponse(response);
+            }
             WxError error = WxError.fromJson(resultContent);
             if (error.getErrorCode() != 0) {
               throw new WxErrorException(error);

weixin-java-mp/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>me.chanjar</groupId>
         <artifactId>weixin-java-parent</artifactId>
-        <version>1.1.7-SNAPSHOT</version>
+        <version>1.1.8-SNAPSHOT</version>
     </parent>
     <artifactId>weixin-java-mp</artifactId>
     <name>WeiXin Java Tools - MP</name>

weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/http/QrCodeRequestExecutor.java

@@ -47,20 +47,21 @@ public class QrCodeRequestExecutor implements RequestExecutor<File, WxMpQrCodeTi
       httpGet.setConfig(config);
     }
 
-    CloseableHttpResponse response = httpclient.execute(httpGet);
+    try (CloseableHttpResponse response = httpclient.execute(httpGet)) {
-
+      Header[] contentTypeHeader = response.getHeaders("Content-Type");
-    Header[] contentTypeHeader = response.getHeaders("Content-Type");
+      if (contentTypeHeader != null && contentTypeHeader.length > 0) {
-    if (contentTypeHeader != null && contentTypeHeader.length > 0) {
+        // 出错
-      // 出错
+        if (ContentType.TEXT_PLAIN.getMimeType().equals(contentTypeHeader[0].getValue())) {
-      if (ContentType.TEXT_PLAIN.getMimeType().equals(contentTypeHeader[0].getValue())) {
+          String responseContent = Utf8ResponseHandler.INSTANCE.handleResponse(response);
-        String responseContent = Utf8ResponseHandler.INSTANCE.handleResponse(response);
+          throw new WxErrorException(WxError.fromJson(responseContent));
-        throw new WxErrorException(WxError.fromJson(responseContent));
+        }
       }
+      InputStream inputStream = InputStreamResponseHandler.INSTANCE.handleResponse(response);
+
+      File localFile = FileUtils.createTmpFile(inputStream, UUID.randomUUID().toString(), "jpg");
+      return localFile;
     }
-    InputStream inputStream = InputStreamResponseHandler.INSTANCE.handleResponse(response);
+
-    
-    File localFile = FileUtils.createTmpFile(inputStream, UUID.randomUUID().toString(), "jpg");
-    return localFile;
   }
 
 }