diff --git a/modules/core/src/main/resources/config/jeesite-core.yml b/modules/core/src/main/resources/config/jeesite-core.yml
index ca84e0db..e5565857 100644
--- a/modules/core/src/main/resources/config/jeesite-core.yml
+++ b/modules/core/src/main/resources/config/jeesite-core.yml
@@ -528,7 +528,7 @@ file:
   # 上传单个文件最大字节（500M），在这之上还有 > Tomcat限制 > Nginx限制，等，此设置会覆盖 spring.http.multipart.maxFileSize 设置
   maxFileSize: 500*1024*1024
   
-  # 设置允许上传的文件后缀
+  # 设置允许上传的文件后缀（全局设置）
   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,.ipa,.apk,
@@ -539,6 +539,10 @@ file:
 #    application/vnd.ms-excel,application/vnd.openxmlformats-officedocument.spreadsheetml.sheet,
 #    application/vnd.ms-powerpoint,application/vnd.openxmlformats-officedocument.presentationml.presentation
   
+  # 上传图片自动压缩宽高，指定为 -1 不进行压缩（全局设置）  v4.1.7
+  imageMaxWidth: 1024
+  imageMaxHeight: 768
+  
   # 是否开启分片上传
   chunked: false
   # 分片大小，单位字节（10M）
diff --git a/modules/core/src/main/resources/db/upgrade/core/mysql/mysql_4.1.7.0.sql b/modules/core/src/main/resources/db/upgrade/core/mysql/mysql_4.1.7.0.sql
deleted file mode 100644
index 457774e7..00000000
--- a/modules/core/src/main/resources/db/upgrade/core/mysql/mysql_4.1.7.0.sql
+++ /dev/null
@@ -1,4 +0,0 @@
-
--- 文件表增加排序字段
-ALTER TABLE `${_prefix}sys_file_upload` 
-ADD COLUMN `file_sort` decimal(10) NULL COMMENT '文件排序' AFTER `file_type`;
diff --git a/modules/core/src/main/resources/db/upgrade/core/mysql/mysql_4.1.7.s1.sql b/modules/core/src/main/resources/db/upgrade/core/mysql/mysql_4.1.7.s1.sql
new file mode 100644
index 00000000..77959116
--- /dev/null
+++ b/modules/core/src/main/resources/db/upgrade/core/mysql/mysql_4.1.7.s1.sql
@@ -0,0 +1,8 @@
+
+-- 文件表增加排序字段
+ALTER TABLE `${_prefix}sys_file_upload` 
+ADD COLUMN `file_sort` decimal(10) NULL COMMENT '文件排序' AFTER `file_type`;
+
+-- 新增 BPM 模块
+INSERT INTO `${_prefix}sys_module`(`module_code`, `module_name`, `description`, `main_class_name`, `current_version`, `upgrade_info`, `status`, `create_by`, `create_date`, `update_by`, `update_date`, `remarks`)
+VALUES ('bpm', '业务流程', '流程模型设计器、流程定义管理、待办任务、一般任务', 'com.jeesite.modules.bpm.entity.BpmEntity', '4.1.6', NULL, '0', 'system', '2019-08-11 22:36:24', 'system', '2019-08-11 22:36:24', NULL);
diff --git a/modules/core/src/main/resources/db/upgrade/core/versions b/modules/core/src/main/resources/db/upgrade/core/versions
index 3329c87b..72c3db24 100644
--- a/modules/core/src/main/resources/db/upgrade/core/versions
+++ b/modules/core/src/main/resources/db/upgrade/core/versions
@@ -13,4 +13,4 @@
 4.1.4
 4.1.5
 4.1.6
-4.1.7.0
\ No newline at end of file
+4.1.7.s1
\ No newline at end of file
diff --git a/web/src/main/resources/config/application.yml b/web/src/main/resources/config/application.yml
index 87f07731..a1b1f008 100644
--- a/web/src/main/resources/config/application.yml
+++ b/web/src/main/resources/config/application.yml
@@ -529,7 +529,7 @@ logging:
 #  # 上传单个文件最大字节（500M），在这之上还有 > Tomcat限制 > Nginx限制，等。
 #  maxFileSize: 500*1024*1024
 #  
-#  # 设置允许上传的文件后缀
+#  # 设置允许上传的文件后缀（全局设置）
 #  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,.ipa,.apk,
@@ -540,6 +540,10 @@ logging:
 ##    application/vnd.ms-excel,application/vnd.openxmlformats-officedocument.spreadsheetml.sheet,
 ##    application/vnd.ms-powerpoint,application/vnd.openxmlformats-officedocument.presentationml.presentation
 #
+#  # 上传图片自动压缩宽高，指定为 -1 不进行压缩（全局设置）  v4.1.7
+#  imageMaxWidth: 1024
+#  imageMaxHeight: 768
+#  
 #  # 是否开启分片上传
 #  chunked: false
 #  # 分片大小，单位字节（10M）