From f44d13ddec66af5cecb492b831df62bb1e940b47 Mon Sep 17 00:00:00 2001
From: thinkgem <thinkgem@163.com>
Date: Mon, 2 Jul 2018 23:00:37 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=AF=E6=8C=81war=E5=8C=85=E4=B8=8D?=
 =?UTF-8?q?=E8=A7=A3=E5=8E=8B=E7=9A=84=E6=83=85=E5=86=B5=E4=B8=8B=E8=BF=90?=
 =?UTF-8?q?=E8=A1=8C=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/jeesite/common/io/FileUtils.java |  8 +++++++
 parent/pom.xml                                |  2 +-
 .../org.eclipse.wst.common.component          | 10 ++++----
 web/bin/run-web.bat                           | 24 +++++++++++++++----
 web/bin/run-web.sh                            | 15 ++++++++----
 web/pom.xml                                   | 20 ++++++++++++++--
 web/src/main/webapp/WEB-INF/startup.bat       |  1 -
 web/src/main/webapp/WEB-INF/startup.sh        |  2 +-
 8 files changed, 63 insertions(+), 19 deletions(-)

diff --git a/common/src/main/java/com/jeesite/common/io/FileUtils.java b/common/src/main/java/com/jeesite/common/io/FileUtils.java
index bdf04805..46efaacf 100644
--- a/common/src/main/java/com/jeesite/common/io/FileUtils.java
+++ b/common/src/main/java/com/jeesite/common/io/FileUtils.java
@@ -948,6 +948,10 @@ public class FileUtils extends org.apache.commons.io.FileUtils {
 		} catch (IOException e) {
 			e.printStackTrace();
 		}
+		// 取不到，取当前工作路径
+		if (StringUtils.isBlank(projectPath)){
+			projectPath = System.getProperty("user.dir");
+		}
 		return projectPath;
     }
     
@@ -982,6 +986,10 @@ public class FileUtils extends org.apache.commons.io.FileUtils {
 		} catch (IOException e) {
 			e.printStackTrace();
 		}
+		// 取不到，取当前工作路径
+		if (StringUtils.isBlank(webappPath)){
+			webappPath = System.getProperty("user.dir");
+		}
 		return webappPath;
     }
     
diff --git a/parent/pom.xml b/parent/pom.xml
index 7d0cb6f5..6859ac88 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -94,7 +94,7 @@
 						</goals> -->
 						<configuration>
 							<!-- <classesDirectory>${project.outputDirectory}</classesDirectory>
-							<finalName>jeesite</finalName>
+							<finalName>${finalName}</finalName>
 							<outputDirectory>${project.build.directory}/${project.artifactId}/WEB-INF/lib</outputDirectory>
 							<includes>
 								<include>com/thinkgem/jeesite/**</include>
diff --git a/web/.settings/org.eclipse.wst.common.component b/web/.settings/org.eclipse.wst.common.component
index f12d36fd..772f2495 100644
--- a/web/.settings/org.eclipse.wst.common.component
+++ b/web/.settings/org.eclipse.wst.common.component
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?><project-modules id="moduleCoreId" project-version="1.5.0">
-  <wb-module deploy-name="jeesite-web">
-        <dependent-module archiveName="jeesite-module-core-4.0.4-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/jeesite-module-core/jeesite-module-core">
+  <wb-module deploy-name="web">
+        <dependent-module archiveName="jeesite-module-core-4.0.5-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/jeesite-module-core/jeesite-module-core">
             <dependency-type>uses</dependency-type>
         </dependent-module>
-        <dependent-module archiveName="jeesite-common-4.0.4-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/jeesite-common/jeesite-common">
+        <dependent-module archiveName="jeesite-common-4.0.5-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/jeesite-common/jeesite-common">
             <dependency-type>uses</dependency-type>
         </dependent-module>
-        <dependent-module archiveName="jeesite-framework-4.0.4-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/jeesite-framework/jeesite-framework">
+        <dependent-module archiveName="jeesite-framework-4.0.5-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/jeesite-framework/jeesite-framework">
             <dependency-type>uses</dependency-type>
         </dependent-module>
         <property name="component.exclusion.patterns"/>
         <property name="java-output-path" value="/src/main/webapp/WEB-INF/classes"/>
-        <property name="context-root" value="jeesite-web"/>
+        <property name="context-root" value="web"/>
 		<wb-resource deploy-path="/WEB-INF/classes" source-path="src/main/java"/>
 		<wb-resource deploy-path="/WEB-INF/classes" source-path="src/main/resources"/>
         <wb-resource deploy-path="/" source-path="/target/m2e-wtp/web-resources"/>
diff --git a/web/bin/run-web.bat b/web/bin/run-web.bat
index f1341471..e6bc298b 100644
--- a/web/bin/run-web.bat
+++ b/web/bin/run-web.bat
@@ -13,11 +13,27 @@ cd %~dp0
 
 cd ..
 call mvn clean package spring-boot:repackage -Dmaven.test.skip=true -U
-
 cd target
-call unzip -n *.war -d web
 
-cd web/WEB-INF
-call startup.bat
+title %cd%
+set JAVA_OPTS=-Xms256m -Xmx1024m -XX:MetaspaceSize=128m -XX:MaxMetaspaceSize=512m
+rem set JAVA_OPTS=%JAVA_OPTS% -Dspring.config.location=%cd%\app.yml
 
+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%" %JAVA_OPTS% -jar web.war
+goto end
+
+:end
 pause
\ No newline at end of file
diff --git a/web/bin/run-web.sh b/web/bin/run-web.sh
index 69ffb689..fc85ab2a 100644
--- a/web/bin/run-web.sh
+++ b/web/bin/run-web.sh
@@ -11,10 +11,15 @@ 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
+JAVA_OPTS="-Xms256m -Xmx1024m -XX:MetaspaceSize=128m -XX:MaxMetaspaceSize=512m"
+#JAVA_OPTS="$JAVA_OPTS -Dspring.config.location=$PWD\app.yml"
+
+if [ -z "$JAVA_HOME" ]; then
+  RUN_JAVA=java
+else
+  RUN_JAVA="$JAVA_HOME"/bin/java
+fi
+
+exec $RUN_JAVA $JAVA_OPTS -jar web.war
\ No newline at end of file
diff --git a/web/pom.xml b/web/pom.xml
index 6fe1228f..ce30d1e2 100644
--- a/web/pom.xml
+++ b/web/pom.xml
@@ -19,6 +19,7 @@
 	
 	<properties>
 		
+		<finalName>web</finalName><!-- war包的名称  ${project.artifactId} -->
 		<start-class>com.jeesite.modules.config.Application</start-class>
 		
 		<!-- environment setting -->
@@ -70,7 +71,7 @@
 	</dependencies>
 	
 	<build>
-		<finalName>${project.artifactId}</finalName>
+		<finalName>${finalName}</finalName>
 		<outputDirectory>${project.basedir}/src/main/webapp/WEB-INF/classes/</outputDirectory>
 		<plugins>
 			
@@ -84,6 +85,21 @@
 				<artifactId>maven-shade-plugin</artifactId>
 			</plugin> -->
 			
+			<!-- 打包插件, war包名称不带版本号 -->
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-war-plugin</artifactId>
+				<configuration>
+					<packagingExcludes></packagingExcludes>
+					<warSourceExcludes></warSourceExcludes>
+					<webappDirectory>${project.build.directory}/${project.artifactId}</webappDirectory>
+					<warName>${finalName}</warName>
+					<archive>
+						<addMavenDescriptor>false</addMavenDescriptor>
+					</archive>
+				</configuration>
+			</plugin>
+			
 			<!-- Eclipse插件 -->
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
@@ -91,7 +107,7 @@
 				<configuration>
 					<downloadSources>${eclipse-plugin-download-sources}</downloadSources>
 					<downloadJavadocs>${eclipse-plugin-download-javadocs}</downloadJavadocs>
-					<wtpContextName>${project.artifactId}</wtpContextName>
+					<wtpContextName>${finalName}</wtpContextName>
 					<wtpversion>2.0</wtpversion>
 					<jeeversion>6.0</jeeversion>
 				</configuration>
diff --git a/web/src/main/webapp/WEB-INF/startup.bat b/web/src/main/webapp/WEB-INF/startup.bat
index ffa9157d..3810265e 100644
--- a/web/src/main/webapp/WEB-INF/startup.bat
+++ b/web/src/main/webapp/WEB-INF/startup.bat
@@ -15,7 +15,6 @@ rem echo.
 cd %~dp0
 
 title %cd%
-
 set JAVA_OPTS=-Xms256m -Xmx1024m -XX:MetaspaceSize=128m -XX:MaxMetaspaceSize=512m
 
 if "%JAVA_HOME%" == "" goto noJavaHome
diff --git a/web/src/main/webapp/WEB-INF/startup.sh b/web/src/main/webapp/WEB-INF/startup.sh
index 58086622..f2d6ef3b 100644
--- a/web/src/main/webapp/WEB-INF/startup.sh
+++ b/web/src/main/webapp/WEB-INF/startup.sh
@@ -17,4 +17,4 @@ 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
+exec $RUN_JAVA -cp $PWD/../ $JAVA_OPTS org.springframework.boot.loader.WarLauncher
\ No newline at end of file