From 77155af474e453e21416c8239e36171e744cfbee Mon Sep 17 00:00:00 2001
From: thinkgem <thinkgem@163.com>
Date: Fri, 2 Aug 2019 18:12:46 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8D=95=E5=85=83=E6=B5=8B=E8=AF=95=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96=EF=BC=8C=E4=B8=8D=E5=86=8D=E5=BF=85=E9=A1=BB=E4=BE=9D?=
 =?UTF-8?q?=E8=B5=96=20j2cache.proerties=20=E5=B1=9E=E6=80=A7=E6=96=87?=
 =?UTF-8?q?=E4=BB=B6=EF=BC=8C=E7=B3=BB=E7=BB=9F=E9=BB=98=E8=AE=A4=E4=BC=9A?=
 =?UTF-8?q?=E8=AE=BE=E5=AE=9A=E4=B8=80=E4=BA=9B=E9=BB=98=E8=AE=A4=E5=80=BC?=
 =?UTF-8?q?=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../core/src/test/java/{config => }/application.yml    | 10 +++++-----
 modules/core/src/test/java/config/j2cache.properties   |  8 --------
 .../src/test/java/{logback.xml => logback-test.xml}    |  2 +-
 web/src/test/java/{logback.xml => logback-test.xml}    |  2 +-
 4 files changed, 7 insertions(+), 15 deletions(-)
 rename modules/core/src/test/java/{config => }/application.yml (73%)
 delete mode 100644 modules/core/src/test/java/config/j2cache.properties
 rename modules/core/src/test/java/{logback.xml => logback-test.xml} (84%)
 rename web/src/test/java/{logback.xml => logback-test.xml} (84%)

diff --git a/modules/core/src/test/java/config/application.yml b/modules/core/src/test/java/application.yml
similarity index 73%
rename from modules/core/src/test/java/config/application.yml
rename to modules/core/src/test/java/application.yml
index c5e7a5cd..d1795b04 100644
--- a/modules/core/src/test/java/config/application.yml
+++ b/modules/core/src/test/java/application.yml
@@ -1,12 +1,12 @@
 
-# 产品或项目名称、版本、版权年份
+# 产品或项目名称、软件开发公司名称
 productName: JeeSite Demo
+companyName: ThinkGem
+
+# 产品版本、版权年份
 productVersion: V4.1
 copyrightYear: 2018
 
-# 软件提供商公司或个人名称
-companyName: ThinkGem
-
 # 数据库连接
 jdbc: 
   
@@ -20,4 +20,4 @@ jdbc:
 
 # 日志配置
 logging:
-  config: classpath:logback.xml
+  config: classpath:logback-test.xml
diff --git a/modules/core/src/test/java/config/j2cache.properties b/modules/core/src/test/java/config/j2cache.properties
deleted file mode 100644
index decc9d2c..00000000
--- a/modules/core/src/test/java/config/j2cache.properties
+++ /dev/null
@@ -1,8 +0,0 @@
-#J2Cache configuration
-
-j2cache.broadcast = none
-
-j2cache.L1.provider_class = caffeine
-j2cache.L2.provider_class = none
-
-caffeine.region.default = 10000, 1h
\ No newline at end of file
diff --git a/modules/core/src/test/java/logback.xml b/modules/core/src/test/java/logback-test.xml
similarity index 84%
rename from modules/core/src/test/java/logback.xml
rename to modules/core/src/test/java/logback-test.xml
index b9aef4b4..98aa2446 100644
--- a/modules/core/src/test/java/logback.xml
+++ b/modules/core/src/test/java/logback-test.xml
@@ -3,7 +3,7 @@
 	
 	<!-- Framework level setting -->
 	<include resource="config/logger-core.xml"/>
-	
+	<include resource="org/springframework/boot/logging/logback/defaults.xml" />
 	<!-- Console log output -->
 	<appender name="console" class="ch.qos.logback.core.ConsoleAppender">
 		<encoder>
diff --git a/web/src/test/java/logback.xml b/web/src/test/java/logback-test.xml
similarity index 84%
rename from web/src/test/java/logback.xml
rename to web/src/test/java/logback-test.xml
index b9aef4b4..98aa2446 100644
--- a/web/src/test/java/logback.xml
+++ b/web/src/test/java/logback-test.xml
@@ -3,7 +3,7 @@
 	
 	<!-- Framework level setting -->
 	<include resource="config/logger-core.xml"/>
-	
+	<include resource="org/springframework/boot/logging/logback/defaults.xml" />
 	<!-- Console log output -->
 	<appender name="console" class="ch.qos.logback.core.ConsoleAppender">
 		<encoder>