From f8562e1ccbdf7ea1858a0b969dc1c71596ec8974 Mon Sep 17 00:00:00 2001 From: thinkgem Date: Tue, 17 Apr 2018 20:55:22 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96bat=E8=84=9A=E6=9C=AC?= =?UTF-8?q?=E5=8F=8Ashell=E8=84=9A=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- common/bin/deploy.bat | 2 +- common/bin/javadoc.bat | 4 +--- common/bin/package.bat | 4 +--- modules/core/bin/deploy.bat | 4 +--- modules/core/bin/javadoc.bat | 4 +--- modules/core/bin/package.bat | 4 +--- modules/core/pom.xml | 6 ++++++ parent/bin/deploy.bat | 4 +--- parent/bin/package.bat | 4 +--- .../org.eclipse.wst.common.component | 4 ++-- web/bin/clean.bat | 4 +--- web/bin/cleanide.bat | 4 +--- web/bin/init-data.bat | 2 +- web/bin/init-data.sh | 9 +++++++-- web/bin/package.bat | 4 +--- web/bin/package.sh | 13 ++++++++++++ web/bin/run-tomcat.bat | 7 +------ web/bin/run-tomcat.sh | 9 +++++++-- web/bin/run-web.bat | 7 ++----- web/bin/run-web.sh | 20 +++++++++++++++++++ web/src/main/resources/logback.xml | 2 +- web/src/main/webapp/WEB-INF/startup.sh | 20 +++++++++++++++++++ 22 files changed, 91 insertions(+), 50 deletions(-) create mode 100644 web/bin/package.sh create mode 100644 web/bin/run-web.sh create mode 100644 web/src/main/webapp/WEB-INF/startup.sh diff --git a/common/bin/deploy.bat b/common/bin/deploy.bat index 357f797f..5cfb2b1a 100644 --- a/common/bin/deploy.bat +++ b/common/bin/deploy.bat @@ -13,7 +13,7 @@ echo. %~d0 cd %~dp0 -cd ../ +cd .. call mvn clean deploy -Dmaven.test.skip=true -Pdeploy pause \ No newline at end of file diff --git a/common/bin/javadoc.bat b/common/bin/javadoc.bat index 2a5ea0c5..087a0262 100644 --- a/common/bin/javadoc.bat +++ b/common/bin/javadoc.bat @@ -7,13 +7,11 @@ rem */ echo. echo [信息] 编译工程Javadoc，生成jar包文件。 echo. -pause -echo. %~d0 cd %~dp0 -cd ../ +cd .. call mvn clean javadoc:jar pause \ No newline at end of file diff --git a/common/bin/package.bat b/common/bin/package.bat index db5ed5da..8fe98465 100644 --- a/common/bin/package.bat +++ b/common/bin/package.bat @@ -7,13 +7,11 @@ rem */ echo. echo [信息] 打包安装工程，生成jar包文件。 echo. -pause -echo. %~d0 cd %~dp0 -cd ../ +cd .. call mvn clean install -Dmaven.test.skip=true -Ppackage pause \ No newline at end of file diff --git a/modules/core/bin/deploy.bat b/modules/core/bin/deploy.bat index 357f797f..5e52bb4b 100644 --- a/modules/core/bin/deploy.bat +++ b/modules/core/bin/deploy.bat @@ -7,13 +7,11 @@ rem */ echo. echo [信息] 部署工程版本到Nexus服务器。 echo. -pause -echo. %~d0 cd %~dp0 -cd ../ +cd .. call mvn clean deploy -Dmaven.test.skip=true -Pdeploy pause \ No newline at end of file diff --git a/modules/core/bin/javadoc.bat b/modules/core/bin/javadoc.bat index 2a5ea0c5..087a0262 100644 --- a/modules/core/bin/javadoc.bat +++ b/modules/core/bin/javadoc.bat @@ -7,13 +7,11 @@ rem */ echo. echo [信息] 编译工程Javadoc，生成jar包文件。 echo. -pause -echo. %~d0 cd %~dp0 -cd ../ +cd .. call mvn clean javadoc:jar pause \ No newline at end of file diff --git a/modules/core/bin/package.bat b/modules/core/bin/package.bat index db5ed5da..8fe98465 100644 --- a/modules/core/bin/package.bat +++ b/modules/core/bin/package.bat @@ -7,13 +7,11 @@ rem */ echo. echo [信息] 打包安装工程，生成jar包文件。 echo. -pause -echo. %~d0 cd %~dp0 -cd ../ +cd .. call mvn clean install -Dmaven.test.skip=true -Ppackage pause \ No newline at end of file diff --git a/modules/core/pom.xml b/modules/core/pom.xml index 937655cc..3d12247b 100644 --- a/modules/core/pom.xml +++ b/modules/core/pom.xml @@ -23,6 +23,12 @@ + + com.jeesite + jeesite-common + ${project.parent.version} + + com.jeesite jeesite-framework diff --git a/parent/bin/deploy.bat b/parent/bin/deploy.bat index 357f797f..5e52bb4b 100644 --- a/parent/bin/deploy.bat +++ b/parent/bin/deploy.bat @@ -7,13 +7,11 @@ rem */ echo. echo [信息] 部署工程版本到Nexus服务器。 echo. -pause -echo. %~d0 cd %~dp0 -cd ../ +cd .. call mvn clean deploy -Dmaven.test.skip=true -Pdeploy pause \ No newline at end of file diff --git a/parent/bin/package.bat b/parent/bin/package.bat index db5ed5da..8fe98465 100644 --- a/parent/bin/package.bat +++ b/parent/bin/package.bat @@ -7,13 +7,11 @@ rem */ echo. echo [信息] 打包安装工程，生成jar包文件。 echo. -pause -echo. %~d0 cd %~dp0 -cd ../ +cd .. call mvn clean install -Dmaven.test.skip=true -Ppackage pause \ No newline at end of file diff --git a/web/.settings/org.eclipse.wst.common.component b/web/.settings/org.eclipse.wst.common.component index 42914879..f0225d72 100644 --- a/web/.settings/org.eclipse.wst.common.component +++ b/web/.settings/org.eclipse.wst.common.component @@ -3,10 +3,10 @@ uses - + uses - + uses diff --git a/web/bin/clean.bat b/web/bin/clean.bat index fd357abd..7d90bb22 100644 --- a/web/bin/clean.bat +++ b/web/bin/clean.bat @@ -7,13 +7,11 @@ rem */ echo. echo [信息] 清理生成路径。 echo. -pause -echo. %~d0 cd %~dp0 -cd ../ +cd .. call mvn clean pause \ No newline at end of file diff --git a/web/bin/cleanide.bat b/web/bin/cleanide.bat index eae74589..b9db5319 100644 --- a/web/bin/cleanide.bat +++ b/web/bin/cleanide.bat @@ -7,13 +7,11 @@ rem */ echo. echo [信息] 清理Eclipse工程文件。 echo. -pause -echo. %~d0 cd %~dp0 -cd ../ +cd .. call mvn -Declipse.workspace=%cd% eclipse:clean eclipse:eclipse del .classpath diff --git a/web/bin/init-data.bat b/web/bin/init-data.bat index 6bff8183..56bd733a 100644 --- a/web/bin/init-data.bat +++ b/web/bin/init-data.bat @@ -35,7 +35,7 @@ echo. %~d0 cd %~dp0 -cd ../ +cd .. 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 68140917..c4899db1 100644 --- a/web/bin/init-data.sh +++ b/web/bin/init-data.sh @@ -1,5 +1,10 @@ #!/usr/bin/env bash - +# /** +# * Copyright (c) 2013-Now http://jeesite.com All rights reserved. +# * +# * Author: ThinkGem@163.com +# * +# */ echo "" echo "[淇℃伅] 鍒濆鍖栨暟鎹簱锛岃璋ㄦ厧鎿嶄綔銆" read -s -n1 -p "璇锋寜浠绘剰閿户缁 ... " @@ -24,4 +29,4 @@ read -s -n1 -p "璇锋寜浠绘剰閿户缁 ... " echo "" cd .. -exec mvn test -Dtest=com.jeesite.test.InitCoreData,com.jeesite.test.InitGenData +mvn test -Dtest=com.jeesite.test.InitCoreData,com.jeesite.test.InitGenData diff --git a/web/bin/package.bat b/web/bin/package.bat index 8f8c33ee..e39e9a43 100644 --- a/web/bin/package.bat +++ b/web/bin/package.bat @@ -7,13 +7,11 @@ rem */ echo. echo [信息] 打包Web工程，生成war/jar包文件。 echo. -pause -echo. %~d0 cd %~dp0 -cd ../ +cd .. call mvn clean package spring-boot:repackage -Dmaven.test.skip=true -U pause \ No newline at end of file diff --git a/web/bin/package.sh b/web/bin/package.sh new file mode 100644 index 00000000..01f5b055 --- /dev/null +++ b/web/bin/package.sh @@ -0,0 +1,13 @@ +#!/bin/sh +# /** +# * Copyright (c) 2013-Now http://jeesite.com All rights reserved. +# * +# * Author: ThinkGem@163.com +# * +# */ +echo "" +echo "[淇℃伅] 鎵撳寘Web宸ョ▼锛岀敓鎴恮ar/jar鍖呮枃浠躲" +echo "" + +cd .. +mvn clean package spring-boot:repackage -Dmaven.test.skip=true -U diff --git a/web/bin/run-tomcat.bat b/web/bin/run-tomcat.bat index b7210ed5..11cbc241 100644 --- a/web/bin/run-tomcat.bat +++ b/web/bin/run-tomcat.bat @@ -7,18 +7,13 @@ rem */ echo. echo [信息] 使用 Spring Boot Tomcat 运行 Web 工程。 echo. -rem pause -rem echo. %~d0 cd %~dp0 -cd ../ - +cd .. title %cd% - set MAVEN_OPTS=%MAVEN_OPTS% -Xms256m -Xmx1024m -XX:MetaspaceSize=128m -XX:MaxMetaspaceSize=512m - call mvn clean spring-boot:run -U pause \ No newline at end of file diff --git a/web/bin/run-tomcat.sh b/web/bin/run-tomcat.sh index 694ec680..c6e68ab5 100644 --- a/web/bin/run-tomcat.sh +++ b/web/bin/run-tomcat.sh @@ -1,9 +1,14 @@ #!/bin/sh - +# /** +# * Copyright (c) 2013-Now http://jeesite.com All rights reserved. +# * +# * Author: ThinkGem@163.com +# * +# */ echo "" echo "[淇℃伅] 浣跨敤 Spring Boot Tomcat 杩愯 Web 宸ョ▼銆" echo "" cd .. MAVEN_OPTS="$MAVEN_OPTS -Xms256m -Xmx1024m -XX:MetaspaceSize=128m -XX:MaxMetaspaceSize=512m" -exec mvn clean spring-boot:run -U +mvn clean spring-boot:run -U diff --git a/web/bin/run-web.bat b/web/bin/run-web.bat index ec1ee7c8..f1341471 100644 --- a/web/bin/run-web.bat +++ b/web/bin/run-web.bat @@ -7,20 +7,17 @@ rem */ echo. echo [信息] 打包Web工程，并运行Web工程。 echo. -rem pause -rem echo. %~d0 cd %~dp0 cd .. - call mvn clean package spring-boot:repackage -Dmaven.test.skip=true -U -cd target/ +cd target call unzip -n *.war -d web -cd web/WEB-INF/ +cd web/WEB-INF call startup.bat pause \ No newline at end of file diff --git a/web/bin/run-web.sh b/web/bin/run-web.sh new file mode 100644 index 00000000..69ffb689 --- /dev/null +++ b/web/bin/run-web.sh @@ -0,0 +1,20 @@ +#!/bin/sh +# /** +# * Copyright (c) 2013-Now http://jeesite.com All rights reserved. +# * +# * Author: ThinkGem@163.com +# * +# */ +echo "" +echo "[淇℃伅] 浣跨敤 Spring Boot Tomcat 杩愯 Web 宸ョ▼銆" +echo "" + +cd .. +mvn clean package spring-boot:repackage -Dmaven.test.skip=true -U + +cd target +unzip -n *.war -d web + +cd web/WEB-INF +chmod +x *.sh +./startup.sh diff --git a/web/src/main/resources/logback.xml b/web/src/main/resources/logback.xml index e481ca3a..4ac1d483 100644 --- a/web/src/main/resources/logback.xml +++ b/web/src/main/resources/logback.xml @@ -2,7 +2,7 @@ - + diff --git a/web/src/main/webapp/WEB-INF/startup.sh b/web/src/main/webapp/WEB-INF/startup.sh new file mode 100644 index 00000000..58086622 --- /dev/null +++ b/web/src/main/webapp/WEB-INF/startup.sh @@ -0,0 +1,20 @@ +#!/bin/sh +# /** +# * Copyright (c) 2013-Now http://jeesite.com All rights reserved. +# * +# * Author: ThinkGem@163.com +# * +# */ +echo "" +echo "[淇℃伅] 杩愯Web宸ョ▼銆" +echo "" + +JAVA_OPTS="$MAVEN_OPTS -Xms256m -Xmx1024m -XX:MetaspaceSize=128m -XX:MaxMetaspaceSize=512m" + +if [ -z "$JAVA_HOME" ]; then + RUN_JAVA=java +else + RUN_JAVA="$JAVA_HOME"/bin/java +fi + +exec $RUN_JAVA -cp `dirname $0`/../ $JAVA_OPTS org.springframework.boot.loader.WarLauncher \ No newline at end of file