optimize: optimize some scripts related to Apollo (#5926)

apache · Oct 16, 2023 · 3baf2b4 · 3baf2b4
1 parent f709186
commit 3baf2b4
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 3 deletions.
diff --git a/changes/en-us/2.0.0.md b/changes/en-us/2.0.0.md
@@ -132,6 +132,7 @@ The version is updated as follows:
 - [[#5829](https://github.com/seata/seata/pull/5829)] fix codecov chart not display
 - [[#5878](https://github.com/seata/seata/pull/5878)] optimize `httpcore` and `httpclient` dependencies
 - [[#5917](https://github.com/seata/seata/pull/5917)] upgrade native-lib-loader version
+- [[#5926](https://github.com/seata/seata/pull/5926)] optimize some scripts related to Apollo
 
 ### security:
 - [[#5642](https://github.com/seata/seata/pull/5642)] add Hessian Serializer WhiteDenyList

diff --git a/changes/zh-cn/2.0.0.md b/changes/zh-cn/2.0.0.md
@@ -132,7 +132,7 @@ Seata 是一款开源的分布式事务解决方案，提供高性能和简单
 - [[#5829](https://github.com/seata/seata/pull/5829)] 修正 `codecov chart` 不展示的问题
 - [[#5878](https://github.com/seata/seata/pull/5878)] 优化 `httpcore` 和 `httpclient` 的依赖定义
 - [[#5917](https://github.com/seata/seata/pull/5917)] 升级 native-lib-loader 版本
-
+- [[#5926](https://github.com/seata/seata/pull/5926)] 优化一些与 Apollo 相关的脚本
 
 ### security:
 - [[#5642](https://github.com/seata/seata/pull/5642)] 增加Hessian 序列化黑白名单

diff --git a/config/seata-config-apollo/src/main/java/io/seata/config/apollo/ApolloConfiguration.java b/config/seata-config-apollo/src/main/java/io/seata/config/apollo/ApolloConfiguration.java
@@ -186,13 +186,13 @@ private void readyApolloConfig() {
                 System.setProperty(PROP_APOLLO_SECRET, apolloAccesskeySecret);
             }
         }
-        if (!properties.containsKey(APOLLO_CLUSTER)) {
+        if (!properties.containsKey(PROP_APOLLO_CLUSTER)) {
             String apolloCluster = FILE_CONFIG.getConfig(getApolloCluster());
             if (StringUtils.isNotBlank(apolloCluster)) {
                 System.setProperty(PROP_APOLLO_CLUSTER, apolloCluster);
             }
         }
-        if (!properties.containsKey(APOLLO_CONFIG_SERVICE)) {
+        if (!properties.containsKey(PROP_APOLLO_CONFIG_SERVICE)) {
             String apolloConfigService = FILE_CONFIG.getConfig(getApolloConfigService());
             if (StringUtils.isNotBlank(apolloConfigService)) {
                 System.setProperty(PROP_APOLLO_CONFIG_SERVICE, apolloConfigService);

diff --git a/script/client/conf/registry.conf b/script/client/conf/registry.conf
@@ -95,6 +95,7 @@ config {
     apolloMeta = "http://192.168.1.204:8801"
     namespace = "application"
     apolloAccesskeySecret = ""
+    cluster = ""
   }
   zk {
     serverAddr = "127.0.0.1:2181"

diff --git a/script/client/spring/application.properties b/script/client/spring/application.properties
@@ -90,6 +90,7 @@ seata.config.apollo.apollo-meta=http://192.168.1.204:8801
 seata.config.apollo.apollo-accesskey-secret=
 seata.config.apollo.app-id=seata-server
 seata.config.apollo.namespace=application
+seata.config.apollo.cluster=
 
 seata.config.etcd3.server-addr=http://localhost:2379
 

diff --git a/script/client/spring/application.yml b/script/client/spring/application.yml
@@ -84,6 +84,7 @@ seata:
       app-id: seata-server
       namespace: application
       apollo-accesskey-secret:
+      cluster:
     etcd3:
       server-addr: http://localhost:2379
     nacos: