From dc45c3d62e7fa34071dec7cf34690ccc57f53519 Mon Sep 17 00:00:00 2001 From: shizhendong Date: Thu, 26 Sep 2024 10:27:34 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20mvc=20=E5=93=8D=E5=BA=94=20=E6=96=87?= =?UTF-8?q?=E4=BB=B6=E6=97=B6=EF=BC=8C=E5=AF=B9=20filename=20=E8=BF=9B?= =?UTF-8?q?=E8=A1=8C=20url=20=E7=BC=96=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../geedge/asw/common/util/ResponseUtil.java | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/src/main/java/net/geedge/asw/common/util/ResponseUtil.java b/src/main/java/net/geedge/asw/common/util/ResponseUtil.java index 5d29954..006fc77 100644 --- a/src/main/java/net/geedge/asw/common/util/ResponseUtil.java +++ b/src/main/java/net/geedge/asw/common/util/ResponseUtil.java @@ -1,16 +1,15 @@ package net.geedge.asw.common.util; -import java.io.IOException; - -import org.springframework.http.MediaType; - -import com.j256.simplemagic.ContentInfo; -import com.j256.simplemagic.ContentInfoUtil; - import cn.hutool.core.io.IORuntimeException; import cn.hutool.core.util.ReflectUtil; import cn.hutool.core.util.StrUtil; +import com.j256.simplemagic.ContentInfo; +import com.j256.simplemagic.ContentInfoUtil; import jakarta.servlet.http.HttpServletResponse; +import org.springframework.http.MediaType; + +import java.io.IOException; +import java.net.URLEncoder; public class ResponseUtil { @@ -25,7 +24,7 @@ public class ResponseUtil { * @throws IOException */ public static void downloadFile(HttpServletResponse response, String contentType, String filename, byte[] data) throws IORuntimeException, IOException { - String fileName = T.URLUtil.encode(filename, T.CharsetUtil.CHARSET_UTF_8); + String fileName = URLEncoder.encode(filename, "UTF-8"); ReflectUtil.invoke(response, "addHeader", "Content-Disposition", "attachment; filename=" + fileName); ReflectUtil.invoke(response, "addHeader", "Content-Length", "" + data.length); ReflectUtil.invoke(response, "setHeader", "Access-Control-Expose-Headers", "Content-Disposition"); @@ -46,7 +45,7 @@ public class ResponseUtil { public static void downloadFile(HttpServletResponse response, String filename, byte[] data) throws IORuntimeException, IOException { response.setContentType(ResponseUtil.getDownloadContentType(filename)); - String fileName = T.URLUtil.encode(filename, T.CharsetUtil.CHARSET_UTF_8); + String fileName = URLEncoder.encode(filename, "UTF-8"); // response.addHeader("Content-Disposition", "attachment; filename=" + fileName); // response.addHeader("Content-Length", "" + data.length); // response.setHeader("Access-Control-Expose-Headers", "Content-Disposition");