From 49fc74be5d4c65d34d29237b05e26a1a0238715e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=96=AF=E7=8B=82=E7=9A=84=E7=8B=AE=E5=AD=90Li?=
 <15040126243@163.com>
Date: Mon, 27 Sep 2021 21:30:07 +0800
Subject: [PATCH] =?UTF-8?q?fix=20=E4=BF=AE=E5=A4=8D=E6=9B=B4=E6=96=B0?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98=20=E5=AF=BC=E5=87=BA=E6=96=87=E4=BB=B6?=
 =?UTF-8?q?=E5=90=8D=E4=B9=B1=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/ruoyi/web/controller/system/SysOssController.java     | 2 +-
 .../src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java   | 2 +-
 ruoyi-ui/src/plugins/download.js                              | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysOssController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysOssController.java
index 5778b2a02..3c043534d 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysOssController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysOssController.java
@@ -102,7 +102,7 @@ public class SysOssController extends BaseController {
 		response.reset();
 		response.addHeader("Access-Control-Allow-Origin", "*");
 		response.addHeader("Access-Control-Expose-Headers", "Content-Disposition");
-		FileUtils.setAttachmentResponseHeader(response, URLEncoder.encode(sysOss.getOriginalName(), StandardCharsets.UTF_8.toString()));
+		FileUtils.setAttachmentResponseHeader(response, sysOss.getOriginalName());
 		response.setContentType(MediaType.APPLICATION_OCTET_STREAM_VALUE + "; charset=UTF-8");
 		long data;
 		try {
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java b/ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java
index 4060b1794..e3001c605 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java
@@ -46,7 +46,7 @@ public class ExcelUtil {
 			response.reset();
 			response.addHeader("Access-Control-Allow-Origin", "*");
 			response.addHeader("Access-Control-Expose-Headers", "Content-Disposition");
-			FileUtils.setAttachmentResponseHeader(response, URLEncoder.encode(filename, StandardCharsets.UTF_8.toString()));
+			FileUtils.setAttachmentResponseHeader(response, filename);
 			response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet;charset=UTF-8");
 			ServletOutputStream os = response.getOutputStream();
 			EasyExcel.write(os, clazz)
diff --git a/ruoyi-ui/src/plugins/download.js b/ruoyi-ui/src/plugins/download.js
index 248ed01c8..50f664a53 100644
--- a/ruoyi-ui/src/plugins/download.js
+++ b/ruoyi-ui/src/plugins/download.js
@@ -40,7 +40,7 @@ export default {
       this.saveAs(blob, decodeURI(res.headers['download-filename']))
     })
   },
-  oss(ossId, name) {
+  oss(ossId) {
     var url = baseURL + '/system/oss/download/' + ossId
     axios({
       method: 'get',
@@ -49,7 +49,7 @@ export default {
       headers: { 'Authorization': 'Bearer ' + getToken() }
     }).then(res => {
       const blob = new Blob([res.data], { type: 'application/octet-stream' })
-      this.saveAs(blob, name)
+      this.saveAs(blob, decodeURI(res.headers['download-filename']))
     })
   },
   zip(url, name) {