bugfix: the issue where connection held during the first phase of PostgreSQL cannot be rollback (#6825)

Author: xiaoxiangyeyu0

changes/en-us/2.x.md

@@ -36,7 +36,7 @@ Add changes here for all PR submitted to the 2.x branch.
 - [[#6812](https://github.com/apache/incubator-seata/pull/6812)] bugfix: change group and node offline status are not pushed in real time
 - [[#6817](https://github.com/apache/incubator-seata/pull/6817)] bugfix: fix namingserver changVgroup failed
 - [[#6820](https://github.com/apache/incubator-seata/pull/6820)] Fix file path error in the Dockerfile
-
+- [[#6825](https://github.com/apache/incubator-seata/pull/6825)] Fix the issue of XA mode transaction timeout and inability to roll back in Postgres
 
 
 ### optimize:
@@ -134,5 +134,6 @@ Thanks to these contributors for their code commits. Please report an unintended
 - [l81893521](https://github.com/l81893521)
 - [laywin](https://github.com/laywin)
 - [xingfudeshi](https://github.com/xingfudeshi)
+- [xiaoxiangyeyu0](https://github.com/xiaoxiangyeyu0)
 
 Also, we receive many valuable issues, questions and advices from our community. Thanks for you all.

changes/zh-cn/2.x.md

@@ -37,6 +37,7 @@
 - [[#6759](https://github.com/apache/incubator-seata/pull/6759)] 修复跨库表主动刷新`tableMeta`的异常问题
 - [[#6817](https://github.com/apache/incubator-seata/pull/6817)] 修复namingserver切换事务分组失效的问题
 - [[#6820](https://github.com/apache/incubator-seata/pull/6820)] 修复Dockerfile得文件结构错误
+- [[#6825](https://github.com/apache/incubator-seata/pull/6825)] 修复Postgres的XA模式事务超时无法回滚问题
 - 
 ### optimize:
 - [[#6499](https://github.com/apache/incubator-seata/pull/6499)] 拆分 committing 和 rollbacking 状态的任务线程池
@@ -134,6 +135,7 @@
 - [l81893521](https://github.com/l81893521)
 - [laywin](https://github.com/laywin)
 - [xingfudeshi](https://github.com/xingfudeshi)
+- [xiaoxiangyeyu0](https://github.com/xiaoxiangyeyu0)
 
 同时，我们收到了社区反馈的很多有价值的issue和建议，非常感谢大家。
 

rm-datasource/src/main/java/org/apache/seata/rm/datasource/xa/ConnectionProxyXA.java

@@ -140,8 +140,12 @@ public synchronized void xaCommit(String xid, long branchId, String applicationD
      * @param applicationData application data
      */
     public synchronized void xaRollback(String xid, long branchId, String applicationData) throws XAException {
-        XAXid xaXid = XAXidBuilder.build(xid, branchId);
-        xaRollback(xaXid);
+        if (this.xaBranchXid != null) {
+            xaRollback(xaBranchXid);
+        } else {
+            XAXid xaXid = XAXidBuilder.build(xid, branchId);
+            xaRollback(xaXid);
+        }
     }
 
     /**