From 51387a16649ef2ebcfb5cfd48340017d23c52e4e Mon Sep 17 00:00:00 2001
From: cfl <chaifulai@163.com>
Date: Mon, 11 Sep 2023 13:20:31 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BF=BD=E8=AE=BF=E6=96=B9=E5=BC=8F=E5=85=B6?=
 =?UTF-8?q?=E4=BB=96=E4=BB=A3=E7=A0=81=E4=BF=AE=E6=94=B9=EF=BC=8C=E6=97=A5?=
 =?UTF-8?q?=E5=BF=97=E6=89=93=E5=8D=B0=E5=A2=9E=E5=8A=A0=E7=BA=BF=E7=A8=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/lyms/talkonlineweb/domain/LymsXljcRecordTrace.java  |  2 +-
 .../java/com/lyms/talkonlineweb/enums/TraceWayEnum.java     |  2 +-
 talkonlineweb/src/main/resources/logback-spring.xml         | 13 +++++++------
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/talkonlineweb/src/main/java/com/lyms/talkonlineweb/domain/LymsXljcRecordTrace.java b/talkonlineweb/src/main/java/com/lyms/talkonlineweb/domain/LymsXljcRecordTrace.java
index 2301f18..d0715f2 100644
--- a/talkonlineweb/src/main/java/com/lyms/talkonlineweb/domain/LymsXljcRecordTrace.java
+++ b/talkonlineweb/src/main/java/com/lyms/talkonlineweb/domain/LymsXljcRecordTrace.java
@@ -64,7 +64,7 @@ public class LymsXljcRecordTrace implements Serializable {
     private String tracePerson;
 
     /**
-     * 追访方式 1 电话追访 2 上门追访 3 其他
+     * 追访方式 1 电话追访 2 上门追访 9 其他
      */
     @TableField(value = "trace_way")
     private Integer traceWay;
diff --git a/talkonlineweb/src/main/java/com/lyms/talkonlineweb/enums/TraceWayEnum.java b/talkonlineweb/src/main/java/com/lyms/talkonlineweb/enums/TraceWayEnum.java
index edb60e4..6477f26 100644
--- a/talkonlineweb/src/main/java/com/lyms/talkonlineweb/enums/TraceWayEnum.java
+++ b/talkonlineweb/src/main/java/com/lyms/talkonlineweb/enums/TraceWayEnum.java
@@ -11,7 +11,7 @@ public enum TraceWayEnum {
 
     WAY_TEL(1,"电话追访"),
     WAY_HOME(2,"上门追访"),
-    WAY_OTHER(3,"其他");
+    WAY_OTHER(9,"其他");
 
     private Integer code;
     private String name;
diff --git a/talkonlineweb/src/main/resources/logback-spring.xml b/talkonlineweb/src/main/resources/logback-spring.xml
index adefeda..9974cde 100644
--- a/talkonlineweb/src/main/resources/logback-spring.xml
+++ b/talkonlineweb/src/main/resources/logback-spring.xml
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <configuration status="OFF">
+
     <appenders>
 
         <Console name="Console" target="SYSTEM_OUT">
             <!--只接受程序中DEBUG级别的日志进行处理-->
             <ThresholdFilter level="DEBUG" onMatch="ACCEPT" onMismatch="DENY"/>
-            <PatternLayout pattern="[%d{yyyy-MM-dd HH:mm:ss.SSS}] %-5level %class{36} %L %M - %msg%xEx%n"/>
+            <PatternLayout pattern="[%d{yyyy-MM-dd HH:mm:ss.SSS}] [%thread] %-5level %class{36} %L %M - %msg%xEx%n"/>
         </Console>
 
         <!--处理DEBUG级别的日志，并把该日志放到logs/debug.log文件中-->
@@ -17,7 +18,7 @@
                 <ThresholdFilter level="INFO" onMatch="DENY" onMismatch="NEUTRAL"/>
             </Filters>
             <PatternLayout
-                    pattern="[%d{yyyy-MM-dd HH:mm:ss.SSS}] %-5level %class{36} %L %M - %msg%xEx%n"/>
+                    pattern="[%d{yyyy-MM-dd HH:mm:ss.SSS}] [%thread] %-5level %class{36} %L %M - %msg%xEx%n"/>
             <Policies>
                 <SizeBasedTriggeringPolicy size="500 MB"/>
                 <TimeBasedTriggeringPolicy/>
@@ -33,7 +34,7 @@
                 <ThresholdFilter level="WARN" onMatch="DENY" onMismatch="NEUTRAL"/>
             </Filters>
             <PatternLayout
-                    pattern="[%d{yyyy-MM-dd HH:mm:ss.SSS}] %-5level %class{36} %L %M - %msg%xEx%n"/>
+                    pattern="[%d{yyyy-MM-dd HH:mm:ss.SSS}] [%thread] %-5level %class{36} %L %M - %msg%xEx%n"/>
             <Policies>
                 <SizeBasedTriggeringPolicy size="500 MB"/>
                 <TimeBasedTriggeringPolicy/>
@@ -48,7 +49,7 @@
                 <ThresholdFilter level="ERROR" onMatch="DENY" onMismatch="NEUTRAL"/>
             </Filters>
             <PatternLayout
-                    pattern="[%d{yyyy-MM-dd HH:mm:ss.SSS}] %-5level %class{36} %L %M - %msg%xEx%n"/>
+                    pattern="[%d{yyyy-MM-dd HH:mm:ss.SSS}] [%thread] %-5level %class{36} %L %M - %msg%xEx%n"/>
             <Policies>
                 <SizeBasedTriggeringPolicy size="500 MB"/>
                 <TimeBasedTriggeringPolicy/>
@@ -60,7 +61,7 @@
                      filePattern="logs/$${date:yyyy-MM}/error-%d{yyyy-MM-dd}-%i.log.gz">
             <ThresholdFilter level="ERROR"/>
             <PatternLayout
-                    pattern="[%d{yyyy-MM-dd HH:mm:ss}] %-5level %class{36} %L %M - %msg%xEx%n"/>
+                    pattern="[%d{yyyy-MM-dd HH:mm:ss}] [%thread] %-5level %class{36} %L %M - %msg%xEx%n"/>
             <Policies>
                 <SizeBasedTriggeringPolicy size="500 MB"/>
                 <TimeBasedTriggeringPolicy/>
@@ -70,7 +71,7 @@
         <!--druid的日志记录追加器-->
         <RollingFile name="druidSqlRollingFile" fileName="./logs/druid-sql.log"
                      filePattern="logs/$${date:yyyy-MM}/api-%d{yyyy-MM-dd}-%i.log.gz">
-            <PatternLayout pattern="[%d{yyyy-MM-dd HH:mm:ss}] %-5level %L %M - %msg%xEx%n"/>
+            <PatternLayout pattern="[%d{yyyy-MM-dd HH:mm:ss}] [%thread] %-5level %L %M - %msg%xEx%n"/>
             <Policies>
                 <SizeBasedTriggeringPolicy size="500 MB"/>
                 <TimeBasedTriggeringPolicy/>
-- 
1.8.3.1