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

update batch

Browse Source
This commit is contained in:
thinkgem
2020-05-24 23:27:20 +08:00
parent ae5b06a48f
commit 0cf9420b73
5 changed files with 19 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
web/bin/docker/Dockerfile
View File

@@ -20,4 +20,4 @@ ENTRYPOINT java -cp /app $JAVA_OPTS org.springframework.boot.loader.WarLauncher
EXPOSE 8980
# docker run -p 8980:8980 com.jeesite/jeesite-web:4.1
# docker run -p 8980:8980 com.jeesite/jeesite-web:4.2

34
web/bin/run-web.bat
View File

@@ -17,33 +17,13 @@ call mvn clean package spring-boot:repackage -Dmaven.test.skip=true -U
cd target
rem <20><><EFBFBD><EFBFBD>Web<65><62><EFBFBD>̣<EFBFBD><CCA3><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
title %cd%
rem <20>Ż<EFBFBD>JVM<EFBFBD><EFBFBD><EFBFBD><EFBFBD>
set "JAVA_OPTS=-Xms512m -Xmx1024m -XX:MetaspaceSize=128m -XX:MaxMetaspaceSize=512m"
rem <20><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>޸<EFBFBD> web.jar Ϊ<><CEAA><EFBFBD><EFBFBD> jar <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
mkdir web
copy web.war web
cd web
jar -xvf web.war
cd WEB-INF
call startup.bat
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"
rem <20><>ʽ<EFBFBD><CABD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>û<EFBFBD><C3BB><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ƣ<EFBFBD><C6A3><EFBFBD><EFBFBD>ز<EFBFBD>ͬ<EFBFBD><CDAC><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ļ<EFBFBD>
rem set "JAVA_OPTS=%JAVA_OPTS% -Dspring.profiles.active=prod"
if "%JAVA_HOME%" == "" goto noJavaHome
if not "%JAVA_HOME%" == "" goto gotJavaHome
goto end
:noJavaHome
set RUN_JAVA=java
goto runJava
:gotJavaHome
set "RUN_JAVA=%JAVA_HOME%\bin\java"
goto runJava
:runJava
rem <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>޸<EFBFBD> web.war Ϊ<><CEAA><EFBFBD><EFBFBD> war <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
call "%RUN_JAVA%" %JAVA_OPTS% -jar web.war
goto end
:end
pause

23
web/bin/run-web.sh
View File

@@ -15,20 +15,11 @@ mvn clean package spring-boot:repackage -Dmaven.test.skip=true -U
cd target
# 打包Web工程（结束）
# 优化JVM参数
JAVA_OPTS="$MAVEN_OPTS -Xms512m -Xmx1024m -XX:MetaspaceSize=128m -XX:MaxMetaspaceSize=512m"
# 方式一、配置外部自定义的属性文件（建议）
# JAVA_OPTS="$JAVA_OPTS -Dspring.config.location=$PWD\app.yml"
# 方式二、配置环境名称，加载不同的属性文件
# JAVA_OPTS="$JAVA_OPTS -Dspring.profiles.active=prod"
if [ -z "$JAVA_HOME" ]; then
RUN_JAVA=java
else
RUN_JAVA="$JAVA_HOME"/bin/java
fi
# 根据情况修改 web.war 为您的 war 包名称
exec $RUN_JAVA $JAVA_OPTS -jar web.war
# 根据情况修改 web.jar 为您的 jar 包名称
mkdir web
cp web.war ./web
cd web
jar -xvf web.war
cd WEB-INF
exec ./startup.sh

4
web/pom.xml
View File

@@ -19,7 +19,7 @@
<properties>
<finalName>web</finalName><!-- war包的名称 -->
<finalName>web</finalName><!-- war or jar 包的名称 -->
<start-class>com.jeesite.modules.Application</start-class>
<!-- environment setting -->
@@ -28,7 +28,7 @@
<!-- docker service -->
<docker.registryUrl>http://192.168.56.102:2375</docker.registryUrl>
<docker.imageName>${project.groupId}/${project.artifactId}:4.1</docker.imageName>
<docker.imageName>${project.groupId}/${project.artifactId}:4.2</docker.imageName>
</properties>

4
web/src/main/resources/config/application.yml
View File

@@ -8,7 +8,7 @@ productName: JeeSite Demo
companyName: ThinkGem
# 产品版本、版权年份
productVersion: V4.1
productVersion: V4.2
copyrightYear: 2020
#是否演示模式
@@ -20,7 +20,7 @@ demoMode: false
server:
port: 8981
port: 8980
servlet:
context-path: /js
tomcat: