移除config和log模块,配置多数据源 但仍有问题

zen-admin/src/main/kotlin/com/gxzc/zen/controller/ExampleController.kt

@@ -4,6 +4,7 @@ import com.gxzc.zen.api.rec.model.SysDic
 import com.gxzc.zen.api.rec.service.ISysDicService
 import com.gxzc.zen.api.sys.model.SysDept
 import com.gxzc.zen.api.sys.service.ISysDeptService
+import org.slf4j.LoggerFactory
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.stereotype.Controller
 import org.springframework.web.bind.annotation.RequestMapping
@@ -12,11 +13,15 @@ import org.springframework.web.bind.annotation.RequestMapping
 @Controller
 @RequestMapping("example")
 class ExampleController {
+    companion object {
+        val logger = LoggerFactory.getLogger(ExampleController::class.java)
+    }
+
     @Autowired
     lateinit var sysDeptService: ISysDeptService
 
-//    @Autowired
-//    val sysDicService: ISysDicService?= null
+    @Autowired
+    val sysDicService: ISysDicService? = null
 
     @RequestMapping("/test")
     fun test() {
@@ -25,17 +30,17 @@ class ExampleController {
             it.principal = "create"
             it.sort = 1
         }
-        sysDeptService.insert(dept)
+        logger.info("c {}", sysDeptService.custom())
     }
 
     @RequestMapping("/test2")
-    fun test2(){
+    fun test2() {
         val sysDic = SysDic().also {
             it.key = "hehe"
             it.value = "hehe"
             it.sort = 1
         }
 
-//        sysDicService?.insert(sysDic)
+        sysDicService?.insert(sysDic)
     }
 }

zen-admin/src/main/resources/application.yml

@@ -1,22 +1,5 @@
 server:
-  port: 8081
-
-###################  mybatis-plus配置  ###################
-mybatis-plus:
-  mapper-locations: classpath:mapping/*/*.xml
-  typeAliasesPackage: com.gxzc.zen.api.sys.mapper, com.gxzc.zen.api.rec.mapper
-  global-config:
-    id-type: 0  #0:数据库ID自增   1:用户输入id  2:全局唯一id(IdWorker)  3:全局唯一ID(uuid)
-    db-column-underline: true
-    refresh-mapper: true
-    logic-delete-value: 0
-    logic-not-delete-value: 1
-  configuration:
-    map-underscore-to-camel-case: true
-    cache-enabled: true #配置的缓存的全局开关
-    lazyLoadingEnabled: true #延时加载的开关
-    multipleResultSetsEnabled: true #开启的话，延时加载一个属性时会加载该对象全部属性，否则按需加载属性
-    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl #打印sql语句,调试用
+  port: 8082
 
 
 ###################  spring配置  ###################
@@ -35,4 +18,7 @@ spring:
       max-request-size: 100MB #最大请求大小
       max-file-size: 100MB #最大文件大小
   aop:
-    proxy-target-class: true #false为启用jdk默认动态代理,true为cglib动态代理
+    proxy-target-class: true #false为启用jdk默认动态代理,true为cglib动态代理
+    auto: true
+logging:
+  level: debug

zen-api/src/main/kotlin/com/gxzc/zen/api/rec/mapper/SysDicDao.kt

@@ -2,6 +2,7 @@ package com.gxzc.zen.api.rec.mapper;
 
 import com.gxzc.zen.api.rec.model.SysDic;
 import com.gxzc.zen.common.base.BaseMapper;
+import org.springframework.stereotype.Repository
 
 /**
  * <p>
@@ -11,4 +12,5 @@ import com.gxzc.zen.common.base.BaseMapper;
  * @author NorthLan123
  * @since 2018-01-27
  */
+@Repository
 interface SysDicDao : BaseMapper<SysDic>

zen-api/src/main/kotlin/com/gxzc/zen/api/rec/model/SysDic.kt

@@ -1,5 +1,6 @@
 package com.gxzc.zen.api.rec.model;
 
+import com.baomidou.mybatisplus.annotations.TableName
 import com.gxzc.zen.common.base.BaseModel;
 
 /**
@@ -10,6 +11,7 @@ import com.gxzc.zen.common.base.BaseModel;
  * @author NorthLan123
  * @since 2018-01-27
  */
+@TableName("sys_dic")
 data class SysDic(
         /**
          * 字典代码

zen-api/src/main/kotlin/com/gxzc/zen/api/rec/service/impl/SysDicServiceImpl.kt

@@ -14,7 +14,7 @@ import org.springframework.stereotype.Service;
  * @author NorthLan123
  * @since 2018-01-27
  */
-//@Service
+@Service
 open class SysDicServiceImpl : ServiceImpl<SysDicDao, SysDic>(), ISysDicService {
 
 }

zen-api/src/main/kotlin/com/gxzc/zen/api/sys/mapper/SysDeptDao.kt

@@ -13,4 +13,6 @@ import org.springframework.stereotype.Repository
  * @since 2018-01-26
  */
 @Repository
-interface SysDeptDao : BaseMapper<SysDept>
+interface SysDeptDao : BaseMapper<SysDept> {
+    fun custom(): Long
+}

zen-api/src/main/kotlin/com/gxzc/zen/api/sys/service/ISysDeptService.kt

@@ -11,4 +11,6 @@ import com.gxzc.zen.api.sys.model.SysDept
  * @author NorthLan
  * @since 2018-01-26
  */
-interface ISysDeptService : IService<SysDept>
+interface ISysDeptService : IService<SysDept> {
+    fun custom(): Long
+}

zen-api/src/main/kotlin/com/gxzc/zen/api/sys/service/impl/SysDeptServiceImpl.kt

@@ -15,4 +15,8 @@ import org.springframework.stereotype.Service
  * @since 2018-01-26
  */
 @Service
-class SysDeptServiceImpl : ISysDeptService, ServiceImpl<SysDeptDao, SysDept>()
+class SysDeptServiceImpl : ISysDeptService, ServiceImpl<SysDeptDao, SysDept>() {
+    override fun custom(): Long {
+        return baseMapper.custom()
+    }
+}

zen-api/src/main/resources/mapping/rec/SysDicDao.xml

@@ -4,16 +4,16 @@
 
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.gxzc.zen.api.rec.model.SysDic">
-    <result column="id" property="id" />
-    <result column="enable" property="enable" />
-    <result column="remark" property="remark" />
-    <result column="create_time" property="createTime" />
-    <result column="create_by" property="createBy" />
-    <result column="update_time" property="updateTime" />
-    <result column="update_by" property="updateBy" />
-        <result column="key" property="key" />
-        <result column="value" property="value" />
-        <result column="sort" property="sort" />
+        <result column="id" property="id"/>
+        <result column="enable" property="enable"/>
+        <result column="remark" property="remark"/>
+        <result column="create_time" property="createTime"/>
+        <result column="create_by" property="createBy"/>
+        <result column="update_time" property="updateTime"/>
+        <result column="update_by" property="updateBy"/>
+        <result column="key" property="key"/>
+        <result column="value" property="value"/>
+        <result column="sort" property="sort"/>
     </resultMap>
 
 </mapper>

zen-api/src/main/resources/mapping/sys/SysDeptDao.xml

@@ -16,4 +16,8 @@
         <result column="sort" property="sort"/>
     </resultMap>
 
+    <select id="custom" resultType="java.lang.Long">
+        SELECT count(*) FROM sys_dept
+    </select>
+
 </mapper>

zen-config/build.gradle

@@ -1,3 +0,0 @@
-dependencies {
-    compile project(":zen-common")
-}

zen-log/build.gradle

@@ -1,3 +0,0 @@
-dependencies {
-    compile project(":zen-common")
-}

zen-orm/src/main/kotlin/com/gxzc/zen/orm/RecDataSourceConfig.kt

@@ -1,13 +1,15 @@
 package com.gxzc.zen.orm
 
 import com.alibaba.druid.pool.DruidDataSource
-import com.gxzc.zen.orm.base.BaseDataSourceProperties
+import com.baomidou.mybatisplus.spring.MybatisSqlSessionFactoryBean
+import com.baomidou.mybatisplus.spring.boot.starter.MybatisPlusProperties
+import com.baomidou.mybatisplus.spring.boot.starter.SpringBootVFS
 import org.apache.ibatis.session.SqlSessionFactory
-import org.mybatis.spring.SqlSessionFactoryBean
 import org.mybatis.spring.SqlSessionTemplate
 import org.mybatis.spring.annotation.MapperScan
 import org.slf4j.Logger
 import org.slf4j.LoggerFactory
+import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.beans.factory.annotation.Qualifier
 import org.springframework.boot.context.properties.ConfigurationProperties
 import org.springframework.context.annotation.Bean
@@ -17,12 +19,12 @@ import org.springframework.jdbc.datasource.DataSourceTransactionManager
 import javax.sql.DataSource
 
 /**
- * Sys 数据源配置<br>
- * 扫描路径为 com.gxzc.zen.*.sys
+ * Rec 数据源配置<br>
+ * 扫描路径为 com.gxzc.zen.*.rec
  * @author NorthLan at 2018/1/26
  */
 @Configuration
-@MapperScan(basePackages = ["com.gxzc.zen.api.rec.mapper"])
+@MapperScan(basePackages = ["com.gxzc.zen.api.rec.mapper"], sqlSessionTemplateRef = RecDataSourceConfig.SQL_SESSION_TEMPLATE_NAME)
 class RecDataSourceConfig {
     companion object {
         const val DATASOURCE_NAME: String = "recDataSource"
@@ -32,15 +34,14 @@ class RecDataSourceConfig {
         val logger: Logger = LoggerFactory.getLogger(RecDataSourceConfig::class.java)
     }
 
-    @Bean(name = ["recDataSourceProperties"])
-    @ConfigurationProperties(prefix = "druid.datasource.rec")
-    fun properties(): BaseDataSourceProperties {
-        return BaseDataSourceProperties()
-    }
+    @Autowired
+    private lateinit var properties: MybatisPlusProperties
+
+    private val mapperLocation: String = "classpath:/mapping/rec/*.xml"
 
     @Bean(DATASOURCE_NAME)
     @ConfigurationProperties(prefix = "druid.datasource.rec")
-    fun dataSource(@Qualifier("recDataSourceProperties") properties: BaseDataSourceProperties): DataSource {
+    fun dataSource(): DataSource {
         return DruidDataSource()
     }
 
@@ -49,18 +50,20 @@ class RecDataSourceConfig {
         return DataSourceTransactionManager(dataSource)
     }
 
-//    @Bean(SQL_SESSION_FACTORY_NAME)
-//    fun sqlSessionFactory(@Qualifier(DATASOURCE_NAME) dataSource: DataSource, @Qualifier("recDataSourceProperties") properties: BaseDataSourceProperties): SqlSessionFactory {
-//        return SqlSessionFactoryBean().let {
-//            it.setDataSource(dataSource)
-//            it.setMapperLocations(PathMatchingResourcePatternResolver().getResources(properties.mapperLocation))
-//            it.`object`
-//        }
-//    }
-//
-//    @Bean(SQL_SESSION_TEMPLATE_NAME)
-////    @Order(-1)
-//    fun sqlSessionTemplate(@Qualifier(SQL_SESSION_FACTORY_NAME) sqlSessionFactory: SqlSessionFactory): SqlSessionTemplate {
-//        return SqlSessionTemplate(sqlSessionFactory)
-//    }
+    @Bean(SQL_SESSION_FACTORY_NAME)
+    fun sqlSessionFactory(@Qualifier(DATASOURCE_NAME) dataSource: DataSource): SqlSessionFactory {
+        return MybatisSqlSessionFactoryBean().let {
+            it.setDataSource(dataSource)
+            it.vfs = SpringBootVFS::class.java
+            it.setConfiguration(properties.configuration)
+            it.setGlobalConfig(properties.globalConfig.convertGlobalConfiguration())
+            it.setMapperLocations(PathMatchingResourcePatternResolver().getResources(mapperLocation))
+            it.`object`
+        }
+    }
+
+    @Bean(SQL_SESSION_TEMPLATE_NAME)
+    fun sqlSessionTemplate(@Qualifier(SQL_SESSION_FACTORY_NAME) sqlSessionFactory: SqlSessionFactory): SqlSessionTemplate {
+        return SqlSessionTemplate(sqlSessionFactory)
+    }
 }

zen-orm/src/main/kotlin/com/gxzc/zen/orm/SysDataSourceConfig.kt

@@ -1,13 +1,15 @@
 package com.gxzc.zen.orm
 
 import com.alibaba.druid.pool.DruidDataSource
-import com.gxzc.zen.orm.base.BaseDataSourceProperties
+import com.baomidou.mybatisplus.spring.MybatisSqlSessionFactoryBean
+import com.baomidou.mybatisplus.spring.boot.starter.MybatisPlusProperties
+import com.baomidou.mybatisplus.spring.boot.starter.SpringBootVFS
 import org.apache.ibatis.session.SqlSessionFactory
-import org.mybatis.spring.SqlSessionFactoryBean
 import org.mybatis.spring.SqlSessionTemplate
 import org.mybatis.spring.annotation.MapperScan
 import org.slf4j.Logger
 import org.slf4j.LoggerFactory
+import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.beans.factory.annotation.Qualifier
 import org.springframework.boot.context.properties.ConfigurationProperties
 import org.springframework.context.annotation.Bean
@@ -23,7 +25,7 @@ import javax.sql.DataSource
  * @author NorthLan at 2018/1/26
  */
 @Configuration
-@MapperScan(basePackages = ["com.gxzc.zen.api.sys.mapper"])
+@MapperScan(basePackages = ["com.gxzc.zen.api.sys.mapper"], sqlSessionTemplateRef = SysDataSourceConfig.SQL_SESSION_TEMPLATE_NAME)
 class SysDataSourceConfig {
     companion object {
         const val DATASOURCE_NAME: String = "sysDataSource"
@@ -33,17 +35,15 @@ class SysDataSourceConfig {
         val logger: Logger = LoggerFactory.getLogger(SysDataSourceConfig::class.java)
     }
 
-    @Bean(name = ["sysDataSourceProperties"])
-    @ConfigurationProperties(prefix = "druid.datasource.sys")
-    @Primary
-    fun properties(): BaseDataSourceProperties {
-        return BaseDataSourceProperties()
-    }
+    @Autowired
+    private lateinit var properties: MybatisPlusProperties
+
+    private val mapperLocation: String = "classpath:/mapping/sys/*.xml"
 
     @Bean(DATASOURCE_NAME)
     @ConfigurationProperties(prefix = "druid.datasource.sys")
     @Primary
-    fun dataSource(@Qualifier("sysDataSourceProperties") properties: BaseDataSourceProperties): DataSource {
+    fun dataSource(): DataSource {
         return DruidDataSource()
     }
 
@@ -53,19 +53,22 @@ class SysDataSourceConfig {
         return DataSourceTransactionManager(dataSource)
     }
 
-//    @Bean(SQL_SESSION_FACTORY_NAME)
-//    @Primary
-//    fun sqlSessionFactory(@Qualifier(DATASOURCE_NAME) dataSource: DataSource, @Qualifier("sysDataSourceProperties") properties: BaseDataSourceProperties): SqlSessionFactory {
-//        return SqlSessionFactoryBean().let {
-//            it.setDataSource(dataSource)
-//            it.setMapperLocations(PathMatchingResourcePatternResolver().getResources(properties.mapperLocation))
-//            it.`object`
-//        }
-//    }
-//
-//    @Bean(SQL_SESSION_TEMPLATE_NAME)
-//    @Primary
-//    fun sqlSessionTemplate(@Qualifier(SQL_SESSION_FACTORY_NAME) sqlSessionFactory: SqlSessionFactory): SqlSessionTemplate {
-//        return SqlSessionTemplate(sqlSessionFactory)
-//    }
+    @Bean(SQL_SESSION_FACTORY_NAME)
+    @Primary
+    fun sqlSessionFactory(@Qualifier(DATASOURCE_NAME) dataSource: DataSource): SqlSessionFactory {
+        return MybatisSqlSessionFactoryBean().let {
+            it.setDataSource(dataSource)
+            it.vfs = SpringBootVFS::class.java
+            it.setConfiguration(properties.configuration)
+            it.setGlobalConfig(properties.globalConfig.convertGlobalConfiguration())
+            it.setMapperLocations(PathMatchingResourcePatternResolver().getResources(mapperLocation))
+            it.`object`
+        }
+    }
+
+    @Bean(SQL_SESSION_TEMPLATE_NAME)
+    @Primary
+    fun sqlSessionTemplate(@Qualifier(SQL_SESSION_FACTORY_NAME) sqlSessionFactory: SqlSessionFactory): SqlSessionTemplate {
+        return SqlSessionTemplate(sqlSessionFactory)
+    }
 }

zen-orm/src/main/kotlin/com/gxzc/zen/orm/base/BaseDataSourceProperties.kt

@@ -1,23 +0,0 @@
-package com.gxzc.zen.orm.base
-
-import org.springframework.boot.autoconfigure.jdbc.DataSourceProperties
-
-/**
- * 数据源配置基类
- * @author NorthLan at 2018/1/27
- */
-open class BaseDataSourceProperties : DataSourceProperties() {
-    var prefix: String = "datasource"
-    var mapperLocation: String = ""
-    var initialSize: Int = 5
-    var minIdle: Int = 5
-    var maxActive: Int = 20
-    var maxWait: Long = 60000
-
-    var timeBetweenEvictionRunsMillis: Long = 60000
-    var minEvictableIdleTimeMillis: Long = 30000
-    var validationQuery: String? = null
-    var testWhileIdle: Boolean = true
-    var testOnBorrow: Boolean = false
-    var testOnReturn: Boolean = false
-}

zen-orm/src/main/resources/application-orm.yml

@@ -1,7 +1,25 @@
-spring:
-  datasource:
-    type: com.alibaba.druid.pool.DruidDataSource
+#spring:
+#  datasource:
+#    type: com.alibaba.druid.pool.DruidDataSource
+
+###################  mybatis-plus配置  ###################
+mybatis-plus:
+#  mapper-locations: classpath:/mapping/*/*.xml
+  global-config:
+    id-type: 0  #0:数据库ID自增   1:用户输入id  2:全局唯一id(IdWorker)  3:全局唯一ID(uuid)
+    db-column-underline: true
+    refresh-mapper: true
+    logic-delete-value: 0
+    logic-not-delete-value: 1
+  configuration:
+    map-underscore-to-camel-case: true
+    cache-enabled: true #配置的缓存的全局开关
+    lazyLoadingEnabled: true #延时加载的开关
+    multipleResultSetsEnabled: true #开启的话，延时加载一个属性时会加载该对象全部属性，否则按需加载属性
+    #log-impl: org.apache.ibatis.logging.stdout.StdOutImpl #打印sql语句,调试用
+
 
+################## Alibaba Druid 配置 ##################
 druid:
   view:
     enable: true
@@ -10,42 +28,42 @@ druid:
     slowSql: true
   datasource:
     sys:
-      type: com.alibaba.druid.pool.DruidDataSource
-      driver-class-name: com.mysql.jdbc.Driver
-      initialize: false #指定初始化数据源，是否用data.sql来初始化，默认: true
-      mapper-location: classpath:mapping/sys/*.xml
+      mapper-location: classpath:mapper/sys/*.xml
       name: archives_sys
-      prefix: sys
       url: jdbc:mysql://127.0.0.1:3306/archives_sys?useUnicode=true&characterEncoding=utf-8&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=UTC&zeroDateTimeBehavior=convertToNull
       username: root
       password: root
+      testWhileIdle: true
+      testOnBorrow: false
+      testOnReturn: false
+      validationQuery: SELECT 1
+      asyncInit: false # 异步初始化
       filters: log4j,wall,mergeStat
+      keepAlive: false
+      driver-class-name: com.mysql.jdbc.Driver
+      initialize: false #指定初始化数据源，是否用data.sql来初始化，默认: true
       initialSize: 5
       minIdle: 5
       maxActive: 20
       timeBetweenEvictionRunsMillis: 60000
       minEvictableIdleTimeMillis: 30000
-      validationQuery: SELECT 1 FROM DUAL
-      testWhileIdle: true
-      testOnBorrow: false
-      testOnReturn: false
     rec:
-      type: com.alibaba.druid.pool.DruidDataSource
-      driver-class-name: com.mysql.jdbc.Driver
-      initialize: false #指定初始化数据源，是否用data.sql来初始化，默认: true
-      mapper-location: classpath:mapping/rec/*.xml
+      mapper-location: classpath:mapper/rec/*.xml
       name: archives_rec
-      prefix: rec
       url: jdbc:mysql://127.0.0.1:3306/archives_rec?useUnicode=true&characterEncoding=utf-8&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=UTC&zeroDateTimeBehavior=convertToNull
       username: root
       password: root
+      testWhileIdle: true
+      testOnBorrow: false
+      testOnReturn: false
+      validationQuery: SELECT 1
+      asyncInit: false # 异步初始化
       filters: log4j,wall,mergeStat
+      keepAlive: false
+      driver-class-name: com.mysql.jdbc.Driver
+      initialize: false #指定初始化数据源，是否用data.sql来初始化，默认: true
       initialSize: 5
       minIdle: 5
       maxActive: 20
       timeBetweenEvictionRunsMillis: 60000
-      minEvictableIdleTimeMillis: 30000
-      validationQuery: SELECT 1 FROM DUAL
-      testWhileIdle: true
-      testOnBorrow: false
-      testOnReturn: false
+      minEvictableIdleTimeMillis: 30000