From d48cf80f8b2263e1ef00b2d4449f07048c83872e Mon Sep 17 00:00:00 2001
From: noear <noear@live.cn>
Date: Tue, 10 Sep 2024 15:03:34 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=20solon=20=E4=BA=8B=E5=8A=A1?=
 =?UTF-8?q?=E6=94=AF=E6=8C=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../solon/integration/FlexDataSourcePlus.java | 27 +++++++++++++++++++
 .../solon/integration/MybatisAdapterFlex.java |  2 +-
 pom.xml                                       |  2 +-
 3 files changed, 29 insertions(+), 2 deletions(-)
 create mode 100644 mybatis-flex-solon-plugin/src/main/java/com/mybatisflex/solon/integration/FlexDataSourcePlus.java

diff --git a/mybatis-flex-solon-plugin/src/main/java/com/mybatisflex/solon/integration/FlexDataSourcePlus.java b/mybatis-flex-solon-plugin/src/main/java/com/mybatisflex/solon/integration/FlexDataSourcePlus.java
new file mode 100644
index 00000000..d6f40639
--- /dev/null
+++ b/mybatis-flex-solon-plugin/src/main/java/com/mybatisflex/solon/integration/FlexDataSourcePlus.java
@@ -0,0 +1,27 @@
+package com.mybatisflex.solon.integration;
+
+import com.mybatisflex.core.datasource.FlexDataSource;
+import org.noear.solon.data.datasource.RoutingDataSource;
+
+import javax.sql.DataSource;
+
+/**
+ * 用与 solon 的事务对接
+ *
+ * @author noear
+ * @since 2.8
+ */
+public class FlexDataSourcePlus extends FlexDataSource implements RoutingDataSource {
+    public FlexDataSourcePlus(String dataSourceKey, DataSource dataSource) {
+        super(dataSourceKey, dataSource);
+    }
+
+    public FlexDataSourcePlus(String dataSourceKey, DataSource dataSource, boolean needDecryptDataSource) {
+        super(dataSourceKey, dataSource, needDecryptDataSource);
+    }
+
+    @Override
+    public DataSource determineCurrentTarget() {
+        return getDataSource();
+    }
+}
diff --git a/mybatis-flex-solon-plugin/src/main/java/com/mybatisflex/solon/integration/MybatisAdapterFlex.java b/mybatis-flex-solon-plugin/src/main/java/com/mybatisflex/solon/integration/MybatisAdapterFlex.java
index 37155365..c824bdcb 100644
--- a/mybatis-flex-solon-plugin/src/main/java/com/mybatisflex/solon/integration/MybatisAdapterFlex.java
+++ b/mybatis-flex-solon-plugin/src/main/java/com/mybatisflex/solon/integration/MybatisAdapterFlex.java
@@ -66,7 +66,7 @@ public class MybatisAdapterFlex extends MybatisAdapterDefault {
 
     @Override
     protected DataSource getDataSource() {
-        return new FlexDataSource(dsWrap.name(), dsWrap.raw());
+        return new FlexDataSourcePlus(dsWrap.name(), dsWrap.raw());
     }
 
     @Override
diff --git a/pom.xml b/pom.xml
index 728dd6ea..22942ddb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -68,7 +68,7 @@
 
         <spring.version>5.3.27</spring.version>
         <spring-boot.version>2.7.11</spring-boot.version>
-        <solon.version>2.5.3</solon.version>
+        <solon.version>2.8.4</solon.version>
 
         <junit.version>4.13.2</junit.version>
         <testcontainers.version>1.19.3</testcontainers.version>