Skip to content

Develop #295

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
binarywang merged 7 commits into from
Jul 31, 2017
Merged

Develop #295

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
8db9ca2
update travis settings
binarywang Jul 14, 2017
72abbaf
feat(okhttp): 修改okhttp底层调用方法
dylanleung Jul 28, 2017
a535236
Merge branch 'master' into develop
dylanleung Jul 28, 2017
c41bd51
feat(log,jsApi): 添加log debug 标记明确下调用底层效果,修复jsAPI Lock 为null 问题
dylanleung Jul 29, 2017
ce5311c
fix(File): 修复文件关闭
dylanleung Jul 31, 2017
38792ac
Merge branch 'develop' into develop
dylanleung Jul 31, 2017
1459580
Update OkHttpMediaDownloadRequestExecutor.java
dylanleung Jul 31, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion weixin-java-common/src/main/java/me/chanjar/weixin/common/util/fs/FileUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
1 change: 1 addition & 0 deletions ...in/java/me/chanjar/weixin/common/util/http/okhttp/OkHttpMediaDownloadRequestExecutor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

Expand Down
2 changes: 2 additions & 0 deletions ...a-mp/src/main/java/me/chanjar/weixin/mp/util/http/okhttp/OkhttpQrCodeRequestExecutor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
}