打包程序优化，直接打成war包，包含容器，支持脚本运行

web/.settings/org.eclipse.wst.common.component

@@ -15,7 +15,7 @@
     <property name="context-root" value="jeesite-web"/>
     <wb-resource deploy-path="/" source-path="src/main/webapp"/>
     <property name="java-output-path" value="/src/main/webapp/WEB-INF/classes"/>
-        <property name="component.exclusion.patterns" value="userfiles/**,test/**"/>
+        <property name="component.exclusion.patterns"/>
     <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"/>

web/bin/run-tomcat.bat

@@ -14,20 +14,12 @@ rem echo.
 cd %~dp0
 
 cd ../
-title %cd%
 
-set currPath=%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
 
-if exist "../package/pom.xml" (
-	cd ../package
-	call mvn clean install -Dmaven.test.skip=true -Ppackage -U
-)
-
-cd %currPath%
-
 call mvn clean spring-boot:run -U
 
 pause

web/bin/run-war.bat

@@ -5,7 +5,7 @@ rem  *
 rem  * Author: ThinkGem@163.com
 rem  */
 echo.
-echo [信息] 运行Web工程。
+echo [信息] 打包Web工程，并运行Web工程。
 echo.
 rem pause
 rem echo.
@@ -14,12 +14,17 @@ rem echo.
 cd %~dp0
 
 cd ../
+call mvn clean package spring-boot:repackage -Dmaven.test.skip=true -U
+
 title %cd%
 
 rem set JAVA_OPTS= -Xms256m -Xmx1024m -XX:PermSize=128m -XX:MaxPermSize=512m
 set JAVA_OPTS= -Xms256m -Xmx1024m -XX:MetaspaceSize=128m -XX:MaxMetaspaceSize=512m
 
 cd target/
-java -jar jeesite-web.war
+call unzip -n jeesite-web.war -d jeesite-web
+
+cd jeesite-web
+call java org.springframework.boot.loader.WarLauncher
 
 pause

web/src/main/resources/config/application.yml

@@ -15,4 +15,3 @@ server:
 
 debug: true
 
-

web/src/main/resources/config/jeesite.yml

@@ -9,7 +9,7 @@ jdbc:
   # Mysql 数据库配置
   type: mysql
   driver: com.mysql.jdbc.Driver
-  url: jdbc:mysql://127.0.0.1:3306/jeesite4?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull
+  url: jdbc:mysql://127.0.0.1:3306/jeesite4?useSSL=true&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull
   username: root
   password: 123456
   testSql: SELECT 1

web/src/main/resources/logback.xml

@@ -56,6 +56,6 @@
 	</root>
 	
 	<!-- Framework level setting -->
-	<include resource="logger-core.xml"/>
+	<include resource="config/logger-core.xml"/>
 	
 </configuration>

web/src/test/java/com/jeesite/test/InitGenData.java

@@ -23,8 +23,8 @@ public class InitGenData extends com.jeesite.modules.gen.db.InitGenData {
 	@Test
 	public void initGenData() throws Exception{
 		createGenTable();
-		initGenTreeData();
 		initGenTestData();
+		initGenTreeData();
 	}
 
 }