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')
     })
   },