分布式事务一致性ok,缓存caffeine ok

build.gradle

@@ -32,6 +32,7 @@ buildscript {
         fastjson_version = '1.2.44'
 
         kisso_version = '3.7.0'
+        // caffeine_version = 'a'
     }
     repositories {
         mavenCentral()
@@ -70,6 +71,7 @@ subprojects {
         compile('org.springframework.boot:spring-boot-starter-aop')
         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')
         testCompile('org.springframework.boot:spring-boot-starter-test')
 
         testCompile("junit:junit:$junit_version")
@@ -87,8 +89,9 @@ subprojects {
         compile("javax.servlet:servlet-api:2.5")
 
         // cache
-        compile("org.ehcache:ehcache:$ehcache_version")
-        compile("net.sf.ehcache:ehcache-core:$ehcache_core_version")
+        compile('com.github.ben-manes.caffeine:caffeine')
+//        compile("org.ehcache:ehcache:$ehcache_version")
+//        compile("net.sf.ehcache:ehcache-core:$ehcache_core_version")
 
         // db
         compile("mysql:mysql-connector-java:$mysql_connector_version")
@@ -108,7 +111,7 @@ subprojects {
 
         // utils
         compile("org.projectlombok:lombok:1.16.18")
-        compile("com.google.guava:guava:23.6-jre")
+//        compile("com.google.guava:guava:23.6-jre")
         compile("com.github.penggle:kaptcha:2.3.2")
         compile("com.alibaba:fastjson:$fastjson_version")
 

settings.gradle

@@ -1,5 +1,5 @@
 rootProject.name = 'zen'
-include 'zen-common'
+include 'zen-core'
 include 'zen-umps'
 include 'zen-orm'
 include 'zen-api'

zen-api/build.gradle

@@ -1,6 +1,7 @@
 dependencies {
-    compile project(":zen-umps")
+//    compile project(":zen-umps")
     compile project(":zen-orm")
+    compile project(":zen-core")
 }
 
 jar{

zen-api/src/main/kotlin/com/gxzc/zen/api/sys/model/SysUser.kt

@@ -56,18 +56,18 @@ data class SysUser(
         /**
          * 备用字段
          */
-        var ext01: String? = null,
+        var ext1: String? = null,
         /**
          * 备用字段
          */
-        var ext02: String? = null,
+        var ext2: String? = null,
         /**
          * 备用字段
          */
-        var ext03: String? = null,
+        var ext3: String? = null,
         /**
          * 备用字段
          */
-        var ext04: String? = null
+        var ext4: String? = null
 ) : BaseModel() {
 }

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

@@ -2,6 +2,7 @@ package com.gxzc.zen.api.sys.service
 
 import com.gxzc.zen.api.sys.model.SysUser
 import com.gxzc.zen.common.base.BaseService
+
 /**
  * <p>
  * 用户管理 服务类
@@ -10,4 +11,6 @@ import com.gxzc.zen.common.base.BaseService
  * @author NorthLan123
  * @since 2018-02-03
  */
-interface ISysUserService : BaseService<SysUser>
+interface ISysUserService : BaseService<SysUser> {
+    fun selectListCacheable(): MutableList<SysUser>
+}

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

@@ -1,9 +1,12 @@
 package com.gxzc.zen.api.sys.service.impl
 
-import com.gxzc.zen.api.sys.model.SysUser
+import com.baomidou.mybatisplus.mapper.EntityWrapper
+import com.baomidou.mybatisplus.service.impl.ServiceImpl
 import com.gxzc.zen.api.sys.mapper.SysUserMapper
+import com.gxzc.zen.api.sys.model.SysUser
 import com.gxzc.zen.api.sys.service.ISysUserService
-import com.baomidou.mybatisplus.service.impl.ServiceImpl
+import org.slf4j.LoggerFactory
+import org.springframework.cache.annotation.Cacheable
 import org.springframework.stereotype.Service
 
 /**
@@ -16,5 +19,14 @@ import org.springframework.stereotype.Service
  */
 @Service
 class SysUserServiceImpl : ServiceImpl<SysUserMapper, SysUser>(), ISysUserService {
+    companion object {
+        private val logger = LoggerFactory.getLogger(SysUserServiceImpl::class.java)
+    }
+
+    @Cacheable("user")
+    override fun selectListCacheable(): MutableList<SysUser> {
+        logger.info("selectListCacheable!!!")
+        return baseMapper.selectList(EntityWrapper<SysUser>())
+    }
 
 }

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

@@ -21,10 +21,10 @@
         <result column="position" property="position" />
         <result column="address" property="address" />
         <result column="staff_no" property="staffNo" />
-        <result column="ext_01" property="ext01" />
-        <result column="ext_02" property="ext02" />
-        <result column="ext_03" property="ext03" />
-        <result column="ext_04" property="ext04" />
+        <result column="ext1" property="ext1" />
+        <result column="ext2" property="ext2" />
+        <result column="ext3" property="ext3" />
+        <result column="ext4" property="ext4" />
     </resultMap>
 
 </mapper>

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

@@ -0,0 +1,76 @@
+package com.gxzc.zen.common.config
+
+import com.github.benmanes.caffeine.cache.Caffeine
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty
+import org.springframework.boot.context.properties.ConfigurationProperties
+import org.springframework.cache.CacheManager
+import org.springframework.cache.annotation.EnableCaching
+import org.springframework.cache.caffeine.CaffeineCache
+import org.springframework.cache.support.SimpleCacheManager
+import org.springframework.context.annotation.Bean
+import org.springframework.context.annotation.Configuration
+import org.springframework.context.annotation.Primary
+import java.util.concurrent.TimeUnit
+
+/**
+ * 缓存配置类
+ * @author NorthLan at 2018/2/4
+ */
+@Configuration
+@EnableCaching
+@ConfigurationProperties(prefix = "cache")
+@ConditionalOnProperty(prefix = "cache", name = ["enable"], havingValue = "true")
+class CacheConfig {
+
+    var cacheSpecs: Map<String, CacheSpec>? = null
+
+    @Bean
+    @Primary
+    fun caffeineCacheManager(): CacheManager {
+        return SimpleCacheManager().also {
+            it.setCaches(buildCache())
+        }
+    }
+
+    fun buildCache(): MutableCollection<CaffeineCache> {
+        val collection = mutableListOf<CaffeineCache>()
+        cacheSpecs?.forEach { name, spec ->
+            run {
+                val builder = Caffeine.newBuilder().also {
+                    if (spec.initialCapacity >= 0) {
+                        it.initialCapacity(spec.initialCapacity)
+                    }
+                    if (spec.maximumSize >= 0) {
+                        it.maximumSize(spec.maximumSize)
+                    }
+                    if (spec.maximumWeight >= 0) {
+                        it.maximumWeight(spec.maximumWeight)
+                    }
+                    if (spec.expireAfterAccess >= 0) {
+                        it.expireAfterAccess(spec.expireAfterAccess, TimeUnit.SECONDS)
+                    }
+                    if (spec.expireAfterWrite >= 0) {
+                        it.expireAfterWrite(spec.expireAfterWrite, TimeUnit.SECONDS)
+                    }
+                    if (spec.refreshAfterWrite >= 0) {
+                        it.refreshAfterWrite(spec.refreshAfterWrite, TimeUnit.SECONDS)
+                    }
+                    if (spec.weakKeys) {
+                        it.weakKeys()
+                    }
+                    if (spec.weakValues) {
+                        it.weakValues()
+                    }
+                    if (spec.softValues) {
+                        it.softValues()
+                    }
+                    if (spec.recordStats) {
+                        it.recordStats()
+                    }
+                }
+                collection.add(CaffeineCache(name, builder.build()))
+            }
+        }
+        return collection
+    }
+}

zen-core/src/main/kotlin/com/gxzc/zen/common/config/CacheSpec.kt

@@ -0,0 +1,18 @@
+package com.gxzc.zen.common.config
+
+/**
+ * 缓存配置数据类
+ * @author NorthLan at 2018/2/4
+ */
+data class CacheSpec(
+        var initialCapacity: Int = -1,
+        var maximumSize: Long = -1,
+        var maximumWeight: Long = -1,
+        var expireAfterAccess: Long = -1,
+        var expireAfterWrite: Long = -1,
+        var refreshAfterWrite: Long = -1,
+        var weakKeys: Boolean = false,
+        var weakValues: Boolean = false,
+        var softValues: Boolean = false,
+        var recordStats: Boolean = false
+)

zen-core/src/main/resources/application-cache.yml

@@ -0,0 +1,21 @@
+############## cache 配置 ##############
+spring:
+  cache:
+    type: caffeine
+    caffeine:
+      spec:
+
+cache:
+  enable: true # 是否生效
+  cache-specs: # see also {CaffeineSpec}
+    user: # cache name
+      initialCapacity: -1 # 初始化容量 默认-1
+      maximumSize: 50 # 最大容量
+      # maximumWeight: -1 # 最大权重,与maximumSize冲突
+      # expireAfterAccess: 1 # 最后一次写入或访问后经过固定时间过期 以expireAfterWrite为准
+      # expireAfterWrite: 1 # 最后一次写入后经过固定时间过期
+      # refreshAfterWrite: 1 # 创建缓存或者最近一次更新缓存后经过固定的时间间隔刷新缓存
+      recordStats: true # 开发统计功能
+      weakKeys: false # 该key是否为弱引用
+      weakValues: false # 该key对应的values是否为弱引用 与softValues冲突
+      softValues: false # 该key对应的values是否为软引用

zen-orm/build.gradle

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

zen-orm/src/main/kotlin/com/gxzc/zen/orm/annotation/MultiTransactional.kt

@@ -4,7 +4,7 @@ import java.lang.annotation.Inherited
 import kotlin.reflect.KClass
 
 /**
- *
+ * 分库多数据源事务一致性处理
  * @author NorthLan
  * @date 2018/2/3
  * @url https://noahlan.com

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

@@ -1,9 +1,7 @@
 package com.gxzc.zen.orm.aop
 
-import com.gxzc.zen.common.util.SpringContextHolder
 import com.gxzc.zen.orm.DynamicMultipleDataSource
 import com.gxzc.zen.orm.annotation.DynamicDataSource
-import com.gxzc.zen.orm.annotation.MultiTransactional
 import com.gxzc.zen.orm.contants.DSKey
 import org.aspectj.lang.JoinPoint
 import org.aspectj.lang.ProceedingJoinPoint
@@ -12,9 +10,7 @@ import org.aspectj.lang.reflect.MethodSignature
 import org.slf4j.LoggerFactory
 import org.springframework.core.annotation.Order
 import org.springframework.stereotype.Component
-import org.springframework.transaction.jta.JtaTransactionManager
 import java.lang.reflect.Method
-import kotlin.reflect.KClass
 
 
 /**
@@ -52,55 +48,6 @@ class DataSourceSwitchAspect {
     fun mpMapperPointCut() {
     }
 
-    /**
-     * 一致性事务切面解决方案
-     */
-    @Around("@annotation(com.gxzc.zen.orm.annotation.MultiTransactional)")
-    fun multiTransactionAround(joinPoint: ProceedingJoinPoint): Any? {
-        logger.info("@MultiTransactional aspect...")
-        val methodName = joinPoint.signature.name
-        val parameterTypes = (joinPoint.signature as MethodSignature).method.parameterTypes
-        val method = joinPoint.target::class.java.getMethod(methodName, *parameterTypes)
-
-        if (method.isAnnotationPresent(MultiTransactional::class.java)) {
-            val multiTransaction = method.getAnnotation(MultiTransactional::class.java)
-            val transactionManager = SpringContextHolder.getBean(JtaTransactionManager::class.java)
-            val userTransaction = transactionManager?.userTransaction
-            return try {
-                userTransaction?.begin()
-                val r = joinPoint.proceed()
-                userTransaction?.commit()
-                return r
-            } catch (e: Throwable) {
-                val rollbackExceptions = multiTransaction.rollbackFor
-                val noRollbackExceptions = multiTransaction.noRollbackFor
-
-                val isRollbackExceptionPresent = isPresent(e, rollbackExceptions)
-                val isNoRollbackExceptionPresent = isPresent(e, noRollbackExceptions)
-
-                // rollbackFor回滚 noRollbackFor不回滚
-                if (isRollbackExceptionPresent || !isNoRollbackExceptionPresent) {
-                    userTransaction?.rollback()
-                } else {
-                    userTransaction?.commit()
-                }
-            }
-        } else {
-            return joinPoint.proceed()
-        }
-    }
-
-    /**
-     * 判断指定类型是否存在于注解中
-     * @param e 指定抛出类型
-     * @param exceptions 注解定义的类型列表
-     */
-    private fun isPresent(e: Throwable, exceptions: Array<KClass<out Throwable>>): Boolean {
-        return exceptions.find {
-            e::class.java.isAssignableFrom(it.java) || e::class.java == it::java
-        } != null
-    }
-
     @Around("@annotation(com.gxzc.zen.orm.annotation.DynamicDataSource)")
     fun annotationAround(joinPoint: ProceedingJoinPoint): Any? {
         logger.debug("@DynamicDatasource aspect...")

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

@@ -0,0 +1,78 @@
+package com.gxzc.zen.orm.aop
+
+import com.gxzc.zen.common.util.SpringContextHolder
+import com.gxzc.zen.orm.annotation.MultiTransactional
+import org.aspectj.lang.ProceedingJoinPoint
+import org.aspectj.lang.annotation.Around
+import org.aspectj.lang.annotation.Aspect
+import org.aspectj.lang.reflect.MethodSignature
+import org.slf4j.LoggerFactory
+import org.springframework.stereotype.Component
+import org.springframework.transaction.jta.JtaTransactionManager
+import kotlin.reflect.KClass
+
+/**
+ *
+ * @author NorthLan at 2018/2/3
+ */
+@Aspect
+@Suppress("unused")
+@Component
+class MultiDataSourceAspect {
+    companion object {
+        private val logger = LoggerFactory.getLogger(MultiDataSourceAspect::class.java)
+    }
+
+    init {
+        logger.debug("${this::class.java.simpleName} initialized...")
+    }
+
+    /**
+     * 一致性事务切面解决方案
+     */
+    @Around("@annotation(com.gxzc.zen.orm.annotation.MultiTransactional)")
+    fun multiTransactionAround(joinPoint: ProceedingJoinPoint): Any? {
+        logger.info("@MultiTransactional aspect...")
+        val methodName = joinPoint.signature.name
+        val parameterTypes = (joinPoint.signature as MethodSignature).method.parameterTypes
+        val method = joinPoint.target::class.java.getMethod(methodName, *parameterTypes)
+
+        if (method.isAnnotationPresent(MultiTransactional::class.java)) {
+            val multiTransaction = method.getAnnotation(MultiTransactional::class.java)
+            val transactionManager = SpringContextHolder.getBean(JtaTransactionManager::class.java)
+            val userTransaction = transactionManager?.userTransaction
+            return try {
+                userTransaction?.begin()
+                val r = joinPoint.proceed()
+                userTransaction?.commit()
+                return r
+            } catch (e: Throwable) {
+                val rollbackExceptions = multiTransaction.rollbackFor
+                val noRollbackExceptions = multiTransaction.noRollbackFor
+
+                val isRollbackExceptionPresent = isPresent(e, rollbackExceptions)
+                val isNoRollbackExceptionPresent = isPresent(e, noRollbackExceptions)
+
+                // rollbackFor回滚 noRollbackFor不回滚
+                if (isRollbackExceptionPresent || !isNoRollbackExceptionPresent) {
+                    userTransaction?.rollback()
+                } else {
+                    userTransaction?.commit()
+                }
+            }
+        } else {
+            return joinPoint.proceed()
+        }
+    }
+
+    /**
+     * 判断指定类型是否存在于注解中
+     * @param e 指定抛出类型
+     * @param exceptions 注解定义的类型列表
+     */
+    private fun isPresent(e: Throwable, exceptions: Array<KClass<out Throwable>>): Boolean {
+        return exceptions.find {
+            e::class.java.isAssignableFrom(it.java) || e::class.java == it::java
+        } != null
+    }
+}

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

@@ -1,148 +1,148 @@
-package com.gxzc.zen.orm.config
-
-import com.gxzc.zen.orm.DataSourceSwitchMethodInterceptor
-import org.springframework.aop.aspectj.AspectJExpressionPointcutAdvisor
-import org.springframework.aop.framework.autoproxy.BeanNameAutoProxyCreator
-import org.springframework.beans.factory.annotation.Qualifier
-import org.springframework.context.annotation.Bean
-import org.springframework.context.annotation.Configuration
-import org.springframework.transaction.PlatformTransactionManager
-import org.springframework.transaction.TransactionDefinition
-import org.springframework.transaction.interceptor.NameMatchTransactionAttributeSource
-import org.springframework.transaction.interceptor.RollbackRuleAttribute
-import org.springframework.transaction.interceptor.RuleBasedTransactionAttribute
-import org.springframework.transaction.interceptor.TransactionInterceptor
-
-
-/**
- * 事务配置 支持动态数据源
- * @author NorthLan at 2018/1/31
- */
-@Configuration
-class TransactionalConfig {
-    companion object {
-        private const val CUSTOMIZE_TRANSACTION_INTERCEPTOR_NAME = "customizeTransactionInterceptor"
-        private const val DATA_SOURCE_SWITCH_METHOD_INTERCEPTOR_NAME = "dataSourceSwitchMethodInterceptor"
-        /**
-         * 默认只对 "*Service" , "*ServiceImpl" Bean 进行事务处理,"*"表示模糊匹配, 比如 : userService,orderServiceImpl
-         */
-        private val DEFAULT_TRANSACTION_BEAN_NAMES = arrayOf("*Service", "*ServiceImpl", "*Mapper")
-        /**
-         * 可传播事务配置
-         */
-        private val DEFAULT_REQUIRED_METHOD_RULE_TRANSACTION_ATTRIBUTES = arrayOf(
-                "add*",
-                "save*",
-                "insert*",
-                "delete*",
-                "update*",
-                "edit*",
-                "batch*",
-                "create*",
-                "remove*"
-        )
-        /**
-         * 默认的只读事务
-         */
-        private val DEFAULT_READ_ONLY_METHOD_RULE_TRANSACTION_ATTRIBUTES = arrayOf(
-                "get*",
-                "count*",
-                "find*",
-                "query*",
-                "select*",
-                "list*",
-                "*"
-        )
-    }
-
-    /**
-     * 自定义事务 BeanName 拦截
-     */
-    private val customizeTransactionBeanNames = arrayOf<String>()
-    /**
-     * 自定义方法名的事务属性相关联,可以使用通配符(*)字符关联相同的事务属性的设置方法; 只读事务
-     */
-    private val customizeReadOnlyMethodRuleTransactionAttributes = arrayOf<String>()
-    /**
-     * 自定义方法名的事务属性相关联,可以使用通配符(*)字符关联相同的事务属性的设置方法;
-     * 传播事务(默认的)[org.springframework.transaction.annotation.Propagation.REQUIRED]
-     */
-    private val customizeRequiredMethodRuleTransactionAttributes = arrayOf<String>()
-
-    /**
-     * 配置事务拦截器
-     * @param platformTransactionManager 事务管理器
-     */
-    @Bean(CUSTOMIZE_TRANSACTION_INTERCEPTOR_NAME)
-    fun customizeTransactionInterceptor(platformTransactionManager: PlatformTransactionManager): TransactionInterceptor {
-        val transactionAttributeSource = NameMatchTransactionAttributeSource()
-        val readOnly = this.readOnlyTransactionRule()
-        val required = this.requiredTransactionRule()
-        // 默认的只读事务配置
-        for (methodName in DEFAULT_READ_ONLY_METHOD_RULE_TRANSACTION_ATTRIBUTES) {
-            transactionAttributeSource.addTransactionalMethod(methodName, readOnly)
-        }
-        // 默认的传播事务配置
-        for (methodName in DEFAULT_REQUIRED_METHOD_RULE_TRANSACTION_ATTRIBUTES) {
-            transactionAttributeSource.addTransactionalMethod(methodName, required)
-        }
-        // 定制的只读事务配置
-        for (methodName in customizeReadOnlyMethodRuleTransactionAttributes) {
-            transactionAttributeSource.addTransactionalMethod(methodName, readOnly)
-        }
-        // 定制的传播事务配置
-        for (methodName in customizeRequiredMethodRuleTransactionAttributes) {
-            transactionAttributeSource.addTransactionalMethod(methodName, required)
-        }
-        return TransactionInterceptor(platformTransactionManager, transactionAttributeSource)
-    }
-
-//    @Bean
-//    fun aspectJExpressionPointcutAdvisor(@Qualifier(CUSTOMIZE_TRANSACTION_INTERCEPTOR_NAME) transactionInterceptor: TransactionInterceptor): AspectJExpressionPointcutAdvisor {
-//        return AspectJExpressionPointcutAdvisor().also {
-//            it.advice = transactionInterceptor
-//            it.expression = "execution (* com.gxzc.zen.api..*Service.*(..))"
+//package com.gxzc.zen.orm.config
+//
+//import com.gxzc.zen.orm.DataSourceSwitchMethodInterceptor
+//import org.springframework.aop.aspectj.AspectJExpressionPointcutAdvisor
+//import org.springframework.aop.framework.autoproxy.BeanNameAutoProxyCreator
+//import org.springframework.beans.factory.annotation.Qualifier
+//import org.springframework.context.annotation.Bean
+//import org.springframework.context.annotation.Configuration
+//import org.springframework.transaction.PlatformTransactionManager
+//import org.springframework.transaction.TransactionDefinition
+//import org.springframework.transaction.interceptor.NameMatchTransactionAttributeSource
+//import org.springframework.transaction.interceptor.RollbackRuleAttribute
+//import org.springframework.transaction.interceptor.RuleBasedTransactionAttribute
+//import org.springframework.transaction.interceptor.TransactionInterceptor
+//
+//
+///**
+// * 事务配置 支持动态数据源
+// * @author NorthLan at 2018/1/31
+// */
+//@Configuration
+//class TransactionalConfig {
+//    companion object {
+//        private const val CUSTOMIZE_TRANSACTION_INTERCEPTOR_NAME = "customizeTransactionInterceptor"
+//        private const val DATA_SOURCE_SWITCH_METHOD_INTERCEPTOR_NAME = "dataSourceSwitchMethodInterceptor"
+//        /**
+//         * 默认只对 "*Service" , "*ServiceImpl" Bean 进行事务处理,"*"表示模糊匹配, 比如 : userService,orderServiceImpl
+//         */
+//        private val DEFAULT_TRANSACTION_BEAN_NAMES = arrayOf("*Service", "*ServiceImpl", "*Mapper")
+//        /**
+//         * 可传播事务配置
+//         */
+//        private val DEFAULT_REQUIRED_METHOD_RULE_TRANSACTION_ATTRIBUTES = arrayOf(
+//                "add*",
+//                "save*",
+//                "insert*",
+//                "delete*",
+//                "update*",
+//                "edit*",
+//                "batch*",
+//                "create*",
+//                "remove*"
+//        )
+//        /**
+//         * 默认的只读事务
+//         */
+//        private val DEFAULT_READ_ONLY_METHOD_RULE_TRANSACTION_ATTRIBUTES = arrayOf(
+//                "get*",
+//                "count*",
+//                "find*",
+//                "query*",
+//                "select*",
+//                "list*",
+//                "*"
+//        )
+//    }
+//
+//    /**
+//     * 自定义事务 BeanName 拦截
+//     */
+//    private val customizeTransactionBeanNames = arrayOf<String>()
+//    /**
+//     * 自定义方法名的事务属性相关联,可以使用通配符(*)字符关联相同的事务属性的设置方法; 只读事务
+//     */
+//    private val customizeReadOnlyMethodRuleTransactionAttributes = arrayOf<String>()
+//    /**
+//     * 自定义方法名的事务属性相关联,可以使用通配符(*)字符关联相同的事务属性的设置方法;
+//     * 传播事务(默认的)[org.springframework.transaction.annotation.Propagation.REQUIRED]
+//     */
+//    private val customizeRequiredMethodRuleTransactionAttributes = arrayOf<String>()
+//
+//    /**
+//     * 配置事务拦截器
+//     * @param platformTransactionManager 事务管理器
+//     */
+//    @Bean(CUSTOMIZE_TRANSACTION_INTERCEPTOR_NAME)
+//    fun customizeTransactionInterceptor(platformTransactionManager: PlatformTransactionManager): TransactionInterceptor {
+//        val transactionAttributeSource = NameMatchTransactionAttributeSource()
+//        val readOnly = this.readOnlyTransactionRule()
+//        val required = this.requiredTransactionRule()
+//        // 默认的只读事务配置
+//        for (methodName in DEFAULT_READ_ONLY_METHOD_RULE_TRANSACTION_ATTRIBUTES) {
+//            transactionAttributeSource.addTransactionalMethod(methodName, readOnly)
+//        }
+//        // 默认的传播事务配置
+//        for (methodName in DEFAULT_REQUIRED_METHOD_RULE_TRANSACTION_ATTRIBUTES) {
+//            transactionAttributeSource.addTransactionalMethod(methodName, required)
 //        }
+//        // 定制的只读事务配置
+//        for (methodName in customizeReadOnlyMethodRuleTransactionAttributes) {
+//            transactionAttributeSource.addTransactionalMethod(methodName, readOnly)
+//        }
+//        // 定制的传播事务配置
+//        for (methodName in customizeRequiredMethodRuleTransactionAttributes) {
+//            transactionAttributeSource.addTransactionalMethod(methodName, required)
+//        }
+//        return TransactionInterceptor(platformTransactionManager, transactionAttributeSource)
 //    }
-
-//    @Bean
-//    fun beanNameAutoProxyCreator(): BeanNameAutoProxyCreator {
-//        return BeanNameAutoProxyCreator().also {
-//            it.setInterceptorNames(DATA_SOURCE_SWITCH_METHOD_INTERCEPTOR_NAME,
-//                    CUSTOMIZE_TRANSACTION_INTERCEPTOR_NAME)
-//            // 归集
-//            it.setBeanNames(*arrayListOf<String>().also {
-//                it.addAll(DEFAULT_TRANSACTION_BEAN_NAMES) // 默认
-//                it.addAll(customizeTransactionBeanNames) // 定制
-//            }.toTypedArray())
-//            it.isProxyTargetClass = true
+//
+////    @Bean
+////    fun aspectJExpressionPointcutAdvisor(@Qualifier(CUSTOMIZE_TRANSACTION_INTERCEPTOR_NAME) transactionInterceptor: TransactionInterceptor): AspectJExpressionPointcutAdvisor {
+////        return AspectJExpressionPointcutAdvisor().also {
+////            it.advice = transactionInterceptor
+////            it.expression = "execution (* com.gxzc.zen.api..*Service.*(..))"
+////        }
+////    }
+//
+////    @Bean
+////    fun beanNameAutoProxyCreator(): BeanNameAutoProxyCreator {
+////        return BeanNameAutoProxyCreator().also {
+////            it.setInterceptorNames(DATA_SOURCE_SWITCH_METHOD_INTERCEPTOR_NAME,
+////                    CUSTOMIZE_TRANSACTION_INTERCEPTOR_NAME)
+////            // 归集
+////            it.setBeanNames(*arrayListOf<String>().also {
+////                it.addAll(DEFAULT_TRANSACTION_BEAN_NAMES) // 默认
+////                it.addAll(customizeTransactionBeanNames) // 定制
+////            }.toTypedArray())
+////            it.isProxyTargetClass = true
+////        }
+////    }
+////
+////    @Bean(DATA_SOURCE_SWITCH_METHOD_INTERCEPTOR_NAME)
+////    fun dataSourceSwitchMethodInterceptor(): DataSourceSwitchMethodInterceptor {
+////        return DataSourceSwitchMethodInterceptor()
+////    }
+//
+//    /**
+//     * 支持当前事务
+//     * 如果不存在创建一个新的
+//     */
+//    private fun requiredTransactionRule(): RuleBasedTransactionAttribute {
+//        return RuleBasedTransactionAttribute().also {
+//            it.rollbackRules = arrayListOf(RollbackRuleAttribute(Exception::class.java))
+//            it.propagationBehavior = TransactionDefinition.PROPAGATION_REQUIRED
+//            it.timeout = TransactionDefinition.TIMEOUT_DEFAULT
 //        }
 //    }
 //
-//    @Bean(DATA_SOURCE_SWITCH_METHOD_INTERCEPTOR_NAME)
-//    fun dataSourceSwitchMethodInterceptor(): DataSourceSwitchMethodInterceptor {
-//        return DataSourceSwitchMethodInterceptor()
+//    /**
+//     * 只读事务
+//     */
+//    private fun readOnlyTransactionRule(): RuleBasedTransactionAttribute {
+//        return RuleBasedTransactionAttribute().also {
+//            it.isReadOnly = true
+//            it.propagationBehavior = TransactionDefinition.PROPAGATION_NOT_SUPPORTED
+//        }
 //    }
-
-    /**
-     * 支持当前事务
-     * 如果不存在创建一个新的
-     */
-    private fun requiredTransactionRule(): RuleBasedTransactionAttribute {
-        return RuleBasedTransactionAttribute().also {
-            it.rollbackRules = arrayListOf(RollbackRuleAttribute(Exception::class.java))
-            it.propagationBehavior = TransactionDefinition.PROPAGATION_REQUIRED
-            it.timeout = TransactionDefinition.TIMEOUT_DEFAULT
-        }
-    }
-
-    /**
-     * 只读事务
-     */
-    private fun readOnlyTransactionRule(): RuleBasedTransactionAttribute {
-        return RuleBasedTransactionAttribute().also {
-            it.isReadOnly = true
-            it.propagationBehavior = TransactionDefinition.PROPAGATION_NOT_SUPPORTED
-        }
-    }
-}
+//}

zen-umps/build.gradle

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

zen-web/build.gradle

@@ -2,6 +2,7 @@ apply plugin: 'war'
 
 dependencies {
 //    compile project(":zen-orm")
+    compile project(":zen-core")
     compile project(":zen-api")
     compile project(":zen-umps")
     compile project(":zen-mq")

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

@@ -1,6 +1,7 @@
 package com.gxzc.zen.controller
 
 import com.gxzc.zen.api.bus.service.IMgrFondsService
+import com.gxzc.zen.api.sys.service.ISysUserService
 import org.slf4j.LoggerFactory
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.web.bind.annotation.GetMapping
@@ -16,8 +17,16 @@ class ExampleController {
     @Autowired
     private lateinit var mgrFondsService: IMgrFondsService
 
+    @Autowired
+    private lateinit var sysUserService: ISysUserService
+
     @GetMapping("testTransaction")
     fun testTransaction() {
         mgrFondsService.testTransaction()
     }
+
+    @GetMapping("testLoad")
+    fun testLoad() {
+        sysUserService.selectListCacheable()
+    }
 }

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

@@ -6,7 +6,7 @@ server:
 spring:
   profiles:
     active: dev
-    include: orm,mq
+    include: orm-local,mq,cache
 #  redis:
 #    host: localhost
 #    port: 6379

zen-web/src/test/kotlin/com/gxzc/zen/cache/TestCacheController.kt

@@ -0,0 +1,23 @@
+package com.gxzc.zen.cache
+
+import com.gxzc.zen.base.BaseTestKt
+import com.gxzc.zen.orm.annotation.Test
+import org.springframework.http.MediaType
+import org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get
+import org.springframework.test.web.servlet.result.MockMvcResultMatchers.content
+import org.springframework.test.web.servlet.result.MockMvcResultMatchers.status
+
+/**
+ *
+ * @author NorthLan at 2018/2/5
+ */
+class TestCacheController : BaseTestKt() {
+
+    @Test
+    fun loadUser() {
+        mockMvc.perform(get("/")
+                .accept(MediaType.parseMediaType("application/json;charset=UTF-8")))
+                .andExpect(status().isOk)
+                .andExpect(content().contentType("application/json"))
+    }
+}