From 67063a6dd7a5419367842a048bfbe47722d6114b Mon Sep 17 00:00:00 2001
From: thinkgem <thinkgem@163.com>
Date: Fri, 24 Jun 2022 09:52:40 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=BE=AE=E6=9C=8D=E5=8A=A1?=
 =?UTF-8?q?=E6=A8=A1=E5=9D=97=E4=BB=A3=E7=A0=81=E7=94=9F=E6=88=90=E7=9A=84?=
 =?UTF-8?q?=E5=90=AF=E5=8A=A8=E8=84=9A=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../templates/modules/gen/config.xml          |  2 +
 .../src/main/webapp/WEB-INF/startup.bat.xml   | 62 +++++++++++++++++++
 .../src/main/webapp/WEB-INF/startup.sh.xml    | 43 +++++++++++++
 web-api/src/main/webapp/WEB-INF/startup.bat   |  2 +-
 web-fast/src/main/webapp/WEB-INF/startup.bat  |  2 +-
 web/src/main/webapp/WEB-INF/startup.bat       |  2 +-
 6 files changed, 110 insertions(+), 3 deletions(-)
 create mode 100644 modules/core/src/main/resources/templates/modules/gen/module_cloud/web/src/main/webapp/WEB-INF/startup.bat.xml
 create mode 100644 modules/core/src/main/resources/templates/modules/gen/module_cloud/web/src/main/webapp/WEB-INF/startup.sh.xml

diff --git a/modules/core/src/main/resources/templates/modules/gen/config.xml b/modules/core/src/main/resources/templates/modules/gen/config.xml
index 659234ef..fb5afb35 100644
--- a/modules/core/src/main/resources/templates/modules/gen/config.xml
+++ b/modules/core/src/main/resources/templates/modules/gen/config.xml
@@ -227,6 +227,8 @@
 			<template>module_cloud/web/src/main/resources/config/bootstrap.xml</template>
 			<template>module_cloud/web/src/main/resources/config/logback-spring.xml</template>
 			<template>module_cloud/web/src/main/resources/static/static.xml</template>
+			<template>module_cloud/web/src/main/webapp/WEB-INF/startup.bat.xml</template>
+			<template>module_cloud/web/src/main/webapp/WEB-INF/startup.sh.xml</template>
 			<template>module_cloud/web/pom.xml</template>
 		</category>
 	</moduleTplCategory>
diff --git a/modules/core/src/main/resources/templates/modules/gen/module_cloud/web/src/main/webapp/WEB-INF/startup.bat.xml b/modules/core/src/main/resources/templates/modules/gen/module_cloud/web/src/main/webapp/WEB-INF/startup.bat.xml
new file mode 100644
index 00000000..2f4f9ac2
--- /dev/null
+++ b/modules/core/src/main/resources/templates/modules/gen/module_cloud/web/src/main/webapp/WEB-INF/startup.bat.xml
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (c) 2013-Now http://jeesite.com All rights reserved.
+     No deletion without permission, or be held responsible to law. -->
+<template>
+	<name>run-web</name>
+	<filePath>${module.moduleCode}/${module.moduleCode}/src/main/webapp/WEB-INF</filePath>
+	<fileName>startup.bat</fileName>
+	<content><![CDATA[chcp 65001
+@echo off
+rem /**
+rem  * Copyright (c) 2013-Now http://jeesite.com All rights reserved.
+rem  * No deletion without permission, or be held responsible to law.
+rem  *
+rem  * Author: ThinkGem@163.com
+rem  */
+echo.
+echo [信息] 运行Web工程。
+echo.
+rem pause
+rem echo.
+
+%~d0
+cd %~dp0
+
+title %cd%
+
+rem 设置JDK目录
+rem set "JAVA_HOME=%cd%\jdk1.8.0_x64"
+
+rem 设置类加载路径
+set "CLASS_PATH=%cd%/../"
+
+rem 优化JVM参数
+set "JAVA_OPTS=%JAVA_OPTS% -Xms512m -Xmx1024m -Dfile.encoding=utf-8"
+
+rem 方式一、配置外部自定义的属性文件（建议）
+rem set "JAVA_OPTS=%JAVA_OPTS% -Dspring.config.location=%cd%\app.yml"
+
+rem 方式二、配置环境名称，加载不同的属性文件
+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
+call "%RUN_JAVA%" -cp %CLASS_PATH% %JAVA_OPTS% org.springframework.boot.loader.WarLauncher
+goto end
+
+:end
+pause
+]]>
+	</content>
+</template>
\ No newline at end of file
diff --git a/modules/core/src/main/resources/templates/modules/gen/module_cloud/web/src/main/webapp/WEB-INF/startup.sh.xml b/modules/core/src/main/resources/templates/modules/gen/module_cloud/web/src/main/webapp/WEB-INF/startup.sh.xml
new file mode 100644
index 00000000..2c913279
--- /dev/null
+++ b/modules/core/src/main/resources/templates/modules/gen/module_cloud/web/src/main/webapp/WEB-INF/startup.sh.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (c) 2013-Now http://jeesite.com All rights reserved.
+     No deletion without permission, or be held responsible to law. -->
+<template>
+	<name>run-web</name>
+	<filePath>${module.moduleCode}/${module.moduleCode}/src/main/webapp/WEB-INF</filePath>
+	<fileName>startup.sh</fileName>
+	<content><![CDATA[#!/bin/sh
+# /**
+#  * Copyright (c) 2013-Now http://jeesite.com All rights reserved.
+#  * No deletion without permission, or be held responsible to law.
+#  *
+#  * Author: ThinkGem@163.com
+#  */
+echo ""
+echo "[信息] 运行Web工程。"
+echo ""
+
+# 设置JDK目录
+# JAVA_HOME="$PWD/jdk1.8.0_x64"
+
+# 设置类加载路径
+CLASS_PATH="$PWD/../"
+
+# 优化JVM参数
+JAVA_OPTS="$JAVA_OPTS -Xms512m -Xmx1024m -Dfile.encoding=utf-8"
+
+# 方式一、配置外部自定义的属性文件（建议）
+# 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
+
+exec $RUN_JAVA -cp $CLASS_PATH $JAVA_OPTS org.springframework.boot.loader.WarLauncher
+]]>
+	</content>
+</template>
\ No newline at end of file
diff --git a/web-api/src/main/webapp/WEB-INF/startup.bat b/web-api/src/main/webapp/WEB-INF/startup.bat
index ebc71645..7d4f47a3 100644
--- a/web-api/src/main/webapp/WEB-INF/startup.bat
+++ b/web-api/src/main/webapp/WEB-INF/startup.bat
@@ -23,7 +23,7 @@ rem 
 set "CLASS_PATH=%cd%/../"
 
 rem �Ż�JVM����
-set "JAVA_OPTS=-Xms512m -Xmx1024m"
+set "JAVA_OPTS=%JAVA_OPTS% -Xms512m -Xmx1024m"
 
 rem ��ʽһ�������ⲿ�Զ���������ļ������飩
 rem set "JAVA_OPTS=%JAVA_OPTS% -Dspring.config.location=%cd%\app.yml"
diff --git a/web-fast/src/main/webapp/WEB-INF/startup.bat b/web-fast/src/main/webapp/WEB-INF/startup.bat
index ebc71645..7d4f47a3 100644
--- a/web-fast/src/main/webapp/WEB-INF/startup.bat
+++ b/web-fast/src/main/webapp/WEB-INF/startup.bat
@@ -23,7 +23,7 @@ rem 
 set "CLASS_PATH=%cd%/../"
 
 rem �Ż�JVM����
-set "JAVA_OPTS=-Xms512m -Xmx1024m"
+set "JAVA_OPTS=%JAVA_OPTS% -Xms512m -Xmx1024m"
 
 rem ��ʽһ�������ⲿ�Զ���������ļ������飩
 rem set "JAVA_OPTS=%JAVA_OPTS% -Dspring.config.location=%cd%\app.yml"
diff --git a/web/src/main/webapp/WEB-INF/startup.bat b/web/src/main/webapp/WEB-INF/startup.bat
index ebc71645..7d4f47a3 100644
--- a/web/src/main/webapp/WEB-INF/startup.bat
+++ b/web/src/main/webapp/WEB-INF/startup.bat
@@ -23,7 +23,7 @@ rem 
 set "CLASS_PATH=%cd%/../"
 
 rem �Ż�JVM����
-set "JAVA_OPTS=-Xms512m -Xmx1024m"
+set "JAVA_OPTS=%JAVA_OPTS% -Xms512m -Xmx1024m"
 
 rem ��ʽһ�������ⲿ�Զ���������ļ������飩
 rem set "JAVA_OPTS=%JAVA_OPTS% -Dspring.config.location=%cd%\app.yml"