From 7f29ea6dd3467bd45a2cfad5c3ec84a249fe81ad Mon Sep 17 00:00:00 2001
From: jmal <zhushilun084@gmail.com>
Date: Sun, 2 May 2021 09:00:32 +0800
Subject: [PATCH] =?UTF-8?q?:bug:fix(*):=20=E4=BF=AE=E5=A4=8D=E6=96=87?=
 =?UTF-8?q?=E4=BB=B6=E5=90=8D=E6=9C=89=E7=89=B9=E6=AE=8A=E5=AD=97=E7=AC=A6?=
 =?UTF-8?q?=E6=97=B6=E4=B8=8A=E4=BC=A0=E5=A4=B1=E8=B4=A5=E7=9A=84=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/SimpleUploader/globalUploader.vue | 4 ++--
 src/utils/file-config.js                         | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/components/SimpleUploader/globalUploader.vue b/src/components/SimpleUploader/globalUploader.vue
index c9fbb18..bc22309 100755
--- a/src/components/SimpleUploader/globalUploader.vue
+++ b/src/components/SimpleUploader/globalUploader.vue
@@ -347,8 +347,8 @@
           // 文件状态设为“合并中”
           this.statusSet(file.id, 'merging')
           api.mergeSimpleUpload({
-            filename: file.name,
-            relativePath: file.relativePath,
+            filename: encodeURIComponent(file.name),
+            relativePath: encodeURIComponent(file.relativePath),
             identifier: file.uniqueIdentifier,
             currentDirectory: this.params.currentDirectory,
             username: this.params.username,
diff --git a/src/utils/file-config.js b/src/utils/file-config.js
index dd7c593..52b3d6a 100644
--- a/src/utils/file-config.js
+++ b/src/utils/file-config.js
@@ -10,9 +10,9 @@ export default {
   // 预览文件的url
   previewUrl: function(username, file, token) {
     if (token) {
-      return `${this.baseUrl}/file/${username}${file.path}${file.name}?jmal-token=${token}`
+      return `${this.baseUrl}/file/${username}${file.path}${encodeURIComponent(file.name)}?jmal-token=${token}`
     } else {
-      return `${this.baseUrl}/file/${username}${file.path}${file.name}`
+      return `${this.baseUrl}/file/${username}${file.path}${encodeURIComponent(file.name)}`
     }
   },
   // mardown里上传图片后的图片预览地址
@@ -27,7 +27,7 @@ export default {
   // 下载文件
   download: function(username, file, token) {
     fileApi.isAllowDownload().then(() => {
-      let url = `${this.baseUrl}/file/${username}${file.path}${file.name}?jmal-token=${token}&o=download`
+      let url = `${this.baseUrl}/file/${username}${file.path}${encodeURIComponent(file.name)}?jmal-token=${token}&o=download`
       window.open(url, '_self')
     })
   },