From 2dc8e6a675b54c39679afb29360fcf34fcd47d96 Mon Sep 17 00:00:00 2001
From: thinkgem <thinkgem@163.com>
Date: Fri, 8 Mar 2019 22:55:01 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=AF=E6=8C=81fileupload=E5=88=86=E7=89=87?=
 =?UTF-8?q?=E4=B8=8A=E4=BC=A0=EF=BC=8C=E5=A4=9A=E7=BA=BF=E7=A8=8B=E4=B8=8A?=
 =?UTF-8?q?=E4=BC=A0=EF=BC=88=E9=BB=98=E8=AE=A4=E5=85=B3=E9=97=AD=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 modules/core/src/main/resources/config/jeesite-core.yml  | 9 ++++++++-
 .../main/resources/i18n/core/common/i18n_en.properties   | 3 ++-
 .../resources/i18n/core/common/i18n_zh_CN.properties     | 3 ++-
 web/src/main/resources/config/application.yml            | 7 +++++++
 4 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/modules/core/src/main/resources/config/jeesite-core.yml b/modules/core/src/main/resources/config/jeesite-core.yml
index 47c21021..3408d311 100644
--- a/modules/core/src/main/resources/config/jeesite-core.yml
+++ b/modules/core/src/main/resources/config/jeesite-core.yml
@@ -500,7 +500,14 @@ file:
 #    application/msword,application/vnd.openxmlformats-officedocument.wordprocessingml.document,
 #    application/vnd.ms-excel,application/vnd.openxmlformats-officedocument.spreadsheetml.sheet,
 #    application/vnd.ms-powerpoint,application/vnd.openxmlformats-officedocument.presentationml.presentation
-
+  
+  # 是否开启分片上传
+  chunked: false
+  # 分片大小，单位字节（10M）
+  chunkSize: 10485760
+  # 最大上传线程数
+  threads: 1
+  
   # 是否用文件流方式下载（支持断点续传）
   isFileStreamDown: true
   
diff --git a/modules/core/src/main/resources/i18n/core/common/i18n_en.properties b/modules/core/src/main/resources/i18n/core/common/i18n_en.properties
index 4e606c29..53401299 100644
--- a/modules/core/src/main/resources/i18n/core/common/i18n_en.properties
+++ b/modules/core/src/main/resources/i18n/core/common/i18n_en.properties
@@ -59,7 +59,7 @@ sys.error.returnButton=Previous page
 
 # =========== 文件上传相关 =========== 
 
-sys.file.uploadFileIsEmpty=This is a new file, please upload file!
+sys.file.uploadFileIsEmpty=This file is not on the server!
 sys.file.uploadValidNotBlank=File md5 and file name cannot be empty!
 sys.file.uploadValidImage=Can only upload images ({0})
 sys.file.uploadValidVideo=Can only upload video ({0})
@@ -70,3 +70,4 @@ sys.file.uploadValidContent=File content format not allowed!
 sys.file.uploadSuccessSeconds=Seconds upload success , time {0}
 sys.file.uploadSuccess=Upload success {0}
 sys.file.downloadFileNotExist=File lost or non-existent!
+sys.file.chunkUploading=Uploading {0}/{1}
diff --git a/modules/core/src/main/resources/i18n/core/common/i18n_zh_CN.properties b/modules/core/src/main/resources/i18n/core/common/i18n_zh_CN.properties
index c3440dfa..31e46b3b 100644
--- a/modules/core/src/main/resources/i18n/core/common/i18n_zh_CN.properties
+++ b/modules/core/src/main/resources/i18n/core/common/i18n_zh_CN.properties
@@ -60,7 +60,7 @@ sys.error.returnButton=返回上一页
 
 # =========== 文件上传相关 =========== 
 
-sys.file.uploadFileIsEmpty=没有找到上传的文件！
+sys.file.uploadFileIsEmpty=服务器上没有这个文件！
 sys.file.uploadValidNotBlank=文件校验码和文件名不能为空！
 sys.file.uploadValidImage=只能上传图片（{0}）
 sys.file.uploadValidVideo=只能上传视频（{0}）
@@ -71,3 +71,4 @@ sys.file.uploadValidContent=文件内容格式不允许！
 sys.file.uploadSuccessSeconds=秒传成功,用时{0}
 sys.file.uploadSuccess=上传成功,用时{0}
 sys.file.downloadFileNotExist=文件已丢失或不存在！
+sys.file.chunkUploading=正在上传 {0}/{1}
diff --git a/web/src/main/resources/config/application.yml b/web/src/main/resources/config/application.yml
index 3eb2fa4b..95d067a9 100644
--- a/web/src/main/resources/config/application.yml
+++ b/web/src/main/resources/config/application.yml
@@ -514,6 +514,13 @@ logging:
 ##    application/vnd.ms-excel,application/vnd.openxmlformats-officedocument.spreadsheetml.sheet,
 ##    application/vnd.ms-powerpoint,application/vnd.openxmlformats-officedocument.presentationml.presentation
 #
+#  # 是否开启分片上传
+#  chunked: false
+#  # 分片大小，单位字节（10M）
+#  chunkSize: 10485760
+#  # 最大上传线程数
+#  threads: 1
+#
 #  # 是否用文件流方式下载（支持断点续传）
 #  isFileStreamDown: true