From c5f5128b1bfbe1f574a559a63cd0d3cc7434bcf6 Mon Sep 17 00:00:00 2001
From: paulGao <paulgao0831@gmail.com>
Date: Thu, 4 Nov 2021 14:39:59 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96LOGBACK=E6=96=87=E4=BB=B6?=
 =?UTF-8?q?=EF=BC=8Clogstash=E5=8F=82=E6=95=B0=E8=AF=BB=E5=8F=96spring?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 admin/src/main/resources/logback-spring.xml       | 3 ++-
 buyer-api/src/main/resources/logback-spring.xml   | 3 ++-
 common-api/src/main/resources/logback-spring.xml  | 3 ++-
 consumer/src/main/resources/logback-spring.xml    | 3 ++-
 manager-api/src/main/resources/logback-spring.xml | 3 ++-
 seller-api/src/main/resources/logback-spring.xml  | 3 ++-
 6 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/admin/src/main/resources/logback-spring.xml b/admin/src/main/resources/logback-spring.xml
index 8e2f8cac9..a8d0eba6f 100644
--- a/admin/src/main/resources/logback-spring.xml
+++ b/admin/src/main/resources/logback-spring.xml
@@ -7,6 +7,7 @@
     <springProperty scope="context" name="APP_NAME" source="spring.application.name"/>
     <!--日志文件保存路径-->
     <springProperty scope="context" name="LOG_FILE_PATH" source="logging.file.path"/>
+    <springProperty scope="context" name="LOGSTASH_SERVER" source="lili.data.logstash.server"/>
     <contextName>${APP_NAME}</contextName>
 
     <appender name="FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
@@ -22,7 +23,7 @@
     <!--输出到elk的LOGSTASH-->
     <appender name="LOGSTASH" class="net.logstash.logback.appender.LogstashTcpSocketAppender">
         <!-- 配置elk日志收集 配饰的是 LOGSTASH 的地址-->
-        <destination>127.0.0.1:4560</destination>
+        <destination>${LOGSTASH_SERVER}</destination>
         <encoder charset="UTF-8" class="net.logstash.logback.encoder.LogstashEncoder">
             <providers>
                 <timestamp>
diff --git a/buyer-api/src/main/resources/logback-spring.xml b/buyer-api/src/main/resources/logback-spring.xml
index 8e2f8cac9..a8d0eba6f 100644
--- a/buyer-api/src/main/resources/logback-spring.xml
+++ b/buyer-api/src/main/resources/logback-spring.xml
@@ -7,6 +7,7 @@
     <springProperty scope="context" name="APP_NAME" source="spring.application.name"/>
     <!--日志文件保存路径-->
     <springProperty scope="context" name="LOG_FILE_PATH" source="logging.file.path"/>
+    <springProperty scope="context" name="LOGSTASH_SERVER" source="lili.data.logstash.server"/>
     <contextName>${APP_NAME}</contextName>
 
     <appender name="FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
@@ -22,7 +23,7 @@
     <!--输出到elk的LOGSTASH-->
     <appender name="LOGSTASH" class="net.logstash.logback.appender.LogstashTcpSocketAppender">
         <!-- 配置elk日志收集 配饰的是 LOGSTASH 的地址-->
-        <destination>127.0.0.1:4560</destination>
+        <destination>${LOGSTASH_SERVER}</destination>
         <encoder charset="UTF-8" class="net.logstash.logback.encoder.LogstashEncoder">
             <providers>
                 <timestamp>
diff --git a/common-api/src/main/resources/logback-spring.xml b/common-api/src/main/resources/logback-spring.xml
index 8e2f8cac9..a8d0eba6f 100644
--- a/common-api/src/main/resources/logback-spring.xml
+++ b/common-api/src/main/resources/logback-spring.xml
@@ -7,6 +7,7 @@
     <springProperty scope="context" name="APP_NAME" source="spring.application.name"/>
     <!--日志文件保存路径-->
     <springProperty scope="context" name="LOG_FILE_PATH" source="logging.file.path"/>
+    <springProperty scope="context" name="LOGSTASH_SERVER" source="lili.data.logstash.server"/>
     <contextName>${APP_NAME}</contextName>
 
     <appender name="FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
@@ -22,7 +23,7 @@
     <!--输出到elk的LOGSTASH-->
     <appender name="LOGSTASH" class="net.logstash.logback.appender.LogstashTcpSocketAppender">
         <!-- 配置elk日志收集 配饰的是 LOGSTASH 的地址-->
-        <destination>127.0.0.1:4560</destination>
+        <destination>${LOGSTASH_SERVER}</destination>
         <encoder charset="UTF-8" class="net.logstash.logback.encoder.LogstashEncoder">
             <providers>
                 <timestamp>
diff --git a/consumer/src/main/resources/logback-spring.xml b/consumer/src/main/resources/logback-spring.xml
index 8e2f8cac9..a8d0eba6f 100644
--- a/consumer/src/main/resources/logback-spring.xml
+++ b/consumer/src/main/resources/logback-spring.xml
@@ -7,6 +7,7 @@
     <springProperty scope="context" name="APP_NAME" source="spring.application.name"/>
     <!--日志文件保存路径-->
     <springProperty scope="context" name="LOG_FILE_PATH" source="logging.file.path"/>
+    <springProperty scope="context" name="LOGSTASH_SERVER" source="lili.data.logstash.server"/>
     <contextName>${APP_NAME}</contextName>
 
     <appender name="FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
@@ -22,7 +23,7 @@
     <!--输出到elk的LOGSTASH-->
     <appender name="LOGSTASH" class="net.logstash.logback.appender.LogstashTcpSocketAppender">
         <!-- 配置elk日志收集 配饰的是 LOGSTASH 的地址-->
-        <destination>127.0.0.1:4560</destination>
+        <destination>${LOGSTASH_SERVER}</destination>
         <encoder charset="UTF-8" class="net.logstash.logback.encoder.LogstashEncoder">
             <providers>
                 <timestamp>
diff --git a/manager-api/src/main/resources/logback-spring.xml b/manager-api/src/main/resources/logback-spring.xml
index 8e2f8cac9..a8d0eba6f 100644
--- a/manager-api/src/main/resources/logback-spring.xml
+++ b/manager-api/src/main/resources/logback-spring.xml
@@ -7,6 +7,7 @@
     <springProperty scope="context" name="APP_NAME" source="spring.application.name"/>
     <!--日志文件保存路径-->
     <springProperty scope="context" name="LOG_FILE_PATH" source="logging.file.path"/>
+    <springProperty scope="context" name="LOGSTASH_SERVER" source="lili.data.logstash.server"/>
     <contextName>${APP_NAME}</contextName>
 
     <appender name="FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
@@ -22,7 +23,7 @@
     <!--输出到elk的LOGSTASH-->
     <appender name="LOGSTASH" class="net.logstash.logback.appender.LogstashTcpSocketAppender">
         <!-- 配置elk日志收集 配饰的是 LOGSTASH 的地址-->
-        <destination>127.0.0.1:4560</destination>
+        <destination>${LOGSTASH_SERVER}</destination>
         <encoder charset="UTF-8" class="net.logstash.logback.encoder.LogstashEncoder">
             <providers>
                 <timestamp>
diff --git a/seller-api/src/main/resources/logback-spring.xml b/seller-api/src/main/resources/logback-spring.xml
index 8e2f8cac9..a8d0eba6f 100644
--- a/seller-api/src/main/resources/logback-spring.xml
+++ b/seller-api/src/main/resources/logback-spring.xml
@@ -7,6 +7,7 @@
     <springProperty scope="context" name="APP_NAME" source="spring.application.name"/>
     <!--日志文件保存路径-->
     <springProperty scope="context" name="LOG_FILE_PATH" source="logging.file.path"/>
+    <springProperty scope="context" name="LOGSTASH_SERVER" source="lili.data.logstash.server"/>
     <contextName>${APP_NAME}</contextName>
 
     <appender name="FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
@@ -22,7 +23,7 @@
     <!--输出到elk的LOGSTASH-->
     <appender name="LOGSTASH" class="net.logstash.logback.appender.LogstashTcpSocketAppender">
         <!-- 配置elk日志收集 配饰的是 LOGSTASH 的地址-->
-        <destination>127.0.0.1:4560</destination>
+        <destination>${LOGSTASH_SERVER}</destination>
         <encoder charset="UTF-8" class="net.logstash.logback.encoder.LogstashEncoder">
             <providers>
                 <timestamp>