Merge commit '4da9ea5dd5210674ccc3d20d470d337857182474' into develop

* commit '4da9ea5dd5210674ccc3d20d470d337857182474':
  增加临时文件目录配置
  增加忽略eclipse本地配置文件目录
  fix README

.gitignore

@@ -15,6 +15,7 @@ hs_err_pid*
 target
 .project
 .classpath
+.settings
 
 sw-pom.xml
 *.iml

weixin-java-common/src/main/java/me/chanjar/weixin/common/util/fs/FileUtils.java

@@ -7,18 +7,25 @@ import java.io.InputStream;
 
 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;
@@ -44,4 +51,16 @@ public class FileUtils {
     }
   }
 
+  /**
+   * 创建临时文件
+   * @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);
+  }
+  
 }

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

@@ -26,6 +26,18 @@ import java.util.regex.Pattern;
  */
 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 {
     if (queryParam != null) {
@@ -59,7 +71,7 @@ public class MediaDownloadRequestExecutor implements RequestExecutor<File, Strin
       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;
   }
 

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;
 
 /**
@@ -59,4 +61,6 @@ public interface WxCpConfigStorage {
 
   public String getHttp_proxy_password();
   
+  public File getTmpDirFile();
+
 }

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 class WxCpInMemoryConfigStorage implements WxCpConfigStorage {
         ", 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;
+  }
+
 }

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 class WxCpServiceImpl implements WxCpService {
 
   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);
   }
 
 
@@ -639,6 +645,14 @@ public class WxCpServiceImpl implements WxCpService {
     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;
     System.out.println(3.1d);

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();
+
 }

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;
 
 /**
@@ -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 class WxMpInMemoryConfigStorage implements WxMpConfigStorage {
         ", http_proxy_password='" + http_proxy_password + '\'' +
         ", jsapiTicket='" + jsapiTicket + '\'' +
         ", jsapiTicketExpiresTime='" + jsapiTicketExpiresTime + '\'' +
+        ", tmpDirFile='" + tmpDirFile + '\'' +
         '}';
   }
 
@@ -201,4 +209,9 @@ public class WxMpInMemoryConfigStorage implements WxMpConfigStorage {
     public void setPartnerKey(String partnerKey) {
         this.partnerKey = partnerKey;
     }
+
+    @Override
+    public File getTmpDirFile() {
+      return this.getTmpDirFile();
+    }
 }

weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/WxMpServiceImpl.java

@@ -7,6 +7,7 @@ import com.google.gson.internal.Streams;
 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.*;
 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;
@@ -214,7 +216,7 @@ public class WxMpServiceImpl implements WxMpService {
   
   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 {