From 77178b576d748fb0f7223fbab4ade8b12d625ed2 Mon Sep 17 00:00:00 2001
From: feiyu02 <risaku@163.com>
Date: 星期二, 24 十月 2023 16:37:59 +0800
Subject: [PATCH] 修复mybatis相关配置等问题

---
 src/main/java/com/flightfeather/monitor/config/MybatisConfig4ds1.kt |   21 +++++++++++++++++----
 1 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/flightfeather/monitor/config/MybatisConfig4ds1.kt b/src/main/java/com/flightfeather/monitor/config/MybatisConfig4ds1.kt
index 1b82eaf..d0c499d 100644
--- a/src/main/java/com/flightfeather/monitor/config/MybatisConfig4ds1.kt
+++ b/src/main/java/com/flightfeather/monitor/config/MybatisConfig4ds1.kt
@@ -5,6 +5,7 @@
 import org.mybatis.spring.SqlSessionTemplate
 import org.mybatis.spring.annotation.MapperScan
 import org.springframework.beans.factory.annotation.Qualifier
+import org.springframework.boot.context.properties.ConfigurationProperties
 import org.springframework.context.annotation.Bean
 import org.springframework.context.annotation.Configuration
 import org.springframework.context.annotation.Primary
@@ -19,18 +20,23 @@
  * @see  DataSourceConfig
  */
 @Configuration
-@MapperScan(basePackages = ["com.flightfeather.monitor.domain.ds1.mapper"],
-    sqlSessionTemplateRef = "ds1SqlSessionTemplate")
+@MapperScan(basePackages = ["com.flightfeather.monitor.domain.ds1.mapper", "com.flightfeather.monitor.mapper"],
+    sqlSessionTemplateRef = "ds1SqlSessionTemplate", sqlSessionFactoryRef = "ds1SqlSessionFactory")
 class MybatisConfig4ds1 {
 
     //涓绘暟鎹簮 ds1鏁版嵁婧�
     @Primary
     @Bean("ds1SqlSessionFactory")
     @Throws(Exception::class)
-    fun ds1SqlSessionFactory(@Qualifier("ds1DataSource") dataSource: DataSource?): SqlSessionFactory? {
+    fun ds1SqlSessionFactory(
+        @Qualifier("ds1DataSource") dataSource: DataSource?,
+        @Qualifier("ds1MybatisConfiguration") configuration: org.apache.ibatis.session.Configuration,
+    ): SqlSessionFactory? {
         val sqlSessionFactory = SqlSessionFactoryBean()
         sqlSessionFactory.setDataSource(dataSource)
-        sqlSessionFactory.setMapperLocations(*PathMatchingResourcePatternResolver().getResources("classpath*:mapper/ds1/*.xml"))
+        sqlSessionFactory.setMapperLocations(*PathMatchingResourcePatternResolver().getResources
+            ("classpath*:mapper/**/*.xml"))
+        sqlSessionFactory.setConfiguration(configuration)
         return sqlSessionFactory.getObject()
     }
 
@@ -45,4 +51,11 @@
     fun ds1SqlSessionTemplate(@Qualifier("ds1SqlSessionFactory") sqlSessionFactory: SqlSessionFactory?): SqlSessionTemplate? {
         return SqlSessionTemplate(sqlSessionFactory)
     }
+
+    @Bean(name = ["ds1MybatisConfiguration"])
+    @ConfigurationProperties(prefix = "mybatis.configuration")
+    fun ds1MybatisConfiguration(): org.apache.ibatis.session.Configuration {
+        return org.apache.ibatis.session.Configuration()
+    }
+
 }
\ No newline at end of file

--
Gitblit v1.9.3