From 131b3780eba3a6adfe42ff661fac07cd9501917e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BB=98=E5=BA=86=E5=90=89?= <51312040@qq.com>
Date: Tue, 18 May 2021 09:43:02 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B3=A8=E5=86=8C=20UAT=20Skywalking=20?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9logback?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Dockerfile-gz                  | 4 ++--
 src/main/resources/logback.xml | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Dockerfile-gz b/Dockerfile-gz
index 2b18037..53df180 100644
--- a/Dockerfile-gz
+++ b/Dockerfile-gz
@@ -1,4 +1,4 @@
-FROM harbor.dcos.guangzhou.unicom.local/eshop/skywalking_agent_springboot_8.1.0:v1.0
+FROM harbor.dcos.guangzhou.unicom.local/eshop/jdk8_springboot_agent:v1.6
 ENV LC_ALL=zh_CN.utf8
 ENV LANG=zh_CN.utf8
 ENV LANGUAGE=zh_CN.utf8
@@ -7,4 +7,4 @@ RUN localedef -c -f UTF-8 -i zh_CN zh_CN.utf8
 RUN mkdir -p /model
 COPY /target/classes/model/. /model/
 ADD /target/biz_service_ebtp_extend-0.0.1.jar /biz_service_ebtp_extend-0.0.1.jar
-ENTRYPOINT ["java", "-Djava.security.egd=file:/dev/./urandom", "-Dspring.profiles.active=uat", "-jar", "/biz_service_ebtp_extend-0.0.1.jar"]
+ENTRYPOINT ["java", "-Djava.security.egd=file:/dev/./urandom", "-Dspring.profiles.active=uat", "-javaagent:/skywalking/agent/skywalking-agent.jar", "-jar", "/biz_service_ebtp_extend-0.0.1.jar"]
diff --git a/src/main/resources/logback.xml b/src/main/resources/logback.xml
index e8a706c..cf6d74b 100644
--- a/src/main/resources/logback.xml
+++ b/src/main/resources/logback.xml
@@ -11,7 +11,7 @@
         <!--展示格式 layout-->
         <layout class="ch.qos.logback.classic.PatternLayout">
             <pattern>
-                <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} ${MY_POD_IP} %contextName [%thread] %-5level %logger{50}  - [ppTraceId: %X{PtxId}, ppSpanId: %X{PspanId}] - %msg%n</pattern>
+                <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} ${MY_POD_IP} %contextName [%thread] %-5level %logger{50}  - [ppTraceId: %X{PtxId}, ppSpanId: %X{PspanId}] - %msg%n</pattern>
             </pattern>
         </layout>
     </appender>
@@ -27,7 +27,7 @@
             <!--文件路径,定义了日志的切分方式——把每一天的日志归档到一个文件中,以防止日志填满整个磁盘空间-->
             <FileNamePattern>${logback.logdir}/${logback.appname}-${MY_POD_IP}.%d{yyyy-MM-dd}.log</FileNamePattern>
             <!--只保留最近3天的日志-->
-            <maxHistory>90</maxHistory>
+            <maxHistory>3</maxHistory>
             <!--应用启动时删除超过时间范围的日志文件-->
             <cleanHistoryOnStart>true</cleanHistoryOnStart>
             <!--用来指定日志文件的上限大小，那么到了这个值，就会删除旧的日志-->