diff --git a/web/bin/init-data.bat b/web/bin/init-data.bat index 532eb908..6bff8183 100644 --- a/web/bin/init-data.bat +++ b/web/bin/init-data.bat @@ -36,6 +36,6 @@ echo. cd %~dp0 cd ../ -call mvn test -Dtest=com.jeesite.test.InitCoreData,com.jeesite.test.InitGenData -U +call mvn test -Dtest=com.jeesite.test.InitCoreData,com.jeesite.test.InitGenData pause \ No newline at end of file diff --git a/web/bin/init-data.sh b/web/bin/init-data.sh index 83523d3a..68140917 100644 --- a/web/bin/init-data.sh +++ b/web/bin/init-data.sh @@ -1,19 +1,27 @@ #!/usr/bin/env bash -echo "[信息] 初始化数据库,请谨慎操作。\n" +echo "" +echo "[信息] 初始化数据库,请谨慎操作。" read -s -n1 -p "请按任意键继续 ... " -echo "\n[信息] 此操作会清空您的现有数据表,并恢复初始状态。\n" +echo "" +echo "[信息] 此操作会清空您的现有数据表,并恢复初始状态。" read -s -n1 -p "请按任意键继续 ... " -echo "\n[信息] 确认继续吗?否则请关闭窗口。(5)\n" +echo "" +echo "[信息] 确认继续吗?否则请关闭窗口。(5)" read -s -n1 -p "请按任意键继续 ... " -echo "\n[信息] 您真的确认继续吗?否则请关闭窗口。(4)\n" +echo "" +echo "[信息] 您真的确认继续吗?否则请关闭窗口。(4)" read -s -n1 -p "请按任意键继续 ... " -echo "\n[信息] 您真的确认继续吗?否则请关闭窗口。(3)\n" +echo "" +echo "[信息] 您真的确认继续吗?否则请关闭窗口。(3)" read -s -n1 -p "请按任意键继续 ... " -echo "\n[信息] 您真的确认继续吗?否则请关闭窗口。(2)\n" +echo "" +echo "[信息] 您真的确认继续吗?否则请关闭窗口。(2)" read -s -n1 -p "请按任意键继续 ... " -echo "\n[信息] 您真的确认继续吗?否则请关闭窗口。(1)\n" +echo "" +echo "[信息] 您真的确认继续吗?否则请关闭窗口。(1)" read -s -n1 -p "请按任意键继续 ... " +echo "" cd .. -mvn test -Dtest=com.jeesite.test.InitCoreData,com.jeesite.test.InitGenData -U +exec mvn test -Dtest=com.jeesite.test.InitCoreData,com.jeesite.test.InitGenData diff --git a/web/bin/run-tomcat.bat b/web/bin/run-tomcat.bat index 24a3eb39..b7210ed5 100644 --- a/web/bin/run-tomcat.bat +++ b/web/bin/run-tomcat.bat @@ -17,7 +17,6 @@ cd ../ title %cd% -rem set MAVEN_OPTS=%MAVEN_OPTS% -Xms256m -Xmx1024m -XX:PermSize=128m -XX:MaxPermSize=512m set MAVEN_OPTS=%MAVEN_OPTS% -Xms256m -Xmx1024m -XX:MetaspaceSize=128m -XX:MaxMetaspaceSize=512m call mvn clean spring-boot:run -U diff --git a/web/bin/run-tomcat.sh b/web/bin/run-tomcat.sh index 64a7a937..694ec680 100644 --- a/web/bin/run-tomcat.sh +++ b/web/bin/run-tomcat.sh @@ -1,7 +1,9 @@ #!/bin/sh +echo "" +echo "[信息] 使用 Spring Boot Tomcat 运行 Web 工程。" +echo "" + cd .. - -MAVEN_OPTS=$MAVEN_OPTS -Xms256m -Xmx1024m -XX:MetaspaceSize=128m -XX:MaxMetaspaceSize=512m - +MAVEN_OPTS="$MAVEN_OPTS -Xms256m -Xmx1024m -XX:MetaspaceSize=128m -XX:MaxMetaspaceSize=512m" exec mvn clean spring-boot:run -U diff --git a/web/src/main/resources/logback.xml b/web/src/main/resources/logback.xml index 0d80eece..e481ca3a 100644 --- a/web/src/main/resources/logback.xml +++ b/web/src/main/resources/logback.xml @@ -1,8 +1,8 @@ - - + +