lsm/hutool
1
0
Fork 0
mirror of https://gitee.com/dromara/hutool.git synced 2025-04-05 17:37:59 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

HttpResponse增加getFileNameFromDisposition方法

Browse Source
This commit is contained in:
Looly 2022-10-24 12:15:07 +08:00
parent b6f0a9b74b
commit c54b529153
2 changed files with 23 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGELOG.md
View File

@ -6,10 +6,11 @@
# 5.8.10.M1 (2022-10-24)
### 🐣新特性
* 【http 】 HttpResponse增加getFileNameFromDisposition方法（pr#2676@Github）
### 🐞Bug修复
* 【db 】 修复分页时order by截断问题（issue#I5X6FM@Gitee）
* 【db 】 修复Partition计算size除数为0报错问题（pr#2677@Github）
* 【core 】 修复Partition计算size除数为0报错问题（pr#2677@Github）
-------------------------------------------------------------------------------------------------------------
# 5.8.9 (2022-10-22)

50
hutool-http/src/main/java/cn/hutool/http/HttpResponse.java
View File

@ -7,6 +7,7 @@ import cn.hutool.core.io.IORuntimeException;
import cn.hutool.core.io.IoUtil;
import cn.hutool.core.io.StreamProgress;
import cn.hutool.core.lang.Assert;
import cn.hutool.core.util.ObjUtil;
import cn.hutool.core.util.ReUtil;
import cn.hutool.core.util.StrUtil;
import cn.hutool.core.util.URLUtil;
@ -448,7 +449,7 @@ public class HttpResponse extends HttpBase<HttpResponse> implements Closeable {
}
// 从头信息中获取文件名
String fileName = getFileNameFromDisposition();
String fileName = getFileNameFromDisposition(null);
if (StrUtil.isBlank(fileName)) {
final String path = httpConnection.getUrl().getPath();
// 从路径中获取文件名
@ -464,6 +465,25 @@ public class HttpResponse extends HttpBase<HttpResponse> implements Closeable {
return FileUtil.file(targetFileOrDir, fileName);
}
/**
* 从Content-Disposition头中获取文件名
* @param paramName 文件参数名
*
* @return 文件名，empty表示无
*/
public String getFileNameFromDisposition(String paramName) {
paramName = ObjUtil.defaultIfNull(paramName, "filename");
String fileName = null;
final String disposition = header(Header.CONTENT_DISPOSITION);
if (StrUtil.isNotBlank(disposition)) {
fileName = ReUtil.get(paramName+"=\"(.*?)\"", disposition, 1);
if (StrUtil.isBlank(fileName)) {
fileName = StrUtil.subAfter(disposition, paramName + "=", true);
}
}
return fileName;
}
// ---------------------------------------------------------------- Private method start
/**
@ -620,33 +640,5 @@ public class HttpResponse extends HttpBase<HttpResponse> implements Closeable {
}
return copyLength;
}
/**
* 从Content-Disposition头中获取文件名，默认为 filename
*
* @return 文件名，empty表示无
*/
public String getFileNameFromDisposition() {
return getFileNameFromDisposition("filename");
}
/**
* 从Content-Disposition头中获取文件名
* @param paramName 文件参数名
*
* @return 文件名，empty表示无
*/
public String getFileNameFromDisposition(String paramName) {
String fileName = null;
final String disposition = header(Header.CONTENT_DISPOSITION);
if (StrUtil.isNotBlank(disposition)) {
fileName = ReUtil.get(paramName+"=\"(.*?)\"", disposition, 1);
if (StrUtil.isBlank(fileName)) {
fileName = StrUtil.subAfter(disposition, "filename=", true);
}
}
return fileName;
}
// ---------------------------------------------------------------- Private method end
}