From 6746a5465926660d7c915e0348e9cd7affc823f2 Mon Sep 17 00:00:00 2001
From: heavyrian2012 <heavyrain.lee@wildfirehat.cn>
Date: Tue, 14 Feb 2023 21:35:58 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=86=85=E7=BD=AE=E5=AD=98?=
 =?UTF-8?q?=E5=82=A8=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/xiaoleilu/loServer/action/FileAction.java   | 2 ++
 .../java/com/xiaoleilu/loServer/action/UploadFileAction.java  | 4 ++++
 2 files changed, 6 insertions(+)

diff --git a/broker/src/main/java/com/xiaoleilu/loServer/action/FileAction.java b/broker/src/main/java/com/xiaoleilu/loServer/action/FileAction.java
index 9c48c603..f901f792 100755
--- a/broker/src/main/java/com/xiaoleilu/loServer/action/FileAction.java
+++ b/broker/src/main/java/com/xiaoleilu/loServer/action/FileAction.java
@@ -90,6 +90,8 @@ public class FileAction extends Action {
         }
 
         response.setContent(file);
+        response.setHeader("Content-Disposition", "attachment; filename=\"" + file.getName() + "\"");
+
         return true;
     }
 
diff --git a/broker/src/main/java/com/xiaoleilu/loServer/action/UploadFileAction.java b/broker/src/main/java/com/xiaoleilu/loServer/action/UploadFileAction.java
index 031bb4a1..84363f6b 100755
--- a/broker/src/main/java/com/xiaoleilu/loServer/action/UploadFileAction.java
+++ b/broker/src/main/java/com/xiaoleilu/loServer/action/UploadFileAction.java
@@ -187,6 +187,10 @@ public class UploadFileAction extends Action {
                     return false;
                 }
 
+                if(remoteFileName != null && remoteFileName.length() > 2 && remoteFileName.startsWith("'") && remoteFileName.endsWith("'")) {
+                    remoteFileName = remoteFileName.substring(1, remoteFileName.length()-1);
+                }
+
                 if (StringUtil.isNullOrEmpty(remoteFileName)) {
                     logger.warn("remoteFileName is empty!");