From bb6792423300edbc317fef63e0595563c9666b72 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: Fri, 23 Jul 2021 10:48:28 +0800
Subject: [PATCH] =?UTF-8?q?update=20OSS=E4=B8=8B=E8=BD=BD=E6=96=87?=
 =?UTF-8?q?=E4=BB=B6=E5=90=8D=E6=94=B9=E4=B8=BA=E5=90=8E=E7=AB=AF=E4=BC=A0?=
 =?UTF-8?q?=E8=BE=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/ruoyi/oss/entity/UploadResult.java    |  2 ++
 .../com/ruoyi/oss/enumd/CloudServiceEnumd.java     |  2 +-
 .../ruoyi/system/controller/SysOssController.java  |  6 ++++++
 ruoyi-ui/src/utils/ossdownload.js                  | 14 ++++++++++----
 ruoyi-ui/src/views/system/oss/index.vue            |  2 +-
 5 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/ruoyi-oss/src/main/java/com/ruoyi/oss/entity/UploadResult.java b/ruoyi-oss/src/main/java/com/ruoyi/oss/entity/UploadResult.java
index 6d38882a..cb4f6205 100644
--- a/ruoyi-oss/src/main/java/com/ruoyi/oss/entity/UploadResult.java
+++ b/ruoyi-oss/src/main/java/com/ruoyi/oss/entity/UploadResult.java
@@ -6,6 +6,8 @@ import lombok.experimental.Accessors;
 
 /**
  * 上传返回体
+ *
+ * @author Lion Li
  */
 @Data
 @NoArgsConstructor
diff --git a/ruoyi-oss/src/main/java/com/ruoyi/oss/enumd/CloudServiceEnumd.java b/ruoyi-oss/src/main/java/com/ruoyi/oss/enumd/CloudServiceEnumd.java
index 497af556..a668bf29 100644
--- a/ruoyi-oss/src/main/java/com/ruoyi/oss/enumd/CloudServiceEnumd.java
+++ b/ruoyi-oss/src/main/java/com/ruoyi/oss/enumd/CloudServiceEnumd.java
@@ -9,7 +9,7 @@ import lombok.Getter;
 /**
  * 云存储服务商枚举
  *
- * @author LionLi
+ * @author Lion Li
  */
 @Getter
 @AllArgsConstructor
diff --git a/ruoyi-oss/src/main/java/com/ruoyi/system/controller/SysOssController.java b/ruoyi-oss/src/main/java/com/ruoyi/system/controller/SysOssController.java
index 7ebca5fa..37910304 100644
--- a/ruoyi-oss/src/main/java/com/ruoyi/system/controller/SysOssController.java
+++ b/ruoyi-oss/src/main/java/com/ruoyi/system/controller/SysOssController.java
@@ -10,6 +10,7 @@ import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.common.exception.CustomException;
+import com.ruoyi.common.utils.file.FileUtils;
 import com.ruoyi.system.bo.SysOssQueryBo;
 import com.ruoyi.system.domain.SysOss;
 import com.ruoyi.system.service.ISysOssService;
@@ -29,6 +30,8 @@ import org.springframework.web.multipart.MultipartFile;
 import javax.servlet.http.HttpServletResponse;
 import javax.validation.constraints.NotEmpty;
 import java.io.IOException;
+import java.net.URLEncoder;
+import java.nio.charset.StandardCharsets;
 import java.util.Arrays;
 import java.util.HashMap;
 import java.util.Map;
@@ -88,6 +91,9 @@ public class SysOssController extends BaseController {
 			throw new CustomException("文件数据不存在!");
 		}
 		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));
 		response.setContentType(MediaType.APPLICATION_OCTET_STREAM_VALUE + "; charset=UTF-8");
 		long data = HttpUtil.download(sysOss.getUrl(), response.getOutputStream(), false);
 		response.setContentLength(Convert.toInt(data));
diff --git a/ruoyi-ui/src/utils/ossdownload.js b/ruoyi-ui/src/utils/ossdownload.js
index e212ca8a..0b9cf10a 100644
--- a/ruoyi-ui/src/utils/ossdownload.js
+++ b/ruoyi-ui/src/utils/ossdownload.js
@@ -6,7 +6,7 @@ const mimeMap = {
 }
 
 const baseUrl = process.env.VUE_APP_BASE_API
-export function downLoadOss(ossId, filename) {
+export function downLoadOss(ossId) {
   var url = baseUrl + '/system/oss/download/' + ossId
     axios({
     method: 'get',
@@ -14,7 +14,7 @@ export function downLoadOss(ossId, filename) {
     responseType: 'blob',
     headers: { 'Authorization': 'Bearer ' + getToken() }
   }).then(res => {
-    resolveBlob(res, mimeMap.oss, filename)
+    resolveBlob(res, mimeMap.oss)
   })
 }
 /**
@@ -22,11 +22,17 @@ export function downLoadOss(ossId, filename) {
  * @param {*} res blob响应内容
  * @param {String} mimeType MIME类型
  */
-export function resolveBlob(res, mimeType, filename) {
+export function resolveBlob(res, mimeType) {
   const aLink = document.createElement('a')
   var blob = new Blob([res.data], { type: mimeType })
+  // 从response的headers中获取filename, 后端response.setHeader("Content-disposition", "attachment; filename=xxxx.docx") 设置的文件名;
+  var patt = new RegExp('filename=([^;]+\\.[^\\.;]+);*')
+  var contentDisposition = decodeURI(res.headers['content-disposition'])
+  var result = patt.exec(contentDisposition)
+  var fileName = result[1]
+  fileName = fileName.replace(/\"/g, '')
   aLink.href = URL.createObjectURL(blob)
-  aLink.setAttribute('download', filename) // 设置下载文件名称
+  aLink.setAttribute('download', decodeURI(fileName)) // 设置下载文件名称
   document.body.appendChild(aLink)
   aLink.click()
   document.body.removeChild(aLink);
diff --git a/ruoyi-ui/src/views/system/oss/index.vue b/ruoyi-ui/src/views/system/oss/index.vue
index 12bc5d36..5ce65753 100644
--- a/ruoyi-ui/src/views/system/oss/index.vue
+++ b/ruoyi-ui/src/views/system/oss/index.vue
@@ -289,7 +289,7 @@ export default {
     },
     /** 下载按钮操作 */
     handleDownload(row) {
-      downLoadOss(row.ossId, row.originalName)
+      downLoadOss(row.ossId)
     },
     /** 删除按钮操作 */
     handleDelete(row) {