From f0111c3aa377bb25f8dd90068d410608472d38cf Mon Sep 17 00:00:00 2001 From: thinkgem Date: Tue, 10 Apr 2018 21:07:58 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=BE=E7=BD=AESpringBoot=E7=9A=84=E4=B8=8A?= =?UTF-8?q?=E4=BC=A0=E6=96=87=E4=BB=B6=E5=A4=A7=E5=B0=8F=E9=99=90=E5=88=B6?= =?UTF-8?q?=E4=B8=8Efile.maxFileSize=E8=AE=BE=E7=BD=AE=E7=BB=9F=E4=B8=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/core/src/main/resources/config/jeesite-core.yml | 2 +- web/src/main/resources/config/jeesite.yml | 9 +++++---- web/src/main/resources/config/ueditor.json | 2 +- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/modules/core/src/main/resources/config/jeesite-core.yml b/modules/core/src/main/resources/config/jeesite-core.yml index d7b64b68..d1d2d194 100644 --- a/modules/core/src/main/resources/config/jeesite-core.yml +++ b/modules/core/src/main/resources/config/jeesite-core.yml @@ -415,7 +415,7 @@ file: #设置允许上传的文件后缀 imageAllowSuffixes: .gif,.bmp,.jpeg,.jpg,.ico,.png,.tif,.tiff, mediaAllowSuffixes: .flv,.swf,.mkv,webm,.mid,.mov,.mp3,.mp4,.m4v,.mpc,.mpeg,.mpg,.swf,.wav,.wma,.wmv,.avi,.rm,.rmi,.rmvb,.aiff,.asf,.ogg,.ogv, - fileAllowSuffixes: .doc,.docx,.rtf,.xls,.xlsx,.csv,.ppt,.pptx,.pdf,.vsd,.txt,.md,.xml,.rar,.zip,7z,.tar,.tgz,.jar,.gz,.gzip,.bz2,.cab,.iso, + fileAllowSuffixes: .doc,.docx,.rtf,.xls,.xlsx,.csv,.ppt,.pptx,.pdf,.vsd,.txt,.md,.xml,.rar,.zip,7z,.tar,.tgz,.jar,.gz,.gzip,.bz2,.cab,.iso,.ipa,.apk, #允许上传的文件内容类型（图片、word、excel、ppt）防止修改后缀恶意上传文件（默认不启用验证） # allowContentTypes: image/jpeg,image/gif,image/bmp,image/png,image/x-png, diff --git a/web/src/main/resources/config/jeesite.yml b/web/src/main/resources/config/jeesite.yml index 8a2bf925..3a0c534c 100644 --- a/web/src/main/resources/config/jeesite.yml +++ b/web/src/main/resources/config/jeesite.yml @@ -108,17 +108,18 @@ jdbc: # timeout: 2000 # password: 1234 # database: 0 +# clientName: ~ # # # Redis 连接池配置 # pool: # maxIdle: 3 # maxTotal: 20 -# -# # 定义Key的前缀标识 -# keyPrefix: ${jdbc.tablePrefix} # # # 是否启用Redis系统缓存及会话 # cacheAndSession: false +# +# # 定义Key的前缀标识 +# keyPrefix: ${jdbc.tablePrefix} #============================# #===== System settings ======# @@ -379,7 +380,7 @@ jdbc: # #设置允许上传的文件后缀 # imageAllowSuffixes: .gif,.bmp,.jpeg,.jpg,.ico,.png,.tif,.tiff, # mediaAllowSuffixes: .flv,.swf,.mkv,webm,.mid,.mov,.mp3,.mp4,.m4v,.mpc,.mpeg,.mpg,.swf,.wav,.wma,.wmv,.avi,.rm,.rmi,.rmvb,.aiff,.asf,.ogg,.ogv, -# fileAllowSuffixes: .doc,.docx,.rtf,.xls,.xlsx,.csv,.ppt,.pptx,.pdf,.vsd,.txt,.md,.xml,.rar,.zip,7z,.tar,.tgz,.jar,.gz,.gzip,.bz2,.cab,.iso, +# fileAllowSuffixes: .doc,.docx,.rtf,.xls,.xlsx,.csv,.ppt,.pptx,.pdf,.vsd,.txt,.md,.xml,.rar,.zip,7z,.tar,.tgz,.jar,.gz,.gzip,.bz2,.cab,.iso,.ipa,.apk, # # #允许上传的文件内容类型（图片、word、excel、ppt）防止修改后缀恶意上传文件（默认不启用验证） ## allowContentTypes: image/jpeg,image/gif,image/bmp,image/png,image/x-png, diff --git a/web/src/main/resources/config/ueditor.json b/web/src/main/resources/config/ueditor.json index 6ab8ba7d..fda9c0cd 100644 --- a/web/src/main/resources/config/ueditor.json +++ b/web/src/main/resources/config/ueditor.json @@ -66,7 +66,7 @@ ".png", ".jpg", ".jpeg", ".gif", ".bmp", ".flv", ".swf", ".mkv", ".avi", ".rm", ".rmvb", ".mpeg", ".mpg", ".ogg", ".ogv", ".mov", ".wmv", ".mp4", ".webm", ".mp3", ".wav", ".mid", - ".rar", ".zip", ".tar", ".gz", ".7z", ".bz2", ".cab", ".iso", + ".rar", ".zip", ".tar", ".gz", ".7z", ".bz2", ".cab", ".iso", ".ipa", ".apk", ".doc", ".docx", ".xls", ".xlsx", ".ppt", ".pptx", ".pdf", ".txt", ".md", ".xml" ], /* 上传文件格式显示 */