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

Author: wangliang181230

changes/en-us/develop.md

@@ -16,6 +16,7 @@ Add changes here for all PR submitted to the develop branch.
 - [[#5890](https://github.com/seata/seata/pull/5890)] remove 7z format compression support
 - [[#5891](https://github.com/seata/seata/pull/5891)] remove mariadb.jdbc dependency
 - [[#5828](https://github.com/seata/seata/pull/5828)] fix codecov chart not display
+- [[#5927](https://github.com/seata/seata/pull/5927)] optimize some scripts related to Apollo
 - [[#5918](https://github.com/seata/seata/pull/5918)] standardized the properties of codecov.yml
 
 ### security:

changes/zh-cn/develop.md

@@ -16,6 +16,7 @@
 - [[#5890](https://github.com/seata/seata/pull/5890)] 移除7z压缩支持
 - [[#5891](https://github.com/seata/seata/pull/5891)] 移除 mariadb.jdbc 依赖
 - [[#5828](https://github.com/seata/seata/pull/5828)] 修正 `codecov chart` 不展示的问题
+- [[#5927](https://github.com/seata/seata/pull/5927)] 优化一些与 Apollo 相关的脚本
 - [[#5918](https://github.com/seata/seata/pull/5918)] 修正codecov.yml不标准属性
 
 ### security:

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);

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"

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
 

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: