From 57f67c0a0e961ff5f2f43a26590492828face3ff Mon Sep 17 00:00:00 2001
From: thinkgem <thinkgem@163.com>
Date: Sat, 13 Oct 2018 21:44:35 +0800
Subject: [PATCH] =?UTF-8?q?=E6=97=A5=E5=BF=97=E9=85=8D=E7=BD=AE=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96=EF=BC=8C=E5=B9=B6=E9=87=8D=E5=91=BD=E5=90=8D=E7=A7=BB?=
 =?UTF-8?q?=E5=8A=A8=E5=88=B0=20src/main/resources/config/logback-spring.x?=
 =?UTF-8?q?ml?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../core/src/main/resources/config/jeesite-core.yml  |  6 +++++-
 .../core/src/main/resources/config/logger-core.xml   | 12 ++++--------
 .../{logback-test.xml => config/logback-spring.xml}  |  3 ---
 .../{logback.xml => config/logback-spring.xml}       |  3 +++
 4 files changed, 12 insertions(+), 12 deletions(-)
 rename modules/core/src/test/resource/{logback-test.xml => config/logback-spring.xml} (79%)
 rename web/src/main/resources/{logback.xml => config/logback-spring.xml} (93%)

diff --git a/modules/core/src/main/resources/config/jeesite-core.yml b/modules/core/src/main/resources/config/jeesite-core.yml
index 5133af71..4f2ff630 100644
--- a/modules/core/src/main/resources/config/jeesite-core.yml
+++ b/modules/core/src/main/resources/config/jeesite-core.yml
@@ -70,7 +70,11 @@ spring:
   # 关闭 Spring Boot Banner 打印
   main:
     bannerMode: "off"
-    
+
+# 日志配置
+logging:
+  config: classpath:config/logback-spring.xml
+  
 #======================================#
 #========== System settings ===========#
 #======================================#
diff --git a/modules/core/src/main/resources/config/logger-core.xml b/modules/core/src/main/resources/config/logger-core.xml
index f1562e08..e956bdb2 100644
--- a/modules/core/src/main/resources/config/logger-core.xml
+++ b/modules/core/src/main/resources/config/logger-core.xml
@@ -1,13 +1,10 @@
 <included>
 	
-	<!-- https://github.com/spring-projects/spring-boot/blob/v2.0.4.RELEASE/spring-boot-project/spring-boot/src/main/resources/org/springframework/boot/logging/logback/defaults.xml -->
+	<!-- https://github.com/spring-projects/spring-boot/blob/v2.0.5.RELEASE/spring-boot-project/spring-boot/src/main/resources/org/springframework/boot/logging/logback/defaults.xml -->
 	<include resource="org/springframework/boot/logging/logback/defaults.xml" />
 	
-	<logger name="org.apache.catalina.webresources.Cache" level="ERROR" />
+	<logger name="org.springframework.boot.web.embedded" level="INFO" />
 	<logger name="net.oschina.j2cache.caffeine.CaffeineProvider" level="ERROR" />
-	<logger name="org.springframework.boot.context.embedded" level="INFO" />
-	<logger name="org.springframework.boot.autoconfigure.logging.AutoConfigurationReportLoggingInitializer" level="INFO" />
-	<logger name="springfox.documentation.spring.web.readers.parameter.ParameterDataTypeReader" level="ERROR" />
 	
 <!-- 	<logger name="org.apache.ibatis" level="DEBUG" /> -->
 <!-- 	<logger name="org.mybatis.spring" level="DEBUG" /> -->
@@ -16,6 +13,7 @@
 	<logger name="com.atomikos.icatch.config.UserTransactionServiceImp" level="ERROR" />
 	<logger name="com.atomikos.jdbc.AbstractDataSourceBean" level="ERROR" />
 	
+	<logger name="springfox.documentation.spring.web.readers.parameter.ParameterDataTypeReader" level="ERROR" />
 <!-- 	<logger name="io.swagger" level="DEBUG" /> -->
 <!-- 	<logger name="springfox" level="DEBUG" /> -->
 	
@@ -25,8 +23,6 @@
 	<logger name="com.jeesite.common.mybatis" level="INFO" />
 	<logger name="com.jeesite.common.mybatis.mapper" level="DEBUG" />
 	<logger name="com.jeesite.common.io.FileUtils" level="INFO" />
-	<logger name="com.jeesite.common.cache.JedisUtils" level="INFO" />
 	<logger name="com.jeesite.common.web.view.JstlView" level="INFO" />
-	<logger name="com.jeesite.modules.job.service.JobService" level="INFO" />
-
+	
 </included>
\ No newline at end of file
diff --git a/modules/core/src/test/resource/logback-test.xml b/modules/core/src/test/resource/config/logback-spring.xml
similarity index 79%
rename from modules/core/src/test/resource/logback-test.xml
rename to modules/core/src/test/resource/config/logback-spring.xml
index f9a67d85..ee2d81ac 100644
--- a/modules/core/src/test/resource/logback-test.xml
+++ b/modules/core/src/test/resource/config/logback-spring.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <configuration debug="false" scan="false">
-
-	<!-- Spring boot default -->
-	<include resource="org/springframework/boot/logging/logback/defaults.xml" />
 	
 	<!-- Console log output -->
 	<appender name="console" class="ch.qos.logback.core.ConsoleAppender">
diff --git a/web/src/main/resources/logback.xml b/web/src/main/resources/config/logback-spring.xml
similarity index 93%
rename from web/src/main/resources/logback.xml
rename to web/src/main/resources/config/logback-spring.xml
index 7fa43cae..1b8db5a4 100644
--- a/web/src/main/resources/logback.xml
+++ b/web/src/main/resources/config/logback-spring.xml
@@ -55,4 +55,7 @@
 	<!-- Framework level setting -->
 	<include resource="config/logger-core.xml"/>
 	
+	<!-- Project level setting -->
+<!-- 	<logger name="your.package" level="DEBUG" /> -->
+	
 </configuration>
\ No newline at end of file