From 1cf48172ad496884cf25956d7d7c7eb3ec715245 Mon Sep 17 00:00:00 2001
From: dxc <jl-daixc@chinaunicom.cn>
Date: Tue, 18 May 2021 16:20:55 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=97=A5=E5=BF=97=E8=BE=93?=
 =?UTF-8?q?=E5=87=BA=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 deployment-gz.yaml                      | 2 ++
 deployment-test.yaml                    | 2 ++
 pro.yaml                                | 2 ++
 src/main/resources/application-pro.yml  | 1 -
 src/main/resources/application-test.yml | 1 -
 src/main/resources/application-uat.yml  | 1 -
 src/main/resources/logback.xml          | 2 +-
 7 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/deployment-gz.yaml b/deployment-gz.yaml
index 0bebba9..8e478cd 100644
--- a/deployment-gz.yaml
+++ b/deployment-gz.yaml
@@ -65,6 +65,8 @@ spec:
         # Apollo 配置中心变量设置
         - name: APOLLO_CONFIGSERVICE
           value: http://apollo-configservice:8080
+        - name: APP_NAME
+          value: biz_service_ebtp_project_uat
         - name: MY_POD_IP #自动获取pod ip作为agent id
           valueFrom:
             fieldRef:
diff --git a/deployment-test.yaml b/deployment-test.yaml
index 312372a..1babf28 100644
--- a/deployment-test.yaml
+++ b/deployment-test.yaml
@@ -47,6 +47,8 @@ spec:
         # Apollo 配置中心变量设置
         - name: APOLLO_CONFIGSERVICE
           value: http://10.242.37.148:6001
+        - name: APP_NAME
+          value: biz_service_ebtp_project_test
         - name: SW_AGENT_COLLECTOR_BACKEND_SERVICES
           value: skywalking-oap-cluster.skywalking:11800
         - name: SW_AGENT_NAME
diff --git a/pro.yaml b/pro.yaml
index 3b48a80..b3becef 100644
--- a/pro.yaml
+++ b/pro.yaml
@@ -80,6 +80,8 @@ spec:
           value: 527BFA7B28577578
         - name: APOLLO_CONFIGSERVICE
           value: http://apollo-configservice:8080
+        - name: APP_NAME
+          value: biz_service_ebtp_project_pro
         - name: MY_POD_IP
           valueFrom:
             fieldRef:
diff --git a/src/main/resources/application-pro.yml b/src/main/resources/application-pro.yml
index c1a35a3..a138ee3 100644
--- a/src/main/resources/application-pro.yml
+++ b/src/main/resources/application-pro.yml
@@ -15,7 +15,6 @@ seata:
 # 对应 apollo 配置中心的应用名
 app:
   id: biz-service-ebtp-project
-  name: biz_service_ebtp_project_pro
   
 # Apollo 配置信息
 apollo:
diff --git a/src/main/resources/application-test.yml b/src/main/resources/application-test.yml
index 0538a7c..ce375c5 100644
--- a/src/main/resources/application-test.yml
+++ b/src/main/resources/application-test.yml
@@ -13,7 +13,6 @@ seata:
 # 对应 apollo 配置中心的应用名
 app:
   id: biz-service-ebtp-project
-  name: biz_service_ebtp_project_test
   
 # Apollo 配置信息
 apollo:
diff --git a/src/main/resources/application-uat.yml b/src/main/resources/application-uat.yml
index 03cb119..0d25893 100644
--- a/src/main/resources/application-uat.yml
+++ b/src/main/resources/application-uat.yml
@@ -15,7 +15,6 @@ seata:
 # 对应 apollo 配置中心的应用名
 app:
   id: biz-service-ebtp-project
-  name: biz_service_ebtp_project_uat
   
 # Apollo 配置信息
 apollo:
diff --git a/src/main/resources/logback.xml b/src/main/resources/logback.xml
index a58ecc3..5ea9279 100644
--- a/src/main/resources/logback.xml
+++ b/src/main/resources/logback.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <configuration scan="true" scanPeriod="60 seconds" debug="true">
-    <springProperty scope="context" name="APP_NAME" source="app.name" defaultValue="biz_service_ebtp_project"/>
+
     <property name="logback.logdir" value="/log" />
     <property name="logback.appname" value="${APP_NAME}" />