From 0244f9a550cf4ba32e5ec70c7bcba67acbb1dab1 Mon Sep 17 00:00:00 2001
From: lanyuanxiaoyao <lanyuanxiaoyao@gmail.com>
Date: Thu, 25 Jan 2024 10:38:13 +0800
Subject: [PATCH] =?UTF-8?q?refactor(all):=20=E4=BC=98=E5=8C=96=E6=97=A5?=
 =?UTF-8?q?=E5=BF=97=E8=BE=93=E5=87=BA=E6=A0=BC=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 service-cloud-query/src/main/resources/logback-spring.xml   | 6 +++---
 .../src/main/resources/logback-spring.xml                   | 6 +++---
 service-flink-query/src/main/resources/logback-spring.xml   | 6 +++---
 service-gateway/src/main/resources/logback-spring.xml       | 6 +++---
 service-hudi-query/src/main/resources/logback-spring.xml    | 6 +++---
 service-info-query/src/main/resources/logback-spring.xml    | 6 +++---
 service-loki-query/src/main/resources/logback-spring.xml    | 6 +++---
 service-pulsar-query/src/main/resources/logback-spring.xml  | 6 +++---
 service-queue/src/main/resources/logback-spring.xml         | 6 +++---
 service-uploader/src/main/resources/logback-spring.xml      | 6 +++---
 service-web/src/main/resources/logback-spring.xml           | 6 +++---
 service-yarn-query/src/main/resources/logback-spring.xml    | 6 +++---
 .../src/main/resources/logback-spring.xml                   | 6 +++---
 13 files changed, 39 insertions(+), 39 deletions(-)

diff --git a/service-cloud-query/src/main/resources/logback-spring.xml b/service-cloud-query/src/main/resources/logback-spring.xml
index f955921..62ded51 100644
--- a/service-cloud-query/src/main/resources/logback-spring.xml
+++ b/service-cloud-query/src/main/resources/logback-spring.xml
@@ -17,7 +17,7 @@
                 <pattern>app=${APP_NAME:- },host=${HOSTNAME},level=%level</pattern>
             </label>
             <message>
-                <pattern>${FILE_LOG_PATTERN:-%d{${LOG_DATEFORMAT_PATTERN:-yyyy-MM-dd HH:mm:ss.SSS}} [${HOSTNAME}] ${LOG_LEVEL_PATTERN:-%5p} ${PID:- } -&#45;&#45; [%t] %-40.40logger{39} #@# : %m%n${LOG_EXCEPTION_CONVERSION_WORD:-%wEx}}</pattern>
+                <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} %p [${HOSTNAME}] [%X{EXTRA_LOG:-}] [%t] %logger #@# %m%n%wEx</pattern>
             </message>
             <sortByTime>true</sortByTime>
         </format>
@@ -25,7 +25,7 @@
 
     <appender name="Console" class="ch.qos.logback.core.ConsoleAppender">
         <encoder>
-            <pattern>${CONSOLE_LOG_PATTERN:-%clr(%d{${LOG_DATEFORMAT_PATTERN:-yyyy-MM-dd HH:mm:ss.SSS}}){faint} %clr(${LOG_LEVEL_PATTERN:-%5p}) %clr(${PID:- }){magenta} %clr(---){faint} %clr([%15.15t]){faint} %clr(%-40.40logger{39}){cyan} %clr(:){faint} %m%n${LOG_EXCEPTION_CONVERSION_WORD:-%wEx}}</pattern>
+            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} %clr(%5p) %clr([${HOSTNAME}]){yellow} [%X{EXTRA_LOG:-}] %clr([%t]){magenta} %clr(%logger{40}){cyan} #@# %m%n%wEx</pattern>
         </encoder>
     </appender>
 
@@ -36,7 +36,7 @@
             <MaxHistory>7</MaxHistory>
         </rollingPolicy>
         <encoder>
-            <pattern>${FILE_LOG_PATTERN:-%d{${LOG_DATEFORMAT_PATTERN:-yyyy-MM-dd HH:mm:ss.SSS}} [${HOSTNAME}] ${LOG_LEVEL_PATTERN:-%5p} ${PID:- } -&#45;&#45; [%t] %-40.40logger{39} #@# : %m%n${LOG_EXCEPTION_CONVERSION_WORD:-%wEx}}</pattern>
+            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} %p [${HOSTNAME}] [%X{EXTRA_LOG:-}] [%t] %logger #@# %m%n%wEx</pattern>
         </encoder>
     </appender>
 
diff --git a/service-executor/service-executor-manager/src/main/resources/logback-spring.xml b/service-executor/service-executor-manager/src/main/resources/logback-spring.xml
index f955921..62ded51 100644
--- a/service-executor/service-executor-manager/src/main/resources/logback-spring.xml
+++ b/service-executor/service-executor-manager/src/main/resources/logback-spring.xml
@@ -17,7 +17,7 @@
                 <pattern>app=${APP_NAME:- },host=${HOSTNAME},level=%level</pattern>
             </label>
             <message>
-                <pattern>${FILE_LOG_PATTERN:-%d{${LOG_DATEFORMAT_PATTERN:-yyyy-MM-dd HH:mm:ss.SSS}} [${HOSTNAME}] ${LOG_LEVEL_PATTERN:-%5p} ${PID:- } -&#45;&#45; [%t] %-40.40logger{39} #@# : %m%n${LOG_EXCEPTION_CONVERSION_WORD:-%wEx}}</pattern>
+                <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} %p [${HOSTNAME}] [%X{EXTRA_LOG:-}] [%t] %logger #@# %m%n%wEx</pattern>
             </message>
             <sortByTime>true</sortByTime>
         </format>
@@ -25,7 +25,7 @@
 
     <appender name="Console" class="ch.qos.logback.core.ConsoleAppender">
         <encoder>
-            <pattern>${CONSOLE_LOG_PATTERN:-%clr(%d{${LOG_DATEFORMAT_PATTERN:-yyyy-MM-dd HH:mm:ss.SSS}}){faint} %clr(${LOG_LEVEL_PATTERN:-%5p}) %clr(${PID:- }){magenta} %clr(---){faint} %clr([%15.15t]){faint} %clr(%-40.40logger{39}){cyan} %clr(:){faint} %m%n${LOG_EXCEPTION_CONVERSION_WORD:-%wEx}}</pattern>
+            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} %clr(%5p) %clr([${HOSTNAME}]){yellow} [%X{EXTRA_LOG:-}] %clr([%t]){magenta} %clr(%logger{40}){cyan} #@# %m%n%wEx</pattern>
         </encoder>
     </appender>
 
@@ -36,7 +36,7 @@
             <MaxHistory>7</MaxHistory>
         </rollingPolicy>
         <encoder>
-            <pattern>${FILE_LOG_PATTERN:-%d{${LOG_DATEFORMAT_PATTERN:-yyyy-MM-dd HH:mm:ss.SSS}} [${HOSTNAME}] ${LOG_LEVEL_PATTERN:-%5p} ${PID:- } -&#45;&#45; [%t] %-40.40logger{39} #@# : %m%n${LOG_EXCEPTION_CONVERSION_WORD:-%wEx}}</pattern>
+            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} %p [${HOSTNAME}] [%X{EXTRA_LOG:-}] [%t] %logger #@# %m%n%wEx</pattern>
         </encoder>
     </appender>
 
diff --git a/service-flink-query/src/main/resources/logback-spring.xml b/service-flink-query/src/main/resources/logback-spring.xml
index f955921..62ded51 100644
--- a/service-flink-query/src/main/resources/logback-spring.xml
+++ b/service-flink-query/src/main/resources/logback-spring.xml
@@ -17,7 +17,7 @@
                 <pattern>app=${APP_NAME:- },host=${HOSTNAME},level=%level</pattern>
             </label>
             <message>
-                <pattern>${FILE_LOG_PATTERN:-%d{${LOG_DATEFORMAT_PATTERN:-yyyy-MM-dd HH:mm:ss.SSS}} [${HOSTNAME}] ${LOG_LEVEL_PATTERN:-%5p} ${PID:- } -&#45;&#45; [%t] %-40.40logger{39} #@# : %m%n${LOG_EXCEPTION_CONVERSION_WORD:-%wEx}}</pattern>
+                <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} %p [${HOSTNAME}] [%X{EXTRA_LOG:-}] [%t] %logger #@# %m%n%wEx</pattern>
             </message>
             <sortByTime>true</sortByTime>
         </format>
@@ -25,7 +25,7 @@
 
     <appender name="Console" class="ch.qos.logback.core.ConsoleAppender">
         <encoder>
-            <pattern>${CONSOLE_LOG_PATTERN:-%clr(%d{${LOG_DATEFORMAT_PATTERN:-yyyy-MM-dd HH:mm:ss.SSS}}){faint} %clr(${LOG_LEVEL_PATTERN:-%5p}) %clr(${PID:- }){magenta} %clr(---){faint} %clr([%15.15t]){faint} %clr(%-40.40logger{39}){cyan} %clr(:){faint} %m%n${LOG_EXCEPTION_CONVERSION_WORD:-%wEx}}</pattern>
+            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} %clr(%5p) %clr([${HOSTNAME}]){yellow} [%X{EXTRA_LOG:-}] %clr([%t]){magenta} %clr(%logger{40}){cyan} #@# %m%n%wEx</pattern>
         </encoder>
     </appender>
 
@@ -36,7 +36,7 @@
             <MaxHistory>7</MaxHistory>
         </rollingPolicy>
         <encoder>
-            <pattern>${FILE_LOG_PATTERN:-%d{${LOG_DATEFORMAT_PATTERN:-yyyy-MM-dd HH:mm:ss.SSS}} [${HOSTNAME}] ${LOG_LEVEL_PATTERN:-%5p} ${PID:- } -&#45;&#45; [%t] %-40.40logger{39} #@# : %m%n${LOG_EXCEPTION_CONVERSION_WORD:-%wEx}}</pattern>
+            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} %p [${HOSTNAME}] [%X{EXTRA_LOG:-}] [%t] %logger #@# %m%n%wEx</pattern>
         </encoder>
     </appender>
 
diff --git a/service-gateway/src/main/resources/logback-spring.xml b/service-gateway/src/main/resources/logback-spring.xml
index 9a06935..fa5015b 100644
--- a/service-gateway/src/main/resources/logback-spring.xml
+++ b/service-gateway/src/main/resources/logback-spring.xml
@@ -17,7 +17,7 @@
                 <pattern>app=${APP_NAME:- },host=${HOSTNAME},level=%level</pattern>
             </label>
             <message>
-                <pattern>${FILE_LOG_PATTERN:-%d{${LOG_DATEFORMAT_PATTERN:-yyyy-MM-dd HH:mm:ss.SSS}} [${HOSTNAME}] ${LOG_LEVEL_PATTERN:-%5p} ${PID:- } -&#45;&#45; [%t] %-40.40logger{39} #@# : %m%n${LOG_EXCEPTION_CONVERSION_WORD:-%wEx}}</pattern>
+                <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} %p [${HOSTNAME}] [%X{EXTRA_LOG:-}] [%t] %logger #@# %m%n%wEx</pattern>
             </message>
             <sortByTime>true</sortByTime>
         </format>
@@ -25,7 +25,7 @@
 
     <appender name="Console" class="ch.qos.logback.core.ConsoleAppender">
         <encoder>
-            <pattern>${CONSOLE_LOG_PATTERN:-%clr(%d{${LOG_DATEFORMAT_PATTERN:-yyyy-MM-dd HH:mm:ss.SSS}}){faint} %clr(${LOG_LEVEL_PATTERN:-%5p}) %clr(${PID:- }){magenta} %clr(---){faint} %clr([%15.15t]){faint} %clr(%-40.40logger{39}){cyan} %clr(:){faint} %m%n${LOG_EXCEPTION_CONVERSION_WORD:-%wEx}}</pattern>
+            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} %clr(%5p) %clr([${HOSTNAME}]){yellow} [%X{EXTRA_LOG:-}] %clr([%t]){magenta} %clr(%logger{40}){cyan} #@# %m%n%wEx</pattern>
         </encoder>
     </appender>
 
@@ -36,7 +36,7 @@
             <MaxHistory>7</MaxHistory>
         </rollingPolicy>
         <encoder>
-            <pattern>${FILE_LOG_PATTERN:-%d{${LOG_DATEFORMAT_PATTERN:-yyyy-MM-dd HH:mm:ss.SSS}} [${HOSTNAME}] ${LOG_LEVEL_PATTERN:-%5p} ${PID:- } -&#45;&#45; [%t] %-40.40logger{39} #@# : %m%n${LOG_EXCEPTION_CONVERSION_WORD:-%wEx}}</pattern>
+            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} %p [${HOSTNAME}] [%X{EXTRA_LOG:-}] [%t] %logger #@# %m%n%wEx</pattern>
         </encoder>
     </appender>
 
diff --git a/service-hudi-query/src/main/resources/logback-spring.xml b/service-hudi-query/src/main/resources/logback-spring.xml
index f955921..62ded51 100644
--- a/service-hudi-query/src/main/resources/logback-spring.xml
+++ b/service-hudi-query/src/main/resources/logback-spring.xml
@@ -17,7 +17,7 @@
                 <pattern>app=${APP_NAME:- },host=${HOSTNAME},level=%level</pattern>
             </label>
             <message>
-                <pattern>${FILE_LOG_PATTERN:-%d{${LOG_DATEFORMAT_PATTERN:-yyyy-MM-dd HH:mm:ss.SSS}} [${HOSTNAME}] ${LOG_LEVEL_PATTERN:-%5p} ${PID:- } -&#45;&#45; [%t] %-40.40logger{39} #@# : %m%n${LOG_EXCEPTION_CONVERSION_WORD:-%wEx}}</pattern>
+                <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} %p [${HOSTNAME}] [%X{EXTRA_LOG:-}] [%t] %logger #@# %m%n%wEx</pattern>
             </message>
             <sortByTime>true</sortByTime>
         </format>
@@ -25,7 +25,7 @@
 
     <appender name="Console" class="ch.qos.logback.core.ConsoleAppender">
         <encoder>
-            <pattern>${CONSOLE_LOG_PATTERN:-%clr(%d{${LOG_DATEFORMAT_PATTERN:-yyyy-MM-dd HH:mm:ss.SSS}}){faint} %clr(${LOG_LEVEL_PATTERN:-%5p}) %clr(${PID:- }){magenta} %clr(---){faint} %clr([%15.15t]){faint} %clr(%-40.40logger{39}){cyan} %clr(:){faint} %m%n${LOG_EXCEPTION_CONVERSION_WORD:-%wEx}}</pattern>
+            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} %clr(%5p) %clr([${HOSTNAME}]){yellow} [%X{EXTRA_LOG:-}] %clr([%t]){magenta} %clr(%logger{40}){cyan} #@# %m%n%wEx</pattern>
         </encoder>
     </appender>
 
@@ -36,7 +36,7 @@
             <MaxHistory>7</MaxHistory>
         </rollingPolicy>
         <encoder>
-            <pattern>${FILE_LOG_PATTERN:-%d{${LOG_DATEFORMAT_PATTERN:-yyyy-MM-dd HH:mm:ss.SSS}} [${HOSTNAME}] ${LOG_LEVEL_PATTERN:-%5p} ${PID:- } -&#45;&#45; [%t] %-40.40logger{39} #@# : %m%n${LOG_EXCEPTION_CONVERSION_WORD:-%wEx}}</pattern>
+            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} %p [${HOSTNAME}] [%X{EXTRA_LOG:-}] [%t] %logger #@# %m%n%wEx</pattern>
         </encoder>
     </appender>
 
diff --git a/service-info-query/src/main/resources/logback-spring.xml b/service-info-query/src/main/resources/logback-spring.xml
index f955921..62ded51 100644
--- a/service-info-query/src/main/resources/logback-spring.xml
+++ b/service-info-query/src/main/resources/logback-spring.xml
@@ -17,7 +17,7 @@
                 <pattern>app=${APP_NAME:- },host=${HOSTNAME},level=%level</pattern>
             </label>
             <message>
-                <pattern>${FILE_LOG_PATTERN:-%d{${LOG_DATEFORMAT_PATTERN:-yyyy-MM-dd HH:mm:ss.SSS}} [${HOSTNAME}] ${LOG_LEVEL_PATTERN:-%5p} ${PID:- } -&#45;&#45; [%t] %-40.40logger{39} #@# : %m%n${LOG_EXCEPTION_CONVERSION_WORD:-%wEx}}</pattern>
+                <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} %p [${HOSTNAME}] [%X{EXTRA_LOG:-}] [%t] %logger #@# %m%n%wEx</pattern>
             </message>
             <sortByTime>true</sortByTime>
         </format>
@@ -25,7 +25,7 @@
 
     <appender name="Console" class="ch.qos.logback.core.ConsoleAppender">
         <encoder>
-            <pattern>${CONSOLE_LOG_PATTERN:-%clr(%d{${LOG_DATEFORMAT_PATTERN:-yyyy-MM-dd HH:mm:ss.SSS}}){faint} %clr(${LOG_LEVEL_PATTERN:-%5p}) %clr(${PID:- }){magenta} %clr(---){faint} %clr([%15.15t]){faint} %clr(%-40.40logger{39}){cyan} %clr(:){faint} %m%n${LOG_EXCEPTION_CONVERSION_WORD:-%wEx}}</pattern>
+            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} %clr(%5p) %clr([${HOSTNAME}]){yellow} [%X{EXTRA_LOG:-}] %clr([%t]){magenta} %clr(%logger{40}){cyan} #@# %m%n%wEx</pattern>
         </encoder>
     </appender>
 
@@ -36,7 +36,7 @@
             <MaxHistory>7</MaxHistory>
         </rollingPolicy>
         <encoder>
-            <pattern>${FILE_LOG_PATTERN:-%d{${LOG_DATEFORMAT_PATTERN:-yyyy-MM-dd HH:mm:ss.SSS}} [${HOSTNAME}] ${LOG_LEVEL_PATTERN:-%5p} ${PID:- } -&#45;&#45; [%t] %-40.40logger{39} #@# : %m%n${LOG_EXCEPTION_CONVERSION_WORD:-%wEx}}</pattern>
+            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} %p [${HOSTNAME}] [%X{EXTRA_LOG:-}] [%t] %logger #@# %m%n%wEx</pattern>
         </encoder>
     </appender>
 
diff --git a/service-loki-query/src/main/resources/logback-spring.xml b/service-loki-query/src/main/resources/logback-spring.xml
index f955921..62ded51 100644
--- a/service-loki-query/src/main/resources/logback-spring.xml
+++ b/service-loki-query/src/main/resources/logback-spring.xml
@@ -17,7 +17,7 @@
                 <pattern>app=${APP_NAME:- },host=${HOSTNAME},level=%level</pattern>
             </label>
             <message>
-                <pattern>${FILE_LOG_PATTERN:-%d{${LOG_DATEFORMAT_PATTERN:-yyyy-MM-dd HH:mm:ss.SSS}} [${HOSTNAME}] ${LOG_LEVEL_PATTERN:-%5p} ${PID:- } -&#45;&#45; [%t] %-40.40logger{39} #@# : %m%n${LOG_EXCEPTION_CONVERSION_WORD:-%wEx}}</pattern>
+                <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} %p [${HOSTNAME}] [%X{EXTRA_LOG:-}] [%t] %logger #@# %m%n%wEx</pattern>
             </message>
             <sortByTime>true</sortByTime>
         </format>
@@ -25,7 +25,7 @@
 
     <appender name="Console" class="ch.qos.logback.core.ConsoleAppender">
         <encoder>
-            <pattern>${CONSOLE_LOG_PATTERN:-%clr(%d{${LOG_DATEFORMAT_PATTERN:-yyyy-MM-dd HH:mm:ss.SSS}}){faint} %clr(${LOG_LEVEL_PATTERN:-%5p}) %clr(${PID:- }){magenta} %clr(---){faint} %clr([%15.15t]){faint} %clr(%-40.40logger{39}){cyan} %clr(:){faint} %m%n${LOG_EXCEPTION_CONVERSION_WORD:-%wEx}}</pattern>
+            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} %clr(%5p) %clr([${HOSTNAME}]){yellow} [%X{EXTRA_LOG:-}] %clr([%t]){magenta} %clr(%logger{40}){cyan} #@# %m%n%wEx</pattern>
         </encoder>
     </appender>
 
@@ -36,7 +36,7 @@
             <MaxHistory>7</MaxHistory>
         </rollingPolicy>
         <encoder>
-            <pattern>${FILE_LOG_PATTERN:-%d{${LOG_DATEFORMAT_PATTERN:-yyyy-MM-dd HH:mm:ss.SSS}} [${HOSTNAME}] ${LOG_LEVEL_PATTERN:-%5p} ${PID:- } -&#45;&#45; [%t] %-40.40logger{39} #@# : %m%n${LOG_EXCEPTION_CONVERSION_WORD:-%wEx}}</pattern>
+            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} %p [${HOSTNAME}] [%X{EXTRA_LOG:-}] [%t] %logger #@# %m%n%wEx</pattern>
         </encoder>
     </appender>
 
diff --git a/service-pulsar-query/src/main/resources/logback-spring.xml b/service-pulsar-query/src/main/resources/logback-spring.xml
index f955921..62ded51 100644
--- a/service-pulsar-query/src/main/resources/logback-spring.xml
+++ b/service-pulsar-query/src/main/resources/logback-spring.xml
@@ -17,7 +17,7 @@
                 <pattern>app=${APP_NAME:- },host=${HOSTNAME},level=%level</pattern>
             </label>
             <message>
-                <pattern>${FILE_LOG_PATTERN:-%d{${LOG_DATEFORMAT_PATTERN:-yyyy-MM-dd HH:mm:ss.SSS}} [${HOSTNAME}] ${LOG_LEVEL_PATTERN:-%5p} ${PID:- } -&#45;&#45; [%t] %-40.40logger{39} #@# : %m%n${LOG_EXCEPTION_CONVERSION_WORD:-%wEx}}</pattern>
+                <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} %p [${HOSTNAME}] [%X{EXTRA_LOG:-}] [%t] %logger #@# %m%n%wEx</pattern>
             </message>
             <sortByTime>true</sortByTime>
         </format>
@@ -25,7 +25,7 @@
 
     <appender name="Console" class="ch.qos.logback.core.ConsoleAppender">
         <encoder>
-            <pattern>${CONSOLE_LOG_PATTERN:-%clr(%d{${LOG_DATEFORMAT_PATTERN:-yyyy-MM-dd HH:mm:ss.SSS}}){faint} %clr(${LOG_LEVEL_PATTERN:-%5p}) %clr(${PID:- }){magenta} %clr(---){faint} %clr([%15.15t]){faint} %clr(%-40.40logger{39}){cyan} %clr(:){faint} %m%n${LOG_EXCEPTION_CONVERSION_WORD:-%wEx}}</pattern>
+            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} %clr(%5p) %clr([${HOSTNAME}]){yellow} [%X{EXTRA_LOG:-}] %clr([%t]){magenta} %clr(%logger{40}){cyan} #@# %m%n%wEx</pattern>
         </encoder>
     </appender>
 
@@ -36,7 +36,7 @@
             <MaxHistory>7</MaxHistory>
         </rollingPolicy>
         <encoder>
-            <pattern>${FILE_LOG_PATTERN:-%d{${LOG_DATEFORMAT_PATTERN:-yyyy-MM-dd HH:mm:ss.SSS}} [${HOSTNAME}] ${LOG_LEVEL_PATTERN:-%5p} ${PID:- } -&#45;&#45; [%t] %-40.40logger{39} #@# : %m%n${LOG_EXCEPTION_CONVERSION_WORD:-%wEx}}</pattern>
+            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} %p [${HOSTNAME}] [%X{EXTRA_LOG:-}] [%t] %logger #@# %m%n%wEx</pattern>
         </encoder>
     </appender>
 
diff --git a/service-queue/src/main/resources/logback-spring.xml b/service-queue/src/main/resources/logback-spring.xml
index f955921..62ded51 100644
--- a/service-queue/src/main/resources/logback-spring.xml
+++ b/service-queue/src/main/resources/logback-spring.xml
@@ -17,7 +17,7 @@
                 <pattern>app=${APP_NAME:- },host=${HOSTNAME},level=%level</pattern>
             </label>
             <message>
-                <pattern>${FILE_LOG_PATTERN:-%d{${LOG_DATEFORMAT_PATTERN:-yyyy-MM-dd HH:mm:ss.SSS}} [${HOSTNAME}] ${LOG_LEVEL_PATTERN:-%5p} ${PID:- } -&#45;&#45; [%t] %-40.40logger{39} #@# : %m%n${LOG_EXCEPTION_CONVERSION_WORD:-%wEx}}</pattern>
+                <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} %p [${HOSTNAME}] [%X{EXTRA_LOG:-}] [%t] %logger #@# %m%n%wEx</pattern>
             </message>
             <sortByTime>true</sortByTime>
         </format>
@@ -25,7 +25,7 @@
 
     <appender name="Console" class="ch.qos.logback.core.ConsoleAppender">
         <encoder>
-            <pattern>${CONSOLE_LOG_PATTERN:-%clr(%d{${LOG_DATEFORMAT_PATTERN:-yyyy-MM-dd HH:mm:ss.SSS}}){faint} %clr(${LOG_LEVEL_PATTERN:-%5p}) %clr(${PID:- }){magenta} %clr(---){faint} %clr([%15.15t]){faint} %clr(%-40.40logger{39}){cyan} %clr(:){faint} %m%n${LOG_EXCEPTION_CONVERSION_WORD:-%wEx}}</pattern>
+            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} %clr(%5p) %clr([${HOSTNAME}]){yellow} [%X{EXTRA_LOG:-}] %clr([%t]){magenta} %clr(%logger{40}){cyan} #@# %m%n%wEx</pattern>
         </encoder>
     </appender>
 
@@ -36,7 +36,7 @@
             <MaxHistory>7</MaxHistory>
         </rollingPolicy>
         <encoder>
-            <pattern>${FILE_LOG_PATTERN:-%d{${LOG_DATEFORMAT_PATTERN:-yyyy-MM-dd HH:mm:ss.SSS}} [${HOSTNAME}] ${LOG_LEVEL_PATTERN:-%5p} ${PID:- } -&#45;&#45; [%t] %-40.40logger{39} #@# : %m%n${LOG_EXCEPTION_CONVERSION_WORD:-%wEx}}</pattern>
+            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} %p [${HOSTNAME}] [%X{EXTRA_LOG:-}] [%t] %logger #@# %m%n%wEx</pattern>
         </encoder>
     </appender>
 
diff --git a/service-uploader/src/main/resources/logback-spring.xml b/service-uploader/src/main/resources/logback-spring.xml
index f955921..62ded51 100644
--- a/service-uploader/src/main/resources/logback-spring.xml
+++ b/service-uploader/src/main/resources/logback-spring.xml
@@ -17,7 +17,7 @@
                 <pattern>app=${APP_NAME:- },host=${HOSTNAME},level=%level</pattern>
             </label>
             <message>
-                <pattern>${FILE_LOG_PATTERN:-%d{${LOG_DATEFORMAT_PATTERN:-yyyy-MM-dd HH:mm:ss.SSS}} [${HOSTNAME}] ${LOG_LEVEL_PATTERN:-%5p} ${PID:- } -&#45;&#45; [%t] %-40.40logger{39} #@# : %m%n${LOG_EXCEPTION_CONVERSION_WORD:-%wEx}}</pattern>
+                <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} %p [${HOSTNAME}] [%X{EXTRA_LOG:-}] [%t] %logger #@# %m%n%wEx</pattern>
             </message>
             <sortByTime>true</sortByTime>
         </format>
@@ -25,7 +25,7 @@
 
     <appender name="Console" class="ch.qos.logback.core.ConsoleAppender">
         <encoder>
-            <pattern>${CONSOLE_LOG_PATTERN:-%clr(%d{${LOG_DATEFORMAT_PATTERN:-yyyy-MM-dd HH:mm:ss.SSS}}){faint} %clr(${LOG_LEVEL_PATTERN:-%5p}) %clr(${PID:- }){magenta} %clr(---){faint} %clr([%15.15t]){faint} %clr(%-40.40logger{39}){cyan} %clr(:){faint} %m%n${LOG_EXCEPTION_CONVERSION_WORD:-%wEx}}</pattern>
+            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} %clr(%5p) %clr([${HOSTNAME}]){yellow} [%X{EXTRA_LOG:-}] %clr([%t]){magenta} %clr(%logger{40}){cyan} #@# %m%n%wEx</pattern>
         </encoder>
     </appender>
 
@@ -36,7 +36,7 @@
             <MaxHistory>7</MaxHistory>
         </rollingPolicy>
         <encoder>
-            <pattern>${FILE_LOG_PATTERN:-%d{${LOG_DATEFORMAT_PATTERN:-yyyy-MM-dd HH:mm:ss.SSS}} [${HOSTNAME}] ${LOG_LEVEL_PATTERN:-%5p} ${PID:- } -&#45;&#45; [%t] %-40.40logger{39} #@# : %m%n${LOG_EXCEPTION_CONVERSION_WORD:-%wEx}}</pattern>
+            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} %p [${HOSTNAME}] [%X{EXTRA_LOG:-}] [%t] %logger #@# %m%n%wEx</pattern>
         </encoder>
     </appender>
 
diff --git a/service-web/src/main/resources/logback-spring.xml b/service-web/src/main/resources/logback-spring.xml
index f955921..62ded51 100644
--- a/service-web/src/main/resources/logback-spring.xml
+++ b/service-web/src/main/resources/logback-spring.xml
@@ -17,7 +17,7 @@
                 <pattern>app=${APP_NAME:- },host=${HOSTNAME},level=%level</pattern>
             </label>
             <message>
-                <pattern>${FILE_LOG_PATTERN:-%d{${LOG_DATEFORMAT_PATTERN:-yyyy-MM-dd HH:mm:ss.SSS}} [${HOSTNAME}] ${LOG_LEVEL_PATTERN:-%5p} ${PID:- } -&#45;&#45; [%t] %-40.40logger{39} #@# : %m%n${LOG_EXCEPTION_CONVERSION_WORD:-%wEx}}</pattern>
+                <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} %p [${HOSTNAME}] [%X{EXTRA_LOG:-}] [%t] %logger #@# %m%n%wEx</pattern>
             </message>
             <sortByTime>true</sortByTime>
         </format>
@@ -25,7 +25,7 @@
 
     <appender name="Console" class="ch.qos.logback.core.ConsoleAppender">
         <encoder>
-            <pattern>${CONSOLE_LOG_PATTERN:-%clr(%d{${LOG_DATEFORMAT_PATTERN:-yyyy-MM-dd HH:mm:ss.SSS}}){faint} %clr(${LOG_LEVEL_PATTERN:-%5p}) %clr(${PID:- }){magenta} %clr(---){faint} %clr([%15.15t]){faint} %clr(%-40.40logger{39}){cyan} %clr(:){faint} %m%n${LOG_EXCEPTION_CONVERSION_WORD:-%wEx}}</pattern>
+            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} %clr(%5p) %clr([${HOSTNAME}]){yellow} [%X{EXTRA_LOG:-}] %clr([%t]){magenta} %clr(%logger{40}){cyan} #@# %m%n%wEx</pattern>
         </encoder>
     </appender>
 
@@ -36,7 +36,7 @@
             <MaxHistory>7</MaxHistory>
         </rollingPolicy>
         <encoder>
-            <pattern>${FILE_LOG_PATTERN:-%d{${LOG_DATEFORMAT_PATTERN:-yyyy-MM-dd HH:mm:ss.SSS}} [${HOSTNAME}] ${LOG_LEVEL_PATTERN:-%5p} ${PID:- } -&#45;&#45; [%t] %-40.40logger{39} #@# : %m%n${LOG_EXCEPTION_CONVERSION_WORD:-%wEx}}</pattern>
+            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} %p [${HOSTNAME}] [%X{EXTRA_LOG:-}] [%t] %logger #@# %m%n%wEx</pattern>
         </encoder>
     </appender>
 
diff --git a/service-yarn-query/src/main/resources/logback-spring.xml b/service-yarn-query/src/main/resources/logback-spring.xml
index f955921..62ded51 100644
--- a/service-yarn-query/src/main/resources/logback-spring.xml
+++ b/service-yarn-query/src/main/resources/logback-spring.xml
@@ -17,7 +17,7 @@
                 <pattern>app=${APP_NAME:- },host=${HOSTNAME},level=%level</pattern>
             </label>
             <message>
-                <pattern>${FILE_LOG_PATTERN:-%d{${LOG_DATEFORMAT_PATTERN:-yyyy-MM-dd HH:mm:ss.SSS}} [${HOSTNAME}] ${LOG_LEVEL_PATTERN:-%5p} ${PID:- } -&#45;&#45; [%t] %-40.40logger{39} #@# : %m%n${LOG_EXCEPTION_CONVERSION_WORD:-%wEx}}</pattern>
+                <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} %p [${HOSTNAME}] [%X{EXTRA_LOG:-}] [%t] %logger #@# %m%n%wEx</pattern>
             </message>
             <sortByTime>true</sortByTime>
         </format>
@@ -25,7 +25,7 @@
 
     <appender name="Console" class="ch.qos.logback.core.ConsoleAppender">
         <encoder>
-            <pattern>${CONSOLE_LOG_PATTERN:-%clr(%d{${LOG_DATEFORMAT_PATTERN:-yyyy-MM-dd HH:mm:ss.SSS}}){faint} %clr(${LOG_LEVEL_PATTERN:-%5p}) %clr(${PID:- }){magenta} %clr(---){faint} %clr([%15.15t]){faint} %clr(%-40.40logger{39}){cyan} %clr(:){faint} %m%n${LOG_EXCEPTION_CONVERSION_WORD:-%wEx}}</pattern>
+            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} %clr(%5p) %clr([${HOSTNAME}]){yellow} [%X{EXTRA_LOG:-}] %clr([%t]){magenta} %clr(%logger{40}){cyan} #@# %m%n%wEx</pattern>
         </encoder>
     </appender>
 
@@ -36,7 +36,7 @@
             <MaxHistory>7</MaxHistory>
         </rollingPolicy>
         <encoder>
-            <pattern>${FILE_LOG_PATTERN:-%d{${LOG_DATEFORMAT_PATTERN:-yyyy-MM-dd HH:mm:ss.SSS}} [${HOSTNAME}] ${LOG_LEVEL_PATTERN:-%5p} ${PID:- } -&#45;&#45; [%t] %-40.40logger{39} #@# : %m%n${LOG_EXCEPTION_CONVERSION_WORD:-%wEx}}</pattern>
+            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} %p [${HOSTNAME}] [%X{EXTRA_LOG:-}] [%t] %logger #@# %m%n%wEx</pattern>
         </encoder>
     </appender>
 
diff --git a/service-zookeeper-query/src/main/resources/logback-spring.xml b/service-zookeeper-query/src/main/resources/logback-spring.xml
index f955921..62ded51 100644
--- a/service-zookeeper-query/src/main/resources/logback-spring.xml
+++ b/service-zookeeper-query/src/main/resources/logback-spring.xml
@@ -17,7 +17,7 @@
                 <pattern>app=${APP_NAME:- },host=${HOSTNAME},level=%level</pattern>
             </label>
             <message>
-                <pattern>${FILE_LOG_PATTERN:-%d{${LOG_DATEFORMAT_PATTERN:-yyyy-MM-dd HH:mm:ss.SSS}} [${HOSTNAME}] ${LOG_LEVEL_PATTERN:-%5p} ${PID:- } -&#45;&#45; [%t] %-40.40logger{39} #@# : %m%n${LOG_EXCEPTION_CONVERSION_WORD:-%wEx}}</pattern>
+                <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} %p [${HOSTNAME}] [%X{EXTRA_LOG:-}] [%t] %logger #@# %m%n%wEx</pattern>
             </message>
             <sortByTime>true</sortByTime>
         </format>
@@ -25,7 +25,7 @@
 
     <appender name="Console" class="ch.qos.logback.core.ConsoleAppender">
         <encoder>
-            <pattern>${CONSOLE_LOG_PATTERN:-%clr(%d{${LOG_DATEFORMAT_PATTERN:-yyyy-MM-dd HH:mm:ss.SSS}}){faint} %clr(${LOG_LEVEL_PATTERN:-%5p}) %clr(${PID:- }){magenta} %clr(---){faint} %clr([%15.15t]){faint} %clr(%-40.40logger{39}){cyan} %clr(:){faint} %m%n${LOG_EXCEPTION_CONVERSION_WORD:-%wEx}}</pattern>
+            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} %clr(%5p) %clr([${HOSTNAME}]){yellow} [%X{EXTRA_LOG:-}] %clr([%t]){magenta} %clr(%logger{40}){cyan} #@# %m%n%wEx</pattern>
         </encoder>
     </appender>
 
@@ -36,7 +36,7 @@
             <MaxHistory>7</MaxHistory>
         </rollingPolicy>
         <encoder>
-            <pattern>${FILE_LOG_PATTERN:-%d{${LOG_DATEFORMAT_PATTERN:-yyyy-MM-dd HH:mm:ss.SSS}} [${HOSTNAME}] ${LOG_LEVEL_PATTERN:-%5p} ${PID:- } -&#45;&#45; [%t] %-40.40logger{39} #@# : %m%n${LOG_EXCEPTION_CONVERSION_WORD:-%wEx}}</pattern>
+            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} %p [${HOSTNAME}] [%X{EXTRA_LOG:-}] [%t] %logger #@# %m%n%wEx</pattern>
         </encoder>
     </appender>