1、优化异步commit，cancel操作，在线程池调用中propagationExistBegin事务，具体看代码

2、添加新的事务恢复类TransactionRecovery_1_2

1、优化异步commit，cancel操作，在线程池调用中propagationExistBegin事务，具体看代码
2、添加新的事务恢复类TransactionRecovery_1_2
徐烜
1 parent 7d9feadf
Showing 11 changed files with 438 additions and 123 deletions
pom.xml
tcc-transaction-core/pom.xml
tcc-transaction-core/src/main/java/org/mengyun/tcctransaction/TransactionManager.java
tcc-transaction-core/src/main/java/org/mengyun/tcctransaction/recover/TransactionRecovery.java
tcc-transaction-core/src/main/java/org/mengyun/tcctransaction/recover/TransactionRecovery_1_1.java
tcc-transaction-core/src/main/java/org/mengyun/tcctransaction/recover/TransactionRecovery_1_2.java
tcc-transaction-core/src/main/java/org/mengyun/tcctransaction/repository/TransactionRepository.java
tcc-transaction-core/src/main/java/org/mengyun/tcctransaction/repository/impl/CachableTransactionRepository.java
tcc-transaction-core/src/main/java/org/mengyun/tcctransaction/repository/impl/JdbcTransactionRepository.java
tcc-transaction-spring/src/main/java/org/mengyun/tcctransaction/spring/recover/RecoverScheduledJob.java
tcc-transaction-spring/src/main/resources/tcc-transaction.xml
@@ -31,6 +31,8 @@
         <toolkit-google-guava.version>19.0</toolkit-google-guava.version>
         <toolkit-javac-janino.version>2.7.8</toolkit-javac-janino.version>
+        <toolkit-apache-commons-lang3.version>3.4</toolkit-apache-commons-lang3.version>
+        <toolkit-alibaba-fastjson.version>1.2.62</toolkit-alibaba-fastjson.version>
         <fullstack-springframework.version>4.2.5.RELEASE</fullstack-springframework.version>
@@ -60,6 +62,22 @@
             </dependency>
             <!-- google相关 end -->
+            <!-- apache-common相关 begin -->
+            <dependency>
+                <groupId>org.apache.commons</groupId>
+                <artifactId>commons-lang3</artifactId>
+                <version>${toolkit-apache-commons-lang3.version}</version>
+            </dependency>
+            <!-- apache-common相关 end -->
+
+            <!-- json相关 begin -->
+            <dependency>
+                <groupId>com.alibaba</groupId>
+                <artifactId>fastjson</artifactId>
+                <version>${toolkit-alibaba-fastjson.version}</version>
+            </dependency>
+            <!-- json相关 end -->
+
             <!-- 日志处理相关 begin -->
             <dependency>
                 <groupId>org.slf4j</groupId>
@@ -24,6 +24,20 @@
         </dependency>
         <!-- google相关 end -->
+        <!-- apache commons相关 begin -->
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-lang3</artifactId>
+        </dependency>
+        <!-- apache commons相关 end -->
+
+        <!-- json相关 begin -->
+        <dependency>
+            <groupId>com.alibaba</groupId>
+            <artifactId>fastjson</artifactId>
+        </dependency>
+        <!-- json相关 end -->
+
         <!-- 日志处理相关 begin -->
         <dependency>
             <groupId>org.slf4j</groupId>
@@ -2,6 +2,7 @@ package org.mengyun.tcctransaction;
 import org.mengyun.tcctransaction.api.TransactionContext;
 import org.mengyun.tcctransaction.api.TransactionStatus;
+import org.mengyun.tcctransaction.api.TransactionXid;
 import org.mengyun.tcctransaction.api.UuidUtils;
 import org.mengyun.tcctransaction.exception.CancellingException;
 import org.mengyun.tcctransaction.exception.ConfirmingException;
@@ -70,7 +71,22 @@ public class TransactionManager {
                 executorService.submit(new Runnable() {
                     @Override
                     public void run() {
-                        commitTransaction(transaction);
+                        // 注意：不同线程必须这样做，否则在业务方法中无法获取Transaction
+                        // 传播需要恢复的事务上下文
+                        try {
+                            TransactionContext transactionContext = new TransactionContext(
+                                    new TransactionXid(
+                                            transaction.getXid().getGlobalTransactionId(),
+                                            transaction.getXid().getBranchQualifier()),
+                                    transaction.getStatus().getId()
+                            );
+                            propagationExistBegin(transactionContext);
+
+                            commitTransaction(transaction);
+                        } catch (NoExistedTransactionException exp) {
+                            LOG.error("async propagation transaction error!", exp);
+                        }
+
                     }
                 });
                 LOG.debug("async submit cost time:" + (System.currentTimeMillis() - statTime));
@@ -110,7 +126,22 @@ public class TransactionManager {
                 executorService.submit(new Runnable() {
                     @Override
                     public void run() {
-                        rollbackTransaction(transaction);
+                        // 注意：不同线程必须这样做，否则在业务方法中无法获取Transaction
+                        // 传播需要恢复的事务上下文
+                        try {
+                            TransactionContext transactionContext = new TransactionContext(
+                                    new TransactionXid(
+                                            transaction.getXid().getGlobalTransactionId(),
+                                            transaction.getXid().getBranchQualifier()),
+                                    transaction.getStatus().getId()
+                            );
+                            propagationExistBegin(transactionContext);
+
+                            rollbackTransaction(transaction);
+                        } catch (NoExistedTransactionException exp) {
+                            LOG.error("async propagation transaction error!", exp);
+                        }
+
                     }
                 });
             } catch (Throwable exp) {
 package org.mengyun.tcctransaction.recover;
-import org.mengyun.tcctransaction.Transaction;
-import org.mengyun.tcctransaction.TransactionType;
-import org.mengyun.tcctransaction.api.TransactionContext;
-import org.mengyun.tcctransaction.api.TransactionStatus;
-import org.mengyun.tcctransaction.api.TransactionXid;
-import org.mengyun.tcctransaction.repository.TransactionRepository;
-import org.mengyun.tcctransaction.support.TransactionConfigurator;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.util.ArrayList;
-import java.util.Calendar;
-import java.util.Date;
-import java.util.List;
-
 /**
- * Created by changmingxie on 11/10/15.
- * 事务恢复.
+ * 事务恢复接口。
  */
-public class TransactionRecovery {
-    /** 日志记录器 */
-    private static final Logger LOG = LoggerFactory.getLogger(TransactionRecovery.class);
-
-    /** TCC事务配置器 */
-    private TransactionConfigurator transactionConfigurator;
-    public void setTransactionConfigurator(TransactionConfigurator transactionConfigurator) {
-        this.transactionConfigurator = transactionConfigurator;
-    }
-
+public interface TransactionRecovery {
     /**
      * 启动事务恢复操作(被RecoverScheduledJob定时任务调用).
      */
-    public void startRecover() {
-        List<Transaction> transactions = loadErrorTransactions(); // 找出所有执行错误的事务信息
-        recoverErrorTransactions(transactions);
-    }
-
-    /**
-     * 找出所有执行错误的事务信息
-     * @return
-     */
-    private List<Transaction> loadErrorTransactions() {
-
-        TransactionRepository transactionRepository = transactionConfigurator.getTransactionRepository();
-
-        long currentTimeInMillis = Calendar.getInstance().getTimeInMillis();
-
-        // 找出相关时间内的异常ROOT类型的事务
-        List<Transaction> transactions = transactionRepository.findAllUnmodifiedSince(
-                new Date(currentTimeInMillis - transactionConfigurator.getRecoverConfig().getRecoverDuration() * 1000),
-                TransactionType.ROOT);
-
-        List<Transaction> recoverTransactions = new ArrayList<>();
-
-        for (Transaction transaction : transactions) {
-            // 检验记录是否已经被修改（版本校验）
-            int result = transactionRepository.update(transaction);
-
-            if (result > 0) {
-                recoverTransactions.add(transaction);
-            }
-        }
-
-        // 日志输出，调试用
-        if (!transactions.isEmpty()){
-            LOG.debug("==>TransactionRecovery loadErrorTransactions transactions size:" + transactions.size());
-        }
-
-        return recoverTransactions;
-    }
-
-
-    /**
-     * 恢复错误的事务.
-     * @param transactions
-     */
-    private void recoverErrorTransactions(List<Transaction> transactions) {
-
-        for (Transaction transaction : transactions) {
-
-            if (transaction.getRetriedCount() > transactionConfigurator.getRecoverConfig().getMaxRetryCount()) {
-                // 超过次数的，跳过
-                LOG.error(String.format(
-                        "TransactionRecovery recover failed with max retry count,will not try again. txid:%s, status:%s,retried count:%d",
-                        transaction.getXid(), transaction.getStatus().getId(), transaction.getRetriedCount()));
-                continue;
-            }
-
-            try {
-                transaction.addRetriedCount(); // 重试次数+1
-
-                // 传播需要恢复的事务上下文
-                TransactionContext transactionContext = new TransactionContext(
-                        new TransactionXid(
-                                transaction.getXid().getGlobalTransactionId(),
-                                transaction.getXid().getBranchQualifier()),
-                        transaction.getStatus().getId()
-                );
-                transactionConfigurator.getTransactionManager().propagationExistBegin(transactionContext);
-
-                if (transaction.getStatus().equals(TransactionStatus.CONFIRMING)) {
-                    // 如果是CONFIRMING(2)状态，则将事务往前执行
-                    transaction.changeStatus(TransactionStatus.CONFIRMING);
-                    transactionConfigurator.getTransactionRepository().update(transaction);
-                    transaction.commit();
-
-                } else {
-                    // 其他情况，把事务状态改为CANCELLING(3)，然后执行回滚
-                    transaction.changeStatus(TransactionStatus.CANCELLING);
-                    transactionConfigurator.getTransactionRepository().update(transaction);
-                    transaction.rollback();
-                }
-
-                // 其他情况下，超时没处理的事务日志直接删除
-                transactionConfigurator.getTransactionRepository().delete(transaction);
-            } catch (Throwable e) {
-                LOG.warn(String.format(
-                        "TransactionRecovery recover failed, txid:%s, status:%s,retried count:%d",
-                        transaction.getXid(), transaction.getStatus().getId(), transaction.getRetriedCount()), e);
-            }
-        }
-    }
+    void startRecover();
 }
+package org.mengyun.tcctransaction.recover;
+
+import org.mengyun.tcctransaction.Transaction;
+import org.mengyun.tcctransaction.TransactionType;
+import org.mengyun.tcctransaction.api.TransactionContext;
+import org.mengyun.tcctransaction.api.TransactionStatus;
+import org.mengyun.tcctransaction.api.TransactionXid;
+import org.mengyun.tcctransaction.repository.TransactionRepository;
+import org.mengyun.tcctransaction.support.TransactionConfigurator;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * Created by changmingxie on 11/10/15.
+ * 事务恢复.
+ */
+public class TransactionRecovery_1_1 implements TransactionRecovery {
+    /** 日志记录器 */
+    private static final Logger LOG = LoggerFactory.getLogger(TransactionRecovery_1_1.class);
+
+    /** TCC事务配置器 */
+    private TransactionConfigurator transactionConfigurator;
+    public void setTransactionConfigurator(TransactionConfigurator transactionConfigurator) {
+        this.transactionConfigurator = transactionConfigurator;
+    }
+
+    @Override
+    public void startRecover() {
+        List<Transaction> transactions = loadErrorTransactions(); // 找出所有执行错误的事务信息
+        recoverErrorTransactions(transactions);
+    }
+
+    /**
+     * 找出所有执行错误的事务信息（时间范围和事务类型）。
+     * @return
+     */
+    private List<Transaction> loadErrorTransactions() {
+
+        TransactionRepository transactionRepository = transactionConfigurator.getTransactionRepository();
+
+        long currentTimeInMillis = Calendar.getInstance().getTimeInMillis();
+
+        // 找出相关时间内的异常ROOT类型的事务
+        List<Transaction> transactions = transactionRepository.findAllUnmodifiedSince(
+                new Date(currentTimeInMillis - transactionConfigurator.getRecoverConfig().getRecoverDuration() * 1000),
+                TransactionType.ROOT);
+
+        List<Transaction> recoverTransactions = new ArrayList<>();
+
+        for (Transaction transaction : transactions) {
+            // 检验记录是否已经被修改（版本校验）
+            int result = transactionRepository.update(transaction);
+
+            if (result > 0) {
+                recoverTransactions.add(transaction);
+            }
+        }
+
+        // 日志输出，调试用
+        if (!transactions.isEmpty()){
+            LOG.debug("==>TransactionRecovery loadErrorTransactions transactions size:" + transactions.size());
+        }
+
+        return recoverTransactions;
+    }
+
+
+    /**
+     * 恢复错误的事务.
+     * @param transactions
+     */
+    private void recoverErrorTransactions(List<Transaction> transactions) {
+
+        for (Transaction transaction : transactions) {
+
+            if (transaction.getRetriedCount() > transactionConfigurator.getRecoverConfig().getMaxRetryCount()) {
+                // 超过最大恢复次数的，跳过
+                LOG.error(String.format(
+                        "TransactionRecovery recover failed with max retry count,will not try again. txid:%s, status:%s,retried count:%d",
+                        transaction.getXid(), transaction.getStatus().getId(), transaction.getRetriedCount()));
+                continue;
+            }
+
+            try {
+                transaction.addRetriedCount(); // 重试次数+1
+
+                // 传播需要恢复的事务上下文
+                TransactionContext transactionContext = new TransactionContext(
+                        new TransactionXid(
+                                transaction.getXid().getGlobalTransactionId(),
+                                transaction.getXid().getBranchQualifier()),
+                        transaction.getStatus().getId()
+                );
+                transactionConfigurator.getTransactionManager().propagationExistBegin(transactionContext);
+
+                if (transaction.getStatus().equals(TransactionStatus.CONFIRMING)) {
+                    // 如果是CONFIRMING(2)状态，则将事务往前执行
+                    transaction.changeStatus(TransactionStatus.CONFIRMING);
+                    transactionConfigurator.getTransactionRepository().update(transaction);
+                    transaction.commit();
+
+                } else {
+                    // 其他情况，把事务状态改为CANCELLING(3)，然后执行回滚
+                    transaction.changeStatus(TransactionStatus.CANCELLING);
+                    transactionConfigurator.getTransactionRepository().update(transaction);
+                    transaction.rollback();
+                }
+
+                // 其他情况下，超时没处理的事务日志直接删除
+                transactionConfigurator.getTransactionRepository().delete(transaction);
+            } catch (Throwable e) {
+                LOG.warn(String.format(
+                        "TransactionRecovery recover failed, txid:%s, status:%s,retried count:%d",
+                        transaction.getXid(), transaction.getStatus().getId(), transaction.getRetriedCount()), e);
+            }
+        }
+    }
+}
+package org.mengyun.tcctransaction.recover;
+
+import com.alibaba.fastjson.JSON;
+import org.apache.commons.lang3.exception.ExceptionUtils;
+import org.mengyun.tcctransaction.Transaction;
+import org.mengyun.tcctransaction.TransactionType;
+import org.mengyun.tcctransaction.api.TransactionContext;
+import org.mengyun.tcctransaction.api.TransactionStatus;
+import org.mengyun.tcctransaction.api.TransactionXid;
+import org.mengyun.tcctransaction.exception.OptimisticLockException;
+import org.mengyun.tcctransaction.repository.TransactionRepository;
+import org.mengyun.tcctransaction.support.TransactionConfigurator;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.Calendar;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 事务恢复1.2版本。
+ */
+public class TransactionRecovery_1_2 implements TransactionRecovery {
+    /** 日志记录器 */
+    private static final Logger LOG = LoggerFactory.getLogger(TransactionRecovery_1_2.class);
+
+    /** TCC事务配置器 */
+    private TransactionConfigurator transactionConfigurator;
+    public void setTransactionConfigurator(TransactionConfigurator transactionConfigurator) {
+        this.transactionConfigurator = transactionConfigurator;
+    }
+
+    @Override
+    public void startRecover() {
+        List<Transaction> transactions = loadErrorTransactions(); // 找出所有执行错误的事务信息
+        recoverErrorTransactions(transactions);
+    }
+
+    /**
+     * 找出所有执行错误的事务信息（时间范围）。
+     * @return
+     */
+    private List<Transaction> loadErrorTransactions() {
+
+        long currentTimeInMillis = Calendar.getInstance().getTimeInMillis();
+
+        TransactionRepository transactionRepository = transactionConfigurator.getTransactionRepository();
+        RecoverConfig recoverConfig = transactionConfigurator.getRecoverConfig();
+
+        return transactionRepository.findAllUnmodifiedSince(
+                new Date(currentTimeInMillis - recoverConfig.getRecoverDuration() * 1000));
+    }
+
+    /**
+     * 恢复错误的事务.
+     * @param transactions
+     */
+    private void recoverErrorTransactions(List<Transaction> transactions) {
+        LOG.debug("problem transactions size:{}", transactions.size());
+
+        for (Transaction transaction : transactions) {
+
+            if (transaction.getRetriedCount() > transactionConfigurator.getRecoverConfig().getMaxRetryCount()) {
+                // 超过最大恢复次数的，跳过（需要人工介入处理）
+                // 不区分ROOT/BRANCH事务
+                LOG.error("recover failed with max retry count, will not try again. " +
+                                "txid:{}, status:{}, retried count:{}, transaction content:{}",
+                        transaction.getXid(),
+                        transaction.getStatus().getId(),
+                        transaction.getRetriedCount(),
+                        JSON.toJSONString(transaction));
+                continue;
+            }
+
+            if (transaction.getTransactionType().equals(TransactionType.BRANCH)) {
+                // 事务可被恢复的最大时间段
+                long maxConfigTransactionDurationTime = transaction.getCreateTime().getTime() +
+                        transactionConfigurator.getRecoverConfig().getMaxRetryCount() *
+                        transactionConfigurator.getRecoverConfig().getRecoverDuration() * 1000;
+                if (System.currentTimeMillis() > maxConfigTransactionDurationTime) {
+                    // 超过最大恢复次数*(recoverDuration指定时间)，跳过（需要人工介入处理）
+                    // 并且是BRANCH事务（还是可以通过主事务触发commit/cancel的）
+                    LOG.error("recover failed with max recoverDuration (maxRetryCount * recoveryDuration), will not try again. " +
+                                    "txid:{}, status:{}, max recoverDuration:{}(s), transaction recoverDuration:{}(s), transaction content:{}",
+                            transaction.getXid(),
+                            transaction.getStatus().getId(),
+                            maxConfigTransactionDurationTime / 1000,
+                            (System.currentTimeMillis() - transaction.getCreateTime().getTime()) / 1000,
+                            JSON.toJSONString(transaction));
+                    continue;
+                }
+            }
+
+            try {
+                transaction.addRetriedCount(); // 重试次数+1
+
+                // 传播需要恢复的事务上下文
+                TransactionContext transactionContext = new TransactionContext(
+                        new TransactionXid(
+                                transaction.getXid().getGlobalTransactionId(),
+                                transaction.getXid().getBranchQualifier()),
+                        transaction.getStatus().getId()
+                );
+                transactionConfigurator.getTransactionManager().propagationExistBegin(transactionContext);
+
+                if (transaction.getStatus().equals(TransactionStatus.TRYING)) {
+                    if (transaction.getTransactionType().equals(TransactionType.ROOT)) {
+                        // 当事务执行超过recoverDuration指定时间，如果事务状态是TRYING（事务类型是ROOT），此时系统状态可能是，
+                        // 可能事务try在执行中，或事务框架update中，或事务框架update出错，等等
+                        // 注意：这些情况下，建议设计try业务方法尽可能在recoverDuration指定时间内完成
+                        transaction.changeStatus(TransactionStatus.CANCELLING);
+                        transactionConfigurator.getTransactionRepository().update(transaction);
+                        transaction.rollback();
+                        transactionConfigurator.getTransactionRepository().delete(transaction);
+                    }
+
+                } else if (transaction.getStatus().equals(TransactionStatus.CONFIRMING)) {
+                    // 当事务执行超过recoverDuration指定时间，如果事务状态是CONFIRMING（不区分ROOT/BRANCH事务），此时系统状态可能是，
+                    // 事务的confirm方法正在执行，等等
+                    // 注意：这种情况下，必须保证confirm方法的幂等性
+                    transaction.changeStatus(TransactionStatus.CONFIRMING);
+                    transactionConfigurator.getTransactionRepository().update(transaction);
+                    transaction.commit();
+                    transactionConfigurator.getTransactionRepository().delete(transaction);
+
+                } else if (transaction.getStatus().equals(TransactionStatus.CANCELLING)) {
+                    // 当事务执行超过recoverDuration指定时间，如果事务状态是CANCELING（不区分ROOT/BRANCH事务），此时系统状态可能是，
+                    // 事务还是TRYING状态，事务的cancel方法正在执行，等等
+                    // 注意：这种情况下，必须保证cancel方法的幂等性
+                    transaction.changeStatus(TransactionStatus.CANCELLING);
+                    transactionConfigurator.getTransactionRepository().update(transaction);
+                    transaction.rollback();
+                    transactionConfigurator.getTransactionRepository().delete(transaction);
+
+                } else {
+                    LOG.error("transaction status error, txid:{}, status:{}",
+                            transaction.getXid(),
+                            transaction.getStatus().getId());
+
+                }
+
+            } catch (Throwable throwable) {
+                if (throwable instanceof OptimisticLockException
+                        || ExceptionUtils.getRootCause(throwable) instanceof OptimisticLockException
+                        ) {
+                    LOG.warn(String.format("optimisticLockException happened while recover. " +
+                                    "txid:%s, status:%s,retried count:%d,transaction content:%s",
+                            transaction.getXid(),
+                            transaction.getStatus().getId(),
+                            transaction.getRetriedCount(),
+                            JSON.toJSONString(transaction)),
+                            throwable);
+                } else {
+                    LOG.error(String.format("recover failed, " +
+                                    "txid:%s, status:%s,retried count:%d,transaction content:%s",
+                            transaction.getXid(),
+                            transaction.getStatus().getId(),
+                            transaction.getRetriedCount(),
+                            JSON.toJSONString(transaction)),
+                            throwable);
+                }
+            }
+        }
+    }
+
+
+
+}
@@ -39,7 +39,16 @@ public interface TransactionRepository {
     /**
      * 找出所有未处理事务日志（从某一时间点开始）.
+     * @param date 时间
+     * @param transactionType 事务类型
      * @return
      */
     List<Transaction> findAllUnmodifiedSince(Date date, TransactionType transactionType);
+
+    /**
+     * 找出所有未处理事务日志（从某一时间点开始）.
+     * @param date 时间
+     * @return
+     */
+    List<Transaction> findAllUnmodifiedSince(Date date);
 }
@@ -114,10 +114,20 @@ public abstract class CachableTransactionRepository implements TransactionReposi
         return transactions;
     }
+    @Override
+    public List<Transaction> findAllUnmodifiedSince(Date date) {
+        List<Transaction> transactions = doFindAllUnmodifiedSince(date);
+        for (Transaction transaction : transactions) {
+            putToCache(transaction);
+        }
+        return transactions;
+    }
+
     //-------------------- 需要覆写的方法 --------------------//
     protected abstract int doCreate(Transaction transaction);
     protected abstract int doUpdate(Transaction transaction);
     protected abstract int doDelete(Transaction transaction);
     protected abstract Transaction doFindOne(Xid xid);
     protected abstract List<Transaction> doFindAllUnmodifiedSince(Date date, TransactionType transactionType);
+    protected abstract List<Transaction> doFindAllUnmodifiedSince(Date date);
 }
@@ -268,10 +268,10 @@ public class JdbcTransactionRepository extends CachableTransactionRepository {
     private final static String SELECT_MULTI_SQL_Template =
             "SELECT GLOBAL_TX_ID, BRANCH_QUALIFIER, CONTENT,STATUS,TRANSACTION_TYPE,CREATE_TIME,LAST_UPDATE_TIME,RETRIED_COUNT,VERSION,DOMAIN " +
             "FROM %s " +
-            "WHERE LAST_UPDATE_TIME != ? AND TRANSACTION_TYPE = ? %s";
+            "WHERE LAST_UPDATE_TIME < ? AND TRANSACTION_TYPE = ? %s";
     @Override
     protected List<Transaction> doFindAllUnmodifiedSince(Date date, TransactionType transactionType) {
-        LOG.debug("==>doFindOne date:" + date);
+        LOG.debug("==>doFindOne date:{},transactionType:{}", date, transactionType);
         List<Transaction> transactions = new ArrayList<>();
@@ -315,4 +315,61 @@ public class JdbcTransactionRepository extends CachableTransactionRepository {
         return transactions;
     }
+
+    private final static String SELECT_MULTI_SQL_Template_2 =
+            "SELECT GLOBAL_TX_ID, BRANCH_QUALIFIER, CONTENT,STATUS,TRANSACTION_TYPE,CREATE_TIME,LAST_UPDATE_TIME,RETRIED_COUNT,VERSION,DOMAIN " +
+                    "FROM %s " +
+                    "WHERE LAST_UPDATE_TIME < ? %s";
+
+    @Override
+    public List<Transaction> doFindAllUnmodifiedSince(Date date) {
+        LOG.debug("==>doFindOne date:" + date);
+
+        List<Transaction> transactions = new ArrayList<>();
+
+        Connection connection = null;
+        PreparedStatement stmt = null;
+
+        try {
+            connection = this.getConnection();
+
+            if (Strings.isNullOrEmpty(domain)) {
+                stmt = connection.prepareStatement(String.format(SELECT_MULTI_SQL_Template_2,
+                        getTableName(), ""));
+
+                LOG.debug("sql={}", String.format(SELECT_MULTI_SQL_Template_2,
+                        getTableName(), ""));
+
+            } else {
+                stmt = connection.prepareStatement(String.format(SELECT_MULTI_SQL_Template_2,
+                        getTableName(), "AND DOMAIN = ?"));
+
+                LOG.debug("sql={}", String.format(SELECT_MULTI_SQL_Template_2,
+                        getTableName(), ""));
+            }
+            stmt.setTimestamp(1, new Timestamp(date.getTime()));
+            if (!Strings.isNullOrEmpty(domain)) {
+                stmt.setString(2, domain);
+            }
+
+            ResultSet resultSet = stmt.executeQuery();
+
+            while (resultSet.next()) {
+                byte[] transactionBytes = resultSet.getBytes(3);
+                Transaction transaction = (Transaction) serializer.deserialize(transactionBytes);
+                transaction.setLastUpdateTime(resultSet.getDate(7));
+                transaction.setVersion(resultSet.getLong(9));
+                transaction.resetRetriedCount(resultSet.getInt(8));
+                transactions.add(transaction);
+            }
+
+        } catch (Throwable e) {
+            throw new TransactionIOException(e);
+        } finally {
+            closeStatement(stmt);
+            this.releaseConnection(connection);
+        }
+
+        return transactions;
+    }
 }
@@ -40,7 +40,6 @@ public class RecoverScheduledJob {
      * 初始化方法，Spring启动时执行.
      */
     public void init() {
-
         try {
             // MethodInvokingJobDetailFactoryBean 负责生成具体的任务，只需要指定某个对象的某个方法，在触发器触发时，即调用指定对象的指定方法。
             MethodInvokingJobDetailFactoryBean jobDetail = new MethodInvokingJobDetailFactoryBean();
@@ -45,7 +45,7 @@
     <!-- 事务恢复任务调度器 -->
     <bean id="recoverScheduler" class="org.springframework.scheduling.quartz.SchedulerFactoryBean"/>
     <!-- 事务恢复 -->
-    <bean id="transactionRecovery" class="org.mengyun.tcctransaction.recover.TransactionRecovery">
+    <bean id="transactionRecovery" class="org.mengyun.tcctransaction.recover.TransactionRecovery_1_2">
         <property name="transactionConfigurator" ref="tccTransactionConfigurator"/>
     </bean>