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 @@ - %d{yyyy-MM-dd HH:mm:ss.SSS} ${MY_POD_IP} %contextName [%thread] %-5level %logger{50} - [ppTraceId: %X{PtxId}, ppSpanId: %X{PspanId}] - %msg%n + %d{yyyy-MM-dd HH:mm:ss.SSS} %contextName [%thread] %-5level %logger{50} - %msg%n + + + + ERROR + + DENY + + ACCEPT + - ${logback.logdir}/${logback.appname}-${MY_POD_IP}.log + ${logback.logdir}/info.${logback.appname}.log - ${logback.logdir}/${logback.appname}-${MY_POD_IP}.%d{yyyy-MM-dd}.log + ${logback.logdir}/info.${logback.appname}.%d{yyyy-MM-dd}.log - 90 + 3 true @@ -36,14 +46,44 @@ UTF-8 - %d ${MY_POD_IP} [%thread] %-5level %logger{64} %line - [ppTraceId: %X{PtxId}, ppSpanId: %X{PspanId}] - %msg%n + %d [%thread] %-5level %logger{64} %line - %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 + + + + +