From 251cdf4e41e754c285e692bd34889fbc62ee46c4 Mon Sep 17 00:00:00 2001
From: zhangyx <1254353766@qq.com>
Date: Sat, 10 Apr 2021 12:04:34 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=A4=A9=E5=AE=AB?=
=?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
---
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 aed21ef..f9c757e 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-project
annotations:
- lb.cke.tg.unicom/target-vports: 18012-18012
+# lb.cke.tg.unicom/target-vports: 18012-18012
prometheus.io/port: '18012'
prometheus.io/jl-svc: 'true'
spec:
diff --git a/src/main/resources/application-uat.yml b/src/main/resources/application-uat.yml
index 3647a9e..f172254 100644
--- a/src/main/resources/application-uat.yml
+++ b/src/main/resources/application-uat.yml
@@ -14,7 +14,7 @@ app:
# Apollo 配置信息
apollo:
- meta: http://10.242.31.158:6001/
+ meta: http://apollo-configservice:8080
bootstrap:
namespace: application
enabled: true
@@ -97,7 +97,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 da621b2..b67c27c 100644
--- a/src/main/resources/logback.xml
+++ b/src/main/resources/logback.xml
@@ -11,33 +11,23 @@
- %d{yyyy-MM-dd HH:mm:ss.SSS} %contextName [%thread] %-5level %logger{50} - %msg%n
+ %d{yyyy-MM-dd HH:mm:ss.SSS} ${MY_POD_IP} %contextName [%thread] %-5level %logger{50} - [ppTraceId: %X{PtxId}, ppSpanId: %X{PspanId}] - %msg%n
-
-
-
- ERROR
-
- DENY
-
- ACCEPT
-
- ${logback.logdir}/info.${logback.appname}.log
+ ${logback.logdir}/${logback.appname}-${MY_POD_IP}.log
- ${logback.logdir}/info.${logback.appname}.%d{yyyy-MM-dd}.log
+ ${logback.logdir}/${logback.appname}-${MY_POD_IP}.%d{yyyy-MM-dd}.log
- 3
+ 90
true
@@ -46,44 +36,14 @@
UTF-8
- %d [%thread] %-5level %logger{64} %line - %msg%n
+ %d ${MY_POD_IP} [%thread] %-5level %logger{64} %line - [ppTraceId: %X{PtxId}, ppSpanId: %X{PspanId}] - %msg%n
-
-
-
- Error
-
-
- ${logback.logdir}/error.${logback.appname}.log
-
-
-
- ${logback.logdir}/error.${logback.appname}.%d{yyyy-MM-dd}.log
-
- 3
-
- true
-
-
-
-
-
- UTF-8
- %d [%thread] %-5level %logger{128} %line - %msg%n
-
-
-
-
-
From 354cafe7cdab05a37e4a471681c4821ff998fe13 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E9=93=B6=E9=9B=AA?=
Date: Sat, 10 Apr 2021 12:13:49 +0800
Subject: [PATCH 2/2] Update application-uat.yml
---
src/main/resources/application-uat.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/main/resources/application-uat.yml b/src/main/resources/application-uat.yml
index f172254..b0410c1 100644
--- a/src/main/resources/application-uat.yml
+++ b/src/main/resources/application-uat.yml
@@ -14,7 +14,7 @@ app:
# Apollo 配置信息
apollo:
- meta: http://apollo-configservice:8080
+ meta: http://apollo-configservice:8080/
bootstrap:
namespace: application
enabled: true