Skip to content
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.

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

Feature/fix-download-bug #3203

Merged
merged 3 commits into from
Jan 1, 2024
Merged
Changes from 1 commit
Commits
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
Prev Previous commit
Next Next commit
fix微信永久素材下载返回json 和ok下载永久素材丢失流的问题
shenliuming committed Dec 30, 2023
commit 9c35ff1417df1523eb64850e1191e0039247ed46
Original file line number Diff line number Diff line change
@@ -46,7 +46,7 @@ public InputStream execute(String uri, String materialId, WxType wxType) throws
// 下载媒体文件出错
byte[] responseContent = IOUtils.toByteArray(inputStream);
String responseContentString = new String(responseContent, StandardCharsets.UTF_8);
if (responseContentString.length() < 100) {
if (responseContentString.length() <= 128) {
try {
WxError wxError = WxGsonBuilder.create().fromJson(responseContentString, WxError.class);
if (wxError.getErrorCode() != 0) {
Original file line number Diff line number Diff line change
@@ -42,7 +42,7 @@ public InputStream execute(String uri, String materialId, WxType wxType) throws
// 下载媒体文件出错
byte[] responseContent = IOUtils.toByteArray(inputStream);
String responseContentString = new String(responseContent, StandardCharsets.UTF_8);
if (responseContentString.length() < 100) {
if (responseContentString.length() <= 128) {
try {
WxError wxError = WxGsonBuilder.create().fromJson(responseContentString, WxError.class);
if (wxError.getErrorCode() != 0) {
Original file line number Diff line number Diff line change
@@ -10,6 +10,7 @@
import okhttp3.*;
import okio.BufferedSink;
import okio.Okio;
import org.apache.commons.io.IOUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

@@ -40,10 +41,7 @@ public InputStream execute(String uri, String materialId, WxType wxType) throws
String responseContent = response.body().string();
throw new WxErrorException(WxError.fromJson(responseContent, WxType.MP));
}

try (ByteArrayOutputStream outputStream = new ByteArrayOutputStream(); BufferedSink sink = Okio.buffer(Okio.sink(outputStream))) {
sink.writeAll(response.body().source());
return new ByteArrayInputStream(outputStream.toByteArray());
}
byte[] responseContent = IOUtils.toByteArray(response.body().source().inputStream());
return new ByteArrayInputStream(responseContent);
}
}