From 2e8a33431c10ed9cbfc134c933e5147a824898ea Mon Sep 17 00:00:00 2001
From: ZhangJian He <shoothzj@gmail.com>
Date: Wed, 15 Mar 2023 08:26:37 +0800
Subject: [PATCH 1/2] remove unused propery ctrip.appid

---
 apollo-adminservice/src/main/resources/adminservice.properties   | 1 -
 apollo-configservice/src/main/resources/configservice.properties | 1 -
 2 files changed, 2 deletions(-)

diff --git a/apollo-adminservice/src/main/resources/adminservice.properties b/apollo-adminservice/src/main/resources/adminservice.properties
index 21e5c7a6ea2..ef2203e661c 100644
--- a/apollo-adminservice/src/main/resources/adminservice.properties
+++ b/apollo-adminservice/src/main/resources/adminservice.properties
@@ -15,7 +15,6 @@
 #
 #Used for apollo-assembly
 spring.application.name= apollo-adminservice
-ctrip.appid= 100003172
 server.port= 8090
 logging.file.name= /opt/logs/100003172/apollo-adminservice.log
 spring.jmx.default-domain = apollo-adminservice
diff --git a/apollo-configservice/src/main/resources/configservice.properties b/apollo-configservice/src/main/resources/configservice.properties
index 1f9f8be545b..099e4ec33c3 100644
--- a/apollo-configservice/src/main/resources/configservice.properties
+++ b/apollo-configservice/src/main/resources/configservice.properties
@@ -15,7 +15,6 @@
 #
 #Used for apollo-assembly
 spring.application.name= apollo-configservice
-ctrip.appid= 100003171
 server.port= 8080
 logging.file.name= /opt/logs/100003171/apollo-configservice.log
 spring.jmx.default-domain = apollo-configservice

From 4e9ea664f00f6cdb6bfe3b7afbb7f23533c8388f Mon Sep 17 00:00:00 2001
From: ZhangJian He <shoothzj@gmail.com>
Date: Sun, 19 Mar 2023 17:05:01 +0800
Subject: [PATCH 2/2] remove

---
 apollo-adminservice/src/main/resources/application.yml  | 3 ---
 apollo-adminservice/src/test/resources/application.yml  | 3 ---
 apollo-configservice/src/main/resources/application.yml | 2 --
 apollo-configservice/src/test/resources/application.yml | 3 ---
 4 files changed, 11 deletions(-)

diff --git a/apollo-adminservice/src/main/resources/application.yml b/apollo-adminservice/src/main/resources/application.yml
index af45e2dd013..459e3b926d6 100644
--- a/apollo-adminservice/src/main/resources/application.yml
+++ b/apollo-adminservice/src/main/resources/application.yml
@@ -28,9 +28,6 @@ spring:
       hibernate:
         metadata_builder_contributor: com.ctrip.framework.apollo.common.jpa.SqlFunctionsMetadataBuilderContributor
 
-ctrip:
-  appid: 100003172
-  
 server:
   port: 8090
 
diff --git a/apollo-adminservice/src/test/resources/application.yml b/apollo-adminservice/src/test/resources/application.yml
index 1e30105119a..3aa1cb7942e 100644
--- a/apollo-adminservice/src/test/resources/application.yml
+++ b/apollo-adminservice/src/test/resources/application.yml
@@ -20,9 +20,6 @@ spring:
 server:
   port: ${port:8090}
 
-ctrip:
-  appid: 100003172
-
 eureka:
   instance:
     hostname: ${hostname:localhost}
diff --git a/apollo-configservice/src/main/resources/application.yml b/apollo-configservice/src/main/resources/application.yml
index 0900f3ecd9c..1711f629d80 100644
--- a/apollo-configservice/src/main/resources/application.yml
+++ b/apollo-configservice/src/main/resources/application.yml
@@ -27,8 +27,6 @@ spring:
     properties:
       hibernate:
         metadata_builder_contributor: com.ctrip.framework.apollo.common.jpa.SqlFunctionsMetadataBuilderContributor
-ctrip:
-  appid: 100003171
 
 server:
   port: 8080
diff --git a/apollo-configservice/src/test/resources/application.yml b/apollo-configservice/src/test/resources/application.yml
index 48e5bf6439b..d6a561ff0fc 100644
--- a/apollo-configservice/src/test/resources/application.yml
+++ b/apollo-configservice/src/test/resources/application.yml
@@ -20,9 +20,6 @@ spring:
 server:
   port: ${port:8080}
 
-ctrip:
-  appid: 100003171
-
 eureka:
   instance:
     hostname: ${hostname:localhost}