Merge branch 'develop' into feature_support_mysql_updatejoin

.github/workflows/publishes.yml

@@ -46,11 +46,11 @@ jobs:
       - name: "Package and Publish-Image-To-DockerHub"
         if: matrix.type == 'image'
         env:
+          IMAGE_NAME: openjdk:8u342
           REGISTRY_USERNAME: ${{ secrets.REGISTRY_USERNAME }}
           REGISTRY_PASSWORD: ${{ secrets.REGISTRY_PASSWORD }}
         run: |
-          echo "IMAGE_NAME=openjdk:8u332" >> $GITHUB_ENV;
-          if [ "${{github.ref}}" == "refs/heads/snapshot" ]; then
+          if [ "${{ github.ref_name }}" == "develop" ] || [ "${{ github.ref_name }}" == "snapshot" ]; then
             ./mvnw -T 4C clean package -Pimage               -DskipTests -e -B -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn;
           else
             ./mvnw -T 4C clean package -Pimage,release-image -DskipTests -e -B -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn;

build/pom.xml

@@ -234,6 +234,7 @@
                         <exclude>**/META-INF/additional-spring-configuration-metadata.json</exclude>
                         <exclude>protobuf/**</exclude>
                         <exclude>**/*.proto</exclude>
+                        <exclude>static/console-fe/**</exclude>
                     </excludes>
                 </configuration>
             </plugin>

changes/en-us/develop.md

@@ -10,14 +10,16 @@ Add changes here for all PR submitted to the develop branch.
 
 
 ### bugfix:
+- [[#4954](https://github.com/seata/seata/pull/4954)] fix output expression incorrectly throws npe
 - [[#4817](https://github.com/seata/seata/pull/4817)] fix in high version springboot property not Standard
 - [[#4838](https://github.com/seata/seata/pull/4838)] fix when use Statement.executeBatch() can not generate undo log
 - [[#4779](https://github.com/seata/seata/pull/4779)] fix and support Apache Dubbo 3
 - [[#4912](https://github.com/seata/seata/pull/4912)] fix mysql InsertOnDuplicateUpdate column case is different and cannot be matched
 - [[#4543](https://github.com/seata/seata/pull/4543)] fix support Oracle nclob types
 - [[#4915](https://github.com/seata/seata/pull/4915)] fix failed to get server recovery properties
 - [[#4919](https://github.com/seata/seata/pull/4919)] fix XID port  and  address null:0 before coordinator.init
-
+- [[#4928](https://github.com/seata/seata/pull/4928)] fix rpcContext.getClientRMHolderMap NPE 
+- [[#4953](https://github.com/seata/seata/pull/4953)] fix InsertOnDuplicateUpdate bypass modify pk
 
 ### optimize:
 - [[#4774](https://github.com/seata/seata/pull/4774)] optimize mysql8 dependencies for seataio/seata-server image
@@ -35,6 +37,12 @@ Add changes here for all PR submitted to the develop branch.
 - [[#4911](https://github.com/seata/seata/pull/4911)] add license checker workflow
 - [[#4917](https://github.com/seata/seata/pull/4917)] upgrade package-lock.json fix vulnerabilities
 - [[#4924](https://github.com/seata/seata/pull/4924)] optimize pom dependencies
+- [[#4932](https://github.com/seata/seata/pull/4932)] extract the default values for some properties
+- [[#4925](https://github.com/seata/seata/pull/4925)] optimize java doc warning
+- [[#4921](https://github.com/seata/seata/pull/4921)] fix some vulnerabilities in console and upgrade skywalking-eyes
+- [[#4936](https://github.com/seata/seata/pull/4936)] optimize read of storage configuration
+- [[#4946](https://github.com/seata/seata/pull/4946)] pass the sqlexception to client when get lock
+- [[#4962](https://github.com/seata/seata/pull/4962)] optimize build and fix the base image
 
 ### test:
 - [[#4794](https://github.com/seata/seata/pull/4794)] try to fix the test `DataSourceProxyTest.getResourceIdTest()`
@@ -56,5 +64,6 @@ Thanks to these contributors for their code commits. Please report an unintended
 - [AlbumenJ](https://github.com/AlbumenJ)
 - [doubleDimple](https://github.com/doubleDimple)
 - [jsbxyyx](https://github.com/jsbxyyx)
+- [tuwenlin](https://github.com/tuwenlin)
 
 Also, we receive many valuable issues, questions and advices from our community. Thanks for you all.

changes/zh-cn/develop.md

@@ -10,13 +10,16 @@
 
 
 ### bugfix：
+- [[#4954](https://github.com/seata/seata/pull/4954)] 修复output表达式错误时，保存执行结果空指针异常
 - [[#4817](https://github.com/seata/seata/pull/4817)] 修复高版本springboot配置不标准的问题
 - [[#4838](https://github.com/seata/seata/pull/4838)] 修复使用 Statement.executeBatch() 时无法生成undo log 的问题
 - [[#4779](https://github.com/seata/seata/pull/4779)] 修复支持 Apache Dubbo 3 版本
 - [[#4912](https://github.com/seata/seata/pull/4912)] 修复mysql InsertOnDuplicateUpdate 列名大小写不一致无法正确匹配
 - [[#4543](https://github.com/seata/seata/pull/4543)] 修复对 Oracle 数据类型nclob的支持
 - [[#4915](https://github.com/seata/seata/pull/4915)] 修复获取不到ServerRecoveryProperties属性的问题
 - [[#4919](https://github.com/seata/seata/pull/4919)] 修复XID的port和address出现null:0的情况
+- [[#4928](https://github.com/seata/seata/pull/4928)] 修复 rpcContext.getClientRMHolderMap NPE 问题
+- [[#4953](https://github.com/seata/seata/pull/4953)] 修复InsertOnDuplicateUpdate可绕过修改主键的问题
 
 ### optimize：
 - [[#4774](https://github.com/seata/seata/pull/4774)] 优化 seataio/seata-server 镜像中的 mysql8 依赖
@@ -34,6 +37,12 @@
 - [[#4911](https://github.com/seata/seata/pull/4911)] 添加 header 和license 检测
 - [[#4917](https://github.com/seata/seata/pull/4917)] 升级 package-lock.json 修复漏洞
 - [[#4924](https://github.com/seata/seata/pull/4924)] 优化 pom 依赖
+- [[#4932](https://github.com/seata/seata/pull/4932)] 抽取部分配置的默认值
+- [[#4925](https://github.com/seata/seata/pull/4925)] 优化 javadoc 注释
+- [[#4921](https://github.com/seata/seata/pull/4921)] 修复控制台模块安全漏洞和升级 skywalking-eyes 版本
+- [[#4936](https://github.com/seata/seata/pull/4936)] 优化存储配置的读取
+- [[#4946](https://github.com/seata/seata/pull/4946)] 将获取锁时遇到的sql异常传递给客户端
+- [[#4962](https://github.com/seata/seata/pull/4962)] 优化构建配置，并修正docker镜像的基础镜像
 
 ### test：
 - [[#4794](https://github.com/seata/seata/pull/4794)] 重构代码，尝试修复单元测试 `DataSourceProxyTest.getResourceIdTest()`
@@ -55,5 +64,6 @@
 - [AlbumenJ](https://github.com/AlbumenJ)
 - [doubleDimple](https://github.com/doubleDimple)
 - [jsbxyyx](https://github.com/jsbxyyx)
+- [tuwenlin](https://github.com/tuwenlin)
 
 同时，我们收到了社区反馈的很多有价值的issue和建议，非常感谢大家。

common/src/main/java/io/seata/common/DefaultValues.java

@@ -195,4 +195,78 @@ public interface DefaultValues {
      */
     int DEFAULT_XA_CONNECTION_TWO_PHASE_HOLD_TIMEOUT = 10000;
 
+    /**
+     * the constant DEFAULT_COMMITING_RETRY_PERIOD
+     */
+    int DEFAULT_COMMITING_RETRY_PERIOD = 1000;
+
+    /**
+     * the constant DEFAULT_ASYNC_COMMITTING_RETRY_PERIOD
+     */
+    int DEFAULT_ASYNC_COMMITTING_RETRY_PERIOD = 1000;
+
+    /**
+     * the constant DEFAULT_ROLLBACKING_RETRY_PERIOD
+     */
+    int DEFAULT_ROLLBACKING_RETRY_PERIOD = 1000;
+
+    /**
+     * the constant DEFAULT_TIMEOUT_RETRY_PERIOD
+     */
+    int DEFAULT_TIMEOUT_RETRY_PERIOD = 1000;
+
+    /**
+     * the constant DEFAULT_UNDO_LOG_DELETE_PERIOD
+     */
+    long DEFAULT_UNDO_LOG_DELETE_PERIOD = 24 * 60 * 60 * 1000;
+
+    /**
+     * the constant DEFAULT_SERVICE_SESSION_RELOAD_READ_SIZE
+     */
+    int DEFAULT_SERVICE_SESSION_RELOAD_READ_SIZE = 100;
+
+    /**
+     *the constant DEFAULT_PROMETHEUS_PORT
+     */
+    int DEFAULT_PROMETHEUS_PORT = 9898;
+
+    /**
+     * the const DEFAULT_METRICS_ENABLED
+     */
+    boolean DEFAULT_METRICS_ENABLED = false;
+
+    /**
+     * the const DEFAULT_METRICS_REGISTRY_TYPE
+     */
+    String DEFAULT_METRICS_REGISTRY_TYPE = "compact";
+
+    /**
+     * the const DEFAULT_METRICS_EXPORTER_LIST
+     */
+    String DEFAULT_METRICS_EXPORTER_LIST = "prometheus";
+
+    /**
+     * the const DEFAULT_MAX_COMMIT_RETRY_TIMEOUT
+     */
+    long DEFAULT_MAX_COMMIT_RETRY_TIMEOUT = 100;
+
+    /**
+     * the const DEFAULT_MAX_ROLLBACK_RETRY_TIMEOUT
+     */
+    long DEFAULT_MAX_ROLLBACK_RETRY_TIMEOUT = 100;
+
+    /**
+     * the const DEFAULT_ROLLBACK_RETRY_TIMEOUT_UNLOCK_ENABLE
+     */
+    boolean DEFAULT_ROLLBACK_RETRY_TIMEOUT_UNLOCK_ENABLE = false;
+
+    /**
+     * DEFAULT_DISTRIBUTED_LOCK_EXPIRE_TIME
+     */
+    long DEFAULT_DISTRIBUTED_LOCK_EXPIRE_TIME = 10000;
+
+    /**
+     * DEFAULT_ENABLE_BRANCH_ASYNC_REMOVE
+     */
+    boolean DEFAULT_ENABLE_BRANCH_ASYNC_REMOVE = false;
 }

dependencies/pom.xml

@@ -48,7 +48,7 @@
         <apache-zookeeper.version>3.5.9</apache-zookeeper.version>
         <curator-test.version>2.9.1</curator-test.version>
         <spring-context-support.version>1.0.2</spring-context-support.version>
-        <apollo-client.version>1.6.0</apollo-client.version>
+        <apollo-client.version>2.0.1</apollo-client.version>
         <mock-jedis.version>0.1.16</mock-jedis.version>
         <eureka-clients.version>1.10.17</eureka-clients.version>
         <consul-clients.version>1.4.2</consul-clients.version>
@@ -63,7 +63,7 @@
         <jcommander.version>1.72</jcommander.version>
         <xz.version>1.8</xz.version>
         <commons-compress.version>1.19</commons-compress.version>
-        <ant.version>1.10.6</ant.version>
+        <ant.version>1.10.12</ant.version>
         <lz4.version>1.7.1</lz4.version>
 
         <protobuf.version>3.7.1</protobuf.version>
@@ -295,6 +295,12 @@
                 <groupId>com.alipay.sofa</groupId>
                 <artifactId>registry-client-all</artifactId>
                 <version>${sofa.registry.version}</version>
+                <exclusions>
+                    <exclusion>
+                        <groupId>com.alipay.sofa.lookout</groupId>
+                        <artifactId>lookout-api</artifactId>
+                    </exclusion>
+                </exclusions>
             </dependency>
             <dependency>
                 <groupId>com.alipay.sofa</groupId>
@@ -353,6 +359,10 @@
                         <groupId>javax.servlet</groupId>
                         <artifactId>servlet-api</artifactId>
                     </exclusion>
+                    <exclusion>
+                        <groupId>com.github.andrewoma.dexx</groupId>
+                        <artifactId>dexx-collections</artifactId>
+                    </exclusion>
                 </exclusions>
             </dependency>
             <dependency>

distribution/Dockerfile

@@ -22,7 +22,7 @@
 # 1. docker run --name=seata-server -d seata-server:1.6.0-dev
 #
 # https://hub.docker.com/orgs/seataio
-FROM openjdk:8u332
+FROM openjdk:8u342
 
 # set label
 LABEL maintainer="Seata <seata.io>"

metrics/seata-metrics-core/src/main/java/io/seata/metrics/exporter/ExporterFactory.java

@@ -26,6 +26,8 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import static io.seata.common.DefaultValues.DEFAULT_METRICS_EXPORTER_LIST;
+
 /**
  * Exporter Factory for load all configured exporters
  *
@@ -37,7 +39,7 @@ public class ExporterFactory {
     public static List<Exporter> getInstanceList() {
         List<Exporter> exporters = new ArrayList<>();
         String exporterTypeNameList = ConfigurationFactory.getInstance().getConfig(
-            ConfigurationKeys.METRICS_PREFIX + ConfigurationKeys.METRICS_EXPORTER_LIST, null);
+            ConfigurationKeys.METRICS_PREFIX + ConfigurationKeys.METRICS_EXPORTER_LIST, DEFAULT_METRICS_EXPORTER_LIST);
         if (!StringUtils.isNullOrEmpty(exporterTypeNameList)) {
             String[] exporterTypeNames = exporterTypeNameList.split(",");
             for (String exporterTypeName : exporterTypeNames) {

metrics/seata-metrics-core/src/main/java/io/seata/metrics/registry/RegistryFactory.java

@@ -23,6 +23,8 @@
 import io.seata.config.ConfigurationFactory;
 import io.seata.core.constants.ConfigurationKeys;
 
+import static io.seata.common.DefaultValues.DEFAULT_METRICS_REGISTRY_TYPE;
+
 /**
  * Registry Factory for load configured metrics registry
  *
@@ -32,7 +34,7 @@ public class RegistryFactory {
     public static Registry getInstance() {
         RegistryType registryType;
         String registryTypeName = ConfigurationFactory.getInstance().getConfig(
-            ConfigurationKeys.METRICS_PREFIX + ConfigurationKeys.METRICS_REGISTRY_TYPE, null);
+            ConfigurationKeys.METRICS_PREFIX + ConfigurationKeys.METRICS_REGISTRY_TYPE, DEFAULT_METRICS_REGISTRY_TYPE);
         if (!StringUtils.isNullOrEmpty(registryTypeName)) {
             try {
                 registryType = RegistryType.getType(registryTypeName);

metrics/seata-metrics-exporter-prometheus/src/main/java/io/seata/metrics/exporter/prometheus/PrometheusExporter.java

@@ -30,6 +30,7 @@
 import io.seata.metrics.exporter.Exporter;
 import io.seata.metrics.registry.Registry;
 
+import static io.seata.common.DefaultValues.DEFAULT_PROMETHEUS_PORT;
 import static io.seata.core.constants.ConfigurationKeys.METRICS_EXPORTER_PROMETHEUS_PORT;
 
 /**
@@ -46,7 +47,7 @@ public class PrometheusExporter extends Collector implements Collector.Describab
 
     public PrometheusExporter() throws IOException {
         int port = ConfigurationFactory.getInstance().getInt(
-            ConfigurationKeys.METRICS_PREFIX + METRICS_EXPORTER_PROMETHEUS_PORT, 9898);
+            ConfigurationKeys.METRICS_PREFIX + METRICS_EXPORTER_PROMETHEUS_PORT, DEFAULT_PROMETHEUS_PORT);
         this.server = new HTTPServer(port, true);
         this.register();
     }