diff --git a/CHANGELOG.md b/CHANGELOG.md
index a5f4c6cd9..95674ce30 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,7 +3,7 @@
 
 -------------------------------------------------------------------------------------------------------------
 
-# 5.7.19 (2021-12-29)
+# 5.7.19 (2022-01-04)
 
 ### 🐣新特性
 * 【db     】     优化Condition参数拆分（pr#2046@Github）
@@ -13,6 +13,7 @@
 ### 🐞Bug修复
 * 【http   】     HttpUtil重定向次数失效问题（issue#I4O28Q@Gitee）
 * 【core   】     修复UrlPath空白path多/问题（issue#I49KAL@Gitee）
+* 【core   】     修复ServletUtil写出文件时未添加双引号导致逗号等特殊符号引起的问题（issue#I4P1BF@Gitee）
 
 -------------------------------------------------------------------------------------------------------------
 # 5.7.18 (2021-12-25)
diff --git a/hutool-core/src/test/java/cn/hutool/core/io/FileUtilTest.java b/hutool-core/src/test/java/cn/hutool/core/io/FileUtilTest.java
index 2d04528ba..712b19b5a 100644
--- a/hutool-core/src/test/java/cn/hutool/core/io/FileUtilTest.java
+++ b/hutool-core/src/test/java/cn/hutool/core/io/FileUtilTest.java
@@ -413,6 +413,22 @@ public class FileUtilTest {
 
 		mimeType = FileUtil.getMimeType("test.js");
 		Assert.assertEquals("application/x-javascript", mimeType);
+
+		// office03
+		mimeType = FileUtil.getMimeType("test.doc");
+		Assert.assertEquals("application/msword", mimeType);
+		mimeType = FileUtil.getMimeType("test.xls");
+		Assert.assertEquals("application/vnd.ms-excel", mimeType);
+		mimeType = FileUtil.getMimeType("test.ppt");
+		Assert.assertEquals("application/vnd.ms-powerpoint", mimeType);
+
+		// office07+
+		mimeType = FileUtil.getMimeType("test.docx");
+		Assert.assertEquals("application/vnd.openxmlformats-officedocument.wordprocessingml.document", mimeType);
+		mimeType = FileUtil.getMimeType("test.xlsx");
+		Assert.assertEquals("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet", mimeType);
+		mimeType = FileUtil.getMimeType("test.pptx");
+		Assert.assertEquals("application/vnd.openxmlformats-officedocument.presentationml.presentation", mimeType);
 	}
 
 	@Test
diff --git a/hutool-extra/src/main/java/cn/hutool/extra/servlet/ServletUtil.java b/hutool-extra/src/main/java/cn/hutool/extra/servlet/ServletUtil.java
index e0ebb429f..5c1391b17 100644
--- a/hutool-extra/src/main/java/cn/hutool/extra/servlet/ServletUtil.java
+++ b/hutool-extra/src/main/java/cn/hutool/extra/servlet/ServletUtil.java
@@ -553,24 +553,27 @@ public class ServletUtil {
 	 *
 	 * @param response    响应对象{@link HttpServletResponse}
 	 * @param in          需要返回客户端的内容
-	 * @param contentType 返回的类型
-	 *                    如：
-	 *                    1、application/pdf、
-	 *                    2、application/vnd.ms-excel、
-	 *                    3、application/msword、
-	 *                    4、application/vnd.ms-powerpoint
+	 * @param contentType 返回的类型，可以使用{@link FileUtil#getMimeType(String)}获取对应扩展名的MIME信息
+	 *                    <ul>
+	 *                      <li>application/pdf</li>
+	 *                      <li>application/vnd.ms-excel</li>
+	 *                      <li>application/msword</li>
+	 *                      <li>application/vnd.ms-powerpoint</li>
+	 *                    </ul>
 	 *                    docx、xlsx 这种 office 2007 格式 设置 MIME;网页里面docx 文件是没问题，但是下载下来了之后就变成doc格式了
-	 *                    https://blog.csdn.net/cyh2260629/article/details/73824760
-	 *                    5、MIME_EXCELX_TYPE = "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet";
-	 *                    6、MIME_PPTX_TYPE = "application/vnd.openxmlformats-officedocument.presentationml.presentation";
-	 *                    7、MIME_WORDX_TYPE = "application/vnd.openxmlformats-officedocument.wordprocessingml.document";
-	 *                    8、MIME_STREAM_TYPE = "application/octet-stream;charset=utf-8"; #原始字节流
-	 * @param fileName    文件名
+	 *                    参考：https://my.oschina.net/shixiaobao17145/blog/32489
+	 *                    <ul>
+	 *                      <li>MIME_EXCELX_TYPE = "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet";</li>
+	 *                      <li>MIME_PPTX_TYPE = "application/vnd.openxmlformats-officedocument.presentationml.presentation";</li>
+	 *                      <li>MIME_WORDX_TYPE = "application/vnd.openxmlformats-officedocument.wordprocessingml.document";</li>
+	 *                      <li>MIME_STREAM_TYPE = "application/octet-stream;charset=utf-8"; #原始字节流</li>
+	 *                    </ul>
+	 * @param fileName    文件名，自动添加双引号
 	 * @since 4.1.15
 	 */
 	public static void write(HttpServletResponse response, InputStream in, String contentType, String fileName) {
 		final String charset = ObjectUtil.defaultIfNull(response.getCharacterEncoding(), CharsetUtil.UTF_8);
-		response.setHeader("Content-Disposition", StrUtil.format("attachment;filename={}",
+		response.setHeader("Content-Disposition", StrUtil.format("attachment;filename=\"{}\"",
 				URLUtil.encode(fileName, CharsetUtil.charset(charset))));
 		response.setContentType(contentType);
 		write(response, in);