diff --git a/application/common/library/Upload.php b/application/common/library/Upload.php
index f526bdfa..e471007f 100644
--- a/application/common/library/Upload.php
+++ b/application/common/library/Upload.php
@@ -152,7 +152,7 @@ class Upload
             '{sec}'      => date("s"),
             '{random}'   => Random::alnum(16),
             '{random32}' => Random::alnum(32),
-            '{filename}' => $filename,
+            '{filename}' => substr($filename, 0, 100),
             '{suffix}'   => $suffix,
             '{.suffix}'  => $suffix ? '.' . $suffix : '',
             '{filemd5}'  => $md5,
@@ -300,7 +300,7 @@ class Upload
         $params = array(
             'admin_id'    => (int)session('admin.id'),
             'user_id'     => (int)cookie('uid'),
-            'filename'    => htmlspecialchars(strip_tags($this->fileInfo['name'])),
+            'filename'    => substr(htmlspecialchars(strip_tags($this->fileInfo['name'])), 0, 100),
             'filesize'    => $this->fileInfo['size'],
             'imagewidth'  => $this->fileInfo['imagewidth'],
             'imageheight' => $this->fileInfo['imageheight'],
diff --git a/public/assets/js/require-backend.min.js b/public/assets/js/require-backend.min.js
index 011c702a..d5d17ab7 100644
--- a/public/assets/js/require-backend.min.js
+++ b/public/assets/js/require-backend.min.js
@@ -7403,6 +7403,9 @@ define('upload',['jquery', 'bootstrap', 'dropzone', 'template'], function ($, un
                         //上传URL
                         url = url ? url : Config.upload.uploadurl;
                         url = Fast.api.fixurl(url);
+                        var chunking = Config.upload.chunking || false,
+                            chunkSize = Config.upload.chunksize || 2097152;
+
                         //最大可上传文件大小
                         maxsize = typeof maxsize !== "undefined" ? maxsize : Config.upload.maxsize;
                         //文件类型
@@ -7415,6 +7418,7 @@ define('upload',['jquery', 'bootstrap', 'dropzone', 'template'], function ($, un
                         mimetype = mimetype.split(",").map(function (k) {
                             return k.indexOf("/") > -1 ? k : (!k || k === "*" || k.charAt(0) === "." ? k : "." + k);
                         }).join(",");
+                        mimetype = mimetype === '*' ? null : mimetype;
 
                         //最大文件限制转换成mb
                         var maxFilesize = (function (maxsize) {
@@ -7452,6 +7456,8 @@ define('upload',['jquery', 'bootstrap', 'dropzone', 'template'], function ($, un
                                 }
                                 return params;
                             },
+                            chunking: chunking,
+                            chunkSize: chunkSize,
                             maxFilesize: maxFilesize,
                             acceptedFiles: mimetype,
                             maxFiles: (maxcount && parseInt(maxcount) > 1 ? maxcount : (multiple ? null : 1)),
diff --git a/public/assets/js/require-upload.js b/public/assets/js/require-upload.js
index 9aa68359..828023ec 100755
--- a/public/assets/js/require-upload.js
+++ b/public/assets/js/require-upload.js
@@ -156,6 +156,7 @@ define(['jquery', 'bootstrap', 'dropzone', 'template'], function ($, undefined,
                         mimetype = mimetype.split(",").map(function (k) {
                             return k.indexOf("/") > -1 ? k : (!k || k === "*" || k.charAt(0) === "." ? k : "." + k);
                         }).join(",");
+                        mimetype = mimetype === '*' ? null : mimetype;
 
                         //最大文件限制转换成mb
                         var maxFilesize = (function (maxsize) {