From 81936a70d3ae25b3136065e307a615e3beb765ad Mon Sep 17 00:00:00 2001
From: noear <noear@live.cn>
Date: Tue, 15 Oct 2024 09:46:18 +0800
Subject: [PATCH] =?UTF-8?q?mybatis-plus-solon-plugin=20=E5=BE=AE=E8=B0=83?=
 =?UTF-8?q?=E7=A4=BA=E4=BE=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/test/java/demo/Config.java            | 38 ++++++-------------
 .../src/test/resources/app.yml                |  7 ++--
 2 files changed, 14 insertions(+), 31 deletions(-)

diff --git a/mybatis-plus-solon-plugin/src/test/java/demo/Config.java b/mybatis-plus-solon-plugin/src/test/java/demo/Config.java
index e7b915360..c3ed33dbd 100644
--- a/mybatis-plus-solon-plugin/src/test/java/demo/Config.java
+++ b/mybatis-plus-solon-plugin/src/test/java/demo/Config.java
@@ -4,10 +4,8 @@ import com.baomidou.mybatisplus.core.MybatisConfiguration;
 import com.baomidou.mybatisplus.core.MybatisSqlSessionFactoryBuilder;
 import com.baomidou.mybatisplus.core.config.GlobalConfig;
 import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler;
-import com.zaxxer.hikari.HikariDataSource;
 import demo.dso.MetaObjectHandlerImpl;
 import demo.dso.MybatisSqlSessionFactoryBuilderImpl;
-import okhttp3.Interceptor;
 import org.apache.ibatis.solon.annotation.Db;
 import org.noear.solon.Solon;
 import org.noear.solon.annotation.Bean;
@@ -18,33 +16,19 @@ import javax.sql.DataSource;
 
 @Configuration
 public class Config {
-    @Bean("db1")
-    public DataSource db1(@Inject("${dataSource.db1}") HikariDataSource hikariDataSource) {
-        return hikariDataSource;
+    @Bean
+    public void db1_cfg(@Db("db1") MybatisConfiguration cfg,
+                        @Db("db1") GlobalConfig globalConfig) {
+        //增加 mybatis-plus 的自带分页插件
+        MybatisPlusInterceptor plusInterceptor = new MybatisPlusInterceptor();
+        plusInterceptor.addInnerInterceptor(new PaginationInnerInterceptor(DbType.MYSQL));
+
+        cfg.addInterceptor(plusInterceptor);
     }
 
 //    @Bean
-//    public Interceptor plusInterceptor() {
-//        MybatisPlusInterceptor plusInterceptor = new MybatisPlusInterceptor();
-//        plusInterceptor.addInnerInterceptor(new PaginationInnerInterceptor(DbType.MYSQL));
-//        return plusInterceptor;
+//    public MybatisSqlSessionFactoryBuilder factoryBuilderNew(){
+//        return new MybatisSqlSessionFactoryBuilderImpl();
 //    }
-
-    @Bean
-    public void db1_ext(@Db("db1") GlobalConfig globalConfig) {
-        MetaObjectHandler metaObjectHandler = new MetaObjectHandlerImpl();
-
-        globalConfig.setMetaObjectHandler(metaObjectHandler);
-    }
-
-    @Bean
-    public void db1_ext2(@Db("db1") MybatisConfiguration config){
-        config.getTypeHandlerRegistry().register("xxx");
-        config.setDefaultEnumTypeHandler(null);
-    }
-
-    @Bean
-    public MybatisSqlSessionFactoryBuilder factoryBuilderNew(){
-        return new MybatisSqlSessionFactoryBuilderImpl();
-    }
 }
+
diff --git a/mybatis-plus-solon-plugin/src/test/resources/app.yml b/mybatis-plus-solon-plugin/src/test/resources/app.yml
index bd9926b35..6d738e2fe 100644
--- a/mybatis-plus-solon-plugin/src/test/resources/app.yml
+++ b/mybatis-plus-solon-plugin/src/test/resources/app.yml
@@ -2,10 +2,9 @@ server:
     port: 6040
 
 # 配置数据源
-dataSource:
-    db1:
-        # 与数据库名可用保持一致
-        schema: test
+solon.dataSources:
+    db1!:
+        class: "com.zaxxer.hikari.HikariDataSource"
         jdbcUrl: jdbc:mysql://127.0.0.1:3306/test?useUnicode=true&characterEncoding=utf8&autoReconnect=true&rewriteBatchedStatements=true
         driverClassName: com.mysql.cj.jdbc.Driver
         username: root