Merge branch 'develop' into 0710

Author: funky-eyes

README.md

@@ -82,7 +82,7 @@ For more details about principle and design, please go to [Seata wiki page](http
 
 ## Maven dependency
 ```xml
-<seata.version>1.5.1</seata.version>
+<seata.version>1.5.2</seata.version>
 
 <dependency>
     <groupId>io.seata</groupId>

all/pom.xml

@@ -26,7 +26,6 @@
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>seata-all</artifactId>
-
     <name>Seata All-in-one ${project.version}</name>
     <description>Seata is an easy-to-use, high-performance, java based, open source distributed transaction solution.</description>
 

build/pom.xml

@@ -63,7 +63,7 @@
 
     <properties>
         <!-- seata version -->
-        <revision>1.5.2-SNAPSHOT</revision>
+        <revision>1.6.0-SNAPSHOT</revision>
 
         <!-- Compiler settings properties -->
         <java.version>1.8</java.version>
@@ -121,6 +121,8 @@
         <!-- For docker image-->
         <image.publish.skip>true</image.publish.skip>
         <image.tags>latest</image.tags>
+
+        <dependencies.copy.skip>true</dependencies.copy.skip>
     </properties>
 
     <build>

changes/en-us/1.5.2.md

@@ -0,0 +1,88 @@
+### 1.5.2
+
+[source](https://github.com/seata/seata/archive/v1.5.2.zip) |
+[binary](https://github.com/seata/seata/releases/download/v1.5.2/seata-server-1.5.2.zip)
+
+<details>	
+  <summary><mark>Release notes</mark></summary>	
+
+
+### Seata 1.5.2
+
+Seata 1.5.2 Released.
+
+Seata is an easy-to-use, high-performance, open source distributed transaction solution.
+
+The version is updated as follows:
+
+### feature：
+- [[#4661](https://github.com/seata/seata/pull/4713)] support xid consistency load balance
+- [[#4676](https://github.com/seata/seata/pull/4676)] support server to expose Nacos services by mounting SLB
+- [[#4642](https://github.com/seata/seata/pull/4642)] support batch message parallel processing
+- [[#4567](https://github.com/seata/seata/pull/4567)] support where method condition(find_in_set)
+
+
+### bugfix：
+- [[#4515](https://github.com/seata/seata/pull/4515)] fix the error of SeataTCCFenceAutoConfiguration when database unused
+- [[#4661](https://github.com/seata/seata/pull/4661)] fix sql exception with PostgreSQL in module console
+- [[#4667](https://github.com/seata/seata/pull/4682)] fix the exception in RedisTransactionStoreManager for update map During iteration
+- [[#4678](https://github.com/seata/seata/pull/4678)] fix the error of key transport.enableRmClientBatchSendRequest cache penetration if not configure
+- [[#4701](https://github.com/seata/seata/pull/4701)] fix missing command line args
+- [[#4607](https://github.com/seata/seata/pull/4607)] fix bug on skipping lock check
+- [[#4696](https://github.com/seata/seata/pull/4696)] fix oracle database insert value
+- [[#4726](https://github.com/seata/seata/pull/4726)] fix batch message send may return NullPointException
+- [[#4729](https://github.com/seata/seata/pull/4729)] fix set AspectTransactional.rollbackForClassName with wrong value
+- [[#4653](https://github.com/seata/seata/pull/4653)] fix the sql exception when pk is non-numeric in INSERT_ON_DUPLICATE SQL
+
+### optimize：
+- [[#4650](https://github.com/seata/seata/pull/4650)] fix some security vulnerabilities
+- [[#4670](https://github.com/seata/seata/pull/4670)] optimize the thread pool size of branchResultMessageExecutor
+- [[#4662](https://github.com/seata/seata/pull/4662)] optimize rollback transaction metrics
+- [[#4693](https://github.com/seata/seata/pull/4693)] optimize the console navigation bar
+- [[#4700](https://github.com/seata/seata/pull/4700)] fix maven-compiler-plugin and maven-resources-plugin execute failed
+- [[#4711](https://github.com/seata/seata/pull/4711)] separate lib dependencies for deployments
+- [[#4720](https://github.com/seata/seata/pull/4720)] optimize pom description
+- [[#4728](https://github.com/seata/seata/pull/4728)] upgrade logback dependency to 1.2.9
+- [[#4745](https://github.com/seata/seata/pull/4745)] support mysql8 in release package
+- [[#4626](https://github.com/seata/seata/pull/4626)] Replace `flatten-maven-plugin` with `easyj-maven-plugin` to fix the conflict between `shade` and `flatten`
+- [[#4629](https://github.com/seata/seata/pull/4629)] check relation of before status and after status when updating global session
+- [[#4662](https://github.com/seata/seata/pull/4662)] make EnhancedServiceLoader more readable
+
+### test:
+
+- [[#4544](https://github.com/seata/seata/pull/4544)] optimize jackson dependencies in TransactionContextFilterTest
+- [[#4731](https://github.com/seata/seata/pull/4731)] fix UT failed in AsyncWorkerTest and LockManagerTest
+
+Thanks to these contributors for their code commits. Please report an unintended omission.
+
+<!-- Please make sure your Github ID is in the list below -->
+- [slievrly](https://github.com/slievrly)
+- [pengten](https://github.com/pengten)
+- [YSF-A](https://github.com/YSF-A)
+- [tuwenlin](https://github.com/tuwenlin)
+- [Ifdevil](https://github.com/Ifdevil)
+- [wingchi-leung](https://github.com/wingchi-leung)
+- [liurong](https://github.com/robynron)
+- [opelok-z](https://github.com/opelok-z)
+- [a364176773](https://github.com/a364176773)
+- [2129zxl](https://github.com/2129zxl)
+- [Smery-lxm](https://github.com/Smery-lxm)
+- [doubleDimple](https://github.com/doubleDimple)
+- [wangliang181230](https://github.com/wangliang181230)
+- [Bughue](https://github.com/Bughue)
+- [AYue-94](https://github.com/AYue-94)
+- [lingxiao-wu](https://github.com/lingxiao-wu)
+- [caohdgege](https://github.com/caohdgege)
+
+
+Also, we receive many valuable issues, questions and advices from our community. Thanks for you all.
+
+#### Link
+
+- **Seata:** https://github.com/seata/seata
+- **Seata-Samples:** https://github.com/seata/seata-samples
+- **Release:** https://github.com/seata/seata/releases
+- **WebSite:** https://seata.io
+
+
+</details>

changes/en-us/develop.md

@@ -4,51 +4,21 @@ Add changes here for all PR submitted to the develop branch.
 <!-- Please add the `changes` to the following location(feature/bugfix/optimize/test) based on the type of PR -->
 
 ### feature：
-  - [[#4661](https://github.com/seata/seata/pull/4713)] support xid load balance
-  - [[#4676](https://github.com/seata/seata/pull/4676)] support server to expose Nacos services by mounting SLB
-  - [[#4642](https://github.com/seata/seata/pull/4642)] support batch message parallel processing
 
 
 ### bugfix：
-  - [[#4515](https://github.com/seata/seata/pull/4515)] fix the error of SeataTCCFenceAutoConfiguration when database unused
-  - [[#4661](https://github.com/seata/seata/pull/4661)] fix sql exception with PostgreSQL in module console
-  - [[#4667](https://github.com/seata/seata/pull/4682)] fix the exception in RedisTransactionStoreManager for update map During iteration
-  - [[#4678](https://github.com/seata/seata/pull/4678)] fix the error of key transport.enableRmClientBatchSendRequest cache penetration if not configure
-  - [[#4701](https://github.com/seata/seata/pull/4701)] fix missing command line args
-  - [[#4607](https://github.com/seata/seata/pull/4607)] fix bug on skipping lock check
-  - [[#4696](https://github.com/seata/seata/pull/4696)] fix oracle database insert value
-  - [[#4726](https://github.com/seata/seata/pull/4726)] fix batch message send may return NullPointException
-  - [[#4729](https://github.com/seata/seata/pull/4729)] fix set AspectTransactional.rollbackForClassName with wrong value
+  
 
 ### optimize：
-  - [[#4650](https://github.com/seata/seata/pull/4650)] fix some security vulnerabilities
-  - [[#4670](https://github.com/seata/seata/pull/4670)] optimize the thread pool size of branchResultMessageExecutor
-  - [[#4662](https://github.com/seata/seata/pull/4662)] optimize rollback transaction metrics
-  - [[#4693](https://github.com/seata/seata/pull/4693)] optimize the console navigation bar
-  - [[#4700](https://github.com/seata/seata/pull/4700)] fix maven-compiler-plugin and maven-resources-plugin execute failed
-  - [[#4711](https://github.com/seata/seata/pull/4711)] separate lib dependencies for deployments
-  - [[#4720](https://github.com/seata/seata/pull/4720)] optimize pom description
-  - [[#4728](https://github.com/seata/seata/pull/4728)] upgrade logback dependency to 1.2.9
-  - [[#4745](https://github.com/seata/seata/pull/4745)] support mysql8 in release package
+- [[#4774](https://github.com/seata/seata/pull/4774)] optimize mysql8 dependencies for seataio/seata-server image 
 
 ### test:
 
-  - [[#4544](https://github.com/seata/seata/pull/4544)] optimize jackson dependencies in TransactionContextFilterTest
-  - [[#4731](https://github.com/seata/seata/pull/4731)] fix UT failed in AsyncWorkerTest and LockManagerTest
 
 Thanks to these contributors for their code commits. Please report an unintended omission.
 
 <!-- Please make sure your Github ID is in the list below -->
 - [slievrly](https://github.com/slievrly)
-- [pengten](https://github.com/pengten)
-- [YSF-A](https://github.com/YSF-A)
-- [tuwenlin](https://github.com/tuwenlin)
-- [Ifdevil](https://github.com/Ifdevil)
-- [wingchi-leung](https://github.com/wingchi-leung)
-- [liurong](https://github.com/robynron)
-- [opelok-z](https://github.com/opelok-z)
-- [a364176773](https://github.com/a364176773)
-- [2129zxl](https://github.com/2129zxl)
-- [Smery-lxm](https://github.com/Smery-lxm)
+
 
 Also, we receive many valuable issues, questions and advices from our community. Thanks for you all.

changes/zh-cn/1.5.2.md

@@ -0,0 +1,89 @@
+### 1.5.2
+
+[source](https://github.com/seata/seata/archive/v1.5.2.zip) |
+[binary](https://github.com/seata/seata/releases/download/v1.5.2/seata-server-1.5.2.zip)
+
+<details>
+  <summary><mark>Release notes</mark></summary>
+
+
+### Seata 1.5.2
+
+Seata 1.5.2  发布。
+
+Seata 是一款开源的分布式事务解决方案，提供高性能和简单易用的分布式事务服务。
+
+此版本更新如下：
+
+### feature：
+- [[#4661](https://github.com/seata/seata/pull/4713)] 支持根据xid负载均衡算法
+- [[#4676](https://github.com/seata/seata/pull/4676)] 支持Nacos作为注册中心时，server通过挂载SLB暴露服务
+- [[#4642](https://github.com/seata/seata/pull/4642)] 支持client批量请求并行处理
+- [[#4567](https://github.com/seata/seata/pull/4567)] 支持where条件中find_in_set函数
+
+
+### bugfix：
+- [[#4515](https://github.com/seata/seata/pull/4515)] 修复develop分支SeataTCCFenceAutoConfiguration在客户端未使用DB时，启动抛出ClassNotFoundException的问题。
+- [[#4661](https://github.com/seata/seata/pull/4661)] 修复控制台中使用PostgreSQL出现的SQL异常
+- [[#4667](https://github.com/seata/seata/pull/4682)] 修复develop分支RedisTransactionStoreManager迭代时更新map的异常
+- [[#4678](https://github.com/seata/seata/pull/4678)] 修复属性transport.enableRmClientBatchSendRequest没有配置的情况下缓存穿透的问题
+- [[#4701](https://github.com/seata/seata/pull/4701)] 修复命令行参数丢失问题
+- [[#4607](https://github.com/seata/seata/pull/4607)] 修复跳过全局锁校验的缺陷
+- [[#4696](https://github.com/seata/seata/pull/4696)] 修复 oracle 存储模式时的插入问题
+- [[#4726](https://github.com/seata/seata/pull/4726)] 修复批量发送消息时可能的NPE问题
+- [[#4729](https://github.com/seata/seata/pull/4729)] 修复AspectTransactional.rollbackForClassName设置错误
+- [[#4653](https://github.com/seata/seata/pull/4653)] 修复 INSERT_ON_DUPLICATE 主键为非数值异常
+
+### optimize：
+- [[#4650](https://github.com/seata/seata/pull/4650)] 修复安全漏洞
+- [[#4670](https://github.com/seata/seata/pull/4670)] 优化branchResultMessageExecutor线程池的线程数
+- [[#4662](https://github.com/seata/seata/pull/4662)] 优化回滚事务监控指标
+- [[#4693](https://github.com/seata/seata/pull/4693)] 优化控制台导航栏
+- [[#4700](https://github.com/seata/seata/pull/4700)] 修复 maven-compiler-plugin 和 maven-resources-plugin 执行失败
+- [[#4711](https://github.com/seata/seata/pull/4711)] 分离部署时 lib 依赖
+- [[#4720](https://github.com/seata/seata/pull/4720)] 优化pom描述
+- [[#4728](https://github.com/seata/seata/pull/4728)] 将logback版本依赖升级至1.2.9
+- [[#4745](https://github.com/seata/seata/pull/4745)] 发行包中支持 mysql8 driver
+- [[#4626](https://github.com/seata/seata/pull/4626)] 使用 `easyj-maven-plugin` 插件代替 `flatten-maven-plugin`插件，以修复`shade` 插件与 `flatten` 插件不兼容的问题
+- [[#4629](https://github.com/seata/seata/pull/4629)] 更新globalSession状态时检查更改前后的约束关系
+- [[#4662](https://github.com/seata/seata/pull/4662)] 优化 EnhancedServiceLoader 可读性
+
+
+### test：
+- [[#4544](https://github.com/seata/seata/pull/4544)] 优化TransactionContextFilterTest中jackson包依赖问题
+- [[#4731](https://github.com/seata/seata/pull/4731)] 修复 AsyncWorkerTest 和 LockManagerTest 的单测问题。
+
+
+非常感谢以下 contributors 的代码贡献。若有无意遗漏，请报告。
+
+<!-- 请确保您的 GitHub ID 在以下列表中 -->
+- [slievrly](https://github.com/slievrly)
+- [pengten](https://github.com/pengten)
+- [YSF-A](https://github.com/YSF-A)
+- [tuwenlin](https://github.com/tuwenlin)
+- [2129zxl](https://github.com/2129zxl)
+- [Ifdevil](https://github.com/Ifdevil)
+- [wingchi-leung](https://github.com/wingchi-leung)
+- [liurong](https://github.com/robynron)
+- [opelok-z](https://github.com/opelok-z)
+- [a364176773](https://github.com/a364176773)
+- [Smery-lxm](https://github.com/Smery-lxm)
+- [lvekee](https://github.com/lvekee)
+- [doubleDimple](https://github.com/doubleDimple)
+- [wangliang181230](https://github.com/wangliang181230)
+- [Bughue](https://github.com/Bughue)
+- [AYue-94](https://github.com/AYue-94)
+- [lingxiao-wu](https://github.com/lingxiao-wu)
+- [caohdgege](https://github.com/caohdgege)
+
+同时，我们收到了社区反馈的很多有价值的issue和建议，非常感谢大家。
+
+
+#### Link
+
+- **Seata:** https://github.com/seata/seata
+- **Seata-Samples:** https://github.com/seata/seata-samples
+- **Release:** https://github.com/seata/seata/releases
+- **WebSite:** https://seata.io
+
+</details>

changes/zh-cn/develop.md

@@ -3,52 +3,21 @@
 <!-- 请根据PR的类型添加 `变更记录` 到以下对应位置(feature/bugfix/optimize/test) 下 -->
 
 ### feature：
-  - [[#4661](https://github.com/seata/seata/pull/4713)] 支持根据xid负载均衡算法
-  - [[#4676](https://github.com/seata/seata/pull/4676)] 支持Nacos作为注册中心时，server通过挂载SLB暴露服务
-  - [[#4642](https://github.com/seata/seata/pull/4642)] 支持client批量请求并行处理
 
 
 ### bugfix：
-  - [[#4515](https://github.com/seata/seata/pull/4515)] 修复develop分支SeataTCCFenceAutoConfiguration在客户端未使用DB时，启动抛出ClassNotFoundException的问题。
-  - [[#4661](https://github.com/seata/seata/pull/4661)] 修复控制台中使用PostgreSQL出现的SQL异常
-  - [[#4667](https://github.com/seata/seata/pull/4682)] 修复develop分支RedisTransactionStoreManager迭代时更新map的异常
-  - [[#4678](https://github.com/seata/seata/pull/4678)] 修复属性transport.enableRmClientBatchSendRequest没有配置的情况下缓存穿透的问题
-  - [[#4701](https://github.com/seata/seata/pull/4701)] 修复命令行参数丢失问题
-  - [[#4607](https://github.com/seata/seata/pull/4607)] 修复跳过全局锁校验的缺陷
-  - [[#4696](https://github.com/seata/seata/pull/4696)] 修复 oracle 存储模式时的插入问题
-  - [[#4726](https://github.com/seata/seata/pull/4726)] 修复批量发送消息时可能的NPE问题
-  - [[#4729](https://github.com/seata/seata/pull/4729)] 修复AspectTransactional.rollbackForClassName设置错误
+
 
 ### optimize：
-  - [[#4650](https://github.com/seata/seata/pull/4650)] 修复安全漏洞
-  - [[#4670](https://github.com/seata/seata/pull/4670)] 优化branchResultMessageExecutor线程池的线程数
-  - [[#4662](https://github.com/seata/seata/pull/4662)] 优化回滚事务监控指标
-  - [[#4693](https://github.com/seata/seata/pull/4693)] 优化控制台导航栏
-  - [[#4700](https://github.com/seata/seata/pull/4700)] 修复 maven-compiler-plugin 和 maven-resources-plugin 执行失败
-  - [[#4711](https://github.com/seata/seata/pull/4711)] 分离部署时 lib 依赖
-  - [[#4720](https://github.com/seata/seata/pull/4720)] 优化pom描述
-  - [[#4728](https://github.com/seata/seata/pull/4728)] 将logback版本依赖升级至1.2.9
-  - [[#4745](https://github.com/seata/seata/pull/4745)] 发行包中支持 mysql8 driver
+- [[#4774](https://github.com/seata/seata/pull/4774)] 优化 seataio/seata-server 镜像中的 mysql8 依赖
+
 
 ### test：
-  - [[#4544](https://github.com/seata/seata/pull/4544)] 优化TransactionContextFilterTest中jackson包依赖问题
-  - [[#4731](https://github.com/seata/seata/pull/4731)] 修复 AsyncWorkerTest 和 LockManagerTest 的单测问题。
 
 
 非常感谢以下 contributors 的代码贡献。若有无意遗漏，请报告。
 
 <!-- 请确保您的 GitHub ID 在以下列表中 -->
 - [slievrly](https://github.com/slievrly)
-- [pengten](https://github.com/pengten)
-- [YSF-A](https://github.com/YSF-A)
-- [tuwenlin](https://github.com/tuwenlin)
-- [2129zxl](https://github.com/2129zxl)
-- [Ifdevil](https://github.com/Ifdevil)
-- [wingchi-leung](https://github.com/wingchi-leung)
-- [liurong](https://github.com/robynron)
-- [opelok-z](https://github.com/opelok-z)
-- [a364176773](https://github.com/a364176773)
-- [Smery-lxm](https://github.com/Smery-lxm)
-- [lvekee](https://github.com/lvekee)
 
 同时，我们收到了社区反馈的很多有价值的issue和建议，非常感谢大家。

core/src/main/java/io/seata/core/protocol/Version.java

@@ -36,7 +36,7 @@ public class Version {
     /**
      * The constant CURRENT.
      */
-    private static final String CURRENT = "1.5.2-SNAPSHOT";
+    private static final String CURRENT = "1.6.0-SNAPSHOT";
     private static final String VERSION_0_7_1 = "0.7.1";
     private static final String VERSION_1_5_0 = "1.5.0";
     private static final int MAX_VERSION_DOT = 3;

discovery/seata-discovery-nacos/src/main/java/io/seata/discovery/registry/nacos/NacosRegistryServiceImpl.java

@@ -24,13 +24,15 @@
 import java.util.concurrent.ConcurrentMap;
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;
+
 import com.alibaba.nacos.api.NacosFactory;
 import com.alibaba.nacos.api.naming.NamingMaintainService;
 import com.alibaba.nacos.api.naming.NamingService;
 import com.alibaba.nacos.api.naming.listener.EventListener;
 import com.alibaba.nacos.api.naming.listener.NamingEvent;
 import com.alibaba.nacos.api.naming.pojo.Instance;
 import com.alibaba.nacos.api.naming.pojo.Service;
+
 import io.seata.common.util.CollectionUtils;
 import io.seata.common.util.NetUtil;
 import io.seata.common.util.StringUtils;
@@ -145,7 +147,9 @@ public List<InetSocketAddress> lookup(String key) throws Exception {
             return null;
         }
         if (useSLBWay) {
-            LOGGER.info("look up service address of SLB by nacos");
+            if (LOGGER.isDebugEnabled()) {
+                LOGGER.debug("look up service address of SLB by nacos");
+            }
             if (!CLUSTER_ADDRESS_MAP.containsKey(PUBLIC_NAMING_ADDRESS_PREFIX + clusterName)) {
                 Service service = getNamingMaintainInstance().queryService(DEFAULT_APPLICATION, clusterName);
                 String pubnetIp = service.getMetadata().get(PUBLIC_NAMING_SERVICE_META_IP_KEY);

pom.xml

@@ -155,6 +155,9 @@
             <properties>
                 <image.publish.skip>false</image.publish.skip>
                 <image.tags>latest</image.tags>
+                <dependencies.copy.skip>false</dependencies.copy.skip>
+                <mysql.jdbc.version>5.1.35</mysql.jdbc.version>
+                <mysql8.jdbc.version>8.0.27</mysql8.jdbc.version>
             </properties>
         </profile>
         <!-- profile: arrch64 -->