修复引入jms-jta情况下单数据源事务无法使用的bug,修改了单数据源的配置方式

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

@@ -16,6 +16,4 @@ import org.springframework.stereotype.Repository
  */
 @Repository
 interface SysDicMapper : BaseMapper<SysDic> {
-    fun updateNoLogic(@Param("et") entity: SysDic, @Param("ew") wrapper: Wrapper<SysDic>): Long
-    fun physicalDelete(@Param("ew") wrapper: Wrapper<SysDic>): Long
 }

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

@@ -16,6 +16,4 @@ import org.springframework.stereotype.Repository
  */
 @Repository
 interface SysParamMapper : BaseMapper<SysParam> {
-    fun updateNoLogic(@Param("et") entity: SysParam, @Param("ew") wrapper: Wrapper<SysParam>): Long
-    fun physicalDelete(@Param("ew") wrapper: Wrapper<SysParam>): Long
 }

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

@@ -1,5 +1,6 @@
 package com.gxzc.zen.api.sys.model
 
+import com.baomidou.mybatisplus.annotations.TableField
 import com.baomidou.mybatisplus.annotations.TableName
 import com.gxzc.zen.common.base.BaseModel
 
@@ -64,6 +65,16 @@ data class SysUser(
         /**
          * 备用字段
          */
-        var ext4: String? = null
+        var ext4: String? = null,
+        /**
+         * 性别
+         */
+        var gender: Int? = null,
+
+
+        /////////////////////////////////////////////////
+        @TableField(exist = false)
+        var roles: MutableList<SysRole>? = null
+        /////////////////////////////////////////////////
 ) : BaseModel() {
 }

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

@@ -11,11 +11,13 @@ package com.gxzc.zen.api.sys.service
 interface ISysPermissionService {
     /**
      * 获取指定用户的所有权限并缓存至user_perm key: uid_*
+     * FIXME TODO 凡是修改了 user_role / role 表的都需要针对 user_id 将缓存进行更新
      */
     fun getPermissionSetByUserId(id: Long): HashSet<String>
-    /**
-     * 初始化所有用户的权限缓存
-     * FIXME TODO 凡是修改了 user_role / role 表的都需要针对 user_id 将缓存进行移除或更新
-     */
-    fun initAllUserPermissionCache()
+
+//    /**
+//     * 初始化所有用户的权限缓存
+//     *
+//     */
+//    fun initAllUserPermissionCache()
 }

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

@@ -12,6 +12,40 @@ import com.gxzc.zen.common.base.BaseService
  * @since 2018-02-06
  */
 interface ISysUserService : BaseService<SysUser> {
-    fun getUserByIdCacheable(id: Long): SysUser
+    /**
+     * 查询用户列表
+     * 缓存
+     */
+    fun getListCacheable(): MutableList<SysUser>
+
+    /**
+     * 通过 id 查询用户
+     * 缓存
+     */
+    fun getUserByIdCacheable(id: Long): SysUser?
+
+    /**
+     * 通过 account 查询用户
+     * 缓存
+     */
     fun getUserByAccountCacheable(account: String): SysUser?
+
+    /**
+     * 插入并缓存
+     * TODO 通知其他系统
+     */
+    fun insertCacheable(entity: SysUser)
+
+    /**
+     * 修改 并 更新缓存
+     * TODO 通知其他系统
+     */
+    fun modify(entity: SysUser): SysUser
+
+    /**
+     * 物理删除
+     * 刷新缓存
+     * TODO 通知其他系统
+     */
+    fun physicalDeleteCacheable(id: Long)
 }

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

@@ -1,7 +1,6 @@
 package com.gxzc.zen.api.sys.service.impl
 
 import com.baomidou.mybatisplus.mapper.EntityWrapper
-import com.baomidou.mybatisplus.plugins.Page
 import com.baomidou.mybatisplus.service.impl.ServiceImpl
 import com.gxzc.zen.api.sys.mapper.SysDicMapper
 import com.gxzc.zen.api.sys.model.SysDic
@@ -9,7 +8,7 @@ import com.gxzc.zen.api.sys.service.ISysDicService
 import com.gxzc.zen.common.contants.CACHEKEYS
 import com.gxzc.zen.common.exception.ZenException
 import com.gxzc.zen.common.exception.ZenExceptionEnum
-import com.gxzc.zen.orm.annotation.MultiTransactional
+import com.gxzc.zen.orm.annotation.ZenTransactional
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.cache.CacheManager
 import org.springframework.cache.annotation.Cacheable
@@ -58,7 +57,7 @@ class SysDicServiceImpl : ServiceImpl<SysDicMapper, SysDic>(), ISysDicService {
     }
 
     @Suppress("UNCHECKED_CAST")
-    @MultiTransactional
+    @ZenTransactional
     override fun modify(data: SysDic): SysDic {
         baseMapper.updateNoLogic(data, EntityWrapper<SysDic>().eq("id", data.id))
         // 更新缓存
@@ -90,7 +89,7 @@ class SysDicServiceImpl : ServiceImpl<SysDicMapper, SysDic>(), ISysDicService {
     }
 
     @Suppress("UNCHECKED_CAST")
-    @MultiTransactional
+    @ZenTransactional
     override fun insertCacheable(data: SysDic) {
         if (baseMapper.insert(data) == 0) {
             throw ZenException(ZenExceptionEnum.BIZ_INSERT_ERROR)
@@ -101,7 +100,7 @@ class SysDicServiceImpl : ServiceImpl<SysDicMapper, SysDic>(), ISysDicService {
     }
 
     @Suppress("UNCHECKED_CAST")
-    @MultiTransactional
+    @ZenTransactional
     override fun physicalDeleteCacheable(id: Long) {
         if (baseMapper.physicalDelete(EntityWrapper<SysDic>().eq("id", id)) <= 0) {
             throw ZenException(ZenExceptionEnum.BIZ_DELETE_ERROR)

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

@@ -8,7 +8,7 @@ import com.gxzc.zen.api.sys.service.ISysParamService
 import com.gxzc.zen.common.contants.CACHEKEYS
 import com.gxzc.zen.common.exception.ZenException
 import com.gxzc.zen.common.exception.ZenExceptionEnum
-import com.gxzc.zen.orm.annotation.MultiTransactional
+import com.gxzc.zen.orm.annotation.ZenTransactional
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.cache.CacheManager
 import org.springframework.cache.annotation.Cacheable
@@ -57,7 +57,7 @@ class SysParamServiceImpl : ServiceImpl<SysParamMapper, SysParam>(), ISysParamSe
     }
 
     @Suppress("UNCHECKED_CAST")
-    @MultiTransactional
+    @ZenTransactional
     override fun modify(data: SysParam): SysParam {
         baseMapper.updateNoLogic(data, EntityWrapper<SysParam>().eq("id", data.id))
         // 更新缓存
@@ -89,7 +89,7 @@ class SysParamServiceImpl : ServiceImpl<SysParamMapper, SysParam>(), ISysParamSe
     }
 
     @Suppress("UNCHECKED_CAST")
-    @MultiTransactional
+    @ZenTransactional
     override fun insertCacheable(data: SysParam) {
         if (baseMapper.insert(data) == 0) {
             throw ZenException(ZenExceptionEnum.BIZ_INSERT_ERROR)
@@ -100,7 +100,7 @@ class SysParamServiceImpl : ServiceImpl<SysParamMapper, SysParam>(), ISysParamSe
     }
 
     @Suppress("UNCHECKED_CAST")
-    @MultiTransactional
+    @ZenTransactional
     override fun physicalDeleteCacheable(id: Long) {
         if (baseMapper.physicalDelete(EntityWrapper<SysParam>().eq("id", id)) <= 0) {
             throw ZenException(ZenExceptionEnum.BIZ_DELETE_ERROR)

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

@@ -4,10 +4,8 @@ import com.gxzc.zen.api.sys.service.ISysPermissionService
 import com.gxzc.zen.api.sys.service.ISysUserRoleService
 import com.gxzc.zen.common.contants.CACHEKEYS
 import org.springframework.beans.factory.annotation.Autowired
-import org.springframework.cache.CacheManager
 import org.springframework.cache.annotation.Cacheable
 import org.springframework.stereotype.Service
-import javax.annotation.PostConstruct
 
 /**
  * <p>
@@ -19,8 +17,8 @@ import javax.annotation.PostConstruct
  */
 @Service
 class SysPermissionServiceImpl : ISysPermissionService {
-    @Autowired
-    private lateinit var cacheManager: CacheManager
+//    @Autowired
+//    private lateinit var cacheManager: CacheManager
 
     @Autowired
     private lateinit var sysUserRoleService: ISysUserRoleService
@@ -35,17 +33,17 @@ class SysPermissionServiceImpl : ISysPermissionService {
         return permIds
     }
 
-    @PostConstruct
-    override fun initAllUserPermissionCache() {
-        val cache = cacheManager.getCache(CACHEKEYS.USER_PERM)
-        val userRoleMap = sysUserRoleService.getUserRoleList()
-        for (item in userRoleMap) {
-            val permIds = linkedSetOf<String>()
-            for (role in item.value) {
-                role.perms?.split(',')?.toCollection(permIds)
-            }
-            cache.put("uid_${item.key}", permIds)
-        }
-    }
+//    @PostConstruct
+//    override fun initAllUserPermissionCache() {
+//        val cache = cacheManager.getCache(CACHEKEYS.USER_PERM)
+//        val userRoleMap = sysUserRoleService.getUserRoleList()
+//        for (item in userRoleMap) {
+//            val permIds = linkedSetOf<String>()
+//            for (role in item.value) {
+//                role.perms?.split(',')?.toCollection(permIds)
+//            }
+//            cache.put("uid_${item.key}", permIds)
+//        }
+//    }
 
 }

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

@@ -1,6 +1,5 @@
 package com.gxzc.zen.api.sys.service.impl
 
-import com.baomidou.mybatisplus.mapper.EntityWrapper
 import com.baomidou.mybatisplus.service.impl.ServiceImpl
 import com.gxzc.zen.api.sys.mapper.SysUserRoleMapper
 import com.gxzc.zen.api.sys.model.SysRole
@@ -30,6 +29,7 @@ class SysUserRoleServiceImpl : ServiceImpl<SysUserRoleMapper, SysUserRole>(), IS
         return baseMapper.selectUserRoleListByUserId(id)
     }
 
+
     override fun getUserRoleList(): Map<Long, MutableList<SysRole>> {
         val allSysUserRole = baseMapper.selectList(null)
         val groupUserRole = allSysUserRole.groupBy({ it.userId }, { it.roleId })

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

@@ -1,10 +1,16 @@
 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 com.gxzc.zen.common.contants.CACHEKEYS
+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.cache.CacheManager
 import org.springframework.cache.annotation.Cacheable
 import org.springframework.stereotype.Service
 
@@ -18,15 +24,76 @@ import org.springframework.stereotype.Service
  */
 @Service
 class SysUserServiceImpl : ServiceImpl<SysUserMapper, SysUser>(), ISysUserService {
+    companion object {
+        const val CACHE_KEY_ALL = "all"
+    }
+
+    @Autowired
+    private lateinit var cacheManager: CacheManager
+
+    //    @PostConstruct
+    fun initCache() {
+        getListCacheable()
+    }
+
+
+    @Cacheable(CACHEKEYS.USER, key = "'$CACHE_KEY_ALL'")
+    override fun getListCacheable(): MutableList<SysUser> {
+        return baseMapper.selectByParams(null)
+    }
 
-    @Cacheable(CACHEKEYS.USER, key = "'account_' + #account")
     override fun getUserByAccountCacheable(account: String): SysUser? {
-        return baseMapper.selectByAccount(account)
+        return getListCacheable().find {
+            it.account == account
+        }
+    }
+
+    override fun getUserByIdCacheable(id: Long): SysUser? {
+        return getListCacheable().find {
+            it.id == id
+        }
+    }
+
+    @Suppress("UNCHECKED_CAST")
+    @ZenTransactional
+    override fun insertCacheable(entity: SysUser) {
+        if (baseMapper.insert(entity) == 0) {
+            throw ZenException(ZenExceptionEnum.BIZ_INSERT_ERROR)
+        }
+        val cache = cacheManager.getCache(CACHEKEYS.USER)
+        val cachedList: MutableList<SysUser>? = cache[CACHE_KEY_ALL].get() as MutableList<SysUser>?
+        cachedList?.add(entity)
     }
 
-    @Cacheable(CACHEKEYS.USER)
-    override fun getUserByIdCacheable(id: Long): SysUser {
-        return baseMapper.selectById(id)
+    @Suppress("UNCHECKED_CAST")
+    @ZenTransactional
+    override fun modify(entity: SysUser): SysUser {
+        baseMapper.updateNoLogic(entity, EntityWrapper<SysUser>().eq("id", entity.id))
+        // 更新缓存
+        val cache = cacheManager.getCache(CACHEKEYS.USER)
+        val cachedList: MutableList<SysUser>? = cache[CACHE_KEY_ALL].get() as MutableList<SysUser>?
+        cachedList?.let {
+            val idx = it.indexOfFirst { it.id == entity.id }
+            if (idx != -1) {
+                it[idx] = entity
+            }
+        }
+        return entity
     }
 
+    @Suppress("UNCHECKED_CAST")
+    @ZenTransactional
+    override fun physicalDeleteCacheable(id: Long) {
+        if (baseMapper.physicalDelete(EntityWrapper<SysUser>().eq("id", id)) <= 0) {
+            throw ZenException(ZenExceptionEnum.BIZ_DELETE_ERROR)
+        }
+        //
+        val cache = cacheManager.getCache(CACHEKEYS.USER)
+        val cachedList: MutableList<SysUser>? = cache[CACHE_KEY_ALL].get() as MutableList<SysUser>?
+        cachedList?.let {
+            it.removeIf {
+                it.id == id
+            }
+        }
+    }
 }

zen-api/src/main/kotlin/com/gxzc/zen/api/util/SysUserUtil.kt

@@ -0,0 +1,24 @@
+package com.gxzc.zen.api.util
+
+import com.gxzc.zen.api.sys.model.SysUser
+import com.gxzc.zen.api.sys.service.ISysUserService
+import com.gxzc.zen.common.util.SpringContextHolder
+
+/**
+ * 系统用户 工具类
+ * 从缓存中取出
+ * @author NorthLan
+ * @date 2018/3/22
+ * @url https://noahlan.com
+ */
+object SysUserUtil {
+    private val sysUserService: ISysUserService = SpringContextHolder.getBean(ISysUserService::class.java)
+
+    fun getByAccount(account: String): SysUser? {
+        return sysUserService.getUserByAccountCacheable(account)
+    }
+
+    fun getById(id: Long): SysUser? {
+        return sysUserService.getUserByIdCacheable(id)
+    }
+}

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

@@ -86,15 +86,11 @@
         </set>
     </sql>
 
-    <sql id="sqlOrder">
-        ORDER BY id,sort
-    </sql>
-
     <select id="selectByParams" resultType="com.gxzc.zen.api.sys.model.SysDic">
         SELECT *
         FROM sys_dic
         <include refid="dynamicSqlWhere"/>
-        <include refid="sqlOrder"/>
+        ORDER BY id,sort
     </select>
 
     <update id="updateNoLogic" parameterType="com.gxzc.zen.api.sys.model.SysDic">
@@ -103,7 +99,6 @@
         <where>
             ${ew.sqlSegment}
         </where>
-        <include refid="sqlOrder"/>
     </update>
 
     <delete id="physicalDelete">

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

@@ -86,15 +86,11 @@
         </set>
     </sql>
 
-    <sql id="sqlOrder">
-        ORDER BY id,sort
-    </sql>
-
     <select id="selectByParams" resultType="com.gxzc.zen.api.sys.model.SysParam">
         SELECT *
         FROM sys_param
         <include refid="dynamicSqlWhere"/>
-        <include refid="sqlOrder"/>
+        ORDER BY id,sort
     </select>
 
     <update id="updateNoLogic" parameterType="com.gxzc.zen.api.sys.model.SysParam">
@@ -103,7 +99,6 @@
         <where>
             ${ew.sqlSegment}
         </where>
-        <include refid="sqlOrder"/>
     </update>
 
     <delete id="physicalDelete">

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

@@ -24,8 +24,103 @@
         <result column="ext2" property="ext2"/>
         <result column="ext3" property="ext3"/>
         <result column="ext4" property="ext4"/>
+        <result column="gender" property="gender"/>
     </resultMap>
 
+    <sql id="dynamicSqlWhere">
+        <where>
+            <if test="enable != null">
+                <choose>
+                    <when test="enable == true">
+                        AND enable = 1
+                    </when>
+                    <otherwise>
+                        AND enable = 0
+                    </otherwise>
+                </choose>
+            </if>
+            <if test="account != null">
+                AND account = #{account}
+            </if>
+            <if test="id != null">
+                AND id = #{id}
+            </if>
+        </where>
+    </sql>
+
+    <sql id="dynamicSqlSet">
+        <set>
+            <if test="et.account != null">
+                account = #{et.account},
+            </if>
+            <if test="et.username != null">
+                `username` = #{et.username},
+            </if>
+            <if test="et.password != null">
+                `password` = #{et.password},
+            </if>
+            <if test="et.salt != null">
+                salt = #{et.salt},
+            </if>
+            <if test="et.phone != null">
+                phone = #{et.phone},
+            </if>
+            <if test="et.email != null">
+                email = #{et.email},
+            </if>
+            <if test="et.position != null">
+                `position` = #{et.position},
+            </if>
+            <if test="et.address != null">
+                address = #{et.address},
+            </if>
+            <if test="et.staffNo != null">
+                staff_no = #{et.staffNo},
+            </if>
+            <if test="et.ext1 != null">
+                ext1 = #{et.ext1},
+            </if>
+            <if test="et.ext2 != null">
+                ext2 = #{et.ext2},
+            </if>
+            <if test="et.ext3 != null">
+                ext3 = #{et.ext3},
+            </if>
+            <if test="et.ext4 != null">
+                ext4 = #{et.ext4},
+            </if>
+            <if test="et.gender != null">
+                gender = #{et.gender},
+            </if>
+            <!-- 公共字段 -->
+            <if test="et.createTime != null">
+                create_time = #{et.createTime},
+            </if>
+            <if test="et.createBy != null">
+                create_by = #{et.createBy},
+            </if>
+            <if test="et.updateTime != null">
+                update_time = #{et.updateTime},
+            </if>
+            <if test="et.updateBy != null">
+                update_by = #{et.updateBy},
+            </if>
+            <if test="et.remark != null">
+                remark = #{et.remark},
+            </if>
+            <if test="et.enable != null">
+                <choose>
+                    <when test="et.enable == true">
+                        `enable` = 1
+                    </when>
+                    <otherwise>
+                        `enable` = 0
+                    </otherwise>
+                </choose>
+            </if>
+        </set>
+    </sql>
+
     <select id="selectByAccount" resultMap="BaseResultMap">
         SELECT *
         FROM sys_user
@@ -34,4 +129,26 @@
         LIMIT 1
     </select>
 
+    <select id="selectByParams" resultType="com.gxzc.zen.api.sys.model.SysUser">
+        SELECT *
+        FROM sys_user
+        <include refid="dynamicSqlWhere"/>
+        ORDER BY id
+    </select>
+
+    <update id="updateNoLogic" parameterType="com.gxzc.zen.api.sys.model.SysUser">
+        UPDATE sys_dic
+        <include refid="dynamicSqlSet"/>
+        <where>
+            ${ew.sqlSegment}
+        </where>
+    </update>
+
+    <delete id="physicalDelete">
+        DELETE FROM sys_dic
+        <where>
+            ${ew.sqlSegment}
+        </where>
+    </delete>
+
 </mapper>

zen-core/src/main/kotlin/com/gxzc/zen/common/base/BaseMapper.kt

@@ -1,6 +1,8 @@
 package com.gxzc.zen.common.base
 
 import com.baomidou.mybatisplus.mapper.BaseMapper
+import com.baomidou.mybatisplus.mapper.Wrapper
+import org.apache.ibatis.annotations.Param
 
 /**
  * 通用的DAO
@@ -11,5 +13,19 @@ import com.baomidou.mybatisplus.mapper.BaseMapper
  * @url https://noahlan.com
  */
 interface BaseMapper<T> : BaseMapper<T> {
+    /**
+     * 通过自定义SQL查询
+     */
     fun selectByParams(params: MutableMap<String, Any>?): MutableList<T>
+
+    /**
+     * 自定义更新逻辑(忽略mp自带的逻辑删除功能)
+     * 一般更新enable字段时使用
+     */
+    fun updateNoLogic(@Param("et") entity: T, @Param("ew") wrapper: Wrapper<T>): Long
+
+    /**
+     * 物理删除
+     */
+    fun physicalDelete(@Param("ew") wrapper: Wrapper<T>): Long
 }

zen-core/src/main/kotlin/com/gxzc/zen/common/dto/ResponseDto.kt

@@ -18,4 +18,9 @@ class ResponseDto {
 
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     var time: Date = Dates.today
+
+    fun setData(data: Any): ResponseDto {
+        this.data = data
+        return this
+    }
 }

zen-core/src/main/kotlin/com/gxzc/zen/common/util/LogicPagination.kt

@@ -1,56 +0,0 @@
-package com.gxzc.zen.common.util
-
-import com.baomidou.mybatisplus.plugins.Page
-import com.baomidou.mybatisplus.plugins.pagination.Pagination
-
-/**
- * 逻辑分页工具类
- * @author NorthLan
- * @date 2018/3/21
- * @url https://noahlan.com
- */
-object LogicPagination {
-
-    /**
-     * 逻辑分页 获取分页后的list
-     * @param current 当前页码
-     * @param size 每页容量
-     */
-    fun <T> paginationList(data: MutableList<T>, current: Int, size: Int): MutableList<T> {
-        var fromIndex = (current - 1) * size
-        if (fromIndex > data.size) {
-            fromIndex = data.size
-        }
-        var toIndex = current * size
-        if (toIndex > data.size) {
-            toIndex = data.size
-        }
-        return data.subList(fromIndex, toIndex)
-    }
-
-    /**
-     * 逻辑分页 获取分页信息(包含分页后的数据)
-     * @param current 当前页码
-     * @param size 每页容量
-     * @return 返回值参数示例
-     * {
-     *   "total": 9,
-     *   "size": 4,
-     *   "pages": 3,
-     *   "current": 1,
-     *   "records": [
-     *       {
-     *           "id": 1,
-     *           "enable": true,
-     *           "key": "gender",
-     *           "value": "1",
-     *           "label": "男",
-     *           "sort": 1
-     *       }
-     *   ]
-     * }
-     */
-    fun <T> pagination(data: MutableList<T>, current: Int, size: Int): Pagination {
-        return Page<T>(current, size).setRecords(paginationList(data, current, size)).setTotal(data.size)
-    }
-}

zen-core/src/main/kotlin/com/gxzc/zen/common/util/PaginationUtil.kt

@@ -0,0 +1,85 @@
+package com.gxzc.zen.common.util
+
+import com.baomidou.mybatisplus.plugins.Page
+import com.baomidou.mybatisplus.plugins.pagination.Pagination
+import javax.servlet.http.HttpServletRequest
+
+/**
+ * 分页工具类
+ * @author NorthLan
+ * @date 2018/3/23
+ * @url https://noahlan.com
+ */
+object PaginationUtil {
+    const val KEY_CURRENT = "current"
+    const val KEY_PAGESIZE = "pageSize"
+
+    fun getCurrent(request: HttpServletRequest): Int? {
+        return request.getParameter(KEY_CURRENT)?.toInt()
+    }
+
+    fun getPageSize(request: HttpServletRequest): Int? {
+        return request.getParameter(KEY_PAGESIZE)?.toInt()
+    }
+
+    /**
+     * 逻辑分页 获取分页后的list
+     * @param current 当前页码
+     * @param size 每页容量
+     */
+    fun <T> logicPagingList(data: MutableList<T>, current: Int, size: Int): MutableList<T> {
+        var fromIndex = (current - 1) * size
+        if (fromIndex > data.size) {
+            fromIndex = data.size
+        }
+        var toIndex = current * size
+        if (toIndex > data.size) {
+            toIndex = data.size
+        }
+        return data.subList(fromIndex, toIndex)
+    }
+
+    /**
+     * 逻辑分页 获取分页信息(包含分页后的数据)
+     * @param current 当前页码
+     * @param size 每页容量
+     * @return 返回值参数示例
+     * {
+     *   "total": 9,
+     *   "size": 4,
+     *   "pages": 3,
+     *   "current": 1,
+     *   "records": [
+     *       {
+     *           "id": 1,
+     *           "enable": true,
+     *           "key": "gender",
+     *           "value": "1",
+     *           "label": "男",
+     *           "sort": 1
+     *       }
+     *   ]
+     * }
+     */
+    fun <T> logicPaging(data: MutableList<T>, current: Int?, size: Int?): Pagination {
+        return Page<T>(current!!, size!!).setRecords(logicPagingList(data, current, size)).setTotal(data.size)
+    }
+
+    fun <T> logicPaging(data: MutableList<T>, request: HttpServletRequest): Pagination {
+        return logicPaging(data, getCurrent(request), getPageSize(request))
+    }
+
+    /**
+     * 分页参数是否合法
+     */
+    fun paginable(current: Int?, size: Int?): Boolean {
+        return current != null && size != null && current > 0 && size > 0
+    }
+
+    /**
+     * 分页参数是否合法
+     */
+    fun paginable(request: HttpServletRequest): Boolean {
+        return paginable(getCurrent(request), getPageSize(request))
+    }
+}

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

@@ -5,6 +5,7 @@ import kotlin.reflect.KClass
 
 /**
  * 分库多数据源事务一致性处理
+ * 单数据源也需要使用此注解
  * @author NorthLan
  * @date 2018/2/3
  * @url https://noahlan.com
@@ -12,6 +13,6 @@ import kotlin.reflect.KClass
 @Target(AnnotationTarget.FUNCTION)
 @Retention(AnnotationRetention.RUNTIME)
 @Inherited
-annotation class MultiTransactional(val value: String = "",
-                                    val rollbackFor: Array<KClass<out Throwable>> = [],
-                                    val noRollbackFor: Array<KClass<out Throwable>> = [])
+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/MultiDataSourceAspect.kt → zen-orm/src/main/kotlin/com/gxzc/zen/orm/aop/MultiTransactionAspect.kt

@@ -1,54 +1,57 @@
 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.MultiTransactional
+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.boot.autoconfigure.condition.ConditionalOnProperty
 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
-@ConditionalOnProperty(prefix = "orm", name = ["multi-datasource-enable"], havingValue = "true", matchIfMissing = true)
-class MultiDataSourceAspect {
+//@ConditionalOnProperty(prefix = "orm", name = ["multi-datasource-enable"], havingValue = "true", matchIfMissing = true)
+class MultiTransactionAspect {
     companion object {
-        private val logger = LoggerFactory.getLogger(MultiDataSourceAspect::class.java)
+        private val logger = LoggerFactory.getLogger(MultiTransactionAspect::class.java)
     }
 
     init {
-        logger.info("MultiDataSourceAspect initializing...")
+        logger.info("MultiTransactionAspect initializing...")
     }
 
     /**
      * 一致性事务切面解决方案
      */
-    @Around("@annotation(com.gxzc.zen.orm.annotation.MultiTransactional)")
+    @Around("@annotation(com.gxzc.zen.orm.annotation.ZenTransactional)")
     fun multiTransactionAround(joinPoint: ProceedingJoinPoint): Any? {
-        logger.info("@MultiTransactional aspect...")
+        logger.info("@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(MultiTransactional::class.java)) {
-            val multiTransaction = method.getAnnotation(MultiTransactional::class.java)
+        if (method.isAnnotationPresent(ZenTransactional::class.java)) {
+            val multiTransaction = method.getAnnotation(ZenTransactional::class.java)
             val transactionManager = SpringContextHolder.getBean(JtaTransactionManager::class.java)
             val userTransaction = transactionManager.userTransaction
             return try {
-                userTransaction?.begin()
+                userTransaction.begin()
                 val r = joinPoint.proceed()
-                userTransaction?.commit()
-                return r
+                userTransaction.commit()
+                r
             } catch (e: Throwable) {
+                logger.error("error: ", e)
                 val rollbackExceptions = multiTransaction.rollbackFor
                 val noRollbackExceptions = multiTransaction.noRollbackFor
 
@@ -57,10 +60,13 @@ class MultiDataSourceAspect {
 
                 // rollbackFor回滚 noRollbackFor不回滚
                 if (isRollbackExceptionPresent || !isNoRollbackExceptionPresent) {
-                    userTransaction?.rollback()
+                    logger.info("callback...")
+                    userTransaction.rollback()
                 } else {
-                    userTransaction?.commit()
+                    logger.info("commit...")
+                    userTransaction.commit()
                 }
+                throw ZenException(ZenExceptionEnum.SERVER_ERROR)
             }
         } else {
             return joinPoint.proceed()

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

@@ -0,0 +1,69 @@
+package com.gxzc.zen.orm.config
+
+import com.alibaba.druid.pool.xa.DruidXADataSource
+import com.baomidou.mybatisplus.spring.MybatisSqlSessionFactoryBean
+import com.baomidou.mybatisplus.spring.boot.starter.MybatisPlusProperties
+import com.baomidou.mybatisplus.spring.boot.starter.SpringBootVFS
+import com.gxzc.zen.orm.contants.DSKey
+import org.slf4j.LoggerFactory
+import org.springframework.beans.factory.annotation.Autowired
+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.context.properties.EnableConfigurationProperties
+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
+ * @date 2018/3/24
+ * @url https://noahlan.com
+ */
+@Configuration
+@EnableConfigurationProperties(MybatisPlusProperties::class)
+@ConditionalOnProperty(prefix = "orm", name = ["multi-datasource-enable"], havingValue = "false")
+class SingleDataSourceConfig {
+    companion object {
+        private val logger = LoggerFactory.getLogger(MultipleDataSourceConfig::class.java)
+    }
+
+    init {
+        logger.info("SingleDataSourceConfig initializing...")
+    }
+
+    @Autowired
+    private lateinit var properties: MybatisPlusProperties
+
+    @Bean(DSKey.DSKEY_SYS + "druid")
+    @ConfigurationProperties(prefix = "datasource.sys")
+    fun dataSourceSysDruid(): XADataSource {
+        return DruidXADataSource()
+    }
+
+    @Bean(DSKey.DSKEY_SYS)
+    @DependsOn(DSKey.DSKEY_SYS + "druid")
+    @Primary
+    fun dataSourceSys(): DataSource {
+        return AtomikosDataSourceBean().also {
+            it.xaDataSource = dataSourceSysDruid()
+        }
+    }
+
+    @Bean
+    @Primary
+    fun mybatisSqlSessionFactoryBean(@Qualifier(DSKey.DSKEY_SYS) dataSource: DataSource): MybatisSqlSessionFactoryBean {
+        return MybatisSqlSessionFactoryBean().also {
+            it.setDataSource(dataSource)
+            it.vfs = SpringBootVFS::class.java
+            it.setConfiguration(properties.configuration)
+            it.setGlobalConfig(properties.globalConfig?.convertGlobalConfiguration())
+            it.setMapperLocations(properties.resolveMapperLocations())
+        }
+    }
+}

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

@@ -7,7 +7,7 @@ import com.gxzc.zen.api.sys.service.ISysDicService
 import com.gxzc.zen.common.base.BaseController
 import com.gxzc.zen.common.config.response.annotation.ZenResponseFilter
 import com.gxzc.zen.common.dto.ResponseDto
-import com.gxzc.zen.common.util.LogicPagination
+import com.gxzc.zen.common.util.PaginationUtil
 import org.slf4j.LoggerFactory
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.http.ResponseEntity
@@ -34,9 +34,7 @@ class SysDicController : BaseController() {
     @Login(action = Action.Skip)
     @ZenResponseFilter(type = SysDic::class, filter = ["createBy", "updateBy", "createTime", "updateTime"])
     fun getList(@RequestParam(required = false) keyword: String?,
-                @RequestParam(required = false) searchOption: Int?,
-                @RequestParam(required = false) current: Int?,
-                @RequestParam(required = false) pageSize: Int?): ResponseEntity<*> {
+                @RequestParam(required = false) searchOption: Int?): ResponseEntity<*> {
         var data: MutableList<SysDic> = sysDicService.getListCacheable()
         if (!keyword.isNullOrEmpty()) {
             data = data.filter {
@@ -60,10 +58,10 @@ class SysDicController : BaseController() {
             }.toMutableList()
         }
 
-        return if (current != null && pageSize != null) {
+        return if (PaginationUtil.paginable(getRequest())) {
             // 分页
             ResponseEntity.ok(ResponseDto().apply {
-                this.data = LogicPagination.pagination(data, current, pageSize)
+                this.data = PaginationUtil.logicPaging(data, getRequest())
             })
         } else {
             ResponseEntity.ok(ResponseDto().apply {
@@ -93,7 +91,7 @@ class SysDicController : BaseController() {
     fun putDic(@RequestBody data: SysDic): ResponseEntity<*> {
         return if (data.id == null) {
             // insert
-            sysDicService.insertCacheable(data.apply { id = null })
+            sysDicService.insertCacheable(data)
             ResponseEntity.created(URI.create("/sys/dic/${data.id}")).body(ResponseDto()) // 201
         } else {
             // update

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

@@ -7,7 +7,7 @@ import com.gxzc.zen.api.sys.service.ISysParamService
 import com.gxzc.zen.common.base.BaseController
 import com.gxzc.zen.common.config.response.annotation.ZenResponseFilter
 import com.gxzc.zen.common.dto.ResponseDto
-import com.gxzc.zen.common.util.LogicPagination
+import com.gxzc.zen.common.util.PaginationUtil
 import org.slf4j.LoggerFactory
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.http.ResponseEntity
@@ -60,10 +60,10 @@ class SysParamController : BaseController() {
             }.toMutableList()
         }
 
-        return if (current != null && pageSize != null) {
+        return if (PaginationUtil.paginable(getRequest())) {
             // 分页
             ResponseEntity.ok(ResponseDto().apply {
-                this.data = LogicPagination.pagination(data, current, pageSize)
+                this.data = PaginationUtil.logicPaging(data, getRequest())
             })
         } else {
             ResponseEntity.ok(ResponseDto().apply {

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

@@ -11,11 +11,13 @@ import com.gxzc.zen.common.dto.RequestDto
 import com.gxzc.zen.common.dto.ResponseDto
 import com.gxzc.zen.common.exception.ZenException
 import com.gxzc.zen.common.exception.ZenExceptionEnum
+import com.gxzc.zen.common.util.PaginationUtil
 import com.gxzc.zen.umps.util.SSOUtil
 import org.slf4j.LoggerFactory
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.http.ResponseEntity
 import org.springframework.web.bind.annotation.*
+import java.net.URI
 
 /**
  * 用户相关控制器
@@ -37,6 +39,93 @@ class UserController : BaseController() {
     private lateinit var userService: ISysUserService
 
 
+    @GetMapping("{id}")
+    @ZenResponseFilter(type = SysUser::class, filter = ["createTime", "createBy", "updateTime", "updateBy", "password", "salt"])
+    fun getById(@PathVariable id: Long): ResponseEntity<*> {
+        return ResponseEntity.ok(ResponseDto().apply {
+            data = userService.selectById(id)
+        })
+    }
+
+    @PutMapping
+    @ZenResponseFilter(type = SysUser::class, filter = ["createTime", "createBy", "updateTime", "updateBy", "password", "salt"])
+    fun putUser(@RequestBody data: SysUser): ResponseEntity<*> {
+        return if (data.id == null) {
+            // insert
+            userService.insertCacheable(data)
+            ResponseEntity.created(URI.create("/user/${data.id}")).body(ResponseDto()) // 201
+        } else {
+            // update
+            ResponseEntity.ok(ResponseDto().apply {
+                this.data = userService.modify(data) // 200
+            })
+        }
+    }
+
+    @DeleteMapping("{id}")
+    fun delete(@PathVariable id: Long): ResponseEntity<*> {
+        userService.physicalDeleteCacheable(id)
+        return ResponseEntity.ok(ResponseDto())
+    }
+
+    @GetMapping("/list")
+    @ZenResponseFilters(
+            ZenResponseFilter(type = SysUser::class, filter = ["createTime", "createBy", "updateTime", "updateBy", "password", "salt"]),
+            ZenResponseFilter(type = SysRole::class, include = ["id", "name"])
+    )
+    fun list(@RequestParam(required = false) keyword: String?,
+             @RequestParam(required = false) searchOption: Int?): ResponseEntity<*> {
+        // 获取用户列表(忽略enable)
+        var data: MutableList<SysUser> = userService.getListCacheable()
+        if (!keyword.isNullOrEmpty()) {
+            data = data.filter {
+                when (searchOption) {
+                    1 -> run {
+                        if (it.account != null) {
+                            keyword!! in it.account!!
+                        } else {
+                            false
+                        }
+                    }
+                    2 -> run {
+                        if (it.username != null) {
+                            keyword!! in it.username!!
+                        } else {
+                            false
+                        }
+                    }
+                    3 -> run {
+                        if (it.staffNo != null) {
+                            keyword!! in it.staffNo!!
+                        } else {
+                            false
+                        }
+                    }
+                    else -> false
+                }
+            }.toMutableList()
+        }
+
+        // 查出用户角色列表
+        data.forEach {
+            if (it.id != null) {
+                it.roles = userRoleService.getUserRoleListByUserId(it.id!!)
+            }
+        }
+
+        return if (PaginationUtil.paginable(getRequest())) {
+            // 分页
+            ResponseEntity.ok(ResponseDto().apply {
+                this.data = PaginationUtil.logicPaging(data, getRequest())
+            })
+        } else {
+            ResponseEntity.ok(ResponseDto().apply {
+                this.data = data
+            })
+        }
+    }
+
+
     @GetMapping("/info")
     @ZenResponseFilters(
             ZenResponseFilter(type = SysUser::class, include = ["id", "enable", "account", "username", "position", "address", "staffNo", "remark"]),

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

@@ -4,7 +4,7 @@ orm:
 ################## Alibaba Druid 配置 ##################
 spring:
   datasource:
-    type: com.alibaba.druid.pool.DruidDataSource
+#    type: com.alibaba.druid.pool.DruidDataSource
     druid:
       stat-view-servlet:
         enabled: true
@@ -12,29 +12,33 @@ spring:
         login-password: root
         reset-enable: false
       ############ 以下是关闭多数据源时使用的默认数据源 ############
-      username: root
-      password: root
-      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
-      driver-class-name: com.mysql.jdbc.Driver
-      test-on-borrow: false
-      test-on-return: false
-      test-while-idle: true
-      validation-query: SELECT 1
-      async-init: false
-      name: system
-      filters: log4j,wall,mergeStat
-      keep-alive: false
-      initial-size: 5
-      min-idle: 5
-      max-active: 20
-      time-between-eviction-runs-millis: 60000
-      min-evictable-idle-time-millis: 30000
+#      username: root
+#      password: root
+#      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
+#      driver-class-name: com.mysql.jdbc.Driver
+#      test-on-borrow: false
+#      test-on-return: false
+#      test-while-idle: true
+#      validation-query: SELECT 1
+#      async-init: false
+#      name: system
+#      filters: log4j,wall,mergeStat
+#      keep-alive: false
+#      initial-size: 5
+#      min-idle: 5
+#      max-active: 20
+#      time-between-eviction-runs-millis: 60000
+#      min-evictable-idle-time-millis: 30000
+  jta:
+    atomikos:
+      properties:
+        serial-jta-transactions: false
 
 ################## 数据源 配置 ##################
 datasource:
   sys:
     name: system
-    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
+    url: jdbc:mysql://127.0.0.1:3306/archives_sys?pinGlobalTxToPhysicalConnection=true&useUnicode=true&characterEncoding=utf-8&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=UTC&zeroDateTimeBehavior=convertToNull
     driver-class-name: com.mysql.jdbc.Driver
     username: root
     password: root
@@ -52,7 +56,7 @@ datasource:
     min-evictable-idle-time-millis: 30000
   bus:
     name: business
-    url: jdbc:mysql://127.0.0.1:3306/archives_mgr?useUnicode=true&characterEncoding=utf-8&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=UTC&zeroDateTimeBehavior=convertToNull
+    url: jdbc:mysql://127.0.0.1:3306/archives_mgr?pinGlobalTxToPhysicalConnection=true&useUnicode=true&characterEncoding=utf-8&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=UTC&zeroDateTimeBehavior=convertToNull
     driver-class-name: com.mysql.jdbc.Driver
     username: root
     password: root
@@ -72,13 +76,13 @@ datasource:
 ###################  mybatis-plus配置  ###################
 mybatis-plus:
   mapper-locations: classpath*:mapping/**/*.xml
-  type-aliases-package: com.gxzc.zen.api.bus.mapper,com.gxzc.zen.api.sys.mapper
+  type-aliases-package: com.gxzc.zen.api.bus.mapper,com.gxzc.zen.api.sys.mapper,com.gxzc.zen.api.bus.mapper,com.gxzc.zen.api.bus.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
+    logic-delete-value: 0
+    logic-not-delete-value: 1
     sql-injector: com.baomidou.mybatisplus.mapper.LogicSqlInjector
     meta-object-handler: com.gxzc.zen.orm.CustomMetaObjectHandler
   configuration:

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

@@ -1,10 +1,12 @@
 orm:
   multi-datasource-enable: false # 多数据源开关
 
+
+
 ################## Alibaba Druid 配置 ##################
 spring:
   datasource:
-    type: com.alibaba.druid.pool.DruidDataSource
+#    type: com.alibaba.druid.pool.xa.DruidXADataSource
     druid:
       stat-view-servlet:
         enabled: true
@@ -12,29 +14,34 @@ spring:
         login-password: root
         reset-enable: false
       ############ 以下是关闭多数据源时使用的默认数据源 ############
-      username: archives
-      password: archives
-      url: jdbc:mysql://192.168.1.124:3307/archives_sys?useUnicode=true&characterEncoding=utf-8&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=UTC&zeroDateTimeBehavior=convertToNull
-      driver-class-name: com.mysql.jdbc.Driver
-      test-on-borrow: false
-      test-on-return: false
-      test-while-idle: true
-      validation-query: SELECT 1
-      async-init: false
-      name: system
-      filters: log4j,wall,mergeStat
-      keep-alive: false
-      initial-size: 5
-      min-idle: 5
-      max-active: 20
-      time-between-eviction-runs-millis: 60000
-      min-evictable-idle-time-millis: 30000
+#      username: archives
+#      password: archives
+#      url: jdbc:mysql://192.168.1.124:3307/archives_sys?pinGlobalTxToPhysicalConnection=true&useUnicode=true&characterEncoding=utf-8&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=UTC&zeroDateTimeBehavior=convertToNull
+#      driver-class-name: com.mysql.jdbc.Driver
+#      test-on-borrow: false
+#      test-on-return: false
+#      test-while-idle: true
+#      validation-query: SELECT 1
+#      async-init: false
+#      name: system
+#      filters: log4j,wall,mergeStat
+#      keep-alive: false
+#      initial-size: 5
+#      min-idle: 5
+#      max-active: 20
+#      time-between-eviction-runs-millis: 60000
+#      min-evictable-idle-time-millis: 30000
+  jta:
+    atomikos:
+      properties:
+        serial-jta-transactions: false
+
 
 ################## 数据源 配置 ##################
 datasource:
   sys:
     name: system
-    url: jdbc:mysql://192.168.1.124:3307/archives_sys?useUnicode=true&characterEncoding=utf-8&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=UTC&zeroDateTimeBehavior=convertToNull
+    url: jdbc:mysql://192.168.1.124:3307/archives_sys?pinGlobalTxToPhysicalConnection=true&useUnicode=true&characterEncoding=utf-8&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=UTC&zeroDateTimeBehavior=convertToNull
     driver-class-name: com.mysql.jdbc.Driver
     username: archives
     password: archives
@@ -52,7 +59,7 @@ datasource:
     min-evictable-idle-time-millis: 30000
   bus:
     name: business
-    url: jdbc:mysql://192.168.1.124:3307/archives_mgr?useUnicode=true&characterEncoding=utf-8&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=UTC&zeroDateTimeBehavior=convertToNull
+    url: jdbc:mysql://192.168.1.124:3307/archives_sys?pinGlobalTxToPhysicalConnection=true&useUnicode=true&characterEncoding=utf-8&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=UTC&zeroDateTimeBehavior=convertToNull
     driver-class-name: com.mysql.jdbc.Driver
     username: archives
     password: archives

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

@@ -25,6 +25,9 @@ spring:
   aop:
     proxy-target-class: true #false为启用jdk默认动态代理,true为cglib动态代理
     auto: true
+  jackson:
+    deserialization:
+      fail-on-unknown-properties: true # 多余字段反序列化过滤
 logging:
   level:
     root: info