manager/my-worker
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
thinkgem
2020-05-29 16:05:50 +08:00
parent 5d8b56c2ba
commit b4f049e70b
25 changed files with 54 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
web/bin/init-data.bat
View File

@@ -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>..."

4
web/bin/init-data.sh
View File

@@ -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

2
web/bin/run-tomcat.bat
View File

@@ -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

2
web/bin/run-tomcat.sh
View File

@@ -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

14
web/pom.xml
View File

@@ -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>

6
web/src/main/resources/views/modules/demo/demoFormEditForm.html
View File

@@ -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>

6
web/src/main/resources/views/modules/demo/demoFormTableForm.html
View File

@@ -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>

4
web/src/main/resources/views/modules/test/testTreeForm.html
View File

@@ -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>

2
web/src/main/webapp/WEB-INF/startup.bat
View File

@@ -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"

2
web/src/main/webapp/WEB-INF/startup.sh
View File

@@ -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"

5
web/src/test/java/com/jeesite/test/InitData.java
View File

@@ -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");
}
}