refactor: 优化事务监听工具

Author: zhou-hao

hsweb-commons/hsweb-commons-crud/src/main/java/org/hswebframework/web/crud/utils/TransactionUtils.java

@@ -54,13 +54,17 @@ public static <T> Flux<T> tryRunInTransaction(Flux<T> task, TransactionDefinitio
     public static Mono<Void> afterCommitWithOutTransaction(Mono<Void> task) {
         return TransactionUtils.registerSynchronization(
             new TransactionSynchronization() {
+
                 @Override
                 @NonNull
-                public Mono<Void> afterCommit() {
-                    return task;
+                public Mono<Void> afterCompletion(int status) {
+                    if (status == TransactionSynchronization.STATUS_COMMITTED) {
+                        return task;
+                    }
+                    return TransactionSynchronization.super.afterCompletion(status);
                 }
             },
-            TransactionSynchronization::afterCommit
+            sync -> sync.afterCompletion(TransactionSynchronization.STATUS_COMMITTED)
         );
     }
 
@@ -69,12 +73,16 @@ public static Mono<Void> afterCommit(Mono<Void> task) {
             new TransactionSynchronization() {
                 @Override
                 @NonNull
-                public Mono<Void> afterCommit() {
-                    // 开启新事务
-                    return tryRunInTransaction(task, PROPAGATION_REQUIRES_NEW_DEF);
+                public Mono<Void> afterCompletion(int status) {
+                    if (status == TransactionSynchronization.STATUS_COMMITTED) {
+                        // 开启新事务
+                        return tryRunInTransaction(task, PROPAGATION_REQUIRES_NEW_DEF);
+                    }
+                    return TransactionSynchronization.super.afterCompletion(status);
                 }
             },
-            TransactionSynchronization::afterCommit
+
+            sync -> sync.afterCompletion(TransactionSynchronization.STATUS_COMMITTED)
         );
     }