wechat/weixin-java-tools
1
0
Fork 0
mirror of https://gitee.com/binary/weixin-java-tools.git synced 2025-10-31 18:46:10 +08:00
Code Issues Packages Projects Releases Wiki Activity

🐛 #3348 【公共问题】修复无法获取正确文件名的问题

Browse Source
This commit is contained in:
Binary Wang
2024-08-20 11:39:54 +08:00
parent b6a8721bd1
commit 748c19f108
2 changed files with 55 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
weixin-java-common/src/main/java/me/chanjar/weixin/common/util/http/HttpResponseProxy.java
View File

@ -6,6 +6,12 @@ import okhttp3.Response;
import org.apache.http.Header; import org.apache.http.Header;
import org.apache.http.client.methods.CloseableHttpResponse; import org.apache.http.client.methods.CloseableHttpResponse;
import java.io.UnsupportedEncodingException;
import java.net.URLDecoder;
import java.nio.charset.StandardCharsets;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
/** /**
* <pre> * <pre>
* 三种http框架的response代理类，方便提取公共方法 * 三种http框架的response代理类，方便提取公共方法
@ -56,29 +62,42 @@ public class HttpResponseProxy {
throw new WxErrorException("无法获取到文件名，Content-disposition为空"); throw new WxErrorException("无法获取到文件名，Content-disposition为空");
} }
return this.extractFileNameFromContentString(contentDispositionHeader[0].getValue()); return extractFileNameFromContentString(contentDispositionHeader[0].getValue());
} }
private String getFileName(HttpResponse response) throws WxErrorException { private String getFileName(HttpResponse response) throws WxErrorException {
String content = response.header("Content-disposition"); String content = response.header("Content-disposition");
return this.extractFileNameFromContentString(content); return extractFileNameFromContentString(content);
} }
private String getFileName(Response response) throws WxErrorException { private String getFileName(Response response) throws WxErrorException {
String content = response.header("Content-disposition"); String content = response.header("Content-disposition");
return this.extractFileNameFromContentString(content); return extractFileNameFromContentString(content);
} }
private String extractFileNameFromContentString(String content) throws WxErrorException { public static String extractFileNameFromContentString(String content) throws WxErrorException {
if (content == null || content.length() == 0) { if (content == null || content.isEmpty()) {
throw new WxErrorException("无法获取到文件名，content为空"); throw new WxErrorException("无法获取到文件名，content为空");
} }
int startIndex = content.indexOf("filename=\""); // 查找filename*=utf-8''开头的部分
if (startIndex != -1) { Pattern pattern = Pattern.compile("filename\\*=utf-8''(.*?)($|;|\\s|,)");
startIndex += "filename=\"".length(); Matcher matcher = pattern.matcher(content);
int endIndex = content.indexOf('"', startIndex); if (matcher.find()) {
return content.substring(startIndex, endIndex); String encodedFileName = matcher.group(1);
// 解码URL编码的文件名
try {
return URLDecoder.decode(encodedFileName, StandardCharsets.UTF_8.name());
} catch (UnsupportedEncodingException e) {
throw new RuntimeException(e);
}
}
// 查找普通filename="..."部分
pattern = Pattern.compile("filename=\"(.*?)\"");
matcher = pattern.matcher(content);
if (matcher.find()) {
return new String(matcher.group(1).getBytes(StandardCharsets.ISO_8859_1), StandardCharsets.UTF_8);
} }
throw new WxErrorException("无法获取到文件名，header信息有问题"); throw new WxErrorException("无法获取到文件名，header信息有问题");

26
weixin-java-common/src/test/java/me/chanjar/weixin/common/util/http/HttpResponseProxyTest.java Normal file
View File

@ -0,0 +1,26 @@
package me.chanjar.weixin.common.util.http;
import me.chanjar.weixin.common.error.WxErrorException;
import org.testng.annotations.Test;
import static org.testng.Assert.*;
public class HttpResponseProxyTest {
@Test
public void testExtractFileNameFromContentString() throws WxErrorException {
String content = "attachment; filename*=utf-8''%E6%B5%8B%E8%AF%95.xlsx; filename=\"æµ<EFBFBD>è¯<EFBFBD>.xlsx\"";
String filename = HttpResponseProxy.extractFileNameFromContentString(content);
assertNotNull(filename);
assertEquals(filename, "测试.xlsx");
}
@Test
public void testExtractFileNameFromContentString_another() throws WxErrorException {
String content = "attachment; filename*=utf-8''%E8%90%A5%E4%B8%9A%E6%89%A7%E7%85%A7.jpg; filename=\"è<EFBFBD>¥ä¸<EFBFBD>æ<EFBFBD>§ç<EFBFBD>§.jpg\"";
// String content = "attachment; filename=\"è<>¥ä¸<C3A4>æ<EFBFBD>§ç<C2A7>§.jpg\"";
String filename = HttpResponseProxy.extractFileNameFromContentString(content);
assertNotNull(filename);
assertEquals(filename, "营业执照.jpg");
}
}