Merge branch 'develop'

chanjarster · Jun 26, 2015 · 825393d · 825393d
2 parents f0432e6 + 0491e23
commit 825393d
Show file tree

Hide file tree

Showing 14 changed files with 119 additions and 39 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,22 +1,23 @@
-*.class
-test-output
-
-# Mobile Tools for Java (J2ME)
-.mtj.tmp/
-
-# Package Files #
-*.jar
-*.war
-*.ear
-
-# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
-hs_err_pid*
-
-target
-.project
-.classpath
-
-sw-pom.xml
-*.iml
-test-config.xml
-.idea
+*.class
+test-output
+
+# Mobile Tools for Java (J2ME)
+.mtj.tmp/
+
+# Package Files #
+*.jar
+*.war
+*.ear
+
+# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
+hs_err_pid*
+
+target
+.project
+.classpath
+.settings
+
+sw-pom.xml
+*.iml
+test-config.xml
+.idea
diff --git a/README.md b/README.md
@@ -17,7 +17,7 @@ weixin-java-tools
 <dependency>
   <groupId>me.chanjar</groupId>
   <artifactId>weixin-java-mp</artifactId>
-  <version>1.1.5</version>
+  <version>1.1.6</version>
 </dependency>
 ```
 
@@ -27,7 +27,7 @@ weixin-java-tools
 <dependency>
   <groupId>me.chanjar</groupId>
   <artifactId>weixin-java-cp</artifactId>
-  <version>1.1.5</version>
+  <version>1.1.6</version>
 </dependency>
 ```
 

diff --git a/pom.xml b/pom.xml
@@ -5,7 +5,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>me.chanjar</groupId>
   <artifactId>weixin-java-parent</artifactId>
-  <version>1.1.5</version>
+  <version>1.1.6</version>
   <packaging>pom</packaging>
   <name>WeiXin Java Tools - Parent</name>
   <description>微信公众号、企业号上级POM</description>

diff --git a/weixin-java-common/pom.xml b/weixin-java-common/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>me.chanjar</groupId>
     <artifactId>weixin-java-parent</artifactId>
-    <version>1.1.5</version>
+    <version>1.1.6</version>
   </parent>
 
   <artifactId>weixin-java-common</artifactId>

diff --git a/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/fs/FileUtils.java b/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/fs/FileUtils.java
@@ -7,18 +7,25 @@
 
 public class FileUtils {
 
+
   /**
    * 创建临时文件
    * @param inputStream
    * @param name  文件名
    * @param ext   扩展名
+   * @param tmpDirFile   临时文件夹目录
    * @return
    * @throws IOException
    */
-  public static File createTmpFile(InputStream inputStream, String name, String ext) throws IOException {
+  public static File createTmpFile(InputStream inputStream, String name, String ext, File tmpDirFile) throws IOException {
     FileOutputStream fos = null;
     try {
-      File tmpFile = File.createTempFile(name, '.' + ext);
+      File tmpFile;
+      if (tmpDirFile == null) {
+    	  tmpFile = File.createTempFile(name, '.' + ext);
+      } else {
+        tmpFile = File.createTempFile(name, '.' + ext, tmpDirFile);
+      }
       tmpFile.deleteOnExit();
       fos = new FileOutputStream(tmpFile);
       int read = 0;
@@ -43,5 +50,17 @@ public static File createTmpFile(InputStream inputStream, String name, String ex
       }
     }
   }
+
+  /**
+   * 创建临时文件
+   * @param inputStream
+   * @param name  文件名
+   * @param ext   扩展名
+   * @return
+   * @throws IOException
+   */
+  public static File createTmpFile(InputStream inputStream, String name, String ext) throws IOException {
+    return createTmpFile(inputStream, name, ext, null);
+  }
 
 }
diff --git a/...common/src/main/java/me/chanjar/weixin/common/util/http/MediaDownloadRequestExecutor.java b/...common/src/main/java/me/chanjar/weixin/common/util/http/MediaDownloadRequestExecutor.java
@@ -25,6 +25,18 @@
  *
  */
 public class MediaDownloadRequestExecutor implements RequestExecutor<File, String> {
+
+  private File tmpDirFile;
+
+  public MediaDownloadRequestExecutor() {
+    super();
+  }
+
+  public MediaDownloadRequestExecutor(File tmpDirFile) {
+    super();
+    this.tmpDirFile = tmpDirFile;
+  }
+
 
   @Override
   public File execute(CloseableHttpClient httpclient, HttpHost httpProxy, String uri, String queryParam) throws WxErrorException, ClientProtocolException, IOException {
@@ -59,7 +71,7 @@ public File execute(CloseableHttpClient httpclient, HttpHost httpProxy, String u
       return null;
     }
     String[] name_ext = fileName.split("\\.");
-    File localFile = FileUtils.createTmpFile(inputStream, name_ext[0], name_ext[1]);
+    File localFile = FileUtils.createTmpFile(inputStream, name_ext[0], name_ext[1], tmpDirFile);
     return localFile;
   }
 

diff --git a/weixin-java-cp/pom.xml b/weixin-java-cp/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>me.chanjar</groupId>
         <artifactId>weixin-java-parent</artifactId>
-        <version>1.1.5</version>
+        <version>1.1.6</version>
     </parent>
 
     <artifactId>weixin-java-cp</artifactId>

diff --git a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/api/WxCpConfigStorage.java b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/api/WxCpConfigStorage.java
@@ -1,5 +1,7 @@
 package me.chanjar.weixin.cp.api;
 
+import java.io.File;
+
 import me.chanjar.weixin.common.bean.WxAccessToken;
 
 /**
@@ -58,5 +60,7 @@ public interface WxCpConfigStorage {
   public String getHttp_proxy_username();
 
   public String getHttp_proxy_password();
+
+  public File getTmpDirFile();
 
 }
diff --git a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/api/WxCpInMemoryConfigStorage.java b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/api/WxCpInMemoryConfigStorage.java
@@ -1,5 +1,7 @@
 package me.chanjar.weixin.cp.api;
 
+import java.io.File;
+
 import me.chanjar.weixin.common.bean.WxAccessToken;
 
 /**
@@ -28,6 +30,8 @@ public class WxCpInMemoryConfigStorage implements WxCpConfigStorage {
   protected volatile String jsapiTicket;
   protected volatile long jsapiTicketExpiresTime;
 
+  protected volatile File tmpDirFile;
+
   public String getAccessToken() {
     return this.accessToken;
   }
@@ -189,7 +193,16 @@ public String toString() {
         ", http_proxy_password='" + http_proxy_password + '\'' +
         ", jsapiTicket='" + jsapiTicket + '\'' +
         ", jsapiTicketExpiresTime='" + jsapiTicketExpiresTime + '\'' +
+        ", tmpDirFile='" + tmpDirFile + '\'' +
         '}';
   }
 
+  public File getTmpDirFile() {
+    return tmpDirFile;
+  }
+
+  public void setTmpDirFile(File tmpDirFile) {
+    this.tmpDirFile = tmpDirFile;
+  }
+
 }
diff --git a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/api/WxCpServiceImpl.java b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/api/WxCpServiceImpl.java
@@ -78,6 +78,11 @@ public class WxCpServiceImpl implements WxCpService {
 
   protected WxSessionManager sessionManager = new StandardSessionManager();
 
+  /**
+   * 临时文件目录
+   */
+  protected File tmpDirFile;
+
   public boolean checkSignature(String msgSignature, String timestamp, String nonce, String data) {
     try {
       return SHA1.gen(wxCpConfigStorage.getToken(), timestamp, nonce, data).equals(msgSignature);
@@ -236,7 +241,8 @@ public WxMediaUploadResult mediaUpload(String mediaType, File file) throws WxErr
 
   public File mediaDownload(String media_id) throws WxErrorException {
     String url = "https://qyapi.weixin.qq.com/cgi-bin/media/get";
-    return execute(new MediaDownloadRequestExecutor(), url, "media_id=" + media_id);
+
+    return execute(new MediaDownloadRequestExecutor(wxCpConfigStorage.getTmpDirFile()), url, "media_id=" + media_id);
   }
 
 
@@ -638,6 +644,14 @@ public WxSession getSession(String id, boolean create) {
   public void setSessionManager(WxSessionManager sessionManager) {
     this.sessionManager = sessionManager;
   }
+
+  public File getTmpDirFile() {
+    return tmpDirFile;
+  }
+
+  public void setTmpDirFile(File tmpDirFile) {
+    this.tmpDirFile = tmpDirFile;
+  }
 
   public static void main(String[] args) {
     Float a = 3.1f;

diff --git a/weixin-java-mp/pom.xml b/weixin-java-mp/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>me.chanjar</groupId>
         <artifactId>weixin-java-parent</artifactId>
-        <version>1.1.5</version>
+        <version>1.1.6</version>
     </parent>
     <artifactId>weixin-java-mp</artifactId>
     <name>WeiXin Java Tools - MP</name>

diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/WxMpConfigStorage.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/WxMpConfigStorage.java
@@ -1,5 +1,7 @@
 package me.chanjar.weixin.mp.api;
 
+import java.io.File;
+
 import me.chanjar.weixin.common.bean.WxAccessToken;
 
 /**
@@ -68,7 +70,8 @@ public interface WxMpConfigStorage {
 
   public String getHttp_proxy_username();
 
-
   public String getHttp_proxy_password();
+
+  public File getTmpDirFile();
 
 }
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/WxMpInMemoryConfigStorage.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/WxMpInMemoryConfigStorage.java
@@ -1,5 +1,7 @@
 package me.chanjar.weixin.mp.api;
 
+import java.io.File;
+
 import me.chanjar.weixin.common.bean.WxAccessToken;
 
 /**
@@ -11,8 +13,8 @@ public class WxMpInMemoryConfigStorage implements WxMpConfigStorage {
 
   protected volatile String appId;
   protected volatile String secret;
-    protected volatile String partnerId;
-    protected volatile String partnerKey;
+  protected volatile String partnerId;
+  protected volatile String partnerKey;
   protected volatile String token;
   protected volatile String accessToken;
   protected volatile String aesKey;
@@ -28,6 +30,11 @@ public class WxMpInMemoryConfigStorage implements WxMpConfigStorage {
   protected volatile String jsapiTicket;
   protected volatile long jsapiTicketExpiresTime;
 
+  /**
+   * 临时文件目录
+   */
+  protected volatile File tmpDirFile;
+
   public String getAccessToken() {
     return this.accessToken;
   }
@@ -181,6 +188,7 @@ public String toString() {
         ", http_proxy_password='" + http_proxy_password + '\'' +
         ", jsapiTicket='" + jsapiTicket + '\'' +
         ", jsapiTicketExpiresTime='" + jsapiTicketExpiresTime + '\'' +
+        ", tmpDirFile='" + tmpDirFile + '\'' +
         '}';
   }
 
@@ -201,4 +209,9 @@ public String getPartnerKey() {
     public void setPartnerKey(String partnerKey) {
         this.partnerKey = partnerKey;
     }
+
+    @Override
+    public File getTmpDirFile() {
+      return this.getTmpDirFile();
+    }
 }
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/WxMpServiceImpl.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/WxMpServiceImpl.java
@@ -7,6 +7,7 @@
 import com.google.gson.reflect.TypeToken;
 import com.google.gson.stream.JsonReader;
 import com.thoughtworks.xstream.XStream;
+
 import me.chanjar.weixin.common.bean.WxAccessToken;
 import me.chanjar.weixin.common.bean.WxMenu;
 import me.chanjar.weixin.common.bean.WxJsapiSignature;
@@ -27,6 +28,7 @@
 import me.chanjar.weixin.mp.bean.result.*;
 import me.chanjar.weixin.mp.util.http.QrCodeRequestExecutor;
 import me.chanjar.weixin.mp.util.json.WxMpGsonBuilder;
+
 import org.apache.http.Consts;
 import org.apache.http.HttpHost;
 import org.apache.http.auth.AuthScope;
@@ -108,8 +110,7 @@ public String getAccessToken(boolean forceRefresh) throws WxErrorException {
               RequestConfig config = RequestConfig.custom().setProxy(httpProxy).build();
               httpGet.setConfig(config);
             }
-            CloseableHttpClient httpclient = getHttpclient();
-            CloseableHttpResponse response = httpclient.execute(httpGet);
+            CloseableHttpResponse response = getHttpclient().execute(httpGet);
             String resultContent = new BasicResponseHandler().handleResponse(response);
             WxError error = WxError.fromJson(resultContent);
             if (error.getErrorCode() != 0) {
@@ -214,7 +215,7 @@ public WxMediaUploadResult mediaUpload(String mediaType, File file) throws WxErr
 
   public File mediaDownload(String media_id) throws WxErrorException {
     String url = "http://file.api.weixin.qq.com/cgi-bin/media/get";
-    return execute(new MediaDownloadRequestExecutor(), url, "media_id=" + media_id);
+    return execute(new MediaDownloadRequestExecutor(wxMpConfigStorage.getTmpDirFile()), url, "media_id=" + media_id);
   }
 
   public WxMpMassUploadResult massNewsUpload(WxMpMassNews news) throws WxErrorException {
@@ -672,7 +673,7 @@ public WxMpPrepayIdResult getPrepayId(String openId, String outTradeNo, double a
     StringEntity entity = new StringEntity(xml, Consts.UTF_8);
     httpPost.setEntity(entity);
     try {
-      CloseableHttpResponse response = httpClient.execute(httpPost);
+      CloseableHttpResponse response = getHttpclient().execute(httpPost);
       String responseContent = Utf8ResponseHandler.INSTANCE.handleResponse(response);
       XStream xstream = XStreamInitializer.getInstance();
       xstream.alias("xml", WxMpPrepayIdResult.class);