Merge branch 'master' of csk/cus-wms-supervise2.0 into master

src/main/resources/logback.xml

@@ -1,5 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
+<!--
+scan：当此属性设置为true时，配置文件如果发生改变，将会被重新加载，默认值为true。
+scanPeriod：设置监测配置文件是否有修改的时间间隔，如果没有给出时间单位，默认单位是毫秒当scan为true时，此属性生效。默认的时间间隔为1分钟。
+debug：当此属性设置为true时，将打印出logback内部日志信息，实时查看logback运行状态。默认值为false。
+-->
 <configuration scan="false" scanPeriod="60 seconds" debug="false">
 
     <property name="LOG_HOME" value="/data_cus_data_supervise/new_cus_data_supervise/logs"/>
@@ -14,17 +18,44 @@
     <property name="WARN_FILE_NAME" value="cus-wms-warn"></property>
     <property name="ERROR_FILE_NAME" value="cus-wms-error"></property>
 
-    <!-- ConsoleAppender 控制台输出 appender -->
+
+    <property name="STD_CONSOLE_LOG_PATTERN"
+              value="%d{yyyy-MM-dd HH:mm:ss.SSS}[%yellow(%thread)]-[%highlight(%-5level)][%green(%logger{70}):%cyan(%line)] - %msg%n"/>
+
+    <property name="CONSOLE_LOG_PATTERN"
+              value="%d{yyyy-MM-dd HH:mm:ss.SSS}[%thread]-[%-5level][%logger{70}:%line] - %msg%n"/>
+
     <appender name="stdoutAppender" class="ch.qos.logback.core.ConsoleAppender">
+
         <encoder>
-            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS}[%thread]-[%-5level][%logger{70}: %line] - %msg%n</pattern>
+            <pattern>${STD_CONSOLE_LOG_PATTERN}</pattern>
+            <charset>UTF-8</charset>
         </encoder>
     </appender>
 
 
-    <!-- DEBUG 日志 appender  -->
+    <appender name="traceAppender" class="ch.qos.logback.core.rolling.RollingFileAppender">
+
+        <file>${LOG_HOME}/${TRACE_DIR}/${TRACE_FILE_NAME}.log</file>
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <fileNamePattern>${LOG_HOME}/${TRACE_DIR}/${TRACE_FILE_NAME}-%d{yyyy-MM-dd}-%i.log</fileNamePattern>
+            <MaxHistory>365</MaxHistory>
+            <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
+                <maxFileSize>10MB</maxFileSize>
+            </timeBasedFileNamingAndTriggeringPolicy>
+        </rollingPolicy>
+        <encoder>
+            <pattern>${CONSOLE_LOG_PATTERN}</pattern>
+            <charset>UTF-8</charset>
+        </encoder>
+        <filter class="ch.qos.logback.classic.filter.LevelFilter">
+            <level>TRACE</level>
+
+        </filter>
+    </appender>
+
+
     <appender name="debugAppender" class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <!-- 指定日志文件的名称 -->
         <file>${LOG_HOME}/${DEBUG_DIR}/${DEBUG_FILE_NAME}.log</file>
         <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
             <fileNamePattern>${LOG_HOME}/${DEBUG_DIR}/${DEBUG_FILE_NAME}-%d{yyyy-MM-dd}-%i.log</fileNamePattern>
@@ -34,7 +65,8 @@
             </timeBasedFileNamingAndTriggeringPolicy>
         </rollingPolicy>
         <encoder>
-            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS}[%thread]-[%-5level][%logger{70}: %line] - %msg%n</pattern>
+            <pattern>${CONSOLE_LOG_PATTERN}</pattern>
+            <charset>UTF-8</charset>
         </encoder>
         <filter class="ch.qos.logback.classic.filter.LevelFilter">
             <level>DEBUG</level>
@@ -42,7 +74,7 @@
     </appender>
 
 
-    <!-- INFO 日志 appender  -->
+    <!-- phrase 日志 appender  -->
     <appender name="infoAppender" class="ch.qos.logback.core.rolling.RollingFileAppender">
         <!-- 指定日志文件的名称 -->
         <file>${LOG_HOME}/${INFO_DIR}/${INFO_FILE_NAME}.log</file>
@@ -54,7 +86,8 @@
             </timeBasedFileNamingAndTriggeringPolicy>
         </rollingPolicy>
         <encoder>
-            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS}[%thread]-[%-5level][%logger{70}: %line] - %msg%n</pattern>
+            <pattern>${CONSOLE_LOG_PATTERN}</pattern>
+            <charset>UTF-8</charset>
         </encoder>
         <filter class="ch.qos.logback.classic.filter.LevelFilter">
             <level>INFO</level>
@@ -62,7 +95,6 @@
     </appender>
 
 
-    <!-- WARN 日志 appender  -->
     <appender name="warnAppender" class="ch.qos.logback.core.rolling.RollingFileAppender">
         <!-- 指定日志文件的名称 -->
         <file>${LOG_HOME}/${WARN_DIR}/${WARN_FILE_NAME}.log</file>
@@ -74,7 +106,8 @@
             </timeBasedFileNamingAndTriggeringPolicy>
         </rollingPolicy>
         <encoder>
-            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS}[%thread]-[%-5level][%logger{70}: %line] - %msg%n</pattern>
+            <pattern>${CONSOLE_LOG_PATTERN}</pattern>
+            <charset>UTF-8</charset>
         </encoder>
         <filter class="ch.qos.logback.classic.filter.LevelFilter">
             <level>WARN</level>
@@ -88,35 +121,43 @@
         <file>${LOG_HOME}/${ERROR_DIR}/${ERROR_FILE_NAME}.log</file>
         <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
             <fileNamePattern>${LOG_HOME}/${ERROR_DIR}/${ERROR_FILE_NAME}-%d{yyyy-MM-dd}-%i.log</fileNamePattern>
+
             <MaxHistory>365</MaxHistory>
+
             <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
                 <maxFileSize>10MB</maxFileSize>
             </timeBasedFileNamingAndTriggeringPolicy>
         </rollingPolicy>
+
         <encoder>
-            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS}[%thread]-[%-5level][%logger{70}: %line] - %msg%n</pattern>
+            <pattern>${CONSOLE_LOG_PATTERN}</pattern>
+            <charset>UTF-8</charset>
         </encoder>
 
         <filter class="ch.qos.logback.classic.filter.LevelFilter"><!-- 只打印错误日志 -->
-            <!-- 设置过滤级别 -->
             <level>ERROR</level>
         </filter>
     </appender>
 
-
     <logger name="org.apache" level="ERROR"/>
+    <logger name="org.apache.shiro" level="DEBUG"/>
     <logger name="org.mybatis" level="DEBUG"/>
     <logger name="org.hibernate" level="WARN"/>
     <logger name="org.springframework" level="INFO"/>
+    <logger name="io.lettuce" level="INFO"/>
     <logger name="org.thymeleaf" level="INFO"/>
     <logger name="com.zaxxer.hikari" level="ERROR" additivity="false">
         <appender-ref ref="stdoutAppender" />
         <appender-ref ref="errorAppender" />
     </logger>
-    <logger name="com.emato.cus.supervise" level="DEBUG"/>
+    <logger name="org.apache.shiro" level="DEBUG" additivity="false">
+        <appender-ref ref="stdoutAppender" />
+        <appender-ref ref="traceAppender" />
+    </logger>
 
     <root level="DEBUG" >
         <appender-ref ref="stdoutAppender" />
+        <!--<appender-ref ref="traceAppender" />-->
         <appender-ref ref="debugAppender" />
         <!--<appender-ref ref="infoAppender" />
         <appender-ref ref="warnAppender" />