Merge branch 'develop' into develop

PeppaO · Oct 16, 2023 · a9763de · a9763de
2 parents 7c49f4d + 971d1de
commit a9763de
Show file tree

Hide file tree

Showing 7 changed files with 21 additions and 13 deletions.
diff --git a/changes/en-us/develop.md b/changes/en-us/develop.md
@@ -16,6 +16,8 @@ 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:
 - [[#5867](https://github.com/seata/seata/pull/5867)] fix npm package vulnerabilities

diff --git a/changes/zh-cn/develop.md b/changes/zh-cn/develop.md
@@ -17,6 +17,8 @@
 - [[#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:
 - [[#5867](https://github.com/seata/seata/pull/5867)] 修复npm package漏洞

diff --git a/codecov.yml b/codecov.yml
@@ -2,24 +2,25 @@ codecov:
   require_ci_to_pass: yes
 coverage:
   status:
-    patch: no
+    patch: off
+    changes: off
     project:
       default:
         threshold: 1%
         if_not_found: success
-    changes: no
+  round: down
   precision: 2
-  range: "50...100"
+  range: "50..75"
 ignore:
- - "test/.*"
- - ".github/.*"
- - ".mvn/.*"
- - ".style/.*"
- - "*.md"
+ - "**/test"
+ - "**/.github"
+ - "**/.mvn"
+ - "**/.style"
+ - "**/*.md"
  - "rm-datasource/src/test/java/io/seata/rm/datasource/mock"
- - "sqlparser/seata-sqlparser-antlr/src/main/java/io/seata/sqlparser/antlr/mysql/antlr/.*"
- - "sqlparser/seata-sqlparser-antlr/src/main/java/io/seata/sqlparser/antlr/mysql/parser/.*"
+ - "sqlparser/seata-sqlparser-antlr/src/main/java/io/seata/sqlparser/antlr/mysql/antlr"
+ - "sqlparser/seata-sqlparser-antlr/src/main/java/io/seata/sqlparser/antlr/mysql/parser"
 comment:
-  layout: "reach,diff,flags,tree"
+  layout: "reach, diff, flags, tree"
   behavior: default
   require_changes: no
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: