From 3a78e56815e47dee43c60eba4c568a73cd7cfa2c Mon Sep 17 00:00:00 2001
From: gaoxiyang <gaoxiyang1237@126.com>
Date: Tue, 18 Dec 2018 09:52:57 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E5=BD=A9=E8=89=B2=E6=97=A5=E5=BF=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 web/src/main/resources/config/application.yml |  2 +-
 .../main/resources/config/logback-spring.xml  | 22 ++++++++++++-------
 2 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/web/src/main/resources/config/application.yml b/web/src/main/resources/config/application.yml
index ff7ebb69..22bd4eb4 100644
--- a/web/src/main/resources/config/application.yml
+++ b/web/src/main/resources/config/application.yml
@@ -38,7 +38,7 @@ jdbc:
   driver: com.mysql.jdbc.Driver
   url: jdbc:mysql://127.0.0.1:3306/jeesite?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull
   username: root
-  password: 123456
+  password: 159357
   testSql: SELECT 1
 
 #  # Oracle 数据库配置
diff --git a/web/src/main/resources/config/logback-spring.xml b/web/src/main/resources/config/logback-spring.xml
index 1b8db5a4..3f55e205 100644
--- a/web/src/main/resources/config/logback-spring.xml
+++ b/web/src/main/resources/config/logback-spring.xml
@@ -3,15 +3,21 @@
 
 	<!-- Log file path -->
 	<property name="log.path" value="${logPath:-${java.io.tmpdir:-.}}/logs" />
-	
+
+	<!-- 彩色日志 -->
+	<!-- 彩色日志依赖的渲染类 -->
+	<conversionRule conversionWord="clr" converterClass="org.springframework.boot.logging.logback.ColorConverter" />
+	<conversionRule conversionWord="wex" converterClass="org.springframework.boot.logging.logback.WhitespaceThrowableProxyConverter" />
+	<conversionRule conversionWord="wEx" converterClass="org.springframework.boot.logging.logback.ExtendedWhitespaceThrowableProxyConverter" />
+
 	<!-- 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>
+			<pattern>%clr(%d{yyyy-MM-dd HH:mm:ss.SSS}) %-5level %clr([%logger{50}]) - %msg%n</pattern>
 		</encoder>
 	</appender>
 
-	<!-- Log file debug output -->
+	<!-- Log file debug output dsf-->
 	<appender name="debug" class="ch.qos.logback.core.rolling.RollingFileAppender">
 		<file>${log.path}/debug.log</file>
 		<rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
@@ -44,18 +50,18 @@
 			<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="config/logger-core.xml"/>
-	
+
 	<!-- Project level setting -->
-<!-- 	<logger name="your.package" level="DEBUG" /> -->
-	
+	<!-- 	<logger name="your.package" level="DEBUG" /> -->
+
 </configuration>
\ No newline at end of file

From 564e470103f4c0569b1100b20a8181a1565d13cb Mon Sep 17 00:00:00 2001
From: ThinkGem <thinkgem@163.com>
Date: Sat, 22 Dec 2018 15:46:53 +0800
Subject: [PATCH 2/2] update

---
 web/src/main/resources/config/application.yml |  2 +-
 .../main/resources/config/logback-spring.xml  | 21 ++++++++-----------
 2 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/web/src/main/resources/config/application.yml b/web/src/main/resources/config/application.yml
index 22bd4eb4..ff7ebb69 100644
--- a/web/src/main/resources/config/application.yml
+++ b/web/src/main/resources/config/application.yml
@@ -38,7 +38,7 @@ jdbc:
   driver: com.mysql.jdbc.Driver
   url: jdbc:mysql://127.0.0.1:3306/jeesite?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull
   username: root
-  password: 159357
+  password: 123456
   testSql: SELECT 1
 
 #  # Oracle 数据库配置
diff --git a/web/src/main/resources/config/logback-spring.xml b/web/src/main/resources/config/logback-spring.xml
index 3f55e205..d3fa2263 100644
--- a/web/src/main/resources/config/logback-spring.xml
+++ b/web/src/main/resources/config/logback-spring.xml
@@ -3,21 +3,18 @@
 
 	<!-- Log file path -->
 	<property name="log.path" value="${logPath:-${java.io.tmpdir:-.}}/logs" />
-
-	<!-- 彩色日志 -->
-	<!-- 彩色日志依赖的渲染类 -->
+	
+	<!-- Console log output -->
 	<conversionRule conversionWord="clr" converterClass="org.springframework.boot.logging.logback.ColorConverter" />
 	<conversionRule conversionWord="wex" converterClass="org.springframework.boot.logging.logback.WhitespaceThrowableProxyConverter" />
 	<conversionRule conversionWord="wEx" converterClass="org.springframework.boot.logging.logback.ExtendedWhitespaceThrowableProxyConverter" />
-
-	<!-- Console log output -->
 	<appender name="console" class="ch.qos.logback.core.ConsoleAppender">
 		<encoder>
-			<pattern>%clr(%d{yyyy-MM-dd HH:mm:ss.SSS}) %-5level %clr([%logger{50}]) - %msg%n</pattern>
+			<pattern>%clr(%d{MM-dd HH:mm:ss.SSS}) %-5level %clr([%logger{50}]) - %msg%n</pattern>
 		</encoder>
 	</appender>
 
-	<!-- Log file debug output dsf-->
+	<!-- 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">
@@ -50,18 +47,18 @@
 			<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="config/logger-core.xml"/>
-
+	
 	<!-- Project level setting -->
-	<!-- 	<logger name="your.package" level="DEBUG" /> -->
-
+<!-- 	<logger name="your.package" level="DEBUG" /> -->
+	
 </configuration>
\ No newline at end of file