diff --git a/modules/core/src/main/java/com/jeesite/modules/sys/db/InitCoreData.xlsx b/modules/core/src/main/java/com/jeesite/modules/sys/db/InitCoreData.xlsx
index b7a02194..9176cf64 100644
Binary files a/modules/core/src/main/java/com/jeesite/modules/sys/db/InitCoreData.xlsx and b/modules/core/src/main/java/com/jeesite/modules/sys/db/InitCoreData.xlsx differ
diff --git a/modules/core/src/main/resources/config/jeesite-core.yml b/modules/core/src/main/resources/config/jeesite-core.yml
index 2f52992d..05192fd2 100644
--- a/modules/core/src/main/resources/config/jeesite-core.yml
+++ b/modules/core/src/main/resources/config/jeesite-core.yml
@@ -90,7 +90,7 @@ spring:
# 打印横幅
main:
bannerMode: "off"
-
+
# 日志配置
logging:
config: classpath:config/logback-spring.xml
diff --git a/modules/core/src/main/resources/db/upgrade/core/mssql/mssql_4.1.5.sql b/modules/core/src/main/resources/db/upgrade/core/mssql/mssql_4.1.5.sql
index 9f17255f..78c04d2a 100644
--- a/modules/core/src/main/resources/db/upgrade/core/mssql/mssql_4.1.5.sql
+++ b/modules/core/src/main/resources/db/upgrade/core/mssql/mssql_4.1.5.sql
@@ -1,7 +1,7 @@
-- 新增文件管理模块
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 ('filemanager', '文件管理', '公共文件柜、个人文件柜、文件分享', 'com.jeesite.modules.filemanager.web.FilemanagerController', '4.1.4', NULL, '0', 'system', getdate(), 'system', getdate(), NULL);
+VALUES ('filemanager', '文件管理', '公共文件柜、个人文件柜、文件分享', 'com.jeesite.modules.filemanager.web.FilemanagerController', '4.1.x', NULL, '0', 'system', getdate(), 'system', getdate(), NULL);
-- 员工附属机构关系表
CREATE TABLE [${_prefix}sys_employee_office]
diff --git a/modules/core/src/main/resources/db/upgrade/core/mssql/mssql_4.2.0.sql b/modules/core/src/main/resources/db/upgrade/core/mssql/mssql_4.2.0.sql
index 9e863faa..5a8341de 100644
--- a/modules/core/src/main/resources/db/upgrade/core/mssql/mssql_4.2.0.sql
+++ b/modules/core/src/main/resources/db/upgrade/core/mssql/mssql_4.2.0.sql
@@ -6,6 +6,10 @@ VALUES ('1238121573028433920', '0', '0,', 9810, '0000009810,', '1', 0, '安全
-- 文件表增加文件预览标记
ALTER TABLE ${_prefix}sys_file_entity ADD file_preview char(1) NULL;
+-- 新增 UReport 模块
+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 ('ureport', '统计报表', '高性能报表引擎，通过迭代单元格可以实现，任意复杂的中国式报表', 'com.jeesite.modules.ureport.config.UreportConfig', '4.2.0', NULL, '0', 'system', getdate(), 'system', getdate(), NULL);
+
-- 新增 Visual 模块
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 ('visual', '数据大屏', '可视化数据大屏、拖拽搭建、多种图表组件', 'com.jeesite.modules.visual.web.VisualDataController', '4.2.0', NULL, '0', 'system', getdate(), 'system', getdate(), NULL);
diff --git a/modules/core/src/main/resources/db/upgrade/core/mysql/mysql_4.1.5.sql b/modules/core/src/main/resources/db/upgrade/core/mysql/mysql_4.1.5.sql
index 9470458c..ad93b4a8 100644
--- a/modules/core/src/main/resources/db/upgrade/core/mysql/mysql_4.1.5.sql
+++ b/modules/core/src/main/resources/db/upgrade/core/mysql/mysql_4.1.5.sql
@@ -1,7 +1,7 @@
-- 新增文件管理模块
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 ('filemanager', '文件管理', '公共文件柜、个人文件柜、文件分享', 'com.jeesite.modules.filemanager.web.FilemanagerController', '4.1.4', NULL, '0', 'system', now(), 'system', now(), NULL);
+VALUES ('filemanager', '文件管理', '公共文件柜、个人文件柜、文件分享', 'com.jeesite.modules.filemanager.web.FilemanagerController', '4.1.x', NULL, '0', 'system', now(), 'system', now(), NULL);
-- 员工附属机构关系表
CREATE TABLE ${_prefix}sys_employee_office
diff --git a/modules/core/src/main/resources/db/upgrade/core/mysql/mysql_4.2.0.sql b/modules/core/src/main/resources/db/upgrade/core/mysql/mysql_4.2.0.sql
index d5193c4c..0969e926 100644
--- a/modules/core/src/main/resources/db/upgrade/core/mysql/mysql_4.2.0.sql
+++ b/modules/core/src/main/resources/db/upgrade/core/mysql/mysql_4.2.0.sql
@@ -7,6 +7,10 @@ VALUES ('1238121573028433920', '0', '0,', 9810, '0000009810,', '1', 0, '安全
ALTER TABLE `${_prefix}sys_file_entity`
ADD COLUMN `file_preview` char(1) NULL COMMENT '文件预览标记' AFTER `file_meta`;
+-- 新增 UReport 模块
+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 ('ureport', '统计报表', '高性能报表引擎，通过迭代单元格可以实现，任意复杂的中国式报表', 'com.jeesite.modules.ureport.config.UreportConfig', '4.2.0', NULL, '0', 'system', now(), 'system', now(), NULL);
+
-- 新增 Visual 模块
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 ('visual', '数据大屏', '可视化数据大屏、拖拽搭建、多种图表组件', 'com.jeesite.modules.visual.web.VisualDataController', '4.2.0', NULL, '0', 'system', now(), 'system', now(), NULL);
diff --git a/modules/core/src/main/resources/db/upgrade/core/oracle/oracle_4.1.5.sql b/modules/core/src/main/resources/db/upgrade/core/oracle/oracle_4.1.5.sql
index 1dde2a66..97e24051 100644
--- a/modules/core/src/main/resources/db/upgrade/core/oracle/oracle_4.1.5.sql
+++ b/modules/core/src/main/resources/db/upgrade/core/oracle/oracle_4.1.5.sql
@@ -1,7 +1,7 @@
-- 新增文件管理模块
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 ('filemanager', '文件管理', '公共文件柜、个人文件柜、文件分享', 'com.jeesite.modules.filemanager.web.FilemanagerController', '4.1.4', NULL, '0', 'system', sysdate, 'system', sysdate, NULL);
+VALUES ('filemanager', '文件管理', '公共文件柜、个人文件柜、文件分享', 'com.jeesite.modules.filemanager.web.FilemanagerController', '4.1.x', NULL, '0', 'system', sysdate, 'system', sysdate, NULL);
-- 员工附属机构关系表
CREATE TABLE ${_prefix}sys_employee_office
diff --git a/modules/core/src/main/resources/db/upgrade/core/oracle/oracle_4.2.0.sql b/modules/core/src/main/resources/db/upgrade/core/oracle/oracle_4.2.0.sql
index 116af333..4d50f4af 100644
--- a/modules/core/src/main/resources/db/upgrade/core/oracle/oracle_4.2.0.sql
+++ b/modules/core/src/main/resources/db/upgrade/core/oracle/oracle_4.2.0.sql
@@ -7,6 +7,10 @@ VALUES ('1238121573028433920', '0', '0,', 9810, '0000009810,', '1', 0, '安全
ALTER TABLE ${_prefix}sys_file_entity ADD file_preview char(1) NULL;
COMMENT ON COLUMN ${_prefix}sys_file_entity.file_preview IS '文件预览标记';
+-- 新增 UReport 模块
+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 ('ureport', '统计报表', '高性能报表引擎，通过迭代单元格可以实现，任意复杂的中国式报表', 'com.jeesite.modules.ureport.config.UreportConfig', '4.2.0', NULL, '0', 'system', sysdate, 'system', sysdate, NULL);
+
-- 新增 Visual 模块
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 ('visual', '数据大屏', '可视化数据大屏、拖拽搭建、多种图表组件', 'com.jeesite.modules.visual.web.VisualDataController', '4.2.0', NULL, '0', 'system', sysdate, 'system', sysdate, NULL);
diff --git a/modules/core/src/main/resources/db/upgrade/core/postgresql/postgresql_4.1.5.sql b/modules/core/src/main/resources/db/upgrade/core/postgresql/postgresql_4.1.5.sql
index 36c927cf..7c0aa375 100644
--- a/modules/core/src/main/resources/db/upgrade/core/postgresql/postgresql_4.1.5.sql
+++ b/modules/core/src/main/resources/db/upgrade/core/postgresql/postgresql_4.1.5.sql
@@ -1,7 +1,7 @@
-- 新增文件管理模块
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 ('filemanager', '文件管理', '公共文件柜、个人文件柜、文件分享', 'com.jeesite.modules.filemanager.web.FilemanagerController', '4.1.4', NULL, '0', 'system', now(), 'system', now(), NULL);
+VALUES ('filemanager', '文件管理', '公共文件柜、个人文件柜、文件分享', 'com.jeesite.modules.filemanager.web.FilemanagerController', '4.1.x', NULL, '0', 'system', now(), 'system', now(), NULL);
-- 员工附属机构关系表
CREATE TABLE ${_prefix}sys_employee_office
diff --git a/modules/core/src/main/resources/db/upgrade/core/postgresql/postgresql_4.2.0.sql b/modules/core/src/main/resources/db/upgrade/core/postgresql/postgresql_4.2.0.sql
index 2e4a8e86..d34944cb 100644
--- a/modules/core/src/main/resources/db/upgrade/core/postgresql/postgresql_4.2.0.sql
+++ b/modules/core/src/main/resources/db/upgrade/core/postgresql/postgresql_4.2.0.sql
@@ -7,6 +7,10 @@ VALUES ('1238121573028433920', '0', '0,', 9810, '0000009810,', '1', 0, '安全
ALTER TABLE ${_prefix}sys_file_entity ADD file_preview char(1) NULL;
COMMENT ON COLUMN ${_prefix}sys_file_entity.file_preview IS '文件预览标记';
+-- 新增 UReport 模块
+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 ('ureport', '统计报表', '高性能报表引擎，通过迭代单元格可以实现，任意复杂的中国式报表', 'com.jeesite.modules.ureport.config.UreportConfig', '4.2.0', NULL, '0', 'system', now(), 'system', now(), NULL);
+
-- 新增 Visual 模块
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 ('visual', '数据大屏', '可视化数据大屏、拖拽搭建、多种图表组件', 'com.jeesite.modules.visual.web.VisualDataController', '4.2.0', NULL, '0', 'system', now(), 'system', now(), NULL);
diff --git a/modules/core/src/main/resources/templates/modules/gen/include/formControl.html b/modules/core/src/main/resources/templates/modules/gen/include/formControl.html
index abc7eab9..1c68f9e8 100644
--- a/modules/core/src/main/resources/templates/modules/gen/include/formControl.html
+++ b/modules/core/src/main/resources/templates/modules/gen/include/formControl.html
@@ -177,7 +177,7 @@
* \${text('图片上传')}：
<${'#'}form:fileupload id="uploadImage" bizKey="\${${className}.id}" bizType="${className}_image"
- uploadType="image" class="" readonly="false"/>
+ uploadType="image" class="" readonly="false" preview="true"/>
@@ -194,7 +194,7 @@
* \${text('附件上传')}：
<${'#'}form:fileupload id="uploadFile" bizKey="\${${className}.id}" bizType="${className}_file"
- uploadType="all" class="" readonly="false"/>
+ uploadType="all" class="" readonly="false" preview="true"/>
diff --git a/modules/core/src/main/resources/views/modules/msg/msgInnerForm.html b/modules/core/src/main/resources/views/modules/msg/msgInnerForm.html
index 4e9046f6..747b3da3 100644
--- a/modules/core/src/main/resources/views/modules/msg/msgInnerForm.html
+++ b/modules/core/src/main/resources/views/modules/msg/msgInnerForm.html
@@ -62,7 +62,7 @@
<#form:fileupload id="uploadFile" bizKey="${msgInner.id}" bizType="msgInner_file"
- uploadType="all" class="" readonly="false"/>
+ uploadType="all" class="" readonly="false" preview="true"/>
diff --git a/modules/core/src/main/resources/views/themes/default/modules/sys/sysDesktop.html b/modules/core/src/main/resources/views/modules/sys/sysDesktop.html
similarity index 100%
rename from modules/core/src/main/resources/views/themes/default/modules/sys/sysDesktop.html
rename to modules/core/src/main/resources/views/modules/sys/sysDesktop.html
diff --git a/modules/core/src/test/java/application.yml b/modules/core/src/test/java/application.yml
index 11d99d6d..cd9bb4aa 100644
--- a/modules/core/src/test/java/application.yml
+++ b/modules/core/src/test/java/application.yml
@@ -4,8 +4,8 @@ productName: JeeSite Demo
companyName: ThinkGem
# 产品版本、版权年份
-productVersion: V4.1
-copyrightYear: 2018
+productVersion: V4.2
+copyrightYear: 2020
# 数据库连接
jdbc:
diff --git a/web/bin/init-data.bat b/web/bin/init-data.bat
index 9c79050c..f4fd14db 100644
--- a/web/bin/init-data.bat
+++ b/web/bin/init-data.bat
@@ -24,8 +24,8 @@ echo [
echo.
pause
-set "MAVEN_OPTS=%MAVEN_OPTS% -Xms512m -Xmx1024m -XX:MetaspaceSize=128m -XX:MaxMetaspaceSize=512m"
-call mvn test -Dmaven.test.skip=false -Dtest=com.jeesite.test.InitData -Djeesite.initdata=true
+set "MAVEN_OPTS=%MAVEN_OPTS% -Xms512m -Xmx1024m"
+call mvn test -Dmaven.test.skip=false -Dtest=com.jeesite.test.InitData
cd bin
cmd /c msg %username% /time:0 /w "ʼݿ..."
diff --git a/web/bin/init-data.sh b/web/bin/init-data.sh
index 6e4ba5a4..e103ac92 100644
--- a/web/bin/init-data.sh
+++ b/web/bin/init-data.sh
@@ -22,7 +22,7 @@ echo "[信息] 依赖下载完成，下面开始初始化数据库。"
echo ""
read -s -n1 -p "请按任意键继续 ... "
-MAVEN_OPTS="$MAVEN_OPTS -Xms512m -Xmx1024m -XX:MetaspaceSize=128m -XX:MaxMetaspaceSize=512m"
-mvn test -Dmaven.test.skip=false -Dtest=com.jeesite.test.InitData -Djeesite.initdata=true
+MAVEN_OPTS="$MAVEN_OPTS -Xms512m -Xmx1024m"
+mvn test -Dmaven.test.skip=false -Dtest=com.jeesite.test.InitData
cd bin
\ No newline at end of file
diff --git a/web/bin/run-tomcat.bat b/web/bin/run-tomcat.bat
index 3dbdc40f..1cb38b2e 100644
--- a/web/bin/run-tomcat.bat
+++ b/web/bin/run-tomcat.bat
@@ -13,7 +13,7 @@ cd %~dp0
cd ..
title %cd%
-set "MAVEN_OPTS=%MAVEN_OPTS% -Xms512m -Xmx1024m -XX:MetaspaceSize=128m -XX:MaxMetaspaceSize=512m"
+set "MAVEN_OPTS=%MAVEN_OPTS% -Xms512m -Xmx1024m"
call mvn clean spring-boot:run -Dmaven.test.skip=true
pause
\ No newline at end of file
diff --git a/web/bin/run-tomcat.sh b/web/bin/run-tomcat.sh
index 2108bc1a..39c31ad0 100644
--- a/web/bin/run-tomcat.sh
+++ b/web/bin/run-tomcat.sh
@@ -10,5 +10,5 @@ echo "[信息] 使用 Spring Boot Tomcat 运行 Web 工程。"
echo ""
cd ..
-MAVEN_OPTS="$MAVEN_OPTS -Xms512m -Xmx1024m -XX:MetaspaceSize=128m -XX:MaxMetaspaceSize=512m"
+MAVEN_OPTS="$MAVEN_OPTS -Xms512m -Xmx1024m"
mvn clean spring-boot:run -Dmaven.test.skip=true
\ No newline at end of file
diff --git a/web/pom.xml b/web/pom.xml
index 120e69ff..80a8e47f 100644
--- a/web/pom.xml
+++ b/web/pom.xml
@@ -48,13 +48,6 @@
${project.parent.version}
-
-
+
+
org.springframework.boot
diff --git a/web/src/main/resources/views/modules/demo/demoFormEditForm.html b/web/src/main/resources/views/modules/demo/demoFormEditForm.html
index 0d93d378..3118e6b7 100644
--- a/web/src/main/resources/views/modules/demo/demoFormEditForm.html
+++ b/web/src/main/resources/views/modules/demo/demoFormEditForm.html
@@ -221,7 +221,7 @@
<#form:fileupload id="uploadImage" bizKey="${testData.id}" bizType="testData_image"
- uploadType="image" class="" readonly="false"/>
+ uploadType="image" class="" readonly="false" preview="true"/>
@@ -233,7 +233,7 @@
<#form:fileupload id="uploadImage2" returnPath="true"
filePathInputId="uploadImage2Path" fileNameInputId="uploadImage2Name"
- uploadType="image" readonly="false" maxUploadNum="3" isMini="false"/>
+ uploadType="image" readonly="false" preview="true" maxUploadNum="3" isMini="false"/>
<#form:input name="uploadImage2Path" value="/js/userfiles/fileupload/201812/1073024549485039616.png|/js/userfiles/fileupload/201812/1073043095867133952.png" class="form-control"/>
<#form:input name="uploadImage2Name" value="0 (1).png|0 (2).png" class="form-control"/>
@@ -246,7 +246,7 @@
<#form:fileupload id="uploadFile" bizKey="${testData.id}" bizType="testData_file"
- uploadType="all" class="" readonly="false"/>
+ uploadType="all" class="" readonly="false" preview="true"/>
diff --git a/web/src/main/resources/views/modules/demo/demoFormTableForm.html b/web/src/main/resources/views/modules/demo/demoFormTableForm.html
index 372895e4..309060fa 100644
--- a/web/src/main/resources/views/modules/demo/demoFormTableForm.html
+++ b/web/src/main/resources/views/modules/demo/demoFormTableForm.html
@@ -167,7 +167,7 @@
<#form:fileupload id="uploadImage" bizKey="${testData.id}" bizType="testData_image"
- uploadType="image" class="" readonly="false"/>
+ uploadType="image" class="" readonly="false" preview="true"/>
@@ -179,7 +179,7 @@
<#form:fileupload id="uploadImage2" returnPath="true"
filePathInputId="uploadImage2Path" fileNameInputId="uploadImage2Name"
- uploadType="image" readonly="false" maxUploadNum="3" isMini="false"/>
+ uploadType="image" readonly="false" preview="true" maxUploadNum="3" isMini="false"/>
<#form:input name="uploadImage2Path" class="form-control"/>
<#form:input name="uploadImage2Name" class="form-control"/>
@@ -192,7 +192,7 @@
<#form:fileupload id="uploadFile" bizKey="${testData.id}" bizType="testData_file"
- uploadType="all" class="" readonly="false"/>
+ uploadType="all" class="" readonly="false" preview="true"/>
diff --git a/web/src/main/resources/views/modules/test/testTreeForm.html b/web/src/main/resources/views/modules/test/testTreeForm.html
index be858f50..0668af88 100644
--- a/web/src/main/resources/views/modules/test/testTreeForm.html
+++ b/web/src/main/resources/views/modules/test/testTreeForm.html
@@ -72,7 +72,7 @@
<#form:fileupload id="uploadImage" bizKey="${testTree.id}" bizType="testTree_image"
- uploadType="image" class="" readonly="false"/>
+ uploadType="image" class="" readonly="false" preview="true"/>
@@ -83,7 +83,7 @@
<#form:fileupload id="uploadFile" bizKey="${testTree.id}" bizType="testTree_file"
- uploadType="all" class="" readonly="false"/>
+ uploadType="all" class="" readonly="false" preview="true"/>
diff --git a/web/src/main/webapp/WEB-INF/startup.bat b/web/src/main/webapp/WEB-INF/startup.bat
index 05589f1c..40eff033 100644
--- a/web/src/main/webapp/WEB-INF/startup.bat
+++ b/web/src/main/webapp/WEB-INF/startup.bat
@@ -22,7 +22,7 @@ rem
set "CLASS_PATH=%cd%/../"
rem ŻJVM
-set "JAVA_OPTS=-Xms512m -Xmx1024m -XX:MetaspaceSize=128m -XX:MaxMetaspaceSize=512m"
+set "JAVA_OPTS=-Xms512m -Xmx1024m"
rem ʽһⲿԶļ飩
rem set "JAVA_OPTS=%JAVA_OPTS% -Dspring.config.location=%cd%\app.yml"
diff --git a/web/src/main/webapp/WEB-INF/startup.sh b/web/src/main/webapp/WEB-INF/startup.sh
index ec19c4a8..6446b860 100644
--- a/web/src/main/webapp/WEB-INF/startup.sh
+++ b/web/src/main/webapp/WEB-INF/startup.sh
@@ -15,7 +15,7 @@ echo ""
CLASS_PATH="$PWD/../"
# 优化JVM参数
-JAVA_OPTS="-Xms512m -Xmx1024m -XX:MetaspaceSize=128m -XX:MaxMetaspaceSize=512m"
+JAVA_OPTS="-Xms512m -Xmx1024m"
# 方式一、配置外部自定义的属性文件（建议）
# JAVA_OPTS="$JAVA_OPTS -Dspring.config.location=$PWD/app.yml"
diff --git a/web/src/test/java/com/jeesite/test/InitData.java b/web/src/test/java/com/jeesite/test/InitData.java
index 1660b5b9..33e06c7d 100644
--- a/web/src/test/java/com/jeesite/test/InitData.java
+++ b/web/src/test/java/com/jeesite/test/InitData.java
@@ -23,5 +23,10 @@ public class InitData extends BaseInitDataTests {
public void initData01() throws Exception{
logger.info("数据库初始化完成。");
}
+
+ @Override
+ public void initProperty() {
+ System.setProperty("jeesite.initdata", "true");
+ }
}