From 4af38cc914f947da67c11e1c9161e1d8c10d87a8 Mon Sep 17 00:00:00 2001
From: wt_better <yixia.wt@alibaba-inc.com>
Date: Tue, 17 Dec 2024 16:32:16 +0800
Subject: [PATCH] optimize:  UPDATE changes AND version (#7060)

---
 build/pom.xml          |   2 +-
 changes/en-us/2.3.0.md | 128 +++++++++++++++++++++++++++++++++++++++++
 changes/en-us/2.x.md   | 101 ++++++--------------------------
 changes/zh-cn/2.3.0.md | 119 ++++++++++++++++++++++++++++++++++++++
 changes/zh-cn/2.x.md   | 102 ++++++--------------------------
 5 files changed, 282 insertions(+), 170 deletions(-)
 create mode 100644 changes/en-us/2.3.0.md
 create mode 100644 changes/zh-cn/2.3.0.md

diff --git a/build/pom.xml b/build/pom.xml
index c8e53dd9a14..726f3d940d4 100644
--- a/build/pom.xml
+++ b/build/pom.xml
@@ -71,7 +71,7 @@
 
     <properties>
         <!-- seata version -->
-        <revision>2.3.0-SNAPSHOT</revision>
+        <revision>2.3.0</revision>
 
         <!-- Compiler settings properties -->
         <java.version>1.8</java.version>
diff --git a/changes/en-us/2.3.0.md b/changes/en-us/2.3.0.md
new file mode 100644
index 00000000000..883b19b1f27
--- /dev/null
+++ b/changes/en-us/2.3.0.md
@@ -0,0 +1,128 @@
+### 2.3.0
+
+<details>
+  <summary><mark>Release notes</mark></summary>	
+
+### Apache Seata(incubating) 2.3.0
+
+Seata 2.3.0 Released.
+
+Seata is an easy-to-use, high-performance, open source distributed transaction solution.
+
+The version is updated as follows:
+
+### feature:
+
+- [[#6904](https://github.com/apache/incubator-seata/pull/6904)] add fastjson2 serializer support
+- [[#6876](https://github.com/apache/incubator-seata/pull/6876)] support kingbase
+- [[#6881](https://github.com/apache/incubator-seata/pull/6881)] support grpc
+- [[#6864](https://github.com/apache/incubator-seata/pull/6864)] support shentong database
+- [[#6974](https://github.com/apache/incubator-seata/pull/6974)] support fastjson2 undolog parser
+- [[#6992](https://github.com/apache/incubator-seata/pull/6992)] support grpc serializer
+- [[#6973](https://github.com/apache/incubator-seata/pull/6973)] support saga annotation
+- [[#6926](https://github.com/apache/incubator-seata/pull/6926)] support ssl communication for raft nodes
+
+### bugfix:
+
+- [[#6899](https://github.com/apache/incubator-seata/pull/6899)] fix file.conf read failed after package
+- [[#6890](https://github.com/apache/incubator-seata/pull/6890)] fix designerJson to standardJson: subStateMachine
+  compensateState cannot be recognized
+- [[#6907](https://github.com/apache/incubator-seata/pull/6907)] fix the issue of Codecov not generating reports
+- [[#6923](https://github.com/apache/incubator-seata/pull/6923)] Enhance 401 Error Handling by Refreshing Token
+- [[#6925](https://github.com/apache/incubator-seata/pull/6925)] fix the issue in Raft model a follower's crash may lead
+  to the continued use of expired tokens
+- [[#6932](https://github.com/apache/incubator-seata/pull/6932)] when enabling local transactions, the lock contention
+  failure in file & raft mode does not exit, leading to a lingering lock
+- [[#6940](https://github.com/apache/incubator-seata/pull/6940)] Fix NacosRegistry lookup behavior
+  transactionServiceGroup is empty causing NPE error
+- [[#6943](https://github.com/apache/incubator-seata/pull/6943)] fix the conversion error for `convertBranchSession` in
+  concurrent environment.
+- [[#6948](https://github.com/apache/incubator-seata/pull/6948)] Fix the CI build issue on the ARM64 platform
+- [[#6947](https://github.com/apache/incubator-seata/pull/6947)] fix npe for nacos registry when look up address
+- [[#6984](https://github.com/apache/incubator-seata/pull/6984)] support building docker image on openjdk23
+- [[#6994](https://github.com/apache/incubator-seata/pull/6994)] fix the problem of building undoLog exception when
+  update join does not update data
+- [[#7005](https://github.com/apache/incubator-seata/pull/7005)] fix the Raft NPE issue caused by two-phase concurrency
+- [[#7010](https://github.com/apache/incubator-seata/pull/7010)] fix error while the "context" is key word in DM8 when
+  delete undolog
+- [[#7022](https://github.com/apache/incubator-seata/pull/7022)] fix `store.mode` property
+  in `application.raft.example.yml`
+- [[#7025](https://github.com/apache/incubator-seata/pull/7025)] fix vGroupMappingManager is NOT init
+- [[#7044](https://github.com/apache/incubator-seata/pull/7044)] fix tableMeta refresh after closed
+-
+
+### optimize:
+
+- [[#6826](https://github.com/apache/incubator-seata/pull/6826)] remove the branch registration operation of the XA
+  read-only transaction
+- [[#6874](https://github.com/apache/incubator-seata/pull/6874)] modify the version to 2.3.0-SNAPSHOT
+- [[#6892](https://github.com/apache/incubator-seata/pull/6892)] upgrade npmjs version in console module
+- [[#6883](https://github.com/apache/incubator-seata/pull/6874)] remove write only object
+- [[#6892](https://github.com/apache/incubator-seata/pull/6892)] upgrade npmjs version
+- [[#6889](https://github.com/apache/incubator-seata/pull/6889)] Correct word spelling errors
+- [[#6898](https://github.com/apache/incubator-seata/pull/6898)] upgrade npmjs version in saga module
+- [[#6879](https://github.com/apache/incubator-seata/pull/6879)] fix log argument mismatch issue
+- [[#6902](https://github.com/apache/incubator-seata/pull/6900)] optimize readme docs
+- [[#6807](https://github.com/apache/incubator-seata/pull/6807)] splitting MergedWarpMessage enhances the server
+  parallel processing capability
+- [[#6905](https://github.com/apache/incubator-seata/pull/6905)] remove incompatible licenses at build time
+- [[#6906](https://github.com/apache/incubator-seata/pull/6906)] h2 dependency adds test scope
+- [[#6911](https://github.com/apache/incubator-seata/pull/6911)] fix some typos in project
+- [[#6918](https://github.com/apache/incubator-seata/pull/6918)] Use the openjdk image of eclipse-temurin as the base
+  image
+- [[#6938](https://github.com/apache/incubator-seata/pull/6938)] Update online chat information in README.md
+- [[#6950](https://github.com/apache/incubator-seata/pull/6950)] Remove JVM parameter app.id
+- [[#6959](https://github.com/apache/incubator-seata/pull/6959)] update the naming and description for
+  the `seata-http-jakarta` module
+- [[#6991](https://github.com/apache/incubator-seata/pull/6991)] gRPC serialization default to Protobuf
+- [[#6993](https://github.com/apache/incubator-seata/pull/6993)] optimize transaction metrics
+- [[#6995](https://github.com/apache/incubator-seata/pull/6995)] upgrade outdate npmjs dependencies
+- [[#6996](https://github.com/apache/incubator-seata/pull/6996)] optimize lock release logic in AT transaction mode
+- [[#7023](https://github.com/apache/incubator-seata/pull/7023)] optimize fail fast, when all server not available
+- [[#7027](https://github.com/apache/incubator-seata/pull/7027)] raft mode maintains the reload logic consistent with
+  the file
+- [[#6891](https://github.com/apache/incubator-seata/pull/6891)] add StateType Enum
+- [[#7040](https://github.com/apache/incubator-seata/pull/7040)] optimize the print info in ConfigurationFactory
+- [[#7046](https://github.com/apache/incubator-seata/pull/7046)] remove the dependency conflict for spring-webmvc
+- [[#7043](https://github.com/apache/incubator-seata/pull/7043)] finish rollback if sendResult/msg not found
+- [[#7051](https://github.com/apache/incubator-seata/pull/7051)] add namingserver jib
+- [[#7054](https://github.com/apache/incubator-seata/pull/7054)] In file mode when the lock cannot be acquired output
+  the holder's xid
+
+### refactor:
+
+- [[#7017](https://github.com/apache/incubator-seata/pull/7017)] remove dependency on seata-server module
+
+### test:
+
+- [[#6869](https://github.com/apache/incubator-seata/pull/6869)] Add unit tests for the `seata-core` module
+- [[#6927](https://github.com/apache/incubator-seata/pull/6927)] Add unit tests for the `seata-rocketmq` module
+- [[#7018](https://github.com/apache/incubator-seata/pull/7018)] Add unit tests for the `seata-tm` module
+- [[#7030](https://github.com/apache/incubator-seata/pull/7030)] Add unit tests for the `seata-common` module
+
+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)
+- [GoodBoyCoder](https://github.com/GoodBoyCoder)
+- [funky-eyes](https://github.com/funky-eyes)
+- [dk2k](https://github.com/dk2k)
+- [MaoMaoandSnail](https://github.com/MaoMaoandSnail)
+- [yougecn](https://github.com/yougecn)
+- [arrrnold17](https://github.com/arrrnold17)
+- [xjlgod](https://github.com/xjlgod)
+- [PleaseGiveMeTheCoke](https://github.com/PleaseGiveMeTheCoke)
+- [dsomehan](https://github.com/dsomehan)
+- [psxjoy](https://github.com/psxjoy)
+- [xingfudeshi](https://github.com/xingfudeshi)
+- [o-jimin](https://github.com/o-jimin)
+- [lixingjia77](https://github.com/lixingjia77)
+- [whaon](https://github.com/whaon)
+- [YvCeung](https://github.com/YvCeung)
+- [jsbxyyx](https://github.com/jsbxyyx)
+- [lightClouds917](https://github.com/lightClouds917)
+- [Muluo-cyan](https://github.com/Muluo-cyan)
+- [MaoMaoandSnail](https://github.com/MaoMaoandSnail)
+
+Also, we receive many valuable issues, questions and advices from our community. Thanks for you all.
diff --git a/changes/en-us/2.x.md b/changes/en-us/2.x.md
index 1b7dd65812c..0dc00393b96 100644
--- a/changes/en-us/2.x.md
+++ b/changes/en-us/2.x.md
@@ -3,99 +3,34 @@ Add changes here for all PR submitted to the 2.x branch.
 <!-- Please add the `changes` to the following location(feature/bugfix/optimize/test) based on the type of PR -->
 
 ### feature:
-- [[#6904](https://github.com/apache/incubator-seata/pull/6904)] add fastjson2 serializer support
-- [[#6876](https://github.com/apache/incubator-seata/pull/6876)] support kingbase
-- [[#6881](https://github.com/apache/incubator-seata/pull/6881)] support grpc
-- [[#6864](https://github.com/apache/incubator-seata/pull/6864)] support shentong database
-- [[#6974](https://github.com/apache/incubator-seata/pull/6974)] support fastjson2 undolog parser
-- [[#6992](https://github.com/apache/incubator-seata/pull/6992)] support grpc serializer
-- [[#6973](https://github.com/apache/incubator-seata/pull/6973)] support saga annotation
-- [[#6926](https://github.com/apache/incubator-seata/pull/6926)] support ssl communication for raft nodes
 
+- [[#PR_NO](https://github.com/seata/seata/pull/PR_NO)] support XXX
 
 ### bugfix:
-- [[#6899](https://github.com/apache/incubator-seata/pull/6899)] fix file.conf read failed after package
-- [[#6890](https://github.com/apache/incubator-seata/pull/6890)] fix designerJson to standardJson: subStateMachine compensateState cannot be recognized
-- [[#6907](https://github.com/apache/incubator-seata/pull/6907)] fix the issue of Codecov not generating reports
-- [[#6923](https://github.com/apache/incubator-seata/pull/6923)] Enhance 401 Error Handling by Refreshing Token
-- [[#6925](https://github.com/apache/incubator-seata/pull/6925)] fix the issue in Raft model a follower's crash may lead to the continued use of expired tokens
-- [[#6932](https://github.com/apache/incubator-seata/pull/6932)] when enabling local transactions, the lock contention failure in file & raft mode does not exit, leading to a lingering lock
-- [[#6940](https://github.com/apache/incubator-seata/pull/6940)] Fix NacosRegistry lookup behavior transactionServiceGroup is empty causing NPE error
-- [[#6943](https://github.com/apache/incubator-seata/pull/6943)] fix the conversion error for `convertBranchSession` in concurrent environment.
-- [[#6948](https://github.com/apache/incubator-seata/pull/6948)] Fix the CI build issue on the ARM64 platform
-- [[#6947](https://github.com/apache/incubator-seata/pull/6947)] fix npe for nacos registry when look up address
-- [[#6984](https://github.com/apache/incubator-seata/pull/6984)] support building docker image on openjdk23
-- [[#6994](https://github.com/apache/incubator-seata/pull/6994)] fix the problem of building undoLog exception when update join does not update data
-- [[#7005](https://github.com/apache/incubator-seata/pull/7005)] fix the Raft NPE issue caused by two-phase concurrency
-- [[#7010](https://github.com/apache/incubator-seata/pull/7010)] fix error while the "context" is key word in DM8 when delete undolog
-- [[#7022](https://github.com/apache/incubator-seata/pull/7022)] fix `store.mode` property in `application.raft.example.yml`
-- [[#7025](https://github.com/apache/incubator-seata/pull/7025)] fix vGroupMappingManager is NOT init
-- [[#7044](https://github.com/apache/incubator-seata/pull/7044)] fix tableMeta refresh after closed
-- 
+
+- [[#PR_NO](https://github.com/apache/incubator-seata/pull/#PR_NO)] fix XXX
+
 ### optimize:
-- [[#6826](https://github.com/apache/incubator-seata/pull/6826)] remove the branch registration operation of the XA read-only transaction
-- [[#6874](https://github.com/apache/incubator-seata/pull/6874)] modify the version to 2.3.0-SNAPSHOT
-- [[#6892](https://github.com/apache/incubator-seata/pull/6892)] upgrade npmjs version in console module
-- [[#6883](https://github.com/apache/incubator-seata/pull/6874)] remove write only object
-- [[#6892](https://github.com/apache/incubator-seata/pull/6892)] upgrade npmjs version
-- [[#6889](https://github.com/apache/incubator-seata/pull/6889)] Correct word spelling errors
-- [[#6898](https://github.com/apache/incubator-seata/pull/6898)] upgrade npmjs version in saga module
-- [[#6879](https://github.com/apache/incubator-seata/pull/6879)] fix log argument mismatch issue
-- [[#6902](https://github.com/apache/incubator-seata/pull/6900)] optimize readme docs
-- [[#6807](https://github.com/apache/incubator-seata/pull/6807)] splitting MergedWarpMessage enhances the server parallel processing capability
-- [[#6905](https://github.com/apache/incubator-seata/pull/6905)] remove incompatible licenses at build time
-- [[#6906](https://github.com/apache/incubator-seata/pull/6906)] h2 dependency adds test scope 
-- [[#6911](https://github.com/apache/incubator-seata/pull/6911)] fix some typos in project
-- [[#6918](https://github.com/apache/incubator-seata/pull/6918)] Use the openjdk image of eclipse-temurin as the base image
-- [[#6938](https://github.com/apache/incubator-seata/pull/6938)] Update online chat information in README.md 
-- [[#6950](https://github.com/apache/incubator-seata/pull/6950)] Remove JVM parameter app.id
-- [[#6959](https://github.com/apache/incubator-seata/pull/6959)] update the naming and description for the `seata-http-jakarta` module
-- [[#6991](https://github.com/apache/incubator-seata/pull/6991)] gRPC serialization default to Protobuf
-- [[#6993](https://github.com/apache/incubator-seata/pull/6993)] optimize transaction metrics
-- [[#6995](https://github.com/apache/incubator-seata/pull/6995)] upgrade outdate npmjs dependencies
-- [[#6996](https://github.com/apache/incubator-seata/pull/6996)] optimize lock release logic in AT transaction mode
-- [[#7023](https://github.com/apache/incubator-seata/pull/7023)] optimize fail fast, when all server not available
-- [[#7027](https://github.com/apache/incubator-seata/pull/7027)] raft mode maintains the reload logic consistent with the file
-- [[#6891](https://github.com/apache/incubator-seata/pull/6891)] add StateType Enum
-- [[#7040](https://github.com/apache/incubator-seata/pull/7040)] optimize the print info in ConfigurationFactory
-- [[#7046](https://github.com/apache/incubator-seata/pull/7046)] remove the dependency conflict for spring-webmvc
-- [[#7043](https://github.com/apache/incubator-seata/pull/7043)] finish rollback if sendResult/msg not found
-- [[#7051](https://github.com/apache/incubator-seata/pull/7051)] add namingserver jib
-- [[#7054](https://github.com/apache/incubator-seata/pull/7054)] In file mode when the lock cannot be acquired output the holder's xid
 
-### refactor:
-- [[#7017](https://github.com/apache/incubator-seata/pull/7017)] remove dependency on seata-server module
+- [[#PR_NO](https://github.com/apache/incubator-seata/pull/PR_NO)] optimize XXX
 
+### security:
+
+- [[#PR_NO](https://github.com/apache/incubator-seata/pull/PR_NO)] upgrade XXX
 
 ### test:
-- [[#6869](https://github.com/apache/incubator-seata/pull/6869)] Add unit tests for the `seata-core` module
-- [[#6927](https://github.com/apache/incubator-seata/pull/6927)] Add unit tests for the `seata-rocketmq` module
-- [[#7018](https://github.com/apache/incubator-seata/pull/7018)] Add unit tests for the `seata-tm` module
-- [[#7030](https://github.com/apache/incubator-seata/pull/7030)] Add unit tests for the `seata-common` module
+
+- [[#PR_NO](https://github.com/apache/incubator-seata/pull/PR_NO)] test XXX
+
+### refactor:
+
+- [[#PR_NO](https://github.com/apache/incubator-seata/pull/PR_NO)] refactor XXX
 
 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)
-- [GoodBoyCoder](https://github.com/GoodBoyCoder)
-- [funky-eyes](https://github.com/funky-eyes)
-- [dk2k](https://github.com/dk2k)
-- [MaoMaoandSnail](https://github.com/MaoMaoandSnail)
-- [yougecn](https://github.com/yougecn)
-- [arrrnold17](https://github.com/arrrnold17)
-- [xjlgod](https://github.com/xjlgod)
-- [PleaseGiveMeTheCoke](https://github.com/PleaseGiveMeTheCoke)
-- [dsomehan](https://github.com/dsomehan)
-- [psxjoy](https://github.com/psxjoy)
-- [xingfudeshi](https://github.com/xingfudeshi)
-- [o-jimin](https://github.com/o-jimin)
-- [lixingjia77](https://github.com/lixingjia77)
-- [whaon](https://github.com/whaon)
-- [YvCeung](https://github.com/YvCeung)
-- [jsbxyyx](https://github.com/jsbxyyx)
-- [lightClouds917](https://github.com/lightClouds917)
-- [Muluo-cyan](https://github.com/Muluo-cyan)
-- [MaoMaoandSnail](https://github.com/MaoMaoandSnail)
-
-
-Also, we receive many valuable issues, questions and advices from our community. Thanks for you all.
+- [GITHUB_ID](https://github.com/GITHUB_ID)
+
+Also, we receive many valuable issues, questions and advices from our community. Thanks for you all.
\ No newline at end of file
diff --git a/changes/zh-cn/2.3.0.md b/changes/zh-cn/2.3.0.md
new file mode 100644
index 00000000000..e1a9f681511
--- /dev/null
+++ b/changes/zh-cn/2.3.0.md
@@ -0,0 +1,119 @@
+### 2.3.0
+
+<details>
+  <summary><mark>Release notes</mark></summary>
+
+### Apache Seata(incubating) 2.3.0
+
+Apache Seata(incubating) 2.3.0 发布。
+
+Apache Seata(incubating) 是一款开源的分布式事务解决方案，提供高性能和简单易用的分布式事务服务。
+此版本更新如下：
+
+### feature:
+
+- [[#6904](https://github.com/apache/incubator-seata/pull/6904)] 增加Fastjson2序列化Rpc消息支持
+- [[#6876](https://github.com/apache/incubator-seata/pull/6876)] 支持人大金仓数据库(kingbase)
+- [[#6881](https://github.com/apache/incubator-seata/pull/6881)] client和server支持grpc协议
+- [[#6864](https://github.com/apache/incubator-seata/pull/6864)] 支持神通数据库(oscar)
+- [[#6974](https://github.com/apache/incubator-seata/pull/6974)] 支持UndoLog的fastjson2序列化方式
+- [[#6992](https://github.com/apache/incubator-seata/pull/6992)] 支持grpc序列化器
+- [[#6995](https://github.com/apache/incubator-seata/pull/6995)] 升级过时的 npmjs 依赖
+- [[#6973](https://github.com/apache/incubator-seata/pull/6973)] 支持saga注解化
+- [[#6926](https://github.com/apache/incubator-seata/pull/6926)] 支持Raft节点间的SSL通信
+
+### bugfix:
+
+- [[#6899](https://github.com/apache/incubator-seata/pull/6899)] 修复file.conf打包后的读取
+- [[#6890](https://github.com/apache/incubator-seata/pull/6890)] 修复saga设计json转标准json过程中: 子状态机补偿节点无法被识别
+- [[#6907](https://github.com/apache/incubator-seata/pull/6907)] 修复Codecov未生成报告的问题
+- [[#6923](https://github.com/apache/incubator-seata/pull/6923)] 增强 401 错误处理，通过刷新令牌
+- [[#6925](https://github.com/apache/incubator-seata/pull/6925)] 修复Raft模式下，Follower崩溃可能导致Client继续使用过期令牌的问题
+- [[#6932](https://github.com/apache/incubator-seata/pull/6932)] 修复开启本地事务时file&raft模式下锁争抢失败未退出导致可能出现残留锁
+- [[#6940](https://github.com/apache/incubator-seata/pull/6940)] 修复NacosRegistry lookup 行为 transactionServiceGroup
+  为空导致 NPE 错误
+- [[#6943](https://github.com/apache/incubator-seata/pull/6943)] 修复并发状态下 `convertBranchSession` 转换报错问题
+- [[#6948](https://github.com/apache/incubator-seata/pull/6948)] 修复在ARM64平台下CI构建出错的问题
+- [[#6947](https://github.com/apache/incubator-seata/pull/6947)] 修复nacos注册中心查询可用地址时的空指针问题
+- [[#6984](https://github.com/apache/incubator-seata/pull/6984)] 修复 openjdk23 版本下无法构建 docker 镜像的问题
+- [[#6994](https://github.com/apache/incubator-seata/pull/6994)] 修复updateJoin语句未更新到数据时prepareUndoLog异常
+- [[#7005](https://github.com/apache/incubator-seata/pull/7005)] 修复Raft模式下两阶段并发可能导致NPE的问题
+- [[#7010](https://github.com/apache/incubator-seata/pull/7010)] 修复使用达梦数据库时删除undolog发生SQL语法错误
+- [[#7022](https://github.com/apache/incubator-seata/pull/7022)] 修复 `application.raft.example.yml`的 `store.mode`属性
+- [[#7025](https://github.com/apache/incubator-seata/pull/7025)] 修复vGroupMappingManager未初始化的问题
+- [[#7044](https://github.com/apache/incubator-seata/pull/7044)] 修复TableMeta在数据源关闭后刷新错误问题
+
+### optimize:
+
+- [[#6826](https://github.com/apache/incubator-seata/pull/6826)] 移除只读XA事务的分支注册操作
+- [[#6874](https://github.com/apache/incubator-seata/pull/6874)] modify the version to 2.3.0-SNAPSHOT
+- [[#6892](https://github.com/apache/incubator-seata/pull/6892)] 升级 console 模块 npmjs 版本
+- [[#6874](https://github.com/apache/incubator-seata/pull/6874)] 修改版本为2.3.0-SNAPSHOT
+- [[#6883](https://github.com/apache/incubator-seata/pull/6874)] 删除代码中无用对象的创建
+- [[#6892](https://github.com/apache/incubator-seata/pull/6892)] 升级 npmjs 版本
+- [[#6889](https://github.com/apache/incubator-seata/pull/6889)] 修正单词拼写错误
+- [[#6898](https://github.com/apache/incubator-seata/pull/6898)] 升级 saga 模块 npmjs 版本
+- [[#6879](https://github.com/apache/incubator-seata/pull/6879)] 修复日志参数不匹配问题
+- [[#6898](https://github.com/apache/incubator-seata/pull/6898)] 升级 saga 模块 npmjs 版本
+- [[#6902](https://github.com/apache/incubator-seata/pull/6900)] 优化 readme 文档
+- [[#6807](https://github.com/apache/incubator-seata/pull/6807)] 分离merge消息使其能完全并行处理
+- [[#6905](https://github.com/apache/incubator-seata/pull/6905)] 移除构建期不兼容的 license
+- [[#6906](https://github.com/apache/incubator-seata/pull/6906)] h2依赖添加test scope
+- [[#6911](https://github.com/apache/incubator-seata/pull/6911)] 修正项目中的部分拼写错误
+- [[#6918](https://github.com/apache/incubator-seata/pull/6918)] 使用eclipse-temurin的openjdk镜像作为基础镜像
+- [[#6938](https://github.com/apache/incubator-seata/pull/6938)] 更新 README.md 中的社区联系信息
+- [[#6950](https://github.com/apache/incubator-seata/pull/6950)] 移除JVM参数app.id
+- [[#6959](https://github.com/apache/incubator-seata/pull/6959)] 修正 `seata-http-jakarta`的模块命名和描述
+- [[#6991](https://github.com/apache/incubator-seata/pull/6991)] gRPC协议序列化默认值为protobuf
+- [[#6996](https://github.com/apache/incubator-seata/pull/6996)] 优化 AT 事务模式锁释放逻辑
+- [[#6993](https://github.com/apache/incubator-seata/pull/6993)] 优化 metrics 指标
+- [[#6995](https://github.com/apache/incubator-seata/pull/6995)] 升级过时的 npmjs 依赖
+- [[#6996](https://github.com/apache/incubator-seata/pull/6996)] 优化 AT 事务模式锁释放逻辑
+- [[#7023](https://github.com/apache/incubator-seata/pull/7023)] 优化快速失败
+- [[#7027](https://github.com/apache/incubator-seata/pull/7027)] raft模式下reload行为与file保持一致
+- [[#6891](https://github.com/apache/incubator-seata/pull/6891)] 增加 StateType 类型
+- [[#7040](https://github.com/apache/incubator-seata/pull/7040)] 优化ConfigurationFactory加载的打印信息
+- [[#7046](https://github.com/apache/incubator-seata/pull/7046)] 去除spring-webmvc的依赖冲突
+- [[#7043](https://github.com/apache/incubator-seata/pull/7043)] 在获取不到mq的sendResult时，直接完成回滚
+- [[#7051](https://github.com/apache/incubator-seata/pull/7051)] 为namingserver模块添加Jib支持以构建Docker镜像
+- [[#7054](https://github.com/apache/incubator-seata/pull/7054)] file模式中竞争不到锁时输出持有者的xid
+
+### refactor:
+
+- [[#7017](https://github.com/apache/incubator-seata/pull/7017)] 移除 seata-server 模块的依赖
+
+### test:
+
+- [[#6869](https://github.com/apache/incubator-seata/pull/6869)] 增加`seata-core`测试用例覆盖率
+- [[#6927](https://github.com/apache/incubator-seata/pull/6927)] 增加`seata-rocketmq`模块的测试用例
+- [[#7018](https://github.com/apache/incubator-seata/pull/7018)] 增加 `seata-tm` 模块的测试用例
+- [[#7030](https://github.com/apache/incubator-seata/pull/7030)] 增加 `seata-common` 模块的测试用例
+
+非常感谢以下 contributors 的代码贡献。若有无意遗漏，请报告。
+
+<!-- 请确保您的 GitHub ID 在以下列表中 -->
+
+- [slievrly](https://github.com/slievrly)
+- [GoodBoyCoder](https://github.com/GoodBoyCoder)
+- [funky-eyes](https://github.com/funky-eyes)
+- [dk2k](https://github.com/dk2k)
+- [MaoMaoandSnail](https://github.com/MaoMaoandSnail)
+- [yougecn](https://github.com/yougecn)
+- [arrrnold17](https://github.com/arrrnold17)
+- [xjlgod](https://github.com/xjlgod)
+- [PleaseGiveMeTheCoke](https://github.com/PleaseGiveMeTheCoke)
+- [dsomehan](https://github.com/dsomehan)
+- [psxjoy](https://github.com/psxjoy)
+- [xingfudeshi](https://github.com/xingfudeshi)
+- [o-jimin](https://github.com/o-jimin)
+- [lixingjia77](https://github.com/lixingjia77)
+- [whaon](https://github.com/whaon)
+- [YvCeung](https://github.com/YvCeung)
+- [jsbxyyx](https://github.com/jsbxyyx)
+- [lightClouds917](https://github.com/lightClouds917)
+- [Muluo-cyan](https://github.com/Muluo-cyan)
+- [MaoMaoandSnail](https://github.com/MaoMaoandSnail)
+
+同时，我们收到了社区反馈的很多有价值的issue和建议，非常感谢大家。
+
+]()
\ No newline at end of file
diff --git a/changes/zh-cn/2.x.md b/changes/zh-cn/2.x.md
index 9d6ad0afab3..5c76d15a1b0 100644
--- a/changes/zh-cn/2.x.md
+++ b/changes/zh-cn/2.x.md
@@ -3,104 +3,34 @@
 <!-- 请根据PR的类型添加 `变更记录` 到以下对应位置(feature/bugfix/optimize/test) 下 -->
 
 ### feature:
-- [[#6904](https://github.com/apache/incubator-seata/pull/6904)] 增加Fastjson2序列化Rpc消息支持
-- [[#6876](https://github.com/apache/incubator-seata/pull/6876)] 支持人大金仓数据库(kingbase)
-- [[#6881](https://github.com/apache/incubator-seata/pull/6881)] client和server支持grpc协议
-- [[#6864](https://github.com/apache/incubator-seata/pull/6864)] 支持神通数据库(oscar)
-- [[#6974](https://github.com/apache/incubator-seata/pull/6974)] 支持UndoLog的fastjson2序列化方式
-- [[#6992](https://github.com/apache/incubator-seata/pull/6992)] 支持grpc序列化器
-- [[#6995](https://github.com/apache/incubator-seata/pull/6995)] 升级过时的 npmjs 依赖
-- [[#6973](https://github.com/apache/incubator-seata/pull/6973)] 支持saga注解化
-- [[#6926](https://github.com/apache/incubator-seata/pull/6926)] 支持Raft节点间的SSL通信
+
+- [[#PR_NO](https://github.com/seata/seata/pull/PR_NO)] 支持XXX
 
 ### bugfix:
-- [[#6899](https://github.com/apache/incubator-seata/pull/6899)] 修复file.conf打包后的读取
-- [[#6890](https://github.com/apache/incubator-seata/pull/6890)] 修复saga设计json转标准json过程中: 子状态机补偿节点无法被识别
-- [[#6907](https://github.com/apache/incubator-seata/pull/6907)] 修复Codecov未生成报告的问题
-- [[#6923](https://github.com/apache/incubator-seata/pull/6923)] 增强 401 错误处理，通过刷新令牌
-- [[#6925](https://github.com/apache/incubator-seata/pull/6925)] 修复Raft模式下，Follower崩溃可能导致Client继续使用过期令牌的问题
-- [[#6932](https://github.com/apache/incubator-seata/pull/6932)] 修复开启本地事务时file&raft模式下锁争抢失败未退出导致可能出现残留锁
-- [[#6940](https://github.com/apache/incubator-seata/pull/6940)] 修复NacosRegistry lookup 行为 transactionServiceGroup 为空导致 NPE 错误
-- [[#6943](https://github.com/apache/incubator-seata/pull/6943)] 修复并发状态下 `convertBranchSession` 转换报错问题
-- [[#6948](https://github.com/apache/incubator-seata/pull/6948)] 修复在ARM64平台下CI构建出错的问题
-- [[#6947](https://github.com/apache/incubator-seata/pull/6947)] 修复nacos注册中心查询可用地址时的空指针问题
-- [[#6984](https://github.com/apache/incubator-seata/pull/6984)] 修复 openjdk23 版本下无法构建 docker 镜像的问题
-- [[#6994](https://github.com/apache/incubator-seata/pull/6994)] 修复updateJoin语句未更新到数据时prepareUndoLog异常
-- [[#7005](https://github.com/apache/incubator-seata/pull/7005)] 修复Raft模式下两阶段并发可能导致NPE的问题
-- [[#7010](https://github.com/apache/incubator-seata/pull/7010)] 修复使用达梦数据库时删除undolog发生SQL语法错误
-- [[#7022](https://github.com/apache/incubator-seata/pull/7022)] 修复 `application.raft.example.yml`的 `store.mode`属性
-- [[#7025](https://github.com/apache/incubator-seata/pull/7025)] 修复vGroupMappingManager未初始化的问题
-- [[#7044](https://github.com/apache/incubator-seata/pull/7044)] 修复TableMeta在数据源关闭后刷新错误问题
+
+- [[#PR_NO](https://github.com/apache/incubator-seata/pull/#PR_NO)] 修复XXX
 
 ### optimize:
-- [[#6826](https://github.com/apache/incubator-seata/pull/6826)] 移除只读XA事务的分支注册操作
-- [[#6874](https://github.com/apache/incubator-seata/pull/6874)] modify the version to 2.3.0-SNAPSHOT
-- [[#6892](https://github.com/apache/incubator-seata/pull/6892)] 升级 console 模块 npmjs 版本
-- [[#6874](https://github.com/apache/incubator-seata/pull/6874)] 修改版本为2.3.0-SNAPSHOT
-- [[#6883](https://github.com/apache/incubator-seata/pull/6874)] 删除代码中无用对象的创建
-- [[#6892](https://github.com/apache/incubator-seata/pull/6892)] 升级 npmjs 版本
-- [[#6889](https://github.com/apache/incubator-seata/pull/6889)] 修正单词拼写错误
-- [[#6898](https://github.com/apache/incubator-seata/pull/6898)] 升级 saga 模块 npmjs 版本
-- [[#6879](https://github.com/apache/incubator-seata/pull/6879)] 修复日志参数不匹配问题
-- [[#6898](https://github.com/apache/incubator-seata/pull/6898)] 升级 saga 模块 npmjs 版本 
-- [[#6902](https://github.com/apache/incubator-seata/pull/6900)] 优化 readme 文档
-- [[#6807](https://github.com/apache/incubator-seata/pull/6807)] 分离merge消息使其能完全并行处理
-- [[#6905](https://github.com/apache/incubator-seata/pull/6905)] 移除构建期不兼容的 license
-- [[#6906](https://github.com/apache/incubator-seata/pull/6906)] h2依赖添加test scope
-- [[#6911](https://github.com/apache/incubator-seata/pull/6911)] 修正项目中的部分拼写错误
-- [[#6918](https://github.com/apache/incubator-seata/pull/6918)] 使用eclipse-temurin的openjdk镜像作为基础镜像
-- [[#6938](https://github.com/apache/incubator-seata/pull/6938)] 更新 README.md 中的社区联系信息
-- [[#6950](https://github.com/apache/incubator-seata/pull/6950)] 移除JVM参数app.id
-- [[#6959](https://github.com/apache/incubator-seata/pull/6959)] 修正 `seata-http-jakarta`的模块命名和描述
-- [[#6991](https://github.com/apache/incubator-seata/pull/6991)] gRPC协议序列化默认值为protobuf
-- [[#6996](https://github.com/apache/incubator-seata/pull/6996)] 优化 AT 事务模式锁释放逻辑
-- [[#6993](https://github.com/apache/incubator-seata/pull/6993)] 优化 metrics 指标
-- [[#6995](https://github.com/apache/incubator-seata/pull/6995)] 升级过时的 npmjs 依赖
-- [[#6996](https://github.com/apache/incubator-seata/pull/6996)] 优化 AT 事务模式锁释放逻辑
-- [[#7023](https://github.com/apache/incubator-seata/pull/7023)] 优化快速失败
-- [[#7027](https://github.com/apache/incubator-seata/pull/7027)] raft模式下reload行为与file保持一致
-- [[#6891](https://github.com/apache/incubator-seata/pull/6891)] 增加 StateType 类型
-- [[#7040](https://github.com/apache/incubator-seata/pull/7040)] 优化ConfigurationFactory加载的打印信息
-- [[#7046](https://github.com/apache/incubator-seata/pull/7046)] 去除spring-webmvc的依赖冲突
-- [[#7043](https://github.com/apache/incubator-seata/pull/7043)] 在获取不到mq的sendResult时，直接完成回滚
-- [[#7051](https://github.com/apache/incubator-seata/pull/7051)] 为namingserver模块添加Jib支持以构建Docker镜像
-- [[#7054](https://github.com/apache/incubator-seata/pull/7054)] file模式中竞争不到锁时输出持有者的xid
 
-### refactor:
-- [[#7017](https://github.com/apache/incubator-seata/pull/7017)] 移除 seata-server 模块的依赖
+- [[#PR_NO](https://github.com/apache/incubator-seata/pull/PR_NO)] 优化XXX
+
+### security:
 
+- [[#PR_NO](https://github.com/apache/incubator-seata/pull/PR_NO)] 升级XXX
 
 ### test:
-- [[#6869](https://github.com/apache/incubator-seata/pull/6869)] 增加`seata-core`测试用例覆盖率
-- [[#6927](https://github.com/apache/incubator-seata/pull/6927)] 增加`seata-rocketmq`模块的测试用例
-- [[#7018](https://github.com/apache/incubator-seata/pull/7018)] 增加 `seata-tm` 模块的测试用例
-- [[#7030](https://github.com/apache/incubator-seata/pull/7030)] 增加 `seata-common` 模块的测试用例
 
+- [[#PR_NO](https://github.com/apache/incubator-seata/pull/PR_NO)] 测试XXX
+
+### refactor:
+
+- [[#PR_NO](https://github.com/apache/incubator-seata/pull/PR_NO)] 重构XXX
 
 非常感谢以下 contributors 的代码贡献。若有无意遗漏，请报告。
 
 <!-- 请确保您的 GitHub ID 在以下列表中 -->
+
 - [slievrly](https://github.com/slievrly)
-- [GoodBoyCoder](https://github.com/GoodBoyCoder)
-- [funky-eyes](https://github.com/funky-eyes)
-- [dk2k](https://github.com/dk2k)
-- [MaoMaoandSnail](https://github.com/MaoMaoandSnail)
-- [yougecn](https://github.com/yougecn)
-- [arrrnold17](https://github.com/arrrnold17)
-- [xjlgod](https://github.com/xjlgod)
-- [PleaseGiveMeTheCoke](https://github.com/PleaseGiveMeTheCoke)
-- [dsomehan](https://github.com/dsomehan)
-- [psxjoy](https://github.com/psxjoy)
-- [xingfudeshi](https://github.com/xingfudeshi)
-- [o-jimin](https://github.com/o-jimin)
-- [lixingjia77](https://github.com/lixingjia77)
-- [whaon](https://github.com/whaon)
-- [YvCeung](https://github.com/YvCeung)
-- [jsbxyyx](https://github.com/jsbxyyx)
-- [lightClouds917](https://github.com/lightClouds917)
-- [Muluo-cyan](https://github.com/Muluo-cyan)
-- [MaoMaoandSnail](https://github.com/MaoMaoandSnail)
-
-
-同时，我们收到了社区反馈的很多有价值的issue和建议，非常感谢大家。
+- [GITHUB_ID](https://github.com/GITHUB_ID)
 
+同时，我们收到了社区反馈的很多有价值的issue和建议，非常感谢大家。
\ No newline at end of file