From 0ba7153d28e7538b4cd609aeef757391fd932631 Mon Sep 17 00:00:00 2001 From: cyb Date: Wed, 13 Nov 2024 16:10:25 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E5=88=A0=E9=99=A4DataSource=E4=B8=8D?= =?UTF-8?q?=E5=BF=85=E8=A6=81=E7=9A=84=E7=B1=BB=E5=9E=8B=E8=BD=AC=E6=8D=A2?= =?UTF-8?q?=EF=BC=8C=E9=9B=86=E6=88=90=E7=AC=AC=E4=B8=89=E6=96=B9=E6=A1=86?= =?UTF-8?q?=E6=9E=B6=E6=97=B6=EF=BC=8CdataSource=E5=8F=AF=E8=83=BD?= =?UTF-8?q?=E4=B8=BAFlexDataSource=E7=9A=84=E5=8C=85=E8=A3=85=E7=B1=BB?= =?UTF-8?q?=EF=BC=8C=E4=BB=8E=E8=80=8C=E5=AF=BC=E8=87=B4=E7=B1=BB=E5=9E=8B?= =?UTF-8?q?=E8=BD=AC=E6=8D=A2=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/mybatisflex/spring/FlexSpringTransaction.java | 5 +++-- .../java/com/mybatisflex/spring/FlexTransactionFactory.java | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/mybatis-flex-spring/src/main/java/com/mybatisflex/spring/FlexSpringTransaction.java b/mybatis-flex-spring/src/main/java/com/mybatisflex/spring/FlexSpringTransaction.java index cb650ebf..59e03d25 100644 --- a/mybatis-flex-spring/src/main/java/com/mybatisflex/spring/FlexSpringTransaction.java +++ b/mybatis-flex-spring/src/main/java/com/mybatisflex/spring/FlexSpringTransaction.java @@ -20,6 +20,7 @@ import com.mybatisflex.core.transaction.TransactionContext; import com.mybatisflex.core.util.StringUtil; import org.apache.ibatis.transaction.Transaction; +import javax.sql.DataSource; import java.sql.Connection; import java.sql.SQLException; @@ -31,12 +32,12 @@ import java.sql.SQLException; */ public class FlexSpringTransaction implements Transaction { - private final FlexDataSource dataSource; + private final DataSource dataSource; private Boolean isConnectionTransactional; private Boolean autoCommit; private Connection connection; - public FlexSpringTransaction(FlexDataSource dataSource) { + public FlexSpringTransaction(DataSource dataSource) { this.dataSource = dataSource; } diff --git a/mybatis-flex-spring/src/main/java/com/mybatisflex/spring/FlexTransactionFactory.java b/mybatis-flex-spring/src/main/java/com/mybatisflex/spring/FlexTransactionFactory.java index 9e3b83f2..a6c92841 100644 --- a/mybatis-flex-spring/src/main/java/com/mybatisflex/spring/FlexTransactionFactory.java +++ b/mybatis-flex-spring/src/main/java/com/mybatisflex/spring/FlexTransactionFactory.java @@ -34,7 +34,7 @@ public class FlexTransactionFactory extends SpringManagedTransactionFactory { */ @Override public Transaction newTransaction(DataSource dataSource, TransactionIsolationLevel level, boolean autoCommit) { - return new FlexSpringTransaction((FlexDataSource) dataSource); + return new FlexSpringTransaction(dataSource); } /**