!493 添加 solon 适配事务支持

Merge pull request !493 from 西东/main

Author: yangfuhai

mybatis-flex-core/src/main/java/com/mybatisflex/core/datasource/FlexDataSource.java

@@ -202,7 +202,7 @@ public boolean isWrapperFor(Class<?> iface) throws SQLException {
     }
 
 
-    private DataSource getDataSource() {
+    protected DataSource getDataSource() {
         DataSource dataSource = defaultDataSource;
         if (dataSourceMap.size() > 1) {
             String dataSourceKey = DataSourceKey.get();

mybatis-flex-solon-plugin/src/main/java/com/mybatisflex/solon/integration/FlexRoutingDataSource.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 FlexRoutingDataSource extends FlexDataSource implements RoutingDataSource {
+    public FlexRoutingDataSource(String dataSourceKey, DataSource dataSource) {
+        super(dataSourceKey, dataSource);
+    }
+
+    public FlexRoutingDataSource(String dataSourceKey, DataSource dataSource, boolean needDecryptDataSource) {
+        super(dataSourceKey, dataSource, needDecryptDataSource);
+    }
+
+    @Override
+    public DataSource determineCurrentTarget() {
+        return getDataSource();
+    }
+}

mybatis-flex-solon-plugin/src/main/java/com/mybatisflex/solon/integration/MybatisAdapterFlex.java

@@ -17,7 +17,6 @@
 package com.mybatisflex.solon.integration;
 
 import com.mybatisflex.core.FlexGlobalConfig;
-import com.mybatisflex.core.datasource.FlexDataSource;
 import com.mybatisflex.core.mybatis.FlexConfiguration;
 import com.mybatisflex.core.mybatis.FlexSqlSessionFactoryBuilder;
 import com.mybatisflex.core.row.RowMapperInvoker;
@@ -39,12 +38,9 @@
  * @since 2.2
  */
 public class MybatisAdapterFlex extends MybatisAdapterDefault {
-
-    FlexSqlSessionFactoryBuilder factoryBuilderPlus;
-
-    FlexGlobalConfig globalConfig;
-
-    RowMapperInvoker rowMapperInvoker;
+    private FlexSqlSessionFactoryBuilder factoryBuilderPlus;
+    private FlexGlobalConfig globalConfig;
+    private RowMapperInvoker rowMapperInvoker;
 
     protected MybatisAdapterFlex(BeanWrap dsWrap) {
         super(dsWrap);
@@ -66,7 +62,7 @@ protected void initAfter(BeanWrap dsWrap) {
 
     @Override
     protected DataSource getDataSource() {
-        return new FlexDataSource(dsWrap.name(), dsWrap.raw());
+        return new FlexRoutingDataSource(dsWrap.name(), dsWrap.raw());
     }
 
     @Override
@@ -94,7 +90,7 @@ protected void initConfiguration(Environment environment) {
         FlexGlobalConfig.setConfig(environment.getId(), globalConfig, false);
 
         //增加事件扩展机制
-        EventBus.push(globalConfig);
+        EventBus.publish(globalConfig);
 
 
         if (dsWrap.typed()) {

mybatis-flex-solon-plugin/src/main/java/com/mybatisflex/solon/integration/XPluginImpl.java

@@ -17,7 +17,6 @@
 package com.mybatisflex.solon.integration;
 
 import org.apache.ibatis.solon.integration.MybatisAdapterManager;
-import org.noear.solon.core.AopContext;
 import org.noear.solon.core.AppContext;
 import org.noear.solon.core.Plugin;
 
@@ -28,15 +27,6 @@
  * @since 2.2
  */
 public class XPluginImpl implements Plugin {
-
-    //兼容 2.5 以下版本
-    @Override
-    public void start(AopContext context) throws Throwable {
-        // 此插件的 solon.plugin.priority 会大于 mybatis-solon-plugin 的值
-        MybatisAdapterManager.setAdapterFactory(new MybatisAdapterFactoryFlex());
-    }
-
-    //兼容 2.5 以上版本
     @Override
     public void start(AppContext context) throws Throwable {
         // 此插件的 solon.plugin.priority 会大于 mybatis-solon-plugin 的值

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.9.3</solon.version>
 
         <junit.version>4.13.2</junit.version>
         <testcontainers.version>1.19.3</testcontainers.version>