From 8563888fd5aab26bb98d546a99518a26a729d6bc Mon Sep 17 00:00:00 2001
From: thinkgem <thinkgem@163.com>
Date: Sat, 15 Sep 2018 17:46:18 +0800
Subject: [PATCH] v4.0.7

---
 modules/core/src/main/resources/config/jeesite-core.yml  | 4 ++--
 modules/core/src/main/resources/db/upgrade/core/versions | 3 ++-
 web/pom.xml                                              | 6 ++++--
 web/src/main/resources/config/jeesite.yml                | 2 +-
 4 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/modules/core/src/main/resources/config/jeesite-core.yml b/modules/core/src/main/resources/config/jeesite-core.yml
index 8042908d..2c449733 100644
--- a/modules/core/src/main/resources/config/jeesite-core.yml
+++ b/modules/core/src/main/resources/config/jeesite-core.yml
@@ -73,7 +73,7 @@ jdbc:
     stat:
       enabled: true
   
-# Redis 配置（2.x/3.x）
+# Redis 配置
 redis: 
   enabled: false
   
@@ -90,7 +90,7 @@ redis:
   pool:
     maxIdle: 3
     maxTotal: 20
-
+  
   # 是否启用Redis系统缓存及会话（专业版）
   cacheAndSession: false
   
diff --git a/modules/core/src/main/resources/db/upgrade/core/versions b/modules/core/src/main/resources/db/upgrade/core/versions
index c68f7f1d..d092cb18 100644
--- a/modules/core/src/main/resources/db/upgrade/core/versions
+++ b/modules/core/src/main/resources/db/upgrade/core/versions
@@ -4,4 +4,5 @@
 4.0.3
 4.0.4
 4.0.5
-4.0.6
\ No newline at end of file
+4.0.6
+4.0.7
\ No newline at end of file
diff --git a/web/pom.xml b/web/pom.xml
index d09bc0a8..89d11cfa 100644
--- a/web/pom.xml
+++ b/web/pom.xml
@@ -76,8 +76,10 @@
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-war-plugin</artifactId>
 				<configuration>
-					<packagingExcludes></packagingExcludes>
-					<warSourceExcludes></warSourceExcludes>
+					<warSourceExcludes>
+						WEB-INF/classes/*.lic,
+						userfiles/**
+					</warSourceExcludes>
 					<webappDirectory>${project.build.directory}/${project.artifactId}</webappDirectory>
 					<warName>${finalName}</warName>
 					<archive>
diff --git a/web/src/main/resources/config/jeesite.yml b/web/src/main/resources/config/jeesite.yml
index 61b9d832..3ff0d290 100644
--- a/web/src/main/resources/config/jeesite.yml
+++ b/web/src/main/resources/config/jeesite.yml
@@ -102,7 +102,7 @@ jdbc:
 #    stat:
 #      enabled: true
 
-# Redis 配置（2.x/3.x）
+# Redis 配置
 #redis: 
 #  enabled: false
 #