脚本优化，免加 jeesite.initdata=true 参数

2020-05-29 16:05:50 +08:00
parent 5d8b56c2ba
commit b4f049e70b
25 changed files with 54 additions and 33 deletions
--- 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
--- 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
--- 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]
--- 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);
--- 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
--- 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);
--- 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
--- 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);
--- 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
--- 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);
--- 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 @@
 								<span class="required hide">*</span> \${text('图片上传')}：</label>
 							<div class="col-sm-10">
 								<${'#'}form:fileupload id="uploadImage" bizKey="\${${className}.id}" bizType="${className}_image"
-									uploadType="image" class="" readonly="false"/>
+									uploadType="image" class="" readonly="false" preview="true"/>
 							</div>
 						</div>
 					</div>
@@ -194,7 +194,7 @@
 								<span class="required hide">*</span> \${text('附件上传')}：</label>
 							<div class="col-sm-10">
 								<${'#'}form:fileupload id="uploadFile" bizKey="\${${className}.id}" bizType="${className}_file"
-									uploadType="all" class="" readonly="false"/>
+									uploadType="all" class="" readonly="false" preview="true"/>
 							</div>
 						</div>
 					</div>
--- 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 @@
 							<label class="control-label col-sm-2">${text('附件')}：</label>
 							<div class="col-sm-10">
 								<#form:fileupload id="uploadFile" bizKey="${msgInner.id}" bizType="msgInner_file"
-									uploadType="all" class="" readonly="false"/>
+									uploadType="all" class="" readonly="false" preview="true"/>
 							</div>
 						</div>
 					</div>
--- a/modules/core/src/main/resources/views/themes/default/modules/sys/sysDesktop.html
+++ b/modules/core/src/main/resources/views/themes/default/modules/sys/sysDesktop.html
--- 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: 
--- 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 "<EFBFBD><EFBFBD>ʼ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ݿ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>..."
--- 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
--- 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
--- 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
--- a/web/pom.xml
+++ b/web/pom.xml
@@ -48,13 +48,6 @@
 			<version>${project.parent.version}</version>
 		</dependency>
 		
-		<!-- 文件在线预览
-		<dependency>
-			<groupId>com.jeesite</groupId>
-			<artifactId>jeesite-module-filepreview</artifactId>
-			<version>${project.parent.version}</version>
-		</dependency> -->
-		
 		<!-- 文件管理与共享
 		<dependency>
 			<groupId>com.jeesite</groupId>
@@ -62,6 +55,13 @@
 			<version>${project.parent.version}</version>
 		</dependency> -->
 		
+		<!-- 文件在线预览
+		<dependency>
+			<groupId>com.jeesite</groupId>
+			<artifactId>jeesite-module-filepreview</artifactId>
+			<version>${project.parent.version}</version>
+		</dependency> -->
+		
 		<!-- Spring Boot -->
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
--- a/web/src/main/resources/views/modules/demo/demoFormEditForm.html
+++ b/web/src/main/resources/views/modules/demo/demoFormEditForm.html
@@ -221,7 +221,7 @@
 							<label class="control-label col-sm-2">图片上传：</label>
 							<div class="col-sm-10">
 								<#form:fileupload id="uploadImage" bizKey="${testData.id}" bizType="testData_image"
-									uploadType="image" class="" readonly="false"/>
+									uploadType="image" class="" readonly="false" preview="true"/>
 							</div>
 						</div>
 					</div>
@@ -233,7 +233,7 @@
 							<div class="col-sm-10">
 								<#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"/>
 							</div>
@@ -246,7 +246,7 @@
 							<label class="control-label col-sm-2">附件上传：</label>
 							<div class="col-sm-10">
 								<#form:fileupload id="uploadFile" bizKey="${testData.id}" bizType="testData_file"
-									uploadType="all" class="" readonly="false"/>
+									uploadType="all" class="" readonly="false" preview="true"/>
 							</div>
 						</div>
 					</div>
--- a/web/src/main/resources/views/modules/demo/demoFormTableForm.html
+++ b/web/src/main/resources/views/modules/demo/demoFormTableForm.html
@@ -167,7 +167,7 @@
 							<label class="control-label col-sm-2">图片上传：</label>
 							<div class="col-sm-10">
 								<#form:fileupload id="uploadImage" bizKey="${testData.id}" bizType="testData_image"
-									uploadType="image" class="" readonly="false"/>
+									uploadType="image" class="" readonly="false" preview="true"/>
 							</div>
 						</div>
 					</div>
@@ -179,7 +179,7 @@
 							<div class="col-sm-10">
 								<#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"/>
 							</div>
@@ -192,7 +192,7 @@
 							<label class="control-label col-sm-2">附件上传：</label>
 							<div class="col-sm-10">
 								<#form:fileupload id="uploadFile" bizKey="${testData.id}" bizType="testData_file"
-									uploadType="all" class="" readonly="false"/>
+									uploadType="all" class="" readonly="false" preview="true"/>
 							</div>
 						</div>
 					</div>
--- a/web/src/main/resources/views/modules/test/testTreeForm.html
+++ b/web/src/main/resources/views/modules/test/testTreeForm.html
@@ -72,7 +72,7 @@
 							<label class="control-label col-sm-2">${text('图片上传')}：</label>
 							<div class="col-sm-10">
 								<#form:fileupload id="uploadImage" bizKey="${testTree.id}" bizType="testTree_image"
-									uploadType="image" class="" readonly="false"/>
+									uploadType="image" class="" readonly="false" preview="true"/>
 							</div>
 						</div>
 					</div>
@@ -83,7 +83,7 @@
 							<label class="control-label col-sm-2">${text('附件上传')}：</label>
 							<div class="col-sm-10">
 								<#form:fileupload id="uploadFile" bizKey="${testTree.id}" bizType="testTree_file"
-									uploadType="all" class="" readonly="false"/>
+									uploadType="all" class="" readonly="false" preview="true"/>
 							</div>
 						</div>
 					</div>
--- 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 <20>Ż<EFBFBD>JVM<56><4D><EFBFBD><EFBFBD>
-set "JAVA_OPTS=-Xms512m -Xmx1024m -XX:MetaspaceSize=128m -XX:MaxMetaspaceSize=512m"
+set "JAVA_OPTS=-Xms512m -Xmx1024m"

 rem <20><>ʽһ<CABD><D2BB><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ⲿ<EFBFBD>Զ<EFBFBD><D4B6><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ļ<EFBFBD><C4BC><EFBFBD><EFBFBD><EFBFBD><EFBFBD>飩
 rem set "JAVA_OPTS=%JAVA_OPTS% -Dspring.config.location=%cd%\app.yml"
--- 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"
--- 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");
+	}
 	
 }