binarywang#295 修复临时文件关闭

dylanleung · binarywang · commit 7a374c0ed47a · 2017-09-03T00:00:58.000+08:00
* update travis settings * feat(okhttp): 修改okhttp底层调用方法 直接用OkHttpClient代替connect.使客户端单一化.Okhttp 自动管理连接池优化 * feat(log,jsApi): 添加log debug 标记明确下调用底层效果,修复jsAPI Lock 为null 问题 添加log debug 标记明确下调用底层效果,修复jsAPI Lock 为null 问题 binarywang#293 * fix(File): 修复文件关闭 修复文件关闭 * Update OkHttpMediaDownloadRequestExecutor.java
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
@@ -24,7 +24,7 @@ public static File createTmpFile(InputStream inputStream, String name, String ex
       tmpFile = File.createTempFile(name, '.' + ext, tmpDirFile);
     }
 
-//    tmpFile.deleteOnExit();
+    tmpFile.deleteOnExit();
 
     try (FileOutputStream fos = new FileOutputStream(tmpFile)) {
       int read = 0;
diff --git a/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/http/okhttp/OkHttpMediaDownloadRequestExecutor.java b/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/http/okhttp/OkHttpMediaDownloadRequestExecutor.java
@@ -62,6 +62,7 @@ public File execute(String uri, String queryParam) throws WxErrorException, IOEx
     try (BufferedSink sink = Okio.buffer(Okio.sink(file))) {
       sink.writeAll(response.body().source());
     }
+    file.deleteOnExit();
     return file;
   }
 
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/http/okhttp/OkhttpQrCodeRequestExecutor.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/http/okhttp/OkhttpQrCodeRequestExecutor.java
@@ -46,6 +46,8 @@ public File execute(String uri, WxMpQrCodeTicket data) throws WxErrorException,
     try (BufferedSink sink = Okio.buffer(Okio.sink(temp))) {
       sink.writeAll(response.body().source());
     }
+    temp.deleteOnExit();
+
     return temp;
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ public static File createTmpFile(InputStream inputStream, String name, String ex`
`24`	`24`	`tmpFile = File.createTempFile(name, '.' + ext, tmpDirFile);`
`25`	`25`	`}`
`26`	`26`
`27`		`-// tmpFile.deleteOnExit();`
	`27`	`+ tmpFile.deleteOnExit();`
`28`	`28`
`29`	`29`	`try (FileOutputStream fos = new FileOutputStream(tmpFile)) {`
`30`	`30`	`int read = 0;`
Original file line number	Diff line number	Diff line change
`@@ -62,6 +62,7 @@ public File execute(String uri, String queryParam) throws WxErrorException, IOEx`
`62`	`62`	`try (BufferedSink sink = Okio.buffer(Okio.sink(file))) {`
`63`	`63`	`sink.writeAll(response.body().source());`
`64`	`64`	`}`
	`65`	`+ file.deleteOnExit();`
`65`	`66`	`return file;`
`66`	`67`	`}`
`67`	`68`
Original file line number	Diff line number	Diff line change
`@@ -46,6 +46,8 @@ public File execute(String uri, WxMpQrCodeTicket data) throws WxErrorException,`
`46`	`46`	`try (BufferedSink sink = Okio.buffer(Okio.sink(temp))) {`
`47`	`47`	`sink.writeAll(response.body().source());`
`48`	`48`	`}`
	`49`	`+ temp.deleteOnExit();`
	`50`	`+`
`49`	`51`	`return temp;`
`50`	`52`	`}`
`51`	`53`	`}`