将数据源修改为mycat并优化几个mycat不能实现的sql(join 无法select *)

build.gradle

@@ -66,7 +66,7 @@ subprojects {
         compile('org.springframework.boot:spring-boot-starter-web')
         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-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')

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

@@ -11,10 +11,10 @@ import com.gxzc.zen.common.contants.ZenConstants
 import com.gxzc.zen.common.exception.ZenException
 import com.gxzc.zen.common.exception.ZenExceptionEnum
 import com.gxzc.zen.common.util.TreeUtil
-import com.gxzc.zen.orm.annotation.ZenTransactional
 import org.springframework.beans.BeanUtils
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.stereotype.Service
+import org.springframework.transaction.annotation.Transactional
 
 /**
  * <p>
@@ -43,7 +43,7 @@ class SysDictTypeServiceImpl : ServiceImpl<SysDictTypeMapper, SysDictType>(), IS
         return getTree(baseMapper.selectList(null))
     }
 
-    @ZenTransactional
+    @Transactional
     override fun createDictType(entity: SysDictType): SysDictType {
         // 先新增一条数据 再根据此数据更新对应的path
         if (baseMapper.insert(entity) <= 0) {
@@ -66,7 +66,7 @@ class SysDictTypeServiceImpl : ServiceImpl<SysDictTypeMapper, SysDictType>(), IS
         return entity
     }
 
-    @ZenTransactional
+    @Transactional
     override fun deleteDictType(id: Long?) {
         if (id == null) {
             throw ZenException(ZenExceptionEnum.BIZ_DELETE_ERROR)

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

@@ -5,10 +5,10 @@ import com.baomidou.mybatisplus.service.impl.ServiceImpl
 import com.gxzc.zen.api.sys.mapper.SysMenuRoleMapper
 import com.gxzc.zen.api.sys.model.SysMenuRole
 import com.gxzc.zen.api.sys.service.ISysMenuRoleService
-import com.gxzc.zen.orm.annotation.ZenTransactional
 import com.gxzc.zen.umps.constant.ZenHttpSession
 import com.gxzc.zen.umps.util.ShiroRedisUtil
 import org.springframework.stereotype.Service
+import org.springframework.transaction.annotation.Transactional
 
 /**
  * <p>
@@ -36,7 +36,7 @@ class SysMenuRoleServiceImpl : ServiceImpl<SysMenuRoleMapper, SysMenuRole>(), IS
         }
     }
 
-    @ZenTransactional
+    @Transactional
     override fun updateMenuRole(roleId: Long, menuIdList: List<Long>) {
         // 先获取roleid的所有menuid
         val oldMenuIdList = getMenuIdListByRoleId(roleId)

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

@@ -11,13 +11,13 @@ import com.gxzc.zen.common.contants.ZenConstants
 import com.gxzc.zen.common.exception.ZenException
 import com.gxzc.zen.common.exception.ZenExceptionEnum
 import com.gxzc.zen.common.util.TreeUtil
-import com.gxzc.zen.orm.annotation.ZenTransactional
 import com.gxzc.zen.umps.constant.ZenHttpSession
 import com.gxzc.zen.umps.util.SSOUtil
 import com.gxzc.zen.umps.util.ShiroRedisUtil
 import org.springframework.beans.BeanUtils
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.stereotype.Service
+import org.springframework.transaction.annotation.Transactional
 
 /**
  * <p>
@@ -113,7 +113,7 @@ class SysMenuServiceImpl : ServiceImpl<SysMenuMapper, SysMenu>(), ISysMenuServic
         return getTree(getSysMenuList().toList())
     }
 
-    @ZenTransactional
+    @Transactional
     override fun createSysMenu(entity: SysMenu): SysMenu {
         // 先新增一条数据 再根据此数据更新对应的path
         if (baseMapper.insert(entity) <= 0) {
@@ -133,7 +133,7 @@ class SysMenuServiceImpl : ServiceImpl<SysMenuMapper, SysMenu>(), ISysMenuServic
         return entity
     }
 
-    @ZenTransactional
+    @Transactional
     override fun deleteMenu(entity: SysMenu) {
         if (entity.id == null) {
             throw ZenException(ZenExceptionEnum.BIZ_DELETE_ERROR)

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

@@ -12,11 +12,11 @@ import com.gxzc.zen.common.exception.ZenExceptionEnum
 import com.gxzc.zen.common.properties.PlatformProperties
 import com.gxzc.zen.common.util.PlatformUtil
 import com.gxzc.zen.common.util.RedisCacheUtil
-import com.gxzc.zen.orm.annotation.ZenTransactional
 import org.slf4j.LoggerFactory
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.boot.CommandLineRunner
 import org.springframework.stereotype.Service
+import org.springframework.transaction.annotation.Transactional
 
 /**
  * <p>
@@ -69,7 +69,7 @@ class SysParamServiceImpl : ServiceImpl<SysParamMapper, SysParam>(), ISysParamSe
         }.toMutableList()
     }
 
-    @ZenTransactional
+    @Transactional
     override fun modify(data: SysParam): SysParam {
         if (PlatformUtil.getPlatform() == PLATFORM.SYSTEM) {
             baseMapper.updateWOLogic(data, EntityWrapper<SysParam>().eq("id", data.id))
@@ -106,7 +106,7 @@ class SysParamServiceImpl : ServiceImpl<SysParamMapper, SysParam>(), ISysParamSe
         }
     }
 
-    @ZenTransactional
+    @Transactional
     override fun insertCacheable(data: SysParam) {
         if (PlatformUtil.getPlatform() == PLATFORM.SYSTEM) {
             if (baseMapper.insert(data) == 0) {
@@ -120,7 +120,7 @@ class SysParamServiceImpl : ServiceImpl<SysParamMapper, SysParam>(), ISysParamSe
         }
     }
 
-    @ZenTransactional
+    @Transactional
     override fun physicalDeleteCacheable(id: Long) {
         if (PlatformUtil.getPlatform() == PLATFORM.SYSTEM) {
             if (baseMapper.physicalDelete(EntityWrapper<SysParam>().eq("id", id)) <= 0) {

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

@@ -6,13 +6,11 @@ import com.gxzc.zen.api.sys.mapper.SysResourceRoleMapper
 import com.gxzc.zen.api.sys.model.SysResourceRole
 import com.gxzc.zen.api.sys.service.ISysResourceRoleService
 import com.gxzc.zen.api.sys.service.ISysResourceService
-import com.gxzc.zen.common.exception.ZenException
-import com.gxzc.zen.common.exception.ZenExceptionEnum
-import com.gxzc.zen.orm.annotation.ZenTransactional
 import com.gxzc.zen.umps.constant.ZenHttpSession
 import com.gxzc.zen.umps.util.ShiroRedisUtil
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.stereotype.Service
+import org.springframework.transaction.annotation.Transactional
 
 /**
  * <p>
@@ -27,7 +25,7 @@ class SysResourceRoleServiceImpl : ServiceImpl<SysResourceRoleMapper, SysResourc
     @Autowired
     private lateinit var sysResourceService: ISysResourceService
 
-    @ZenTransactional
+    @Transactional
     override fun saveResourceRoleByRoleId(roleId: Long, menuId: Long, resList: List<Long>) {
         // 先获取roleid下的所有对应menuId下的所有resid
         val menuResIdList = sysResourceService.getResourcesByMenuId(menuId).map { it.id!! }

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

@@ -9,9 +9,9 @@ import com.gxzc.zen.api.sys.service.ISysResourceRoleService
 import com.gxzc.zen.api.sys.service.ISysResourceService
 import com.gxzc.zen.common.exception.ZenException
 import com.gxzc.zen.common.exception.ZenExceptionEnum
-import com.gxzc.zen.orm.annotation.ZenTransactional
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.stereotype.Service
+import org.springframework.transaction.annotation.Transactional
 
 /**
  * <p>
@@ -67,7 +67,7 @@ class SysResourceServiceImpl : ServiceImpl<SysResourceMapper, SysResource>(), IS
         return sysResource
     }
 
-    @ZenTransactional
+    @Transactional
     override fun deleteResourceById(id: Long) {
         baseMapper.physicalDeleteById(id)
         // 还要同时删掉 sys_resource_role 对应id的记录

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

@@ -6,10 +6,10 @@ import com.gxzc.zen.api.sys.mapper.SysUserRoleMapper
 import com.gxzc.zen.api.sys.model.SysRole
 import com.gxzc.zen.api.sys.model.SysUserRole
 import com.gxzc.zen.api.sys.service.ISysUserRoleService
-import com.gxzc.zen.orm.annotation.ZenTransactional
 import com.gxzc.zen.umps.constant.ZenHttpSession
 import com.gxzc.zen.umps.util.ShiroRedisUtil
 import org.springframework.stereotype.Service
+import org.springframework.transaction.annotation.Transactional
 
 /**
  * <p>
@@ -37,13 +37,13 @@ class SysUserRoleServiceImpl : ServiceImpl<SysUserRoleMapper, SysUserRole>(), IS
         }.toSet()
     }
 
-    @ZenTransactional
+    @Transactional
     override fun deleteByUserId(userId: Long) {
         baseMapper.physicalDelete(EntityWrapper<SysUserRole>()
                 .eq("user_id", userId))
     }
 
-    @ZenTransactional
+    @Transactional
     override fun updateByUserId(userId: Long, roleIds: List<Long>) {
         // 先查询userId 所有的roleIds
         val tempRoleIds = getUserRoleIdListByUserId(userId)

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

@@ -11,12 +11,12 @@ import com.gxzc.zen.common.contants.PLATFORM
 import com.gxzc.zen.common.exception.ZenException
 import com.gxzc.zen.common.exception.ZenExceptionEnum
 import com.gxzc.zen.common.util.PlatformUtil
-import com.gxzc.zen.orm.annotation.ZenTransactional
 import org.apache.commons.lang3.RandomStringUtils
 import org.apache.shiro.crypto.hash.SimpleHash
 import org.slf4j.LoggerFactory
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.stereotype.Service
+import org.springframework.transaction.annotation.Transactional
 
 /**
  * <p>
@@ -149,7 +149,7 @@ class SysUserServiceImpl : ServiceImpl<SysUserMapper, SysUser>(), ISysUserServic
         return entity
     }
 
-    @ZenTransactional
+    @Transactional
     override fun delete(id: Long) {
         if (baseMapper.physicalDeleteById(id) > 0) {
             // 删除用户相关所有东西

zen-api/src/main/kotlin/com/gxzc/zen/umps/config/ShiroConfig.kt

@@ -16,6 +16,7 @@ import org.springframework.boot.web.servlet.FilterRegistrationBean
 import org.springframework.context.annotation.Bean
 import org.springframework.context.annotation.Configuration
 import org.springframework.context.annotation.DependsOn
+import org.springframework.core.annotation.Order
 import org.springframework.data.redis.connection.jedis.JedisConnectionFactory
 import org.springframework.data.redis.core.RedisTemplate
 import org.springframework.data.redis.serializer.Jackson2JsonRedisSerializer
@@ -53,6 +54,7 @@ class ShiroConfig {
     }
 
     @Bean(name = ["shiroFilter"])
+    @Order(2)
     fun shiroFilter(): ShiroFilterFactoryBean {
         return ShiroFilterFactoryBean().apply {
             securityManager = securityManager()
@@ -80,17 +82,20 @@ class ShiroConfig {
              * member （用户方面）  org.apache.shiro.web.filter.authc.UserFilter
              * user  表示用户不一定已通过认证,只要曾被Shiro记住过登录状态的用户就可以正常发起请求,比如rememberMe
              */
-            filterChainDefinitionMap = hashMapOf<String, String>(
+            filterChainDefinitionMap = linkedMapOf<String, String>( // BUG 此处一定要使用 linkedHashMap 否则顺序有问题
                     "/auth/login" to "canon", // 登陆
                     "/auth/setcookie" to "canon", // 设置cookie
                     "/auth/hello" to "canon", // 获取cookie
-                    "/auth/logout" to "logout", // 登出
+//                    "/auth/logout" to "logout", // 登出
+                    "/test/**" to "canon", // 测试 免登录
                     ////////////////////// 静态资源 /////////////////////
                     "/v2/api-docs" to "anon",
                     "/swagger-resources/**" to "anon",
                     "/swagger-ui.html" to "anon",
                     "/webjars*" to "anon",
                     "/webjars/**" to "anon",
+                    "/druid/**" to "anon",
+                    "/druid/sql.json" to "anon",
                     "/**/favicon.*" to "anon",
                     ////////////////////// 静态资源 /////////////////////
                     "/**" to "cors,authc,perms" // 对于其他未配置的所有url 先设置cors头 再进行登陆判定 最后判定权限

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

@@ -26,8 +26,41 @@
         <result column="ext5" property="ext5"/>
     </resultMap>
 
+    <sql id="CommonColumns">
+        ${prefix}.id,
+        ${prefix}.enable,
+        ${prefix}.remark,
+        ${prefix}.create_time AS createTime,
+        ${prefix}.create_by AS createBy,
+        ${prefix}.update_time AS updateTime,
+        ${prefix}.update_by AS updateBy,
+    </sql>
+
+    <sql id="Columns">
+        <include refid="CommonColumns">
+            <property name="prefix" value="${prefix}"/>
+        </include>
+        ${prefix}.parent_id AS parentId,
+        ${prefix}.path,
+        ${prefix}.code,
+        ${prefix}.type,
+        ${prefix}.title,
+        ${prefix}.uri,
+        ${prefix}.icon,
+        ${prefix}.sort,
+        ${prefix}.ext1,
+        ${prefix}.ext2,
+        ${prefix}.ext3,
+        ${prefix}.ext4,
+        ${prefix}.ext5
+    </sql>
+
     <select id="selectByRoleIds" resultType="com.gxzc.zen.api.sys.model.SysMenu">
-        SELECT A.* FROM
+        SELECT
+        <include refid="Columns">
+            <property name="prefix" value="A"/>
+        </include>
+        FROM
         sys_menu AS A
         INNER JOIN sys_menu_role AS B ON A.id = B.menu_id
         WHERE B.role_id IN

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

@@ -27,8 +27,41 @@
         <result column="ext5" property="ext5"/>
     </resultMap>
 
+    <sql id="CommonColumns">
+        ${prefix}.id,
+        ${prefix}.enable,
+        ${prefix}.remark,
+        ${prefix}.create_time AS createTime,
+        ${prefix}.create_by AS createBy,
+        ${prefix}.update_time AS updateTime,
+        ${prefix}.update_by AS updateBy,
+    </sql>
+
+    <sql id="Columns">
+        <include refid="CommonColumns">
+            <property name="prefix" value="${prefix}"/>
+        </include>
+        ${prefix}.parent_id AS parentId,
+        ${prefix}.menu_id AS menuId,
+        ${prefix}.type,
+        ${prefix}.code,
+        ${prefix}.uri,
+        ${prefix}.name,
+        ${prefix}.path,
+        ${prefix}.method,
+        ${prefix}.description,
+        ${prefix}.ext1,
+        ${prefix}.ext2,
+        ${prefix}.ext3,
+        ${prefix}.ext4,
+        ${prefix}.ext5
+    </sql>
+
     <select id="selectByRoleIds" resultType="com.gxzc.zen.api.sys.model.SysResource">
-        SELECT DISTINCT A.*
+        SELECT DISTINCT
+        <include refid="Columns">
+            <property name="prefix" value="A"/>
+        </include>
         FROM sys_resource AS A
         INNER JOIN sys_resource_role AS B ON A.id = B.resource_id
         WHERE B.role_id IN
@@ -38,7 +71,10 @@
     </select>
 
     <select id="selectByRoleId" resultType="com.gxzc.zen.api.sys.model.SysResource">
-        SELECT A.*
+        SELECT
+        <include refid="Columns">
+            <property name="prefix" value="A"/>
+        </include>
         FROM sys_resource AS A
         INNER JOIN sys_resource_role AS B ON A.id = B.resource_id
         WHERE B.role_id = #{roleId}

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

@@ -4,26 +4,54 @@
 
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.gxzc.zen.api.sys.model.SysRole">
-    <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="parent_id" property="parentId" />
-        <result column="name" property="name" />
-        <result column="path" property="path" />
-        <result column="code" property="code" />
-        <result column="ext1" property="ext1" />
-        <result column="ext2" property="ext2" />
-        <result column="ext3" property="ext3" />
-        <result column="ext4" property="ext4" />
-        <result column="ext5" property="ext5" />
+        <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="parent_id" property="parentId"/>
+        <result column="name" property="name"/>
+        <result column="path" property="path"/>
+        <result column="code" property="code"/>
+        <result column="ext1" property="ext1"/>
+        <result column="ext2" property="ext2"/>
+        <result column="ext3" property="ext3"/>
+        <result column="ext4" property="ext4"/>
+        <result column="ext5" property="ext5"/>
     </resultMap>
 
+    <sql id="CommonColumns">
+        ${prefix}.id,
+        ${prefix}.enable,
+        ${prefix}.remark,
+        ${prefix}.create_time AS createTime,
+        ${prefix}.create_by AS createBy,
+        ${prefix}.update_time AS updateTime,
+        ${prefix}.update_by AS updateBy,
+    </sql>
+
+    <sql id="Columns">
+        <include refid="CommonColumns">
+            <property name="prefix" value="${prefix}"/>
+        </include>
+        ${prefix}.parent_id AS parentId,
+        ${prefix}.name,
+        ${prefix}.path,
+        ${prefix}.code,
+        ${prefix}.ext1,
+        ${prefix}.ext2,
+        ${prefix}.ext3,
+        ${prefix}.ext4,
+        ${prefix}.ext5
+    </sql>
+
     <select id="selectByUserId" resultType="com.gxzc.zen.api.sys.model.SysRole">
-        SELECT A.*
+        SELECT
+        <include refid="Columns">
+            <property name="prefix" value="A"/>
+        </include>
         FROM sys_role AS A
         INNER JOIN sys_user_role AS B ON A.id = B.role_id
         WHERE B.user_id = #{userId}

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

@@ -15,16 +15,48 @@
         <result column="user_id" property="userId"/>
     </resultMap>
 
+    <sql id="CommonColumns">
+        ${prefix}.id,
+        ${prefix}.enable,
+        ${prefix}.remark,
+        ${prefix}.create_time AS createTime,
+        ${prefix}.create_by AS createBy,
+        ${prefix}.update_time AS updateTime,
+        ${prefix}.update_by AS updateBy,
+    </sql>
+
+    <sql id="ColumnsSysRole">
+        <include refid="CommonColumns">
+            <property name="prefix" value="${prefix}"/>
+        </include>
+        ${prefix}.parent_id AS parentId,
+        ${prefix}.name,
+        ${prefix}.path,
+        ${prefix}.code,
+        ${prefix}.ext1,
+        ${prefix}.ext2,
+        ${prefix}.ext3,
+        ${prefix}.ext4,
+        ${prefix}.ext5
+    </sql>
+
     <select id="selectUserRoleListByUserId" resultType="com.gxzc.zen.api.sys.model.SysRole">
-        SELECT A.*
+        SELECT
+        <include refid="ColumnsSysRole">
+            <property name="prefix" value="A"/>
+        </include>
         FROM
-            sys_role AS A
-            INNER JOIN sys_user_role AS B ON B.role_id = A.id
+        sys_role AS A
+        INNER JOIN sys_user_role AS B ON B.role_id = A.id
         WHERE B.user_id = #{userId}
     </select>
 
-    <select id="selectUserRoleListByUserIdList" parameterType="java.util.Map" resultType="com.gxzc.zen.api.sys.model.SysRole">
-        SELECT A.*
+    <select id="selectUserRoleListByUserIdList" parameterType="java.util.Map"
+            resultType="com.gxzc.zen.api.sys.model.SysRole">
+        SELECT
+        <include refid="ColumnsSysRole">
+            <property name="prefix" value="A"/>
+        </include>
         FROM
         sys_role AS A
         INNER JOIN sys_user_role AS B ON B.role_id = A.id

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

@@ -1,38 +0,0 @@
-package com.gxzc.zen.orm
-
-import com.gxzc.zen.orm.contants.DSKey
-import org.slf4j.LoggerFactory
-import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty
-import org.springframework.jdbc.datasource.lookup.AbstractRoutingDataSource
-
-/**
- * 动态数据源ThreadLocal
- * @author NorthLan at 2018/1/29
- */
-@ConditionalOnProperty(prefix = "orm", name = ["multi-datasource-enable"], havingValue = "true", matchIfMissing = true)
-class DynamicMultipleDataSource : AbstractRoutingDataSource() {
-    init {
-        logger.info("DynamicMultipleDataSource initializing...")
-        DATA_SOURCE_KEY.set(DSKey.DSKEY_SYS)
-    }
-
-    companion object {
-        private val logger = LoggerFactory.getLogger(DynamicMultipleDataSource::class.java)
-        private val DATA_SOURCE_KEY = ThreadLocal<String>()
-
-        fun setDataSource(key: String) {
-            DATA_SOURCE_KEY.set(key)
-        }
-
-        fun clear() {
-            DATA_SOURCE_KEY.remove()
-        }
-    }
-
-    override fun determineCurrentLookupKey(): Any {
-        if (DATA_SOURCE_KEY.get() == null) {
-            return DSKey.DSKEY_SYS
-        }
-        return DATA_SOURCE_KEY.get()
-    }
-}

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

@@ -1,10 +0,0 @@
-package com.gxzc.zen.orm.annotation
-
-/**
- * 动态切换数据源 注解
- * 推荐使用于Service中的方法 或 整个service
- * @author NorthLan at 2018/1/29
- */
-@Retention(AnnotationRetention.RUNTIME)
-@Target(AnnotationTarget.FUNCTION, AnnotationTarget.TYPE)
-annotation class DynamicDataSource(val value: String = "")

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

@@ -1,18 +0,0 @@
-package com.gxzc.zen.orm.annotation
-
-import java.lang.annotation.Inherited
-import kotlin.reflect.KClass
-
-/**
- * 分布式多数据源事务一致性处理
- * 单数据源也需要使用此注解
- * @author NorthLan
- * @date 2018/2/3
- * @url https://noahlan.com
- */
-@Target(AnnotationTarget.FUNCTION)
-@Retention(AnnotationRetention.RUNTIME)
-@Inherited
-annotation class ZenTransactional(val value: String = "",
-                                  val rollbackFor: Array<KClass<out Throwable>> = [],
-                                  val noRollbackFor: Array<KClass<out Throwable>> = [])

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

@@ -1,116 +0,0 @@
-package com.gxzc.zen.orm.aop
-
-import com.gxzc.zen.orm.DynamicMultipleDataSource
-import com.gxzc.zen.orm.annotation.DynamicDataSource
-import com.gxzc.zen.orm.contants.DSKey
-import org.aspectj.lang.JoinPoint
-import org.aspectj.lang.ProceedingJoinPoint
-import org.aspectj.lang.annotation.*
-import org.aspectj.lang.reflect.MethodSignature
-import org.slf4j.LoggerFactory
-import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty
-import org.springframework.core.annotation.Order
-import org.springframework.stereotype.Component
-import java.lang.reflect.Method
-
-
-/**
- *
- * @author NorthLan at 2018/1/29
- */
-@Suppress("unused")
-@Aspect
-@Order(-1) // 保证先于事务执行
-@Component
-@ConditionalOnProperty(prefix = "orm", name = ["multi-datasource-enable"], havingValue = "true", matchIfMissing = true)
-class DataSourceSwitchAspect {
-    companion object {
-        private val logger = LoggerFactory.getLogger(DataSourceSwitchAspect::class.java)
-    }
-
-    init {
-        logger.info("DataSourceSwitchAspect initializing...")
-    }
-
-    private var isAnnotationAspect = ThreadLocal<Boolean>().apply { set(false) }
-
-    @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..*Mapper.*(..))")
-    fun mpMapperPointCut() {
-    }
-
-    @Around("@annotation(com.gxzc.zen.orm.annotation.DynamicDataSource)")
-    fun annotationAround(joinPoint: ProceedingJoinPoint): Any? {
-        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.set(false)
-            DynamicMultipleDataSource.clear()
-        }
-    }
-
-    @Before("zenMapperPointCut() || mpMapperPointCut()")
-    fun dynamicDataSource(joinPoint: JoinPoint) {
-        logger.trace("*Mapper aspect...")
-        if (isAnnotationAspect.get() != null && isAnnotationAspect.get()) {
-            return
-        }
-        val target = joinPoint.target
-
-        val packageName: String = try {
-            val h = target::class.java.superclass.getDeclaredField("h")
-            h.isAccessible = true
-            val mapperProxy = h.get(target)
-
-            val mapperInterface = mapperProxy.javaClass.getDeclaredField("mapperInterface")
-            mapperInterface.isAccessible = true
-
-            val clazz = mapperInterface.get(mapperProxy) as Class<*>
-
-            clazz.`package`.name
-        } catch (e: Exception) {
-            logger.trace("get packageName of MapperProxy error, ignore if nothing happened!")
-            logger.trace("set packageName of target...")
-            target::class.java.`package`.name
-        }
-
-        matchDataSource((joinPoint.signature as MethodSignature).method, packageName)
-    }
-
-    @After("zenMapperPointCut() || mpMapperPointCut()")
-    fun afterDynamicDataSource() {
-        DynamicMultipleDataSource.clear()
-    }
-
-    private fun matchDataSource(method: Method, packageName: String) {
-        DSKey.values()
-                .filter { it.pkgName in packageName }
-                .forEach {
-                    setDataSource(method, it.dsKey)
-                    logger.trace("setDataSource: {}", it.dsKey)
-                }
-    }
-
-    /**
-     * 设置数据源key
-     */
-    private fun setDataSource(method: Method, defaultKey: String) {
-        val dynamicDataSource: DynamicDataSource? = method.getAnnotation(DynamicDataSource::class.java)
-        DynamicMultipleDataSource.setDataSource(dynamicDataSource?.value ?: defaultKey)
-    }
-}

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

@@ -1,93 +0,0 @@
-package com.gxzc.zen.orm.aop
-
-import com.gxzc.zen.common.exception.ZenException
-import com.gxzc.zen.common.exception.ZenExceptionEnum
-import com.gxzc.zen.common.util.SpringContextHolder
-import com.gxzc.zen.orm.annotation.ZenTransactional
-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 javax.transaction.Status
-import kotlin.reflect.KClass
-
-/**
- * 一致性事务 切面
- * 非多数据源时也可使用
- * @author NorthLan at 2018/2/3
- */
-@Aspect
-@Suppress("unused")
-@Component
-class MultiTransactionAspect {
-    companion object {
-        private val logger = LoggerFactory.getLogger(MultiTransactionAspect::class.java)
-    }
-
-    init {
-        logger.info("MultiTransactionAspect initializing...")
-    }
-
-    /**
-     * 一致性事务切面解决方案
-     */
-    @Around("@annotation(com.gxzc.zen.orm.annotation.ZenTransactional)")
-    fun multiTransactionAround(joinPoint: ProceedingJoinPoint): Any? {
-        logger.trace("@ZenTransactional 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(ZenTransactional::class.java)) {
-            val multiTransaction = method.getAnnotation(ZenTransactional::class.java)
-            val transactionManager = SpringContextHolder.getBean(JtaTransactionManager::class.java)
-            val userTransaction = transactionManager!!.userTransaction
-
-            // 防止嵌套事务 多次拦截
-            if (userTransaction.status == Status.STATUS_ACTIVE) {
-                return joinPoint.proceed()
-            }
-//            logger.info(userTransaction.status.toString())
-            return try {
-                userTransaction.begin()
-//                logger.info(userTransaction.status.toString())
-                val r = joinPoint.proceed()
-                userTransaction.commit()
-                r
-            } catch (e: Throwable) {
-                logger.error("error: ", e)
-                val rollbackExceptions = multiTransaction.rollbackFor
-                val noRollbackExceptions = multiTransaction.noRollbackFor
-
-                val isRollbackExceptionPresent = isPresent(e, rollbackExceptions)
-                val isNoRollbackExceptionPresent = isPresent(e, noRollbackExceptions)
-
-                // rollbackFor回滚 noRollbackFor不回滚
-                if (isRollbackExceptionPresent || !isNoRollbackExceptionPresent) {
-                    logger.info("callback...")
-                    userTransaction.rollback()
-                    throw ZenException(ZenExceptionEnum.SERVER_ERROR)
-                } else {
-                    logger.info("commit...")
-                    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/AtomikosTransactionConfig.kt

@@ -1,37 +0,0 @@
-package com.gxzc.zen.orm.config
-
-import com.atomikos.icatch.jta.UserTransactionImp
-import com.atomikos.icatch.jta.UserTransactionManager
-import com.gxzc.zen.orm.DynamicMultipleDataSource
-import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty
-import org.springframework.context.annotation.Bean
-import org.springframework.context.annotation.Configuration
-import org.springframework.core.annotation.Order
-import org.springframework.jdbc.datasource.DataSourceTransactionManager
-import org.springframework.transaction.annotation.EnableTransactionManagement
-import org.springframework.transaction.jta.JtaTransactionManager
-
-/**
- * 分布式事务 (jta) 配置 弱xa
- * @author NorthLan
- * @date 2018/4/2
- * @url https://noahlan.com
- */
-@EnableTransactionManagement
-@Configuration
-class AtomikosTransactionConfig {
-    @Bean
-    fun jtaTransactionManager(): JtaTransactionManager {
-        return JtaTransactionManager(
-                UserTransactionImp().apply { setTransactionTimeout(3000) },
-                UserTransactionManager().apply { forceShutdown = true }).apply {
-            setAllowCustomIsolationLevels(true)
-        }
-    }
-
-//    @Bean
-//    @ConditionalOnProperty(prefix = "orm", name = ["multi-datasource-enable"], havingValue = "true", matchIfMissing = true)
-//    fun dataSourceTransactionManager(dataSource: DynamicMultipleDataSource): DataSourceTransactionManager {
-//        return DataSourceTransactionManager(dataSource)
-//    }
-}

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

@@ -1,73 +0,0 @@
-package com.gxzc.zen.orm.config
-
-import com.alibaba.druid.pool.xa.DruidXADataSource
-import com.gxzc.zen.orm.DynamicMultipleDataSource
-import com.gxzc.zen.orm.contants.DSKey
-import org.slf4j.LoggerFactory
-import org.springframework.beans.factory.annotation.Qualifier
-import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty
-import org.springframework.boot.context.properties.ConfigurationProperties
-import org.springframework.boot.jta.atomikos.AtomikosDataSourceBean
-import org.springframework.context.annotation.Bean
-import org.springframework.context.annotation.Configuration
-import org.springframework.context.annotation.DependsOn
-import org.springframework.context.annotation.Primary
-import javax.sql.DataSource
-import javax.sql.XADataSource
-
-
-/**
- * 多数据源配置
- * @author NorthLan at 2018/1/29
- */
-@Configuration
-class MultipleDataSourceConfig {
-    companion object {
-        private val logger = LoggerFactory.getLogger(MultipleDataSourceConfig::class.java)
-    }
-
-    init {
-        logger.info("MultipleDataSourceConfig initializing...")
-    }
-
-    @Bean(DSKey.DSKEY_SYS + "druid")
-    @ConfigurationProperties(prefix = "datasource.sys")
-    fun dataSourceSysDruid(): XADataSource {
-        return DruidXADataSource()
-    }
-
-//    @Bean(DSKey.DSKEY_SHARED + "druid")
-//    @ConfigurationProperties(prefix = "datasource.shared")
-//    @ConditionalOnProperty(prefix = "orm", name = ["multi-datasource-enable"], havingValue = "true", matchIfMissing = true)
-//    fun dataSourceSharedDruid(): XADataSource {
-//        return DruidXADataSource()
-//    }
-
-    @Bean(DSKey.DSKEY_SYS)
-    @DependsOn(DSKey.DSKEY_SYS + "druid")
-    @Primary
-    fun dataSourceSys(): DataSource {
-        return AtomikosDataSourceBean().also {
-            it.xaDataSource = dataSourceSysDruid()
-        }
-    }
-
-//    @Bean(DSKey.DSKEY_SHARED)
-//    @DependsOn(DSKey.DSKEY_SHARED + "druid")
-//    @ConditionalOnProperty(prefix = "orm", name = ["multi-datasource-enable"], havingValue = "true", matchIfMissing = true)
-//    fun dataSourceShared(): DataSource {
-//        return AtomikosDataSourceBean().also {
-//            it.xaDataSource = dataSourceSharedDruid()
-//        }
-//    }
-
-    @Bean
-    @ConditionalOnProperty(prefix = "orm", name = ["multi-datasource-enable"], havingValue = "true", matchIfMissing = true)
-    fun multipleDataSource(@Qualifier(DSKey.DSKEY_SYS) dataSourceSys: DataSource): DynamicMultipleDataSource {
-        return DynamicMultipleDataSource().apply {
-            setTargetDataSources(mapOf(
-                    DSKey.DSKEY_SYS to dataSourceSys))
-            setDefaultTargetDataSource(dataSourceSys)
-        }
-    }
-}

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

@@ -1,137 +0,0 @@
-package com.gxzc.zen.orm.config
-
-import com.baomidou.mybatisplus.MybatisConfiguration
-import com.baomidou.mybatisplus.MybatisXMLLanguageDriver
-import com.baomidou.mybatisplus.spring.MybatisSqlSessionFactoryBean
-import com.baomidou.mybatisplus.spring.boot.starter.ConfigurationCustomizer
-import com.baomidou.mybatisplus.spring.boot.starter.MybatisPlusProperties
-import com.baomidou.mybatisplus.spring.boot.starter.SpringBootVFS
-import com.gxzc.zen.orm.DynamicMultipleDataSource
-import com.gxzc.zen.orm.contants.DSKey
-import org.apache.ibatis.mapping.DatabaseIdProvider
-import org.apache.ibatis.plugin.Interceptor
-import org.slf4j.LoggerFactory
-import org.springframework.beans.factory.ObjectProvider
-import org.springframework.beans.factory.annotation.Qualifier
-import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty
-import org.springframework.boot.context.properties.EnableConfigurationProperties
-import org.springframework.context.annotation.Bean
-import org.springframework.context.annotation.Configuration
-import org.springframework.context.annotation.Primary
-import org.springframework.core.io.ResourceLoader
-import org.springframework.util.Assert
-import org.springframework.util.CollectionUtils
-import org.springframework.util.ObjectUtils
-import org.springframework.util.StringUtils
-import javax.annotation.PostConstruct
-import javax.sql.DataSource
-
-/**
- * Mybatis bean工厂配置
- * @author NorthLan
- * @date 2018/3/27
- * @url https://noahlan.com
- */
-@Configuration
-@EnableConfigurationProperties(MybatisPlusProperties::class)
-class MybatisPlusFactoryConfig {
-    companion object {
-        private val logger = LoggerFactory.getLogger(MybatisPlusFactoryConfig::class.java)
-    }
-
-    private var interceptors: Array<Interceptor>? = null
-    private var properties: MybatisPlusProperties? = null
-    private var resourceLoader: ResourceLoader? = null
-    private var databaseIdProvider: DatabaseIdProvider? = null
-    private var configurationCustomizers: List<ConfigurationCustomizer>? = null
-
-    init {
-        logger.info("MybatisPlusFactoryConfig initializing...")
-    }
-
-    constructor(properties: MybatisPlusProperties,
-                interceptorsProvider: ObjectProvider<Array<Interceptor>>,
-                resourceLoader: ResourceLoader,
-                databaseIdProvider: ObjectProvider<DatabaseIdProvider>,
-                configurationCustomizersProvider: ObjectProvider<List<ConfigurationCustomizer>>) {
-        this.properties = properties
-        this.interceptors = interceptorsProvider.ifAvailable
-        this.resourceLoader = resourceLoader
-        this.databaseIdProvider = databaseIdProvider.ifAvailable
-        this.configurationCustomizers = configurationCustomizersProvider.ifAvailable
-    }
-
-    @PostConstruct
-    fun checkConfigFileExists() {
-        Assert.state(properties != null, "MybatisPlusProperties is null.")
-        if (this.properties!!.isCheckConfigLocation && StringUtils.hasText(this.properties?.configLocation)) {
-            val resource = this.resourceLoader?.getResource(this.properties?.configLocation)
-            Assert.state(resource != null && resource.exists(), "Cannot find config location: " + resource
-                    + " (please addChild config file or check your Mybatis configuration)")
-        }
-    }
-
-    @Bean
-    @Primary
-    @ConditionalOnProperty(prefix = "orm", name = ["multi-datasource-enable"], havingValue = "true", matchIfMissing = true)
-    fun dynamicDSBean(dataSource: DynamicMultipleDataSource): MybatisSqlSessionFactoryBean {
-        return setFactoryBean(dataSource)
-    }
-
-    @Bean
-    @ConditionalOnProperty(prefix = "orm", name = ["multi-datasource-enable"], havingValue = "false", matchIfMissing = true)
-    fun singleDSBean(@Qualifier(DSKey.DSKEY_SYS) dataSource: DataSource): MybatisSqlSessionFactoryBean {
-        return setFactoryBean(dataSource)
-    }
-
-    private fun setFactoryBean(dataSource: DataSource/*, mapperLocation: String?*/): MybatisSqlSessionFactoryBean {
-        return MybatisSqlSessionFactoryBean().apply {
-            setDataSource(dataSource)
-            vfs = SpringBootVFS::class.java
-            if (StringUtils.hasText(properties?.configLocation)) {
-                setConfigLocation(resourceLoader?.getResource(properties?.configLocation))
-            }
-            var configuration = properties?.configuration
-            if (configuration == null && !StringUtils.hasText(properties?.configLocation)) {
-                configuration = MybatisConfiguration()
-            }
-            if (configuration != null && !CollectionUtils.isEmpty(configurationCustomizers)) {
-                configurationCustomizers?.forEach {
-                    it.customize(configuration)
-                }
-            }
-            configuration?.setDefaultScriptingLanguage(MybatisXMLLanguageDriver::class.java)
-            setConfiguration(properties?.configuration)
-            if (properties?.configurationProperties != null) {
-                setConfigurationProperties(properties?.configurationProperties)
-            }
-            if (!ObjectUtils.isEmpty(interceptors)) {
-                setPlugins(interceptors)
-            }
-            if (databaseIdProvider != null) {
-                this.databaseIdProvider = databaseIdProvider
-            }
-            if (StringUtils.hasLength(properties?.typeAliasesPackage)) {
-                setTypeAliasesPackage(properties?.typeAliasesPackage)
-            }
-            // 自定义枚举
-            if (StringUtils.hasLength(properties?.typeEnumsPackage)) {
-                setTypeEnumsPackage(properties?.typeEnumsPackage)
-            }
-            if (StringUtils.hasLength(properties?.typeHandlersPackage)) {
-                setTypeHandlersPackage(properties?.typeHandlersPackage)
-            }
-            if (!ObjectUtils.isEmpty(properties?.resolveMapperLocations())) {
-                setMapperLocations(properties?.resolveMapperLocations())
-            }
-//            if (StringUtils.hasLength(mapperLocation)) {
-//                setMapperLocations(PathMatchingResourcePatternResolver().getResources(mapperLocation))
-//            }
-
-            if (!ObjectUtils.isEmpty(properties?.globalConfig)) {
-                setGlobalConfig(properties?.globalConfig?.convertGlobalConfiguration())
-            }
-        }
-    }
-
-}

zen-orm/src/main/kotlin/com/gxzc/zen/orm/contants/DSKey.kt

@@ -1,15 +0,0 @@
-package com.gxzc.zen.orm.contants
-
-/**
- *
- * @author NorthLan at 2018/1/30
- */
-enum class DSKey(val dsKey: String, val pkgName: String) {
-    DS_SYS("sysDataSource", "com.gxzc.zen.api.sys"),
-    DS_SHARED("sharedDataSource", "com.gxzc.zen.api.shared");
-
-    companion object {
-        const val DSKEY_SYS = "sysDataSource"
-        const val DSKEY_SHARED = "sharedDataSource"
-    }
-}

zen-orm/src/main/kotlin/com/gxzc/zen/orm/sql/ZenSqlInjector.kt

@@ -1,9 +1,15 @@
 package com.gxzc.zen.orm.sql
 
 import com.baomidou.mybatisplus.entity.TableInfo
+import com.baomidou.mybatisplus.enums.FieldFill
+import com.baomidou.mybatisplus.enums.IdType
 import com.baomidou.mybatisplus.mapper.LogicSqlInjector
 import com.baomidou.mybatisplus.toolkit.StringUtils
+import com.baomidou.mybatisplus.toolkit.TableInfoHelper
 import org.apache.ibatis.builder.MapperBuilderAssistant
+import org.apache.ibatis.executor.keygen.Jdbc3KeyGenerator
+import org.apache.ibatis.executor.keygen.KeyGenerator
+import org.apache.ibatis.executor.keygen.NoKeyGenerator
 import org.apache.ibatis.session.Configuration
 import org.springframework.stereotype.Component
 

zen-orm/src/test/kotlin/com/gxzc/zen/generator/TestPathFinder.kt

@@ -1,6 +1,5 @@
 package com.gxzc.zen.generator
 
-import com.gxzc.zen.orm.contants.DSKey
 import org.junit.Test
 import java.io.File
 
@@ -21,8 +20,8 @@ class TestPathFinder {
 
     @Test
     fun enumTest() {
-        DSKey.values()
-                .filter { it.pkgName in "com.gxzc.zen.api.bus.mapper" }
-                .forEach { println(it) }
+//        DSKey.values()
+//                .filter { it.pkgName in "com.gxzc.zen.api.bus.mapper" }
+//                .forEach { println(it) }
     }
 }

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

@@ -1,6 +1,6 @@
 package com.gxzc.zen.web.sys.controller
 
-import com.gxzc.zen.api.sys.service.ISysRoleService
+import com.gxzc.zen.api.sys.service.ISysPermissionService
 import com.gxzc.zen.api.sys.service.ISysUserService
 import com.gxzc.zen.common.base.BaseController
 import com.gxzc.zen.common.dto.RequestDto
@@ -38,7 +38,7 @@ class AuthController : BaseController() {
     private lateinit var userService: ISysUserService
 
     @Autowired
-    private lateinit var roleService: ISysRoleService
+    private lateinit var permissionService: ISysPermissionService
 
     @ApiOperation(value = "登录")
     @PostMapping("/login")
@@ -69,7 +69,7 @@ class AuthController : BaseController() {
                 // 用户基本信息
                 it.setAttribute(ZenHttpSession.SESSION_KEY_USER_INFO, user)
                 // 角色列表
-                it.setAttribute(ZenHttpSession.SESSION_KEY_USER_ROLES, roleService.getRoleListByUserId(user.id))
+                permissionService.getSubjectRoles(session)
             }
         }
         return ResponseEntity.ok(ResponseDto())

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

@@ -14,7 +14,7 @@ spring:
     driver-class-name: com.mysql.jdbc.Driver
     username: archives
     password: archives
-    url: jdbc:mysql://192.168.1.204:8066/SYS?autoReconnect=true&useUnicode=true&characterEncoding=utf-8&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=UTC&zeroDateTimeBehavior=convertToNull
+    url: jdbc:mysql://192.168.1.10:8066/SYS?autoReconnect=true&useUnicode=true&characterEncoding=utf-8&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=UTC&zeroDateTimeBehavior=convertToNull
 
 
 ###################  mybatis-plus配置  ###################

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

@@ -18,7 +18,10 @@ spring:
     username: archives
     password: archives
     url: jdbc:mysql://192.168.1.10:3306/archives_sys?pinGlobalTxToPhysicalConnection=true&autoReconnect=true&useUnicode=true&characterEncoding=utf-8&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=UTC&zeroDateTimeBehavior=convertToNull
-
+  jta:
+    atomikos:
+      properties:
+        serial-jta-transactions: false
 
 ################## 数据源 配置 ##################
 ######## 单数据源使用sys作为默认数据源 ############

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

@@ -38,7 +38,7 @@ logging:
     root: info
     com.gxzc:
       zen: debug
-      zen.umps.config: debug
+      zen.umps.config: warn
     com.xxl.job.core: warn
     com.atomikos: warn
   path: logs/