From 449ec53da291a7d9dff5a8f12b04e376ab2db1ea Mon Sep 17 00:00:00 2001 From: Looly Date: Thu, 7 Apr 2022 00:16:35 +0800 Subject: [PATCH] fix bug --- CHANGELOG.md | 3 ++- hutool-poi/src/main/java/cn/hutool/poi/excel/ExcelWriter.java | 2 +- .../src/test/java/cn/hutool/poi/excel/ExcelWriteTest.java | 4 ++++ 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e82677009..a2abe92e5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,7 +3,7 @@ ------------------------------------------------------------------------------------------------------------- -# 5.8.0.M3 (2022-04-06) +# 5.8.0.M3 (2022-04-07) ### ❌不兼容特性 @@ -14,6 +14,7 @@ ### 🐞Bug修复 * 【core 】 修复UserAgentUtil识别Linux出错（issue#I50YGY@Gitee） +* 【poi 】 修复ExcelWriter.getDisposition方法生成错误（issue#2239@Github） ------------------------------------------------------------------------------------------------------------- diff --git a/hutool-poi/src/main/java/cn/hutool/poi/excel/ExcelWriter.java b/hutool-poi/src/main/java/cn/hutool/poi/excel/ExcelWriter.java index 27033934b..43231fd9d 100644 --- a/hutool-poi/src/main/java/cn/hutool/poi/excel/ExcelWriter.java +++ b/hutool-poi/src/main/java/cn/hutool/poi/excel/ExcelWriter.java @@ -373,7 +373,7 @@ public class ExcelWriter extends ExcelBase { } fileName = StrUtil.addSuffixIfNot(URLUtil.encodeAll(fileName, charset), isXlsx() ? ".xlsx" : ".xls"); - return StrUtil.format("attachment; filename=\"{}\"; filename*={}''{}", fileName, charset.name(), fileName); + return StrUtil.format("attachment; filename=\"{}\";", fileName); } /** diff --git a/hutool-poi/src/test/java/cn/hutool/poi/excel/ExcelWriteTest.java b/hutool-poi/src/test/java/cn/hutool/poi/excel/ExcelWriteTest.java index aa404a379..5cb4aa276 100644 --- a/hutool-poi/src/test/java/cn/hutool/poi/excel/ExcelWriteTest.java +++ b/hutool-poi/src/test/java/cn/hutool/poi/excel/ExcelWriteTest.java @@ -877,4 +877,8 @@ public class ExcelWriteTest { writer.close(); } + @Test + public void getDispositionTest(){ + + } }