diff --git a/mybatis-flex-core/src/main/java/com/mybatisflex/core/datasource/FlexDataSource.java b/mybatis-flex-core/src/main/java/com/mybatisflex/core/datasource/FlexDataSource.java index 90ecbd54..ff1f0e5a 100644 --- a/mybatis-flex-core/src/main/java/com/mybatisflex/core/datasource/FlexDataSource.java +++ b/mybatis-flex-core/src/main/java/com/mybatisflex/core/datasource/FlexDataSource.java @@ -202,7 +202,7 @@ public class FlexDataSource extends AbstractDataSource { } - private DataSource getDataSource() { + protected DataSource getDataSource() { DataSource dataSource = defaultDataSource; if (dataSourceMap.size() > 1) { String dataSourceKey = DataSourceKey.get(); 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/FlexRoutingDataSource.java similarity index 63% rename from mybatis-flex-solon-plugin/src/main/java/com/mybatisflex/solon/integration/FlexDataSourcePlus.java rename to mybatis-flex-solon-plugin/src/main/java/com/mybatisflex/solon/integration/FlexRoutingDataSource.java index d6f40639..e8cdce2b 100644 --- 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/FlexRoutingDataSource.java @@ -11,12 +11,12 @@ import javax.sql.DataSource; * @author noear * @since 2.8 */ -public class FlexDataSourcePlus extends FlexDataSource implements RoutingDataSource { - public FlexDataSourcePlus(String dataSourceKey, DataSource dataSource) { +public class FlexRoutingDataSource extends FlexDataSource implements RoutingDataSource { + public FlexRoutingDataSource(String dataSourceKey, DataSource dataSource) { super(dataSourceKey, dataSource); } - public FlexDataSourcePlus(String dataSourceKey, DataSource dataSource, boolean needDecryptDataSource) { + public FlexRoutingDataSource(String dataSourceKey, DataSource dataSource, boolean needDecryptDataSource) { super(dataSourceKey, dataSource, needDecryptDataSource); } 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 2923eedc..1f6e3a88 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 @@ -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 @@ import javax.sql.DataSource; * @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 @@ public class MybatisAdapterFlex extends MybatisAdapterDefault { @Override protected DataSource getDataSource() { - return new FlexDataSourcePlus(dsWrap.name(), dsWrap.raw()); + return new FlexRoutingDataSource(dsWrap.name(), dsWrap.raw()); } @Override @@ -94,7 +90,7 @@ public class MybatisAdapterFlex extends MybatisAdapterDefault { FlexGlobalConfig.setConfig(environment.getId(), globalConfig, false); //增加事件扩展机制 - EventBus.push(globalConfig); + EventBus.publish(globalConfig); if (dsWrap.typed()) { diff --git a/mybatis-flex-solon-plugin/src/main/java/com/mybatisflex/solon/integration/XPluginImpl.java b/mybatis-flex-solon-plugin/src/main/java/com/mybatisflex/solon/integration/XPluginImpl.java index 80c75121..6cebe6a4 100644 --- a/mybatis-flex-solon-plugin/src/main/java/com/mybatisflex/solon/integration/XPluginImpl.java +++ b/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 @@ import org.noear.solon.core.Plugin; * @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 的值 diff --git a/pom.xml b/pom.xml index d52ea1ec..a1d2f2ec 100644 --- a/pom.xml +++ b/pom.xml @@ -68,7 +68,7 @@ 5.3.27 2.7.11 - 2.8.4 + 2.9.3 4.13.2 1.19.3