优化数据源配置,移动缓存配置文件位置,移除多余的log

build.gradle

@@ -65,6 +65,7 @@ subprojects {
         compile('org.springframework.boot:spring-boot-starter-amqp')
         compile('org.springframework.boot:spring-boot-starter-jta-atomikos')
         compile('org.springframework.boot:spring-boot-starter-cache')
+        compile('org.springframework.boot:spring-boot-starter-data-redis')
         testCompile('org.springframework.boot:spring-boot-starter-test')
 
         testCompile("junit:junit:$junit_version")

zen-core/src/main/kotlin/com/gxzc/zen/common/config/CacheConfig.kt → zen-core/src/main/kotlin/com/gxzc/zen/common/config/cache/caffeine/CacheConfig.kt

@@ -1,7 +1,6 @@
-package com.gxzc.zen.common.config
+package com.gxzc.zen.common.config.cache.caffeine
 
 import com.github.benmanes.caffeine.cache.Caffeine
-import com.gxzc.zen.common.persistance.CacheSpec
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty
 import org.springframework.boot.context.properties.ConfigurationProperties
 import org.springframework.cache.CacheManager

zen-core/src/main/kotlin/com/gxzc/zen/common/persistance/CacheSpec.kt → zen-core/src/main/kotlin/com/gxzc/zen/common/config/cache/caffeine/CacheSpec.kt

@@ -1,4 +1,4 @@
-package com.gxzc.zen.common.persistance
+package com.gxzc.zen.common.config.cache.caffeine
 
 /**
  * 缓存配置数据类

zen-orm/src/main/kotlin/com/gxzc/zen/orm/aop/DataSourceSwitchAspect.kt

@@ -32,19 +32,19 @@ class DataSourceSwitchAspect {
         logger.info("DataSourceSwitchAspect initializing...")
     }
 
-    private var isAnnotationAspect = false
+    private var isAnnotationAspect = ThreadLocal<Boolean>().apply { set(false) }
 
-    @Pointcut("execution(* com.gxzc.zen.api..*Service.*(..))")
-    fun zenServicePointCut() {
-    }
+//    @Pointcut("execution(* com.gxzc.zen.api..*Service.*(..))")
+//    fun zenServicePointCut() {
+//    }
 
     @Pointcut("execution(* com.gxzc.zen.api..*Mapper.*(..))")
     fun zenMapperPointCut() {
     }
 
-    @Pointcut("execution(* com.baomidou.mybatisplus..*Service.*(..))")
-    fun mpServicePointCut() {
-    }
+//    @Pointcut("execution(* com.baomidou.mybatisplus..*Service.*(..))")
+//    fun mpServicePointCut() {
+//    }
 
     @Pointcut("execution(* com.baomidou.mybatisplus..*Mapper.*(..))")
     fun mpMapperPointCut() {
@@ -52,22 +52,22 @@ class DataSourceSwitchAspect {
 
     @Around("@annotation(com.gxzc.zen.orm.annotation.DynamicDataSource)")
     fun annotationAround(joinPoint: ProceedingJoinPoint): Any? {
-        logger.debug("@DynamicDatasource aspect...")
-        isAnnotationAspect = true
+        logger.trace("@DynamicDatasource aspect...")
+        isAnnotationAspect.set(true)
         val method = (joinPoint.signature as MethodSignature).method
         setDataSource(method, DSKey.DSKEY_SYS)
         try {
             return joinPoint.proceed()
         } finally {
-            isAnnotationAspect = false
+            isAnnotationAspect.set(false)
             DynamicMultipleDataSource.clear()
         }
     }
 
     @Before("zenMapperPointCut() || mpMapperPointCut()")
     fun dynamicDataSource(joinPoint: JoinPoint) {
-        logger.debug("*Mapper aspect...")
-        if (isAnnotationAspect) {
+        logger.trace("*Mapper aspect...")
+        if (isAnnotationAspect.get()) {
             return
         }
         val target = joinPoint.target

zen-orm/src/main/kotlin/com/gxzc/zen/orm/aop/MultiTransactionAspect.kt

@@ -62,11 +62,11 @@ class MultiTransactionAspect {
                 if (isRollbackExceptionPresent || !isNoRollbackExceptionPresent) {
                     logger.info("callback...")
                     userTransaction.rollback()
+                    throw ZenException(ZenExceptionEnum.SERVER_ERROR)
                 } else {
                     logger.info("commit...")
                     userTransaction.commit()
                 }
-                throw ZenException(ZenExceptionEnum.SERVER_ERROR)
             }
         } else {
             return joinPoint.proceed()

zen-orm/src/main/kotlin/com/gxzc/zen/orm/config/MultipleDataSourceConfig.kt

@@ -46,6 +46,7 @@ class MultipleDataSourceConfig {
 
     @Bean(DSKey.DSKEY_BUSINESS + "druid")
     @ConfigurationProperties(prefix = "datasource.bus")
+    @ConditionalOnProperty(prefix = "orm", name = ["multi-datasource-enable"], havingValue = "true", matchIfMissing = true)
     fun dataSourceBusDruid(): XADataSource {
         return DruidXADataSource()
     }
@@ -61,6 +62,7 @@ class MultipleDataSourceConfig {
 
     @Bean(DSKey.DSKEY_BUSINESS)
     @DependsOn(DSKey.DSKEY_BUSINESS + "druid")
+    @ConditionalOnProperty(prefix = "orm", name = ["multi-datasource-enable"], havingValue = "true", matchIfMissing = true)
     fun dataSourceBus(): DataSource {
         return AtomikosDataSourceBean().also {
             it.xaDataSource = dataSourceBusDruid()
@@ -68,6 +70,7 @@ class MultipleDataSourceConfig {
     }
 
     @Bean
+    @ConditionalOnProperty(prefix = "orm", name = ["multi-datasource-enable"], havingValue = "true", matchIfMissing = true)
     fun multipleDataSource(@Qualifier(DSKey.DSKEY_SYS) dataSourceSys: DataSource,
                            @Qualifier(DSKey.DSKEY_BUSINESS) dataSourceBus: DataSource): DynamicMultipleDataSource {
         return DynamicMultipleDataSource().apply {

zen-web/src/main/kotlin/com/gxzc/zen/ApplicationInitializer.kt

@@ -1,29 +0,0 @@
-package com.gxzc.zen
-
-import com.gxzc.zen.api.sys.service.ISysUserService
-import org.slf4j.LoggerFactory
-import org.springframework.beans.factory.annotation.Autowired
-import org.springframework.boot.CommandLineRunner
-import org.springframework.stereotype.Component
-
-/**
- * 启动完成 加载
- * @author NorthLan
- * @date 2018/3/26
- * @url https://noahlan.com
- */
-@Component
-class ApplicationInitializer : CommandLineRunner {
-    companion object {
-        private val logger = LoggerFactory.getLogger(ApplicationInitializer::class.java)
-    }
-
-    @Autowired
-    private lateinit var sysUserService: ISysUserService
-
-    override fun run(vararg args: String?) {
-        logger.info("Started successful... initializing data...")
-
-//        sysUserService
-    }
-}