From b6a299d316b8874902d6e11734db9d07da8088b8 Mon Sep 17 00:00:00 2001
From: thinkgem <thinkgem@163.com>
Date: Sat, 6 Jan 2018 10:20:44 +0800
Subject: [PATCH] =?UTF-8?q?=E6=97=A5=E5=BF=97=E6=96=87=E4=BB=B6=E8=B7=AF?=
 =?UTF-8?q?=E5=BE=84=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../core/src/main/resources/logger-core.xml   |  34 +++---
 .../org.eclipse.wst.common.component          |  45 ++++---
 web/src/main/resources/logback.xml            | 114 +++++++++---------
 3 files changed, 95 insertions(+), 98 deletions(-)

diff --git a/modules/core/src/main/resources/logger-core.xml b/modules/core/src/main/resources/logger-core.xml
index 32bbf216..b030732f 100644
--- a/modules/core/src/main/resources/logger-core.xml
+++ b/modules/core/src/main/resources/logger-core.xml
@@ -1,18 +1,18 @@
-<included>
-
-<!-- 	<logger name="org.apache.ibatis" level="DEBUG" /> -->
-<!-- 	<logger name="org.mybatis.spring" level="DEBUG" /> -->
-<!-- 	<logger name="org.springframework.jdbc" level="DEBUG" /> -->
-	<logger name="org.mybatis.spring.transaction" level="DEBUG" />
-	<logger name="org.apache.catalina.webresources.Cache" level="ERROR" />
-	
-	<logger name="com.jeesite" level="DEBUG" />
-	<logger name="com.jeesite.common.i18n" level="INFO" />
-	<logger name="com.jeesite.common.shiro" level="INFO" />
-	<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" />
-	
+<included>
+
+<!-- 	<logger name="org.apache.ibatis" level="DEBUG" /> -->
+<!-- 	<logger name="org.mybatis.spring" level="DEBUG" /> -->
+<!-- 	<logger name="org.springframework.jdbc" level="DEBUG" /> -->
+	<logger name="org.mybatis.spring.transaction" level="DEBUG" />
+	<logger name="org.apache.catalina.webresources.Cache" level="ERROR" />
+	
+	<logger name="com.jeesite" level="DEBUG" />
+	<logger name="com.jeesite.common.i18n" level="INFO" />
+	<logger name="com.jeesite.common.shiro" level="INFO" />
+	<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" />
+	
 </included>
\ No newline at end of file
diff --git a/web/.settings/org.eclipse.wst.common.component b/web/.settings/org.eclipse.wst.common.component
index 90c2bd73..85af978c 100644
--- a/web/.settings/org.eclipse.wst.common.component
+++ b/web/.settings/org.eclipse.wst.common.component
@@ -1,24 +1,21 @@
-<?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-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-framework-4.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/jeesite-framework/jeesite-framework">
-            <dependency-type>uses</dependency-type>
-        </dependent-module>
-        <dependent-module archiveName="jeesite-common-4.0-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-module-devtools-4.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/jeesite-module-devtools/jeesite-module-devtools">
-            <dependency-type>uses</dependency-type>
-        </dependent-module>
-    <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/**"/>
-    <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"/>
-        <wb-resource deploy-path="/" source-path="/src/main/webapp" tag="defaultRootSource"/>
-  </wb-module>
-</project-modules>
+<?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-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-framework-4.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/jeesite-framework/jeesite-framework">
+            <dependency-type>uses</dependency-type>
+        </dependent-module>
+        <dependent-module archiveName="jeesite-common-4.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/jeesite-common/jeesite-common">
+            <dependency-type>uses</dependency-type>
+        </dependent-module>
+    <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/**"/>
+    <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"/>
+        <wb-resource deploy-path="/" source-path="/src/main/webapp" tag="defaultRootSource"/>
+  </wb-module>
+</project-modules>
diff --git a/web/src/main/resources/logback.xml b/web/src/main/resources/logback.xml
index 2cd756f9..44c980c8 100644
--- a/web/src/main/resources/logback.xml
+++ b/web/src/main/resources/logback.xml
@@ -1,58 +1,58 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<configuration debug="false" scan="false">
-
-	<!-- Log file path ../../../../../../../ to disk root -->
-	<property name="log.path" value="${classpath:-../../../../../../../}/logs" />
-
-	<!-- Console log output -->
-	<appender name="console" class="ch.qos.logback.core.ConsoleAppender">
-		<encoder>
-			<pattern>%d{MM-dd HH:mm:ss.SSS} %-5level [%logger{50}] - %msg%n</pattern>
-		</encoder>
-	</appender>
-
-	<!-- Log file debug output -->
-	<appender name="debug" class="ch.qos.logback.core.rolling.RollingFileAppender">
-		<file>${log.path}/debug.log</file>
-		<rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
-			<fileNamePattern>${log.path}/debug.%d{yyyy-MM-dd}.%i.log.zip</fileNamePattern>
-			<maxFileSize>50MB</maxFileSize>
-			<maxHistory>30</maxHistory>
-		</rollingPolicy>
-		<encoder>
-			<pattern>%date [%thread] %-5level [%logger{50}] %file:%line - %msg%n</pattern>
-		</encoder>
-		<!--<filter class="ch.qos.logback.classic.filter.LevelFilter">
-			<level>ERROR</level>
-			<onMatch>DENY</onMatch>
-			<onMismatch>NEUTRAL</onMismatch>
-		</filter>-->
-	</appender>
-
-	<!-- Log file error output -->
-	<appender name="error" class="ch.qos.logback.core.rolling.RollingFileAppender">
-		<file>${log.path}/error.log</file>
-		<rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
-			<fileNamePattern>${log.path}/error.%d{yyyy-MM-dd}.%i.log.zip</fileNamePattern>
-			<maxFileSize>50MB</maxFileSize>
-			<maxHistory>30</maxHistory>
-		</rollingPolicy>
-		<encoder>
-			<pattern>%date [%thread] %-5level [%logger{50}] %file:%line - %msg%n</pattern>
-		</encoder>
-		<filter class="ch.qos.logback.classic.filter.ThresholdFilter">
-			<level>ERROR</level>
-		</filter>
-	</appender>
-	
-	<!-- Level: FATAL 0  ERROR 3  WARN 4  INFO 6  DEBUG 7 -->
-	<root level="INFO">
-		<appender-ref ref="console" />
-		<appender-ref ref="debug" />
-		<appender-ref ref="error" />
-	</root>
-	
-	<!-- Framework level setting -->
-	<include resource="logger-core.xml"/>
-	
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration debug="false" scan="false">
+
+	<!-- Log file path ../../../../../../../ to disk root -->
+	<property name="log.path" value="${logPath:-../../../../../../../}/logs" />
+
+	<!-- Console log output -->
+	<appender name="console" class="ch.qos.logback.core.ConsoleAppender">
+		<encoder>
+			<pattern>%d{MM-dd HH:mm:ss.SSS} %-5level [%logger{50}] - %msg%n</pattern>
+		</encoder>
+	</appender>
+
+	<!-- Log file debug output -->
+	<appender name="debug" class="ch.qos.logback.core.rolling.RollingFileAppender">
+		<file>${log.path}/debug.log</file>
+		<rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
+			<fileNamePattern>${log.path}/debug.%d{yyyy-MM-dd}.%i.log.zip</fileNamePattern>
+			<maxFileSize>50MB</maxFileSize>
+			<maxHistory>30</maxHistory>
+		</rollingPolicy>
+		<encoder>
+			<pattern>%date [%thread] %-5level [%logger{50}] %file:%line - %msg%n</pattern>
+		</encoder>
+		<!--<filter class="ch.qos.logback.classic.filter.LevelFilter">
+			<level>ERROR</level>
+			<onMatch>DENY</onMatch>
+			<onMismatch>NEUTRAL</onMismatch>
+		</filter>-->
+	</appender>
+
+	<!-- Log file error output -->
+	<appender name="error" class="ch.qos.logback.core.rolling.RollingFileAppender">
+		<file>${log.path}/error.log</file>
+		<rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
+			<fileNamePattern>${log.path}/error.%d{yyyy-MM-dd}.%i.log.zip</fileNamePattern>
+			<maxFileSize>50MB</maxFileSize>
+			<maxHistory>30</maxHistory>
+		</rollingPolicy>
+		<encoder>
+			<pattern>%date [%thread] %-5level [%logger{50}] %file:%line - %msg%n</pattern>
+		</encoder>
+		<filter class="ch.qos.logback.classic.filter.ThresholdFilter">
+			<level>ERROR</level>
+		</filter>
+	</appender>
+	
+	<!-- Level: FATAL 0  ERROR 3  WARN 4  INFO 6  DEBUG 7 -->
+	<root level="WARN">
+		<appender-ref ref="console" />
+		<appender-ref ref="debug" />
+		<appender-ref ref="error" />
+	</root>
+	
+	<!-- Framework level setting -->
+	<include resource="logger-core.xml"/>
+	
 </configuration>
\ No newline at end of file