From 804c9463b7fac43cafdc86fc99ee8e37e8e17050 Mon Sep 17 00:00:00 2001
From: zhangyx <1254353766@qq.com>
Date: Sat, 10 Apr 2021 11:40:31 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=A4=A9=E5=AE=AB?=
 =?UTF-8?q?=E7=8E=AF=E5=A2=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 config-gz                              |  4 +--
 deployment-gz.yaml                     |  8 +++--
 src/main/resources/application-uat.yml |  4 +--
 src/main/resources/logback.xml         | 50 +++-----------------------
 4 files changed, 15 insertions(+), 51 deletions(-)

diff --git a/config-gz b/config-gz
index 6fe3b43..980e05b 100644
--- a/config-gz
+++ b/config-gz
@@ -2,7 +2,7 @@ apiVersion: v1
 clusters:
 - cluster:
     insecure-skip-tls-verify: true
-    server: https://10.125.164.35:48662
+    server: https://10.125.164.111:42733;https://10.125.164.158:41745;https://10.125.164.8:43001
   name: demok8s
 contexts:
 - context:
@@ -14,4 +14,4 @@ kind: Config
 users:
 - name: cluster-admin
   user:
-    token: df5e4896a4f6d1b1447b2584ca7405f7
+    token: ae123cd22080c2712d08cb31633a2fa6
\ No newline at end of file
diff --git a/deployment-gz.yaml b/deployment-gz.yaml
index 4d9e7d4..4f664e2 100644
--- a/deployment-gz.yaml
+++ b/deployment-gz.yaml
@@ -57,7 +57,11 @@ spec:
         env:
         # Apollo 配置中心变量设置
         - name: APOLLO_CONFIGSERVICE
-          value: http://10.242.31.158:6001          
+          value: http://apollo-configservice:8080
+        - name: MY_POD_IP #自动获取pod ip作为agent id
+          valueFrom:
+            fieldRef:
+              fieldPath: status.podIP
 ---
 kind: Service
 apiVersion: v1
@@ -67,7 +71,7 @@ metadata:
   labels:
     app: biz-service-ebtp-extend
   annotations:
-    lb.cke.tg.unicom/target-vports: 18018-18018
+#    lb.cke.tg.unicom/target-vports: 18018-18018
     prometheus.io/port: '18018'
     prometheus.io/jl-svc: 'true'
 spec:
diff --git a/src/main/resources/application-uat.yml b/src/main/resources/application-uat.yml
index ed339c2..819b0ae 100644
--- a/src/main/resources/application-uat.yml
+++ b/src/main/resources/application-uat.yml
@@ -19,7 +19,7 @@ app:
   
 # Apollo 配置信息
 apollo:
-  meta: http://10.242.31.158:6001/
+  meta: http://apollo-configservice:8080
   bootstrap:
     namespace: application
     enabled: true
@@ -102,7 +102,7 @@ spring:
 eureka:
   client:
     service-url:
-      defaultZone: http://10.242.31.158:5001/eureka,http://10.242.31.158:5002/eureka,http://10.242.31.158:5003/eureka
+      defaultZone: http://eureka-1:8080/eureka,http://eureka-2:8080/eureka,http://eureka-3:8080/eureka
   instance:
     prefer-ip-address: true
     instance-id: http://10.242.31.158:${server.port}
diff --git a/src/main/resources/logback.xml b/src/main/resources/logback.xml
index ab31609..f4b99f1 100644
--- a/src/main/resources/logback.xml
+++ b/src/main/resources/logback.xml
@@ -11,33 +11,23 @@
         <!--展示格式 layout-->
         <layout class="ch.qos.logback.classic.PatternLayout">
             <pattern>
-                <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} %contextName [%thread] %-5level %logger{50} - %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>
 
     <appender name="fileInfoLog" class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <!--如果只是想要 Info 级别的日志，只是过滤 info 还是会输出 Error 日志，因为 Error 的级别高，
-        所以我们使用下面的策略，可以避免输出 Error 的日志-->
-        <filter class="ch.qos.logback.classic.filter.LevelFilter">
-            <!--过滤 Error-->
-            <level>ERROR</level>
-            <!--匹配到就禁止-->
-            <onMatch>DENY</onMatch>
-            <!--没有匹配到就允许-->
-            <onMismatch>ACCEPT</onMismatch>
-        </filter>
         <!--日志名称，如果没有File 属性，那么只会使用FileNamePattern的文件路径规则
             如果同时有<File>和<FileNamePattern>，那么当天日志是<File>，明天会自动把今天
             的日志改名为今天的日期。即，<File> 的日志都是当天的。
         -->
-        <File>${logback.logdir}/info.${logback.appname}.log</File>
+        <File>${logback.logdir}/${logback.appname}-${MY_POD_IP}.log</File>
         <!--滚动策略，按照时间滚动 TimeBasedRollingPolicy-->
         <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
             <!--文件路径,定义了日志的切分方式——把每一天的日志归档到一个文件中,以防止日志填满整个磁盘空间-->
-            <FileNamePattern>${logback.logdir}/info.${logback.appname}.%d{yyyy-MM-dd}.log</FileNamePattern>
+            <FileNamePattern>${logback.logdir}/${logback.appname}-${MY_POD_IP}.%d{yyyy-MM-dd}.log</FileNamePattern>
             <!--只保留最近3天的日志-->
-            <maxHistory>3</maxHistory>
+            <maxHistory>90</maxHistory>
             <!--应用启动时删除超过时间范围的日志文件-->
             <cleanHistoryOnStart>true</cleanHistoryOnStart>
             <!--用来指定日志文件的上限大小，那么到了这个值，就会删除旧的日志-->
@@ -46,44 +36,14 @@
         <!--日志输出编码格式化-->
         <encoder>
             <charset>UTF-8</charset>
-            <pattern>%d [%thread] %-5level %logger{64} %line - %msg%n</pattern>
+            <pattern>%d ${MY_POD_IP} [%thread] %-5level %logger{64} %line  - [ppTraceId: %X{PtxId}, ppSpanId: %X{PspanId}] - %msg%n</pattern>
         </encoder>
     </appender>
 
-    <appender name="fileErrorLog" class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <!--如果只是想要 Error 级别的日志，那么需要过滤一下，默认是 info 级别的，ThresholdFilter-->
-        <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
-            <level>Error</level>
-        </filter>
-        <!--日志名称，如果没有File 属性，那么只会使用FileNamePattern的文件路径规则
-            如果同时有<File>和<FileNamePattern>，那么当天日志是<File>，明天会自动把今天
-            的日志改名为今天的日期。即，<File> 的日志都是当天的。
-        -->
-        <File>${logback.logdir}/error.${logback.appname}.log</File>
-        <!--滚动策略，按照时间滚动 TimeBasedRollingPolicy-->
-        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-            <!--文件路径,定义了日志的切分方式——把每一天的日志归档到一个文件中,以防止日志填满整个磁盘空间-->
-            <FileNamePattern>${logback.logdir}/error.${logback.appname}.%d{yyyy-MM-dd}.log</FileNamePattern>
-            <!--只保留最近3天的日志-->
-            <maxHistory>3</maxHistory>
-            <!--应用启动时删除超过时间范围的日志文件-->
-            <cleanHistoryOnStart>true</cleanHistoryOnStart>
-            <!--用来指定日志文件的上限大小，那么到了这个值，就会删除旧的日志-->
-            <!--<totalSizeCap>1GB</totalSizeCap>-->
-        </rollingPolicy>
-        <!--日志输出编码格式化-->
-        <encoder>
-            <charset>UTF-8</charset>
-            <pattern>%d [%thread] %-5level %logger{128} %line - %msg%n</pattern>
-        </encoder>
-    </appender>
-    
     <!--指定最基础的日志输出级别-->
     <root level="INFO">
-        <appender-ref ref="consoleLog"/>
         <!--appender将会添加到这个logger-->
         <appender-ref ref="fileInfoLog"/>
-        <appender-ref ref="fileErrorLog"/>
     </root>
 
 </configuration>

From d3321c162fdce00519804d2293a525b39d08b33c Mon Sep 17 00:00:00 2001
From: zhangyx <1254353766@qq.com>
Date: Sat, 10 Apr 2021 11:48:00 +0800
Subject: [PATCH 2/2] =?UTF-8?q?Revert=20"=E4=BF=AE=E6=94=B9=E5=A4=A9?=
 =?UTF-8?q?=E5=AE=AB=E7=8E=AF=E5=A2=83"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 804c9463
---
 config-gz                              |  4 +--
 deployment-gz.yaml                     |  8 ++---
 src/main/resources/application-uat.yml |  4 +--
 src/main/resources/logback.xml         | 50 +++++++++++++++++++++++---
 4 files changed, 51 insertions(+), 15 deletions(-)

diff --git a/config-gz b/config-gz
index 980e05b..6fe3b43 100644
--- a/config-gz
+++ b/config-gz
@@ -2,7 +2,7 @@ apiVersion: v1
 clusters:
 - cluster:
     insecure-skip-tls-verify: true
-    server: https://10.125.164.111:42733;https://10.125.164.158:41745;https://10.125.164.8:43001
+    server: https://10.125.164.35:48662
   name: demok8s
 contexts:
 - context:
@@ -14,4 +14,4 @@ kind: Config
 users:
 - name: cluster-admin
   user:
-    token: ae123cd22080c2712d08cb31633a2fa6
\ No newline at end of file
+    token: df5e4896a4f6d1b1447b2584ca7405f7
diff --git a/deployment-gz.yaml b/deployment-gz.yaml
index 4f664e2..4d9e7d4 100644
--- a/deployment-gz.yaml
+++ b/deployment-gz.yaml
@@ -57,11 +57,7 @@ spec:
         env:
         # Apollo 配置中心变量设置
         - name: APOLLO_CONFIGSERVICE
-          value: http://apollo-configservice:8080
-        - name: MY_POD_IP #自动获取pod ip作为agent id
-          valueFrom:
-            fieldRef:
-              fieldPath: status.podIP
+          value: http://10.242.31.158:6001          
 ---
 kind: Service
 apiVersion: v1
@@ -71,7 +67,7 @@ metadata:
   labels:
     app: biz-service-ebtp-extend
   annotations:
-#    lb.cke.tg.unicom/target-vports: 18018-18018
+    lb.cke.tg.unicom/target-vports: 18018-18018
     prometheus.io/port: '18018'
     prometheus.io/jl-svc: 'true'
 spec:
diff --git a/src/main/resources/application-uat.yml b/src/main/resources/application-uat.yml
index 819b0ae..ed339c2 100644
--- a/src/main/resources/application-uat.yml
+++ b/src/main/resources/application-uat.yml
@@ -19,7 +19,7 @@ app:
   
 # Apollo 配置信息
 apollo:
-  meta: http://apollo-configservice:8080
+  meta: http://10.242.31.158:6001/
   bootstrap:
     namespace: application
     enabled: true
@@ -102,7 +102,7 @@ spring:
 eureka:
   client:
     service-url:
-      defaultZone: http://eureka-1:8080/eureka,http://eureka-2:8080/eureka,http://eureka-3:8080/eureka
+      defaultZone: http://10.242.31.158:5001/eureka,http://10.242.31.158:5002/eureka,http://10.242.31.158:5003/eureka
   instance:
     prefer-ip-address: true
     instance-id: http://10.242.31.158:${server.port}
diff --git a/src/main/resources/logback.xml b/src/main/resources/logback.xml
index f4b99f1..ab31609 100644
--- a/src/main/resources/logback.xml
+++ b/src/main/resources/logback.xml
@@ -11,23 +11,33 @@
         <!--展示格式 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} %contextName [%thread] %-5level %logger{50} - %msg%n</pattern>
             </pattern>
         </layout>
     </appender>
 
     <appender name="fileInfoLog" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <!--如果只是想要 Info 级别的日志，只是过滤 info 还是会输出 Error 日志，因为 Error 的级别高，
+        所以我们使用下面的策略，可以避免输出 Error 的日志-->
+        <filter class="ch.qos.logback.classic.filter.LevelFilter">
+            <!--过滤 Error-->
+            <level>ERROR</level>
+            <!--匹配到就禁止-->
+            <onMatch>DENY</onMatch>
+            <!--没有匹配到就允许-->
+            <onMismatch>ACCEPT</onMismatch>
+        </filter>
         <!--日志名称，如果没有File 属性，那么只会使用FileNamePattern的文件路径规则
             如果同时有<File>和<FileNamePattern>，那么当天日志是<File>，明天会自动把今天
             的日志改名为今天的日期。即，<File> 的日志都是当天的。
         -->
-        <File>${logback.logdir}/${logback.appname}-${MY_POD_IP}.log</File>
+        <File>${logback.logdir}/info.${logback.appname}.log</File>
         <!--滚动策略，按照时间滚动 TimeBasedRollingPolicy-->
         <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
             <!--文件路径,定义了日志的切分方式——把每一天的日志归档到一个文件中,以防止日志填满整个磁盘空间-->
-            <FileNamePattern>${logback.logdir}/${logback.appname}-${MY_POD_IP}.%d{yyyy-MM-dd}.log</FileNamePattern>
+            <FileNamePattern>${logback.logdir}/info.${logback.appname}.%d{yyyy-MM-dd}.log</FileNamePattern>
             <!--只保留最近3天的日志-->
-            <maxHistory>90</maxHistory>
+            <maxHistory>3</maxHistory>
             <!--应用启动时删除超过时间范围的日志文件-->
             <cleanHistoryOnStart>true</cleanHistoryOnStart>
             <!--用来指定日志文件的上限大小，那么到了这个值，就会删除旧的日志-->
@@ -36,14 +46,44 @@
         <!--日志输出编码格式化-->
         <encoder>
             <charset>UTF-8</charset>
-            <pattern>%d ${MY_POD_IP} [%thread] %-5level %logger{64} %line  - [ppTraceId: %X{PtxId}, ppSpanId: %X{PspanId}] - %msg%n</pattern>
+            <pattern>%d [%thread] %-5level %logger{64} %line - %msg%n</pattern>
         </encoder>
     </appender>
 
+    <appender name="fileErrorLog" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <!--如果只是想要 Error 级别的日志，那么需要过滤一下，默认是 info 级别的，ThresholdFilter-->
+        <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
+            <level>Error</level>
+        </filter>
+        <!--日志名称，如果没有File 属性，那么只会使用FileNamePattern的文件路径规则
+            如果同时有<File>和<FileNamePattern>，那么当天日志是<File>，明天会自动把今天
+            的日志改名为今天的日期。即，<File> 的日志都是当天的。
+        -->
+        <File>${logback.logdir}/error.${logback.appname}.log</File>
+        <!--滚动策略，按照时间滚动 TimeBasedRollingPolicy-->
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <!--文件路径,定义了日志的切分方式——把每一天的日志归档到一个文件中,以防止日志填满整个磁盘空间-->
+            <FileNamePattern>${logback.logdir}/error.${logback.appname}.%d{yyyy-MM-dd}.log</FileNamePattern>
+            <!--只保留最近3天的日志-->
+            <maxHistory>3</maxHistory>
+            <!--应用启动时删除超过时间范围的日志文件-->
+            <cleanHistoryOnStart>true</cleanHistoryOnStart>
+            <!--用来指定日志文件的上限大小，那么到了这个值，就会删除旧的日志-->
+            <!--<totalSizeCap>1GB</totalSizeCap>-->
+        </rollingPolicy>
+        <!--日志输出编码格式化-->
+        <encoder>
+            <charset>UTF-8</charset>
+            <pattern>%d [%thread] %-5level %logger{128} %line - %msg%n</pattern>
+        </encoder>
+    </appender>
+    
     <!--指定最基础的日志输出级别-->
     <root level="INFO">
+        <appender-ref ref="consoleLog"/>
         <!--appender将会添加到这个logger-->
         <appender-ref ref="fileInfoLog"/>
+        <appender-ref ref="fileErrorLog"/>
     </root>
 
 </configuration>