单点登陆重构(更适合前后分离)，权限框架重构(基于数据库的动态权限)，缓存重构(未完成)

sql/archives_save.sql

@@ -179,7 +179,7 @@ CREATE TABLE `save_disposition` (
 -- ----------------------------
 -- Records of save_disposition
 -- ----------------------------
-INSERT INTO `save_disposition` VALUES ('1', '
', 'dfddv', '2018-03-07 16:21:55', 'admin', null, null, 'fds', 'fdsfd', 'sfdsf', 'ds', 'df', 'sdfds', 'fs');
+INSERT INTO `save_disposition` VALUES ('1', '
', 'dfddv', '2018-03-07 16:21:55', 'admin', null, null, 'fds', 'fdsfd', 'sfdsf', 'common', 'df', 'sdfds', 'fs');
 INSERT INTO `save_disposition` VALUES ('2', '
', null, '2018-03-22 08:42:08', 'admin', null, null, 'f\'d\'s', 'fsfsfsf', 'f\'d\'s\'f\'f', 'f\'s\'f\'s\'f', 'f\'d\'s', 'f\'s\'f', 'f\'d\'s\'');
 
 -- ----------------------------

zen-api/src/main/kotlin/com/gxzc/zen/api/shared/service/TestSharedService.kt

@@ -2,8 +2,8 @@ package com.gxzc.zen.api.shared.service
 
 import com.gxzc.zen.api.shared.model.ShareTime
 import com.gxzc.zen.api.shared.model.SharedSysDic
-import com.gxzc.zen.api.sys.model.SysDic
-import com.gxzc.zen.api.sys.service.ISysDicService
+import com.gxzc.zen.api.sys.model.SysDict
+import com.gxzc.zen.api.sys.service.ISysDictService
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.stereotype.Service
 
@@ -14,16 +14,16 @@ import org.springframework.stereotype.Service
  * @url https://noahlan.com
  */
 @Service
-class TestSharedService : AbstractSharedService<SysDic, SharedSysDic>() {
+class TestSharedService : AbstractSharedService<SysDict, SharedSysDic>() {
     @Autowired
-    private lateinit var sysDicService: ISysDicService
+    private lateinit var sysDictService: ISysDictService
 
     @Autowired
     private lateinit var sharedSysDicService: ISharedSysDicService
 
-    override fun innerInsert(lastTime: ShareTime): MutableList<SysDic>? {
+    override fun innerInsert(lastTime: ShareTime): MutableList<SysDict>? {
         //
-        val data = sysDicService.selectList(queryConditionWrapper(lastTime.time!!))
+        val data = sysDictService.selectList(queryConditionWrapper(lastTime.time!!))
         data.forEach {
             sharedSysDicService.insert(clone(it))
         }
@@ -34,11 +34,10 @@ class TestSharedService : AbstractSharedService<SysDic, SharedSysDic>() {
         return getLastTime("dic_insert")
     }
 
-    fun clone(entity: SysDic): SharedSysDic {
+    fun clone(entity: SysDict): SharedSysDic {
         return SharedSysDic().apply {
             this.sort = entity.sort
             this.label = entity.label
-            this.key = entity.key
             this.value = entity.value
             commonFieldClone(entity, this)
         }
@@ -51,16 +50,15 @@ class TestSharedService : AbstractSharedService<SysDic, SharedSysDic>() {
     override fun innerSelect(lastTime: ShareTime): MutableList<SharedSysDic>? {
         val data = sharedSysDicService.selectList(queryConditionWrapper(lastTime.time!!))
         data.forEach {
-            sysDicService.insert(cloneSelect(it))
+            sysDictService.insert(cloneSelect(it))
         }
         return data
     }
 
-    fun cloneSelect(entity: SharedSysDic): SysDic {
-        return SysDic().apply {
+    fun cloneSelect(entity: SharedSysDic): SysDict {
+        return SysDict().apply {
             this.sort = entity.sort
             this.label = entity.label
-            this.key = entity.key
             this.value = entity.value
             commonFieldClone(entity, this)
         }

zen-api/src/main/kotlin/com/gxzc/zen/api/sys/common/DictTree.kt

@@ -0,0 +1,45 @@
+package com.gxzc.zen.api.sys.common
+
+import com.gxzc.zen.common.util.common.TreeNode
+
+/**
+ * 字典树
+ * @author NorthLan
+ * @date 2018/4/28
+ * @url https://noahlan.com
+ */
+open class DictTree : TreeNode() {
+    /**
+     * 字典码
+     */
+    var code: String? = null
+    /**
+     * 字典值
+     */
+    var value: String? = null
+    /**
+     * 标签（中文名）
+     */
+    var label: String? = null
+    /**
+     * 类型（1.目录 2.字典)
+     */
+    var type: Int? = null
+
+    override fun equals(other: Any?): Boolean {
+        return if (other is DictTree) {
+            other.code == this.code && other.type == this.type
+        } else {
+            super.equals(other)
+        }
+    }
+
+    override fun hashCode(): Int {
+        var result = super.hashCode()
+        result = 31 * result + (code?.hashCode() ?: 0)
+        result = 31 * result + (value?.hashCode() ?: 0)
+        result = 31 * result + (label?.hashCode() ?: 0)
+        result = 31 * result + (type ?: 0)
+        return result
+    }
+}

zen-api/src/main/kotlin/com/gxzc/zen/api/sys/common/MenuTree.kt

@@ -0,0 +1,52 @@
+package com.gxzc.zen.api.sys.common
+
+import com.gxzc.zen.common.util.common.TreeNode
+
+/**
+ * 菜单树
+ * @author NorthLan
+ * @date 2018/4/28
+ * @url https://noahlan.com
+ */
+class MenuTree : TreeNode() {
+    /**
+     * 菜单编码
+     */
+    var code: String? = null
+    /**
+     * 菜单类型（0:菜单组；1:菜单；）
+     */
+    var type: Int? = null
+    /**
+     * 菜单标题
+     */
+    var title: String? = null
+    /**
+     * 请求地址（前端）
+     */
+    var uri: String? = null
+    /**
+     * 图标名称
+     */
+    var icon: String? = null
+    /**
+     * 扩展字段1
+     */
+    var ext1: String? = null
+    /**
+     * 扩展字段2
+     */
+    var ext2: String? = null
+    /**
+     * 扩展字段3
+     */
+    var ext3: String? = null
+    /**
+     * 扩展字段4
+     */
+    var ext4: String? = null
+    /**
+     * 扩展字段5
+     */
+    var ext5: String? = null
+}

zen-api/src/main/kotlin/com/gxzc/zen/api/sys/common/RoleTree.kt

@@ -0,0 +1,40 @@
+package com.gxzc.zen.api.sys.common
+
+import com.gxzc.zen.common.util.common.TreeNode
+
+/**
+ * 角色树 @see also SysRole
+ * @author NorthLan
+ * @date 2018/4/28
+ * @url https://noahlan.com
+ */
+class RoleTree : TreeNode() {
+    /**
+     * 角色名称
+     */
+    var name: String? = null
+    /**
+     * 角色代码
+     */
+    var code: String? = null
+    /**
+     * 扩展字段1
+     */
+    var ext1: String? = null
+    /**
+     * 扩展字段2
+     */
+    var ext2: String? = null
+    /**
+     * 扩展字段3
+     */
+    var ext3: String? = null
+    /**
+     * 扩展字段4
+     */
+    var ext4: String? = null
+    /**
+     * 扩展字段5
+     */
+    var ext5: String? = null
+}

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

@@ -3,13 +3,14 @@ package com.gxzc.zen.api.sys.mapper
 import com.gxzc.zen.api.sys.model.SysDept
 import com.gxzc.zen.common.base.BaseMapper
 import org.springframework.stereotype.Repository
+
 /**
  * <p>
  * 部门管理 Mapper 接口
  * </p>
  *
- * @author NorthLan123
- * @since 2018-02-06
+ * @author NorthLan
+ * @since 2018-04-28
  */
 @Repository
 interface SysDeptMapper : BaseMapper<SysDept>

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

@@ -3,13 +3,14 @@ package com.gxzc.zen.api.sys.mapper
 import com.gxzc.zen.api.sys.model.SysDeptUser
 import com.gxzc.zen.common.base.BaseMapper
 import org.springframework.stereotype.Repository
+
 /**
  * <p>
  * 部门用户表 Mapper 接口
  * </p>
  *
- * @author NorthLan123
- * @since 2018-02-06
+ * @author NorthLan
+ * @since 2018-04-28
  */
 @Repository
 interface SysDeptUserMapper : BaseMapper<SysDeptUser>

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

@@ -1,7 +1,6 @@
 package com.gxzc.zen.api.sys.mapper
 
-import com.baomidou.mybatisplus.mapper.Wrapper
-import com.gxzc.zen.api.sys.model.SysDic
+import com.gxzc.zen.api.sys.model.SysDict
 import com.gxzc.zen.common.base.BaseMapper
 import org.apache.ibatis.annotations.Param
 import org.springframework.stereotype.Repository
@@ -11,9 +10,10 @@ import org.springframework.stereotype.Repository
  * 字典表 Mapper 接口
  * </p>
  *
- * @author NorthLan123
- * @since 2018-02-06
+ * @author NorthLan
+ * @since 2018-04-28
  */
 @Repository
-interface SysDicMapper : BaseMapper<SysDic> {
+interface SysDictMapper : BaseMapper<SysDict> {
+    fun updatePath(@Param("parentId") parentId: Long, @Param("id") id: Long): Int
 }

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

@@ -3,13 +3,14 @@ package com.gxzc.zen.api.sys.mapper
 import com.gxzc.zen.api.sys.model.SysEventLogin
 import com.gxzc.zen.common.base.BaseMapper
 import org.springframework.stereotype.Repository
+
 /**
  * <p>
  * 登录日志表 Mapper 接口
  * </p>
  *
- * @author NorthLan123
- * @since 2018-02-06
+ * @author NorthLan
+ * @since 2018-04-28
  */
 @Repository
 interface SysEventLoginMapper : BaseMapper<SysEventLogin>

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

@@ -3,13 +3,14 @@ package com.gxzc.zen.api.sys.mapper
 import com.gxzc.zen.api.sys.model.SysEventOper
 import com.gxzc.zen.common.base.BaseMapper
 import org.springframework.stereotype.Repository
+
 /**
  * <p>
  * 操作日志表 Mapper 接口
  * </p>
  *
- * @author NorthLan123
- * @since 2018-02-06
+ * @author NorthLan
+ * @since 2018-04-28
  */
 @Repository
 interface SysEventOperMapper : BaseMapper<SysEventOper>

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

@@ -2,14 +2,19 @@ package com.gxzc.zen.api.sys.mapper
 
 import com.gxzc.zen.api.sys.model.SysMenu
 import com.gxzc.zen.common.base.BaseMapper
+import org.apache.ibatis.annotations.Param
 import org.springframework.stereotype.Repository
+
 /**
  * <p>
  * 菜单表 Mapper 接口
  * </p>
  *
- * @author NorthLan123
- * @since 2018-02-06
+ * @author NorthLan
+ * @since 2018-04-28
  */
 @Repository
-interface SysMenuMapper : BaseMapper<SysMenu>
+interface SysMenuMapper : BaseMapper<SysMenu> {
+    fun selectByRoleIds(@Param("roleIds") roleIds: List<Long>): MutableList<SysMenu>
+    fun updatePath(@Param("parentId") parentId: Long, @Param("id") id: Long): Int
+}

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

@@ -3,13 +3,14 @@ package com.gxzc.zen.api.sys.mapper
 import com.gxzc.zen.api.sys.model.SysMenuRole
 import com.gxzc.zen.common.base.BaseMapper
 import org.springframework.stereotype.Repository
+
 /**
  * <p>
  * 用户菜单表 Mapper 接口
  * </p>
  *
- * @author NorthLan123
- * @since 2018-02-06
+ * @author NorthLan
+ * @since 2018-04-28
  */
 @Repository
 interface SysMenuRoleMapper : BaseMapper<SysMenuRole>

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

@@ -3,13 +3,14 @@ package com.gxzc.zen.api.sys.mapper
 import com.gxzc.zen.api.sys.model.SysNotice
 import com.gxzc.zen.common.base.BaseMapper
 import org.springframework.stereotype.Repository
+
 /**
  * <p>
  * 通知公告表 Mapper 接口
  * </p>
  *
- * @author NorthLan123
- * @since 2018-02-06
+ * @author NorthLan
+ * @since 2018-04-28
  */
 @Repository
 interface SysNoticeMapper : BaseMapper<SysNotice>

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

@@ -1,9 +1,7 @@
 package com.gxzc.zen.api.sys.mapper
 
-import com.baomidou.mybatisplus.mapper.Wrapper
 import com.gxzc.zen.api.sys.model.SysParam
 import com.gxzc.zen.common.base.BaseMapper
-import org.apache.ibatis.annotations.Param
 import org.springframework.stereotype.Repository
 
 /**
@@ -11,9 +9,8 @@ import org.springframework.stereotype.Repository
  * 系统参数表 Mapper 接口
  * </p>
  *
- * @author NorthLan123
- * @since 2018-02-06
+ * @author NorthLan
+ * @since 2018-04-28
  */
 @Repository
-interface SysParamMapper : BaseMapper<SysParam> {
-}
+interface SysParamMapper : BaseMapper<SysParam>

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

@@ -0,0 +1,19 @@
+package com.gxzc.zen.api.sys.mapper
+
+import com.gxzc.zen.api.sys.model.SysResource
+import com.gxzc.zen.common.base.BaseMapper
+import org.apache.ibatis.annotations.Param
+import org.springframework.stereotype.Repository
+
+/**
+ * <p>
+ * 资源表 Mapper 接口
+ * </p>
+ *
+ * @author NorthLan
+ * @since 2018-04-28
+ */
+@Repository
+interface SysResourceMapper : BaseMapper<SysResource> {
+    fun selectByRoleIds(@Param("roleIds") roleIds: List<Long>): MutableList<SysResource>
+}

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

@@ -0,0 +1,16 @@
+package com.gxzc.zen.api.sys.mapper
+
+import com.gxzc.zen.api.sys.model.SysResourceRole
+import com.gxzc.zen.common.base.BaseMapper
+import org.springframework.stereotype.Repository
+
+/**
+ * <p>
+ * 资源角色表(授权表) Mapper 接口
+ * </p>
+ *
+ * @author NorthLan
+ * @since 2018-04-28
+ */
+@Repository
+interface SysResourceRoleMapper : BaseMapper<SysResourceRole>

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

@@ -2,6 +2,7 @@ package com.gxzc.zen.api.sys.mapper
 
 import com.gxzc.zen.api.sys.model.SysRole
 import com.gxzc.zen.common.base.BaseMapper
+import org.apache.ibatis.annotations.Param
 import org.springframework.stereotype.Repository
 
 /**
@@ -9,10 +10,10 @@ import org.springframework.stereotype.Repository
  * 角色表 Mapper 接口
  * </p>
  *
- * @author NorthLan123
- * @since 2018-02-06
+ * @author NorthLan
+ * @since 2018-04-28
  */
 @Repository
 interface SysRoleMapper : BaseMapper<SysRole> {
-
+    fun selectByUserId(@Param("userId") userId: Long): MutableList<SysRole>
 }

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

@@ -14,6 +14,4 @@ import org.springframework.stereotype.Repository
  * @since 2018-02-06
  */
 @Repository
-interface SysUserMapper : BaseMapper<SysUser> {
-    fun selectByAccount(@Param("account") account: String): SysUser
-}
+interface SysUserMapper : BaseMapper<SysUser>

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

@@ -8,26 +8,29 @@ import com.gxzc.zen.common.base.BaseModel
  * 部门管理
  * </p>
  *
- * @author NorthLan123
- * @since 2018-02-06
+ * @author NorthLan
+ * @since 2018-04-28
  */
 @TableName("sys_dept")
-data class SysDept(
-        /**
-         * 父节点ID
-         */
-        var parentId: Long? = null,
-        /**
-         * 部门名称
-         */
-        var name: String? = null,
-        /**
-         * 负责人
-         */
-        var principal: String? = null,
-        /**
-         * 排序号
-         */
-        var sort: Int? = null
-) : BaseModel() {
+open class SysDept : BaseModel() {
+    /**
+     * 父节点ID
+     */
+    var parentId: Long? = null
+    /**
+     * 路径枚举
+     */
+    var path: String? = null
+    /**
+     * 部门名称
+     */
+    var name: String? = null
+    /**
+     * 负责人
+     */
+    var principal: String? = null
+    /**
+     * 排序号
+     */
+    var sort: Int? = null
 }

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

@@ -8,18 +8,17 @@ import com.gxzc.zen.common.base.BaseModel
  * 部门用户表
  * </p>
  *
- * @author NorthLan123
- * @since 2018-02-06
+ * @author NorthLan
+ * @since 2018-04-28
  */
 @TableName("sys_dept_user")
-data class SysDeptUser(
-        /**
-         * 部门ID
-         */
-        var deptId: Long? = null,
-        /**
-         * 用户ID
-         */
-        var userId: Long? = null
-) : BaseModel() {
+open class SysDeptUser : BaseModel() {
+    /**
+     * 部门ID
+     */
+    var deptId: Long? = null
+    /**
+     * 用户ID
+     */
+    var userId: Long? = null
 }

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

@@ -1,33 +0,0 @@
-package com.gxzc.zen.api.sys.model
-
-import com.baomidou.mybatisplus.annotations.TableName
-import com.gxzc.zen.common.base.BaseModel
-
-/**
- * <p>
- * 字典表
- * </p>
- *
- * @author NorthLan123
- * @since 2018-02-06
- */
-@TableName("sys_dic")
-data class SysDic(
-        /**
-         * 字典代码
-         */
-        var key: String? = null,
-        /**
-         * 字典值
-         */
-        var value: String? = null,
-        /**
-         * 标签
-         */
-        var label: String? = null,
-        /**
-         * 排序号
-         */
-        var sort: Int? = null
-) : BaseModel() {
-}

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

@@ -0,0 +1,44 @@
+package com.gxzc.zen.api.sys.model
+
+import com.baomidou.mybatisplus.annotations.TableName
+import com.gxzc.zen.common.base.BaseModel
+
+/**
+ * <p>
+ * 字典表
+ * </p>
+ *
+ * @author NorthLan
+ * @since 2018-04-28
+ */
+@TableName("sys_dict")
+open class SysDict : BaseModel() {
+    /**
+     * 字典码
+     */
+    var code: String? = null
+    /**
+     * 字典值
+     */
+    var value: String? = null
+    /**
+     * 标签（中文名）
+     */
+    var label: String? = null
+    /**
+     * 类型（1.目录 2.字典)
+     */
+    var type: Int? = null
+    /**
+     * 父节点id
+     */
+    var parentId: Long? = null
+    /**
+     * 路径枚举
+     */
+    var path: String? = null
+    /**
+     * 排序号
+     */
+    var sort: Int? = null
+}

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

@@ -8,38 +8,37 @@ import com.gxzc.zen.common.base.BaseModel
  * 登录日志表
  * </p>
  *
- * @author NorthLan123
- * @since 2018-02-06
+ * @author NorthLan
+ * @since 2018-04-28
  */
 @TableName("sys_event_login")
-data class SysEventLogin(
-        /**
-         * 日志标题
-         */
-        var title: String? = null,
-        /**
-         * 请求地址
-         */
-        var requestUri: String? = null,
-        /**
-         * 排序号
-         */
-        var sort: Int? = null,
-        /**
-         * 账户名
-         */
-        var account: String? = null,
-        /**
-         * 登录IP地址
-         */
-        var clientHost: String? = null,
-        /**
-         * 用户代理
-         */
-        var userAgent: String? = null,
-        /**
-         * 请求状态
-         */
-        var status: Int? = null
-) : BaseModel() {
+open class SysEventLogin : BaseModel() {
+    /**
+     * 日志标题
+     */
+    var title: String? = null
+    /**
+     * 请求地址
+     */
+    var requestUri: String? = null
+    /**
+     * 排序号
+     */
+    var sort: Int? = null
+    /**
+     * 账户名
+     */
+    var account: String? = null
+    /**
+     * 登录IP地址
+     */
+    var clientHost: String? = null
+    /**
+     * 用户代理
+     */
+    var userAgent: String? = null
+    /**
+     * 请求状态
+     */
+    var status: Int? = null
 }

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

@@ -8,38 +8,37 @@ import com.gxzc.zen.common.base.BaseModel
  * 操作日志表
  * </p>
  *
- * @author NorthLan123
- * @since 2018-02-06
+ * @author NorthLan
+ * @since 2018-04-28
  */
 @TableName("sys_event_oper")
-data class SysEventOper(
-        /**
-         * 日志标题
-         */
-        var title: String? = null,
-        /**
-         * 请求地址
-         */
-        var requestUri: String? = null,
-        /**
-         * 排序号
-         */
-        var sort: Int? = null,
-        /**
-         * 账户名
-         */
-        var account: String? = null,
-        /**
-         * 登录IP地址
-         */
-        var clientHost: String? = null,
-        /**
-         * 请求参数
-         */
-        var parameter: String? = null,
-        /**
-         * 请求方法
-         */
-        var method: String? = null
-) : BaseModel() {
+open class SysEventOper : BaseModel() {
+    /**
+     * 日志标题
+     */
+    var title: String? = null
+    /**
+     * 请求地址
+     */
+    var requestUri: String? = null
+    /**
+     * 排序号
+     */
+    var sort: Int? = null
+    /**
+     * 账户名
+     */
+    var account: String? = null
+    /**
+     * 登录IP地址
+     */
+    var clientHost: String? = null
+    /**
+     * 请求参数
+     */
+    var parameter: String? = null
+    /**
+     * 请求方法
+     */
+    var method: String? = null
 }

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

@@ -2,52 +2,116 @@ package com.gxzc.zen.api.sys.model
 
 import com.baomidou.mybatisplus.annotations.TableName
 import com.gxzc.zen.common.base.BaseModel
+import com.gxzc.zen.common.util.common.TreeNode
+import java.io.Serializable
 
 /**
  * <p>
  * 菜单表
  * </p>
  *
- * @author NorthLan123
- * @since 2018-02-06
+ * @author NorthLan
+ * @since 2018-04-28
  */
 @TableName("sys_menu")
-data class SysMenu(
-        /**
-         * 平台ID(0:通用,1:系统,2:接收,3:保存,4:管理,5:利用)
-         */
-        var platformId: Int? = null,
-        /**
-         * 上级菜单ID(root:0)
-         */
-        var parentId: Long? = null,
-        /**
-         * 菜单名称
-         */
-        var name: String? = null,
-        /**
-         * 授权，如(user:list,user:create)
-         */
-        var permission: String? = null,
-        /**
-         * 菜单类型（0:目录；1:菜单；2:按钮）
-         */
-        var type: Int? = null,
-        /**
-         * 请求地址
-         */
-        var url: String? = null,
-        /**
-         * 展开状态(1:展开;0:收缩)
-         */
-        var expand: Int? = null,
-        /**
-         * 排序号
-         */
-        var sort: Int? = null,
-        /**
-         * 叶子节点(0:树枝节点;1:叶子节点)
-         */
-        var isLeaf: Int? = null
-) : BaseModel() {
+open class SysMenu : BaseModel() {
+    /**
+     * 上级菜单ID(root:0)
+     */
+    var parentId: Long? = null
+    /**
+     * 路径枚举
+     */
+    var path: String? = null
+    /**
+     * 菜单编码
+     */
+    var code: String? = null
+    /**
+     * 菜单类型（0:菜单组；1:菜单；）
+     */
+    var type: Int? = null
+    /**
+     * 菜单标题
+     */
+    var title: String? = null
+    /**
+     * 请求地址（前端）
+     */
+    var uri: String? = null
+    /**
+     * 图标名称
+     */
+    var icon: String? = null
+    /**
+     * 排序号
+     */
+    var sort: Int? = null
+    /**
+     * 扩展字段1
+     */
+    var ext1: String? = null
+    /**
+     * 扩展字段2
+     */
+    var ext2: String? = null
+    /**
+     * 扩展字段3
+     */
+    var ext3: String? = null
+    /**
+     * 扩展字段4
+     */
+    var ext4: String? = null
+    /**
+     * 扩展字段5
+     */
+    var ext5: String? = null
+
+    override fun equals(other: Any?): Boolean {
+        if (this === other) return true
+        if (other !is SysMenu) return false
+        if (!super.equals(other)) return false
+
+        if (parentId != other.parentId) return false
+        if (path != other.path) return false
+        if (code != other.code) return false
+        if (type != other.type) return false
+        if (title != other.title) return false
+        if (uri != other.uri) return false
+        if (icon != other.icon) return false
+        if (sort != other.sort) return false
+        if (ext1 != other.ext1) return false
+        if (ext2 != other.ext2) return false
+        if (ext3 != other.ext3) return false
+        if (ext4 != other.ext4) return false
+        if (ext5 != other.ext5) return false
+
+        return true
+    }
+
+    override fun hashCode(): Int {
+        var result = super.hashCode()
+        result = 31 * result + (parentId?.hashCode() ?: 0)
+        result = 31 * result + (path?.hashCode() ?: 0)
+        result = 31 * result + (code?.hashCode() ?: 0)
+        result = 31 * result + (type ?: 0)
+        result = 31 * result + (title?.hashCode() ?: 0)
+        result = 31 * result + (uri?.hashCode() ?: 0)
+        result = 31 * result + (icon?.hashCode() ?: 0)
+        result = 31 * result + (sort ?: 0)
+        result = 31 * result + (ext1?.hashCode() ?: 0)
+        result = 31 * result + (ext2?.hashCode() ?: 0)
+        result = 31 * result + (ext3?.hashCode() ?: 0)
+        result = 31 * result + (ext4?.hashCode() ?: 0)
+        result = 31 * result + (ext5?.hashCode() ?: 0)
+        return result
+    }
+
+    /////////////////////////////////////////////////
+//    @TableField(exist = false)
+//    var sysResource: SysResource? = null
+    /////////////////////////////////////////////////
+
+
 }

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

@@ -8,18 +8,17 @@ import com.gxzc.zen.common.base.BaseModel
  * 用户菜单表
  * </p>
  *
- * @author NorthLan123
- * @since 2018-02-06
+ * @author NorthLan
+ * @since 2018-04-28
  */
 @TableName("sys_menu_role")
-data class SysMenuRole(
-        /**
-         * 菜单ID
-         */
-        var menuId: Long? = null,
-        /**
-         * 角色ID
-         */
-        var roleId: Long? = null
-) : BaseModel() {
+open class SysMenuRole : BaseModel() {
+    /**
+     * 菜单ID
+     */
+    var menuId: Long? = null
+    /**
+     * 角色ID
+     */
+    var roleId: Long? = null
 }

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

@@ -1,6 +1,7 @@
 package com.gxzc.zen.api.sys.model
 
 import com.baomidou.mybatisplus.annotations.TableName
+import com.fasterxml.jackson.annotation.JsonFormat
 import java.util.Date
 import com.gxzc.zen.common.base.BaseModel
 
@@ -9,34 +10,34 @@ import com.gxzc.zen.common.base.BaseModel
  * 通知公告表
  * </p>
  *
- * @author NorthLan123
- * @since 2018-02-06
+ * @author NorthLan
+ * @since 2018-04-28
  */
 @TableName("sys_notice")
-data class SysNotice(
-        /**
-         * 公告标题
-         */
-        var noticeTitle: String? = null,
-        /**
-         * 公告类型
-         */
-        var noticeType: String? = null,
-        /**
-         * 发布时间
-         */
-        var sendTime: Date? = null,
-        /**
-         * 来源地址
-         */
-        var sourcesUrl: String? = null,
-        /**
-         * 内容
-         */
-        var content: String? = null,
-        /**
-         * 发布状态
-         */
-        var status: String? = null
-) : BaseModel() {
+open class SysNotice : BaseModel() {
+    /**
+     * 公告标题
+     */
+    var noticeTitle: String? = null
+    /**
+     * 公告类型
+     */
+    var noticeType: String? = null
+    /**
+     * 发布时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    var sendTime: Date? = null
+    /**
+     * 来源地址
+     */
+    var sourcesUrl: String? = null
+    /**
+     * 内容
+     */
+    var content: String? = null
+    /**
+     * 发布状态
+     */
+    var status: String? = null
 }

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

@@ -8,26 +8,29 @@ import com.gxzc.zen.common.base.BaseModel
  * 系统参数表
  * </p>
  *
- * @author NorthLan123
- * @since 2018-02-06
+ * @author NorthLan
+ * @since 2018-04-28
  */
 @TableName("sys_param")
-data class SysParam(
-        /**
-         * 参数key
-         */
-        var key: String? = null,
-        /**
-         * 参数值
-         */
-        var value: String? = null,
-        /**
-         * 标签
-         */
-        var label: String? = null,
-        /**
-         * 排序号
-         */
-        var sort: Int? = null
-) : BaseModel() {
+open class SysParam : BaseModel() {
+    /**
+     * 参数key
+     */
+    var key: String? = null
+    /**
+     * 参数值
+     */
+    var value: String? = null
+    /**
+     * 标签
+     */
+    var label: String? = null
+    /**
+     * 扩展字段
+     */
+    var extend: String? = null
+    /**
+     * 排序号
+     */
+    var sort: Int? = null
 }

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

@@ -0,0 +1,72 @@
+package com.gxzc.zen.api.sys.model
+
+import com.baomidou.mybatisplus.annotations.TableName
+import com.gxzc.zen.common.base.BaseModel
+
+/**
+ * <p>
+ * 资源表
+ * </p>
+ *
+ * @author NorthLan
+ * @since 2018-04-28
+ */
+@TableName("sys_resource")
+open class SysResource : BaseModel() {
+    /**
+     * 上级菜单ID(root:0)
+     */
+    var parentId: Long? = null
+    /**
+     * 关联菜单id(可不关联)
+     */
+    var menuId: Long? = null
+    /**
+     * 资源类型 （1.按钮；2.资源；）
+     */
+    var type: Int? = null
+    /**
+     * 资源编码
+     */
+    var code: String? = null
+    /**
+     * 请求地址（后端）
+     */
+    var uri: String? = null
+    /**
+     * 资源名称
+     */
+    var name: String? = null
+    /**
+     * 路径枚举
+     */
+    var path: String? = null
+    /**
+     * 请求类型
+     */
+    var method: String? = null
+    /**
+     * 描述
+     */
+    var description: String? = null
+    /**
+     * 扩展字段1
+     */
+    var ext1: String? = null
+    /**
+     * 扩展字段2
+     */
+    var ext2: String? = null
+    /**
+     * 扩展字段3
+     */
+    var ext3: String? = null
+    /**
+     * 扩展字段4
+     */
+    var ext4: String? = null
+    /**
+     * 扩展字段5
+     */
+    var ext5: String? = null
+}

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

@@ -0,0 +1,24 @@
+package com.gxzc.zen.api.sys.model
+
+import com.baomidou.mybatisplus.annotations.TableName
+import com.gxzc.zen.common.base.BaseModel
+
+/**
+ * <p>
+ * 资源角色表(授权表)
+ * </p>
+ *
+ * @author NorthLan
+ * @since 2018-04-28
+ */
+@TableName("sys_resource_role")
+open class SysResourceRole : BaseModel() {
+    /**
+     * 角色ID
+     */
+    var roleId: Long? = null
+    /**
+     * 资源ID
+     */
+    var resourceId: Long? = null
+}

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

@@ -8,22 +8,45 @@ import com.gxzc.zen.common.base.BaseModel
  * 角色表
  * </p>
  *
- * @author NorthLan123
- * @since 2018-02-06
+ * @author NorthLan
+ * @since 2018-04-28
  */
 @TableName("sys_role")
-data class SysRole(
-        /**
-         * 角色名称
-         */
-        var name: String? = null,
-        /**
-         * 角色代码
-         */
-        var code: String? = null,
-        /**
-         * 权限列表
-         */
-        var perms: String? = null
-) : BaseModel() {
+open class SysRole : BaseModel() {
+    /**
+     * 父级节点
+     */
+    var parentId: Long? = null
+    /**
+     * 角色名称
+     */
+    var name: String? = null
+    /**
+     * 路径枚举
+     */
+    var path: String? = null
+    /**
+     * 角色代码
+     */
+    var code: String? = null
+    /**
+     * 扩展字段1
+     */
+    var ext1: String? = null
+    /**
+     * 扩展字段2
+     */
+    var ext2: String? = null
+    /**
+     * 扩展字段3
+     */
+    var ext3: String? = null
+    /**
+     * 扩展字段4
+     */
+    var ext4: String? = null
+    /**
+     * 扩展字段5
+     */
+    var ext5: String? = null
 }

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

@@ -1,6 +1,5 @@
 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
 
@@ -9,72 +8,69 @@ import com.gxzc.zen.common.base.BaseModel
  * 用户管理
  * </p>
  *
- * @author NorthLan123
- * @since 2018-02-06
+ * @author NorthLan
+ * @since 2018-04-27
  */
 @TableName("sys_user")
-data class SysUser(
-        /**
-         * 登陆帐户
-         */
-        var account: String? = null,
-        /**
-         * 姓名
-         */
-        var username: String? = null,
-        /**
-         * 密码
-         */
-        var password: String? = null,
-        /**
-         * 盐值
-         */
-        var salt: String? = null,
-        /**
-         * 电话
-         */
-        var phone: String? = null,
-        /**
-         * 邮箱
-         */
-        var email: String? = null,
-        /**
-         * 职位
-         */
-        var position: String? = null,
-        /**
-         * 详细地址
-         */
-        var address: String? = null,
-        /**
-         * 工号
-         */
-        var staffNo: String? = null,
-        /**
-         * 备用字段
-         */
-        var ext1: String? = null,
-        /**
-         * 备用字段
-         */
-        var ext2: String? = null,
-        /**
-         * 备用字段
-         */
-        var ext3: String? = null,
-        /**
-         * 备用字段
-         */
-        var ext4: String? = null,
-        /**
-         * 性别
-         */
-        var gender: Int? = null,
-
-
-        /////////////////////////////////////////////////
-        @TableField(exist = false)
-        var roles: MutableList<SysRole>? = null
-        /////////////////////////////////////////////////
-) : BaseModel() {
-}
+open class SysUser : BaseModel() {
+    /**
+     * 登陆帐户
+     */
+    var account: String? = null
+    /**
+     * 姓名
+     */
+    var username: String? = null
+    /**
+     * 密码
+     */
+    var password: String? = null
+    /**
+     * 密码盐值
+     */
+    var salt: String? = null
+    /**
+     * 电话
+     */
+    var phone: String? = null
+    /**
+     * 邮箱
+     */
+    var email: String? = null
+    /**
+     * 职位
+     */
+    var position: String? = null
+    /**
+     * 详细地址
+     */
+    var address: String? = null
+    /**
+     * 工号
+     */
+    var staffNo: String? = null
+    /**
+     * 账号锁定（1.锁定；0.不锁定；）
+     */
+    var lock: Boolean? = null
+    /**
+     * 备用字段
+     */
+    var ext1: String? = null
+    /**
+     * 备用字段
+     */
+    var ext2: String? = null
+    /**
+     * 备用字段
+     */
+    var ext3: String? = null
+    /**
+     * 备用字段
+     */
+    var ext4: String? = null
+    /**
+     * 性别，定义 1：男 0：女 -1：保密
+     */
+    var gender: Int? = null
+}

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

@@ -8,18 +8,17 @@ import com.gxzc.zen.common.base.BaseModel
  * 用户角色表
  * </p>
  *
- * @author NorthLan123
- * @since 2018-02-06
+ * @author NorthLan
+ * @since 2018-04-27
  */
 @TableName("sys_user_role")
-data class SysUserRole(
-        /**
-         * 角色ID
-         */
-        var roleId: Long? = null,
-        /**
-         * 用户ID
-         */
-        var userId: Long? = null
-) : BaseModel() {
-}
+open class SysUserRole : BaseModel() {
+    /**
+     * 角色ID
+     */
+    var roleId: Long? = null
+    /**
+     * 用户ID
+     */
+    var userId: Long? = null
+}

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

@@ -1,52 +0,0 @@
-package com.gxzc.zen.api.sys.service
-
-import com.gxzc.zen.api.sys.model.SysDic
-import com.gxzc.zen.common.base.BaseService
-
-/**
- * <p>
- * 字典表 服务类
- * </p>
- *
- * @author NorthLan123
- * @since 2018-02-06
- */
-interface ISysDicService : BaseService<SysDic> {
-    /**
-     * 查询所有列表并存入缓存中(忽略enable)
-     */
-    fun getListCacheable(): MutableList<SysDic>
-
-    /**
-     * 查询所有列表(忽略enable,不缓存)
-     */
-    fun getList(enable: Boolean?): MutableList<SysDic>
-
-    /**
-     * 根据key获取对应的SysDic列表(缓存获取)
-     */
-    fun getListByKey(key: String): MutableList<SysDic>
-
-    /**
-     * 获取一个SysDic,若查询结果大于1个则取第一个(缓存获取)
-     */
-    fun getOneByKey(key: String, value: String?, sort: Int?): SysDic?
-
-    /**
-     * 修改SysDic项
-     * 更新缓存项
-     */
-    fun modify(data: SysDic): SysDic
-
-    /**
-     * 新增字典
-     * 刷新缓存
-     */
-    fun insertCacheable(data: SysDic)
-
-    /**
-     * 物理删除字典项
-     * 刷新缓存
-     */
-    fun physicalDeleteCacheable(id: Long)
-}

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

@@ -0,0 +1,22 @@
+package com.gxzc.zen.api.sys.service
+
+import com.gxzc.zen.api.sys.model.SysDict
+import com.gxzc.zen.common.base.BaseService
+import com.gxzc.zen.common.util.common.TreeNode
+
+/**
+ * <p>
+ * 字典表 服务类
+ * </p>
+ *
+ * @author NorthLan
+ * @since 2018-04-28
+ */
+interface ISysDictService : BaseService<SysDict> {
+    fun getRootTree(): TreeNode?
+
+    /**
+     * 插入树节点数据
+     */
+    fun insertTree(entity: SysDict)
+}

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

@@ -1,7 +1,9 @@
 package com.gxzc.zen.api.sys.service
 
+import com.gxzc.zen.api.sys.common.MenuTree
 import com.gxzc.zen.api.sys.model.SysMenu
 import com.gxzc.zen.common.base.BaseService
+
 /**
  * <p>
  * 菜单表 服务类
@@ -10,4 +12,18 @@ import com.gxzc.zen.common.base.BaseService
  * @author NorthLan123
  * @since 2018-02-06
  */
-interface ISysMenuService : BaseService<SysMenu>
+interface ISysMenuService : BaseService<SysMenu> {
+    fun getRootTree(): MenuTree?
+
+    fun getUserMenuTree(platformId: Long): MutableList<MenuTree>
+
+    fun getSysMenuList(): MutableList<SysMenu>
+
+    fun getSysMenuTree(): MutableList<MenuTree>
+
+    fun createSysMenu(entity: SysMenu): SysMenu
+
+    fun updateMenu(entity: SysMenu): SysMenu
+
+    fun deleteMenu(entity: SysMenu)
+}

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

@@ -1,5 +1,9 @@
 package com.gxzc.zen.api.sys.service
 
+import com.gxzc.zen.api.sys.model.SysRole
+import com.gxzc.zen.umps.common.ZenPermission
+import org.apache.shiro.session.Session
+
 /**
  * <p>
  * 权限 服务类
@@ -9,26 +13,31 @@ package com.gxzc.zen.api.sys.service
  * @since 2018-02-06
  */
 interface ISysPermissionService {
+
     /**
-     * 获取指定用户的所有权限并缓存至user_perm key: uid_*
+     * 获取系统所有权限列表并存入 {code 系统缓存}
      */
-    fun getPermissionSetByUserId(id: Long): HashSet<String>
+    fun getAllSysPermission(): MutableList<ZenPermission>
 
     /**
-     * 移除 {@code id} 指定用户的权限缓存
+     * 获取用户主体拥有的权限列表
+     * 若session缓存中没有 则从数据库中取出
      */
-    fun evictCache(id: Long)
+    fun getSubjectPermission(): MutableList<ZenPermission>
 
     /**
-     * 移除 指定用户集 的缓存
+     * 获取用户主体拥有的角色列表
+     * 若session缓存中没有 则从数据库中取出
      */
-    fun evictCache(ids: Set<Long>)
+    fun getSubjectRoles(session: Session): MutableList<SysRole>
 
-    fun clearCache()
+    /**
+     * 更新系统权限缓存
+     */
+    fun updateAllSysPermission()
 
-//    /**
-//     * 初始化所有用户的权限缓存
-//     *
-//     */
-//    fun initAllUserPermissionCache()
+    /**
+     * 更新用户主体权限
+     */
+    fun updateSubjectPermissionByAccount(account: String)
 }

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

@@ -0,0 +1,14 @@
+package com.gxzc.zen.api.sys.service
+
+import com.gxzc.zen.api.sys.model.SysResourceRole
+import com.gxzc.zen.common.base.BaseService
+
+/**
+ * <p>
+ * 资源角色表(授权表) 服务类
+ * </p>
+ *
+ * @author NorthLan
+ * @since 2018-04-28
+ */
+interface ISysResourceRoleService : BaseService<SysResourceRole>

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

@@ -0,0 +1,29 @@
+package com.gxzc.zen.api.sys.service
+
+import com.gxzc.zen.api.sys.model.SysResource
+import com.gxzc.zen.common.base.BaseService
+
+/**
+ * <p>
+ * 资源表 服务类
+ * </p>
+ *
+ * @author NorthLan
+ * @since 2018-04-28
+ */
+interface ISysResourceService : BaseService<SysResource> {
+    /**
+     * 通过role id 列表获取 resource
+     */
+    fun getResourcesByRoleIds(roleIds: List<Long>): MutableList<SysResource>
+
+    fun getResourcesByMenuId(menuId: Long): MutableList<SysResource>
+
+    fun insertResource(menuId: Long, sysResource: SysResource): SysResource
+
+    fun updateResource(sysResource: SysResource): SysResource
+
+    fun deleteResourceById(id: Long)
+
+    fun deleteResourcesByMenuId(menuId: Long)
+}

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

@@ -1,6 +1,5 @@
 package com.gxzc.zen.api.sys.service
 
-import com.baomidou.mybatisplus.plugins.Page
 import com.gxzc.zen.api.sys.model.SysRole
 import com.gxzc.zen.common.base.BaseService
 
@@ -13,24 +12,27 @@ import com.gxzc.zen.common.base.BaseService
  * @since 2018-02-06
  */
 interface ISysRoleService : BaseService<SysRole> {
-    /**
-     * 查询所有角色列表(无过滤)
-     * @param enable @code{null} 为忽略enable
-     */
-    fun getListByParam(name: String?, code: String?, enable: Boolean?): MutableList<SysRole>
 
-    /**
-     * 查询角色列表 分页 过滤 忽略enable 等
-     */
-    fun getListByParamPage(name: String?, code: String?, enable: Boolean?, current: Int, size: Int): Page<SysRole>
+    fun getRoleListByUserId(userId: Long?): MutableList<SysRole>
 
-    /**
-     * 修改 角色信息
-     */
-    fun modify(entity: SysRole): SysRole
-
-    /**
-     * 物理删除
-     */
-    fun physicalDelete(id: Long)
+//    /**
+//     * 查询所有角色列表(无过滤)
+//     * @param enable @code{null} 为忽略enable
+//     */
+//    fun getListByParam(name: String?, code: String?, enable: Boolean?): MutableList<SysRole>
+//
+//    /**
+//     * 查询角色列表 分页 过滤 忽略enable 等
+//     */
+//    fun getListByParamPage(name: String?, code: String?, enable: Boolean?, current: Int, size: Int): Page<SysRole>
+//
+//    /**
+//     * 修改 角色信息
+//     */
+//    fun modify(entity: SysRole): SysRole
+//
+//    /**
+//     * 物理删除
+//     */
+//    fun physicalDelete(id: Long)
 }

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

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

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

@@ -1,139 +0,0 @@
-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.SysDicMapper
-import com.gxzc.zen.api.sys.model.SysDic
-import com.gxzc.zen.api.sys.service.ISysDicService
-import com.gxzc.zen.common.contants.CACHEKEYS
-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.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
-
-/**
- * <p>
- * 字典表 服务实现类
- * </p>
- *
- * @author NorthLan123
- * @since 2018-02-06
- */
-@Suppress("UNCHECKED_CAST")
-@Service
-class SysDicServiceImpl : ServiceImpl<SysDicMapper, SysDic>(), ISysDicService, CommandLineRunner {
-    companion object {
-        private val logger = LoggerFactory.getLogger(SysDicServiceImpl::class.java)
-        const val CACHE_KEY_ALL = "dic_all"
-    }
-
-    @Autowired
-    private lateinit var platformProperties: PlatformProperties
-
-    override fun run(vararg args: String?) {
-        logger.debug("${this::class.simpleName} init.")
-        getListCacheable()
-    }
-
-    override fun getListCacheable(): MutableList<SysDic> {
-        val cached = RedisCacheUtil.get(CACHEKEYS.SYS, CACHE_KEY_ALL)?.get() as? MutableList<SysDic>
-        if (cached != null) {
-            return cached
-        }
-        val ret = baseMapper.selectWOLogic(null)
-        if (PlatformUtil.getPlatform(platformProperties) == PLATFORM.SYSTEM) {
-            RedisCacheUtil.put(CACHEKEYS.SYS, CACHE_KEY_ALL, ret)
-        }
-        return ret
-    }
-
-    override fun getList(enable: Boolean?): MutableList<SysDic> {
-        return if (enable != null) {
-            baseMapper.selectWOLogic(EntityWrapper<SysDic>().eq("enable", enable))
-        } else {
-            baseMapper.selectWOLogic(null)
-        }
-    }
-
-    override fun getListByKey(key: String): MutableList<SysDic> {
-        val allData = getListCacheable()
-        return allData.filter {
-            it.enable != null && it.enable!! && it.key == key
-        }.toMutableList()
-    }
-
-    @ZenTransactional
-    override fun modify(data: SysDic): SysDic {
-        if (PlatformUtil.getPlatform() == PLATFORM.SYSTEM) {
-            baseMapper.updateWOLogic(data, EntityWrapper<SysDic>().eq("id", data.id))
-            // 更新缓存
-            val cached = RedisCacheUtil.get(CACHEKEYS.SYS, CACHE_KEY_ALL)?.get() as? MutableList<SysDic>
-            cached?.let {
-                val idx = it.indexOfFirst { it.id == data.id }
-                if (idx != -1) {
-                    it[idx] = data
-                }
-                RedisCacheUtil.put(CACHEKEYS.SYS, CACHE_KEY_ALL, it)
-            }
-        }
-        return data
-    }
-
-    override fun getOneByKey(key: String, value: String?, sort: Int?): SysDic? {
-        val result = baseMapper.selectWOLogic(EntityWrapper<SysDic>().apply {
-            eq("key", key)
-            if (value.isNullOrEmpty()) {
-                eq("value", value!!)
-            }
-            if (sort != null) {
-                eq("sort", sort)
-            }
-            eq("enable", true)
-        })
-        return if (result.size > 0) {
-            result.filter {
-                it.sort == sort && it.value == value
-            }[0]
-        } else {
-            null
-        }
-    }
-
-    @ZenTransactional
-    override fun insertCacheable(data: SysDic) {
-        if (PlatformUtil.getPlatform() == PLATFORM.SYSTEM) {
-            if (baseMapper.insert(data) == 0) {
-                throw ZenException(ZenExceptionEnum.BIZ_INSERT_ERROR)
-            }
-            val cached = RedisCacheUtil.get(CACHEKEYS.SYS, CACHE_KEY_ALL)?.get() as? MutableList<SysDic>
-            cached?.let {
-                it.add(data)
-                RedisCacheUtil.put(CACHEKEYS.SYS, CACHE_KEY_ALL, it)
-            }
-        }
-    }
-
-    @ZenTransactional
-    override fun physicalDeleteCacheable(id: Long) {
-        if (PlatformUtil.getPlatform() == PLATFORM.SYSTEM) {
-            if (baseMapper.physicalDelete(EntityWrapper<SysDic>().eq("id", id)) <= 0) {
-                throw ZenException(ZenExceptionEnum.BIZ_DELETE_ERROR)
-            }
-            //
-            val cached = RedisCacheUtil.get(CACHEKEYS.SYS, CACHE_KEY_ALL)?.get() as? MutableList<SysDic>
-            cached?.let {
-                it.removeIf {
-                    it.id == id
-                }
-                RedisCacheUtil.put(CACHEKEYS.SYS, CACHE_KEY_ALL, it)
-            }
-        }
-    }
-}

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

@@ -0,0 +1,59 @@
+package com.gxzc.zen.api.sys.service.impl
+
+import com.baomidou.mybatisplus.service.impl.ServiceImpl
+import com.gxzc.zen.api.sys.common.DictTree
+import com.gxzc.zen.api.sys.mapper.SysDictMapper
+import com.gxzc.zen.api.sys.model.SysDict
+import com.gxzc.zen.api.sys.service.ISysDictService
+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.common.util.common.TreeNode
+import com.gxzc.zen.orm.annotation.ZenTransactional
+import org.springframework.beans.BeanUtils
+import org.springframework.stereotype.Service
+
+/**
+ * <p>
+ * 字典表 服务实现类
+ * </p>
+ *
+ * @author NorthLan
+ * @since 2018-04-28
+ */
+@Service
+class SysDictServiceImpl : ServiceImpl<SysDictMapper, SysDict>(), ISysDictService {
+
+    override fun getRootTree(): TreeNode? {
+        val ret = getTree()
+        return if (ret.isEmpty()) null else ret[0]
+    }
+
+    private fun getTree(): MutableList<DictTree> {
+        val nodes = mutableListOf<DictTree>()
+        baseMapper.selectList(null)?.forEach {
+            val node = DictTree()
+            BeanUtils.copyProperties(it, node)
+            nodes.add(node)
+        }
+        return TreeUtil.build(nodes, ZenConstants.TREE_ROOT_PID)
+    }
+
+
+    @ZenTransactional
+    override fun insertTree(entity: SysDict) {
+        // 没有父节点id 不存在的
+        if (entity.parentId == null) {
+            entity.parentId = 0L
+        }
+        // 插入一条,然后修改path
+        if (baseMapper.insert(entity) <= 0) {
+            throw ZenException(ZenExceptionEnum.BIZ_INSERT_ERROR)
+        }
+
+        if (baseMapper.updatePath(entity.parentId!!, entity.id!!) <= 0) {
+            throw ZenException(ZenExceptionEnum.BIZ_INSERT_ERROR)
+        }
+    }
+}

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

@@ -1,9 +1,19 @@
 package com.gxzc.zen.api.sys.service.impl
 
-import com.gxzc.zen.api.sys.model.SysMenu
+import com.baomidou.mybatisplus.mapper.EntityWrapper
+import com.baomidou.mybatisplus.service.impl.ServiceImpl
+import com.gxzc.zen.api.sys.common.MenuTree
 import com.gxzc.zen.api.sys.mapper.SysMenuMapper
+import com.gxzc.zen.api.sys.model.SysMenu
 import com.gxzc.zen.api.sys.service.ISysMenuService
-import com.baomidou.mybatisplus.service.impl.ServiceImpl
+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 org.springframework.beans.BeanUtils
 import org.springframework.stereotype.Service
 
 /**
@@ -17,4 +27,112 @@ import org.springframework.stereotype.Service
 @Service
 class SysMenuServiceImpl : ServiceImpl<SysMenuMapper, SysMenu>(), ISysMenuService {
 
+    private fun getTree(data: List<SysMenu>): MutableList<MenuTree> {
+        val nodes = mutableListOf<MenuTree>()
+        data.forEach {
+            val node = MenuTree()
+            BeanUtils.copyProperties(it, node)
+            nodes.add(node)
+        }
+        return TreeUtil.build(nodes, ZenConstants.TREE_ROOT_PID)
+    }
+
+    override fun getRootTree(): MenuTree? {
+        val ret = getTree(baseMapper.selectList(null))
+        return if (ret.isEmpty()) null else ret[0]
+    }
+
+    private fun getUserMenuTree(resourceMenuIds: List<Long>?, roleIds: List<Long>?): MutableList<MenuTree> {
+        // 获取所有权限菜单
+        val distinctMenu = hashSetOf<SysMenu>().apply {
+            if (resourceMenuIds != null && resourceMenuIds.isNotEmpty()) {
+                addAll(baseMapper.selectBatchIds(resourceMenuIds))
+            }
+            if (roleIds != null && roleIds.isNotEmpty()) {
+                addAll(baseMapper.selectByRoleIds(roleIds))
+            }
+        }
+        // 获取权限菜单的所有父节点以便于组合成树
+        val parentsIds = mutableSetOf<String>()
+        distinctMenu.forEach {
+            if (!it.path.isNullOrEmpty()) {
+                val paths = it.path!!.split(ZenConstants.TREE_PATH_SEPARATOR)
+                parentsIds.addAll(paths.subList(0, paths.size - 1)) // 不添加自身
+            }
+        }
+        if (parentsIds.isNotEmpty()) {
+            distinctMenu.addAll(baseMapper.selectBatchIds(parentsIds))
+        }
+        return getTree(distinctMenu.toList())
+    }
+
+    override fun getUserMenuTree(platformId: Long): MutableList<MenuTree> {
+        var menu = SSOUtil.getCurUserMenuTree(platformId)
+        if (menu == null || menu.isEmpty()) {
+            val res = SSOUtil.getCurUserPerms()?.map { it.menuId!! }
+            val roleIds = SSOUtil.getCurUserRoles()?.map { it.id!! }
+            menu = getUserMenuTree(res, roleIds)
+            if (menu.isNotEmpty()) {
+                // TODO 刷新缓存
+                SSOUtil.setAttribute(ZenHttpSession.SESSION_KEY_USER_MENU + platformId, menu)
+            } else {
+                return mutableListOf()
+            }
+        }
+        // 根据平台id取出对应平台的菜单列表
+        // 此处使用广度优先遍历会快一些 因为主要过滤都在第二层树
+        menu = TreeUtil.findBFS(menu) {
+            it.ext1 != null && it.ext1 == platformId.toString()
+        }
+        if (menu.isNotEmpty()) {
+            val root = menu[0]
+            if (root.children != null && root.children!!.isNotEmpty()) {
+                menu = mutableListOf()
+                root.children?.forEach {
+                    menu.add(it as MenuTree)
+                }
+            }
+        }
+        return menu
+    }
+
+    override fun getSysMenuList(): MutableList<SysMenu> {
+        return baseMapper.selectList(null)
+    }
+
+    override fun getSysMenuTree(): MutableList<MenuTree> {
+        return getTree(getSysMenuList().toList())
+    }
+
+    @ZenTransactional
+    override fun createSysMenu(entity: SysMenu): SysMenu {
+        // 先新增一条数据 再根据此数据更新对应的path
+        if (baseMapper.insert(entity) <= 0) {
+            throw ZenException(ZenExceptionEnum.BIZ_INSERT_ERROR)
+        }
+        if (baseMapper.updatePath(entity.parentId!!, entity.id!!) <= 0) {
+            throw ZenException(ZenExceptionEnum.BIZ_INSERT_ERROR)
+        }
+        return entity
+    }
+
+    override fun updateMenu(entity: SysMenu): SysMenu {
+        if (baseMapper.updateById(entity) <= 0) {
+            throw ZenException(ZenExceptionEnum.BIZ_UPDATE_ERROR)
+        }
+        return entity
+    }
+
+    @ZenTransactional
+    override fun deleteMenu(entity: SysMenu) {
+        if (entity.id == null) {
+            throw ZenException(ZenExceptionEnum.BIZ_DELETE_ERROR)
+        }
+        // 先查询现有的数据 (path)
+        val stored = baseMapper.selectById(entity.id) ?: throw ZenException(ZenExceptionEnum.BIZ_DELETE_ERROR)
+//        val endPath = stored.path?.substring(0, stored.path!!.length - 1) + (stored.id!! + 1)
+        if (baseMapper.physicalDelete(EntityWrapper<SysMenu>().like("path", "${stored.path!!}%")) <= 0) {
+            throw ZenException(ZenExceptionEnum.BIZ_DELETE_ERROR)
+        }
+    }
 }

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

@@ -1,64 +1,99 @@
 package com.gxzc.zen.api.sys.service.impl
 
+import com.gxzc.zen.api.sys.model.SysResource
+import com.gxzc.zen.api.sys.model.SysRole
 import com.gxzc.zen.api.sys.service.ISysPermissionService
-import com.gxzc.zen.api.sys.service.ISysUserRoleService
+import com.gxzc.zen.api.sys.service.ISysResourceService
+import com.gxzc.zen.api.sys.service.ISysRoleService
 import com.gxzc.zen.common.contants.CACHEKEYS
 import com.gxzc.zen.common.util.RedisCacheUtil
+import com.gxzc.zen.umps.common.ZenPermission
+import com.gxzc.zen.umps.constant.ZenHttpSession
+import com.gxzc.zen.umps.util.SSOUtil
+import org.apache.shiro.session.Session
+import org.springframework.beans.BeanUtils
 import org.springframework.beans.factory.annotation.Autowired
-import org.springframework.cache.annotation.Cacheable
 import org.springframework.stereotype.Service
 
 /**
  * <p>
- * 权限表 服务实现类
+ * 权限 服务实现类
  * </p>
  *
  * @author NorthLan123
  * @since 2018-02-06
  */
 @Service
+@Suppress("UNCHECKED_CAST")
 class SysPermissionServiceImpl : ISysPermissionService {
-
+    @Autowired
+    private lateinit var sysResourceService: ISysResourceService
 
     @Autowired
-    private lateinit var sysUserRoleService: ISysUserRoleService
+    private lateinit var roleService: ISysRoleService
 
-    @Cacheable(value = [CACHEKEYS.USER_PERM], key = "'${CACHEKEYS.USER_PERM}:uid_' + #id")
-    override fun getPermissionSetByUserId(id: Long): HashSet<String> {
-        val roleList = sysUserRoleService.getUserRoleListByUserId(id)
-        val permIds = linkedSetOf<String>()
-        for (item in roleList) {
-            item.perms?.split(',')?.toCollection(permIds)
+    override fun getAllSysPermission(): MutableList<ZenPermission> {
+        var result = RedisCacheUtil.get(CACHEKEYS.SYS, "allPerms")?.get() as? MutableList<ZenPermission>
+        if (result == null || result.isEmpty()) {
+            result = mutableListOf()
+            val res = sysResourceService.selectList(null)
+            res?.forEach {
+                result.add(transResource2ZenPermission(it))
+            }
         }
-        return permIds
+
+//        if (PlatformUtil.getPlatform() == PLATFORM.SYSTEM) {
+        if (result.isNotEmpty()) {
+            RedisCacheUtil.put(CACHEKEYS.SYS, "allPerms", result)
+//            }
+        }
+
+        return result
     }
 
-    //    @CacheEvict(value = [CACHEKEYS.USER_PERM], key = "'${CACHEKEYS.USER_PERM}:uid_' + #id")
-    override fun evictCache(id: Long) {
-        RedisCacheUtil.evict(CACHEKEYS.USER_PERM, "${CACHEKEYS.USER_PERM}:uid_$id")
+    override fun getSubjectPermission(): MutableList<ZenPermission> {
+        val session = SSOUtil.getSession() ?: return mutableListOf()
+        var result = session.getAttribute(ZenHttpSession.SESSION_KEY_USER_PERMS) as? MutableList<ZenPermission>
+        if (result == null || result.isEmpty()) {
+            result = mutableListOf()
+            val roles = getSubjectRoles(session)
+            val roleIds = roles.map { it.id!! }
+
+            val resources = sysResourceService.getResourcesByRoleIds(roleIds)
+            resources.forEach { result.add(transResource2ZenPermission(it)) }
+        }
+        if (result.isNotEmpty()) {
+            session.setAttribute(ZenHttpSession.SESSION_KEY_USER_PERMS, result)
+        }
+
+        return result
     }
 
-    override fun evictCache(ids: Set<Long>) {
-        ids.forEach {
-            RedisCacheUtil.evict(CACHEKEYS.USER_PERM, "${CACHEKEYS.USER_PERM}:uid_$it")
+    override fun getSubjectRoles(session: Session): MutableList<SysRole> {
+        var roles = session.getAttribute(ZenHttpSession.SESSION_KEY_USER_ROLES) as? MutableList<SysRole>
+        // session中没有怎么办?
+        if (roles == null || roles.isEmpty()) {
+            // DB中取出来
+            roles = roleService.getRoleListByUserId(session.getAttribute(ZenHttpSession.SESSION_KEY_USER_ID) as? Long)
+            session.setAttribute(ZenHttpSession.SESSION_KEY_USER_ROLES, roles)
         }
+        return roles
     }
 
-    override fun clearCache() {
-        RedisCacheUtil.clear(CACHEKEYS.USER_PERM)
+    fun transResource2ZenPermission(source: SysResource): ZenPermission {
+        val temp = ZenPermission()
+        BeanUtils.copyProperties(source, temp)
+        if (!(temp.uri != null && temp.uri!!.startsWith("/"))) {
+            temp.uri = "/${temp.uri}"
+        }
+        return temp
     }
 
-//    @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)
-//        }
-//    }
+    // TODO 更新缓存
+    override fun updateAllSysPermission() {
+    }
 
+    // TODO 更新缓存
+    override fun updateSubjectPermissionByAccount(account: String) {
+    }
 }

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

@@ -0,0 +1,20 @@
+package com.gxzc.zen.api.sys.service.impl
+
+import com.baomidou.mybatisplus.service.impl.ServiceImpl
+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 org.springframework.stereotype.Service
+
+/**
+ * <p>
+ * 资源角色表(授权表) 服务实现类
+ * </p>
+ *
+ * @author NorthLan
+ * @since 2018-04-28
+ */
+@Service
+class SysResourceRoleServiceImpl : ServiceImpl<SysResourceRoleMapper, SysResourceRole>(), ISysResourceRoleService {
+
+}

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

@@ -0,0 +1,59 @@
+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.SysResourceMapper
+import com.gxzc.zen.api.sys.model.SysResource
+import com.gxzc.zen.api.sys.service.ISysResourceService
+import com.gxzc.zen.common.exception.ZenException
+import com.gxzc.zen.common.exception.ZenExceptionEnum
+import org.springframework.stereotype.Service
+
+/**
+ * <p>
+ * 资源表 服务实现类
+ * </p>
+ *
+ * @author NorthLan
+ * @since 2018-04-28
+ */
+@Service
+class SysResourceServiceImpl : ServiceImpl<SysResourceMapper, SysResource>(), ISysResourceService {
+
+    override fun getResourcesByRoleIds(roleIds: List<Long>): MutableList<SysResource> {
+        return baseMapper.selectByRoleIds(roleIds)
+    }
+
+    override fun getResourcesByMenuId(menuId: Long): MutableList<SysResource> {
+        val condition = SysResource().apply {
+            this.menuId = menuId
+        }
+        return baseMapper.selectList(EntityWrapper(condition))
+    }
+
+    override fun insertResource(menuId: Long, sysResource: SysResource): SysResource {
+        sysResource.menuId = menuId
+        if (baseMapper.insert(sysResource) <= 0) {
+            throw ZenException(ZenExceptionEnum.BIZ_INSERT_ERROR)
+        }
+        return sysResource
+    }
+
+    override fun updateResource(sysResource: SysResource): SysResource {
+        if (baseMapper.updateById(sysResource) <= 0) {
+            throw ZenException(ZenExceptionEnum.BIZ_INSERT_ERROR)
+        }
+        return sysResource
+    }
+
+    override fun deleteResourceById(id: Long) {
+        baseMapper.physicalDeleteById(id)
+    }
+
+    override fun deleteResourcesByMenuId(menuId: Long) {
+        val condition = SysResource().apply {
+            this.menuId = menuId
+        }
+        baseMapper.physicalDelete(EntityWrapper(condition))
+    }
+}

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

@@ -1,17 +1,9 @@
 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.SysRoleMapper
 import com.gxzc.zen.api.sys.model.SysRole
-import com.gxzc.zen.api.sys.service.ISysPermissionService
 import com.gxzc.zen.api.sys.service.ISysRoleService
-import com.gxzc.zen.api.sys.service.ISysUserRoleService
-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
 
 /**
@@ -25,65 +17,66 @@ import org.springframework.stereotype.Service
 @Service
 class SysRoleServiceImpl : ServiceImpl<SysRoleMapper, SysRole>(), ISysRoleService {
 
-    @Autowired
-    private lateinit var sysPermissionService: ISysPermissionService
-
-    @Autowired
-    private lateinit var sysUserRoleService: ISysUserRoleService
-
-    override fun getListByParam(name: String?, code: String?, enable: Boolean?): MutableList<SysRole> {
-        val wrapper = EntityWrapper<SysRole>().apply {
-            if (!name.isNullOrEmpty()) {
-                like("name", name)
-            }
-            if (!code.isNullOrEmpty()) {
-                like("code", code?.toUpperCase())
-            }
-            if (enable != null) {
-                eq("enable", enable)
-            }
-        }
-
-        return baseMapper.selectWOLogic(wrapper)
-    }
-
-    override fun getListByParamPage(name: String?, code: String?, enable: Boolean?, current: Int, size: Int): Page<SysRole> {
-        val page = Page<SysRole>(current, size)
-
-        val wrapper = EntityWrapper<SysRole>().apply {
-            if (!name.isNullOrEmpty()) {
-                like("name", name)
-            }
-            if (!code.isNullOrEmpty()) {
-                like("code", code?.toUpperCase())
-            }
-            if (enable != null) {
-                eq("enable", enable)
-            }
+    override fun getRoleListByUserId(userId: Long?): MutableList<SysRole> {
+        if (userId == null) {
+            return mutableListOf()
         }
-        page.records = baseMapper.selectWOLogicPage(page, wrapper)
-        return page
-    }
-
-    @ZenTransactional
-    override fun modify(entity: SysRole): SysRole {
-//        baseMapper.updateById(entity)
-        baseMapper.updateWOLogic(entity, EntityWrapper<SysRole>().eq("id", entity.id))
-
-        val userIdSet = sysUserRoleService.getUserIdListByRoleId(entity.id!!)
-        sysUserRoleService.evictCache(userIdSet)
-        // 修改role表需要直接清理所有缓存项
-//        sysPermissionService.evictCache(userIdSet)
-        return entity
+        return baseMapper.selectByUserId(userId)
     }
 
-    @ZenTransactional
-    override fun physicalDelete(id: Long) {
-        val userIdSet = sysUserRoleService.getUserIdListByRoleId(id)
-        if (baseMapper.physicalDeleteById(id) <= 0) {
-            throw ZenException(ZenExceptionEnum.BIZ_DELETE_ERROR)
-        }
-        // 修改role表需要直接清理所有缓存项
-        sysUserRoleService.evictCache(userIdSet)
-    }
+//    override fun getListByParam(name: String?, code: String?, enable: Boolean?): MutableList<SysRole> {
+//        val wrapper = EntityWrapper<SysRole>().apply {
+//            if (!name.isNullOrEmpty()) {
+//                like("name", name)
+//            }
+//            if (!code.isNullOrEmpty()) {
+//                like("code", code?.toUpperCase())
+//            }
+//            if (enable != null) {
+//                eq("enable", enable)
+//            }
+//        }
+//
+//        return baseMapper.selectWOLogic(wrapper)
+//    }
+//
+//    override fun getListByParamPage(name: String?, code: String?, enable: Boolean?, current: Int, size: Int): Page<SysRole> {
+//        val page = Page<SysRole>(current, size)
+//
+//        val wrapper = EntityWrapper<SysRole>().apply {
+//            if (!name.isNullOrEmpty()) {
+//                like("name", name)
+//            }
+//            if (!code.isNullOrEmpty()) {
+//                like("code", code?.toUpperCase())
+//            }
+//            if (enable != null) {
+//                eq("enable", enable)
+//            }
+//        }
+//        page.records = baseMapper.selectWOLogicPage(page, wrapper)
+//        return page
+//    }
+//
+//    @ZenTransactional
+//    override fun modify(entity: SysRole): SysRole {
+////        baseMapper.updateById(entity)
+//        baseMapper.updateWOLogic(entity, EntityWrapper<SysRole>().eq("id", entity.id))
+//
+//        val userIdSet = sysUserRoleService.getUserIdListByRoleId(entity.id!!)
+//        sysUserRoleService.evictCache(userIdSet)
+//        // 修改role表需要直接清理所有缓存项
+////        sysPermissionService.evictCache(userIdSet)
+//        return entity
+//    }
+//
+//    @ZenTransactional
+//    override fun physicalDelete(id: Long) {
+//        val userIdSet = sysUserRoleService.getUserIdListByRoleId(id)
+//        if (baseMapper.physicalDeleteById(id) <= 0) {
+//            throw ZenException(ZenExceptionEnum.BIZ_DELETE_ERROR)
+//        }
+//        // 修改role表需要直接清理所有缓存项
+//        sysUserRoleService.evictCache(userIdSet)
+//    }
 }

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

@@ -23,7 +23,7 @@ import org.springframework.stereotype.Service
  * 用户角色表 服务实现类
  * </p>
  *
- * @author NorthLan123
+ * @author NorthLan
  * @since 2018-02-06
  */
 @Service
@@ -32,7 +32,7 @@ class SysUserRoleServiceImpl : ServiceImpl<SysUserRoleMapper, SysUserRole>(), IS
     @Autowired
     private lateinit var sysPermissionService: ISysPermissionService
 
-    @Cacheable(CACHEKEYS.USER_ROLE, key = "'${CACHEKEYS.USER_ROLE}:uid_'+ #id")
+//    @Cacheable(CACHEKEYS.USER_ROLE, key = "'${CACHEKEYS.USER_ROLE}:uid_'+ #id")
     override fun getUserRoleListByUserId(id: Long): MutableList<SysRole> {
         return baseMapper.selectUserRoleListByUserId(id)
     }
@@ -81,7 +81,7 @@ class SysUserRoleServiceImpl : ServiceImpl<SysUserRoleMapper, SysUserRole>(), IS
         }
         val dataList = mutableListOf<SysUserRole>()
         roleIds.forEach {
-            dataList.add(SysUserRole(it, userId))
+//            dataList.add(SysUserRole(it, userId))
         }
         if (!this.insertBatch(dataList)) {
             throw ZenException(ZenExceptionEnum.BIZ_INSERT_ERROR)
@@ -91,13 +91,13 @@ class SysUserRoleServiceImpl : ServiceImpl<SysUserRoleMapper, SysUserRole>(), IS
 
     override fun evictCache(id: Long) {
         RedisCacheUtil.evict(CACHEKEYS.USER_ROLE, "${CACHEKEYS.USER_ROLE}:uid_$id")
-        sysPermissionService.evictCache(id)
+//        sysPermissionService.evictCache(id)
     }
 
     override fun evictCache(ids: Set<Long>) {
         ids.forEach {
             RedisCacheUtil.evict(CACHEKEYS.USER_ROLE, "${CACHEKEYS.USER_ROLE}:uid_$it")
-            sysPermissionService.evictCache(it)
+//            sysPermissionService.evictCache(it)
         }
 
 

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

@@ -1,24 +1,10 @@
 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.SysUserMapper
 import com.gxzc.zen.api.sys.model.SysUser
-import com.gxzc.zen.api.sys.service.ISysUserRoleService
 import com.gxzc.zen.api.sys.service.ISysUserService
-import com.gxzc.zen.common.contants.CACHEKEYS
-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.properties.PlatformProperties
-import com.gxzc.zen.common.util.PlatformUtil
-import com.gxzc.zen.common.util.RedisCacheUtil
-import com.gxzc.zen.orm.annotation.ZenTransactional
-import com.gxzc.zen.umps.util.MD5Salt
-import org.apache.commons.lang3.RandomStringUtils
 import org.slf4j.LoggerFactory
-import org.springframework.beans.factory.annotation.Autowired
-import org.springframework.boot.CommandLineRunner
 import org.springframework.stereotype.Service
 
 /**
@@ -26,149 +12,146 @@ import org.springframework.stereotype.Service
  * 用户管理 服务实现类
  * </p>
  *
- * @author NorthLan123
+ * @author NorthLan
  * @since 2018-02-06
  */
 @Suppress("UNCHECKED_CAST")
 @Service
-class SysUserServiceImpl : ServiceImpl<SysUserMapper, SysUser>(), ISysUserService, CommandLineRunner {
+class SysUserServiceImpl : ServiceImpl<SysUserMapper, SysUser>(), ISysUserService {
+
     companion object {
         private val logger = LoggerFactory.getLogger(SysUserServiceImpl::class.java)
-        const val CACHE_KEY_ALL = "all"
-    }
-
-    @Autowired
-    private lateinit var platformProperties: PlatformProperties
-
-    @Autowired
-    private lateinit var userRoleService: ISysUserRoleService
-
-    override fun run(vararg args: String?) {
-        logger.debug("${this::class.simpleName} init.")
-        getListCacheable()
-    }
-
-    override fun getListCacheable(): MutableList<SysUser> {
-        val cached = RedisCacheUtil.get(CACHEKEYS.USER, CACHE_KEY_ALL)?.get() as? MutableList<SysUser>
-        if (cached != null) {
-            return cached
-        }
-//        val ret = baseMapper.selectByParams(null)
-        val ret = baseMapper.selectWOLogic(null)
-        if (PlatformUtil.getPlatform(platformProperties) == PLATFORM.SYSTEM) {
-            RedisCacheUtil.put(CACHEKEYS.USER, CACHE_KEY_ALL, ret)
-        }
-        return ret
     }
 
-    override fun getUserByAccountCacheable(account: String): SysUser? {
-        return getListCacheable().find {
-            it.account == account
+    override fun getUserByAccount(account: String): SysUser? {
+        val condition = SysUser().apply {
+            this.account = account
         }
+        return baseMapper.selectOne(condition)
     }
 
-    override fun getUserByIdCacheable(id: Long): SysUser? {
-        return getListCacheable().find {
-            it.id == id
-        }
-    }
-
-    @ZenTransactional
-    override fun insertCacheable(entity: SysUser) {
-        if (PlatformUtil.getPlatform() == PLATFORM.SYSTEM) {
-            // 处理一下密码
-            if (entity.password.isNullOrEmpty()) {
-                throw ZenException(ZenExceptionEnum.REG_PASSWORD_ERROR)
-            } else if (entity.password!!.length < 6) {
-                throw ZenException(ZenExceptionEnum.REG_PASSWORD_ERROR)
-            }
-
-            val salt = RandomStringUtils.randomAlphanumeric(9)!!
-            entity.salt = salt
-            entity.password = MD5Salt.md5SaltEncode(salt, entity.password!!)
-
-            if (baseMapper.insert(entity) == 0) {
-                throw ZenException(ZenExceptionEnum.BIZ_INSERT_ERROR)
-            }
 
-            // role
-            val newRoleIdList = entity.roles?.map { it.id!! }
-            if (newRoleIdList != null) {
-                userRoleService.insertBatch(entity.id!!, newRoleIdList)
-            }
-
-            val cached = RedisCacheUtil.get(CACHEKEYS.USER, CACHE_KEY_ALL)?.get() as? MutableList<SysUser>
-            cached?.let {
-                it.add(entity)
-                RedisCacheUtil.put(CACHEKEYS.USER, CACHE_KEY_ALL, it)
-            }
-        }
-    }
-
-    @ZenTransactional
-    override fun modify(entity: SysUser): SysUser {
-        if (PlatformUtil.getPlatform() == PLATFORM.SYSTEM) {
-            /* 更新
-             * 查询原有角色
-             * 删除 / 新增 角色
-             */
-            val userRoleIdList = userRoleService.getUserRoleListByUserId(entity.id!!).map { it.id!! }
-            val newRoleIdList = entity.roles?.map { it.id!! }
-            if (newRoleIdList != null) {
-                // del
-                val delRoleIdList = userRoleIdList.toMutableList()
-                delRoleIdList.removeAll(newRoleIdList)
-                // add
-                val addRoleIdList = newRoleIdList.toMutableList()
-                addRoleIdList.removeAll(userRoleIdList)
-
-                userRoleService.physicalDeleteBatch(entity.id!!, delRoleIdList)
-                userRoleService.insertBatch(entity.id!!, addRoleIdList)
-            }
-
-            val originEntity = baseMapper.selectById(entity.id!!)
-
-            // 密码搞一下
-            if (!entity.password.isNullOrEmpty() && entity.password!!.length >= 6) {
-                val salt = RandomStringUtils.randomAlphanumeric(9)!!
-                entity.salt = salt
-                entity.password = MD5Salt.md5SaltEncode(salt, entity.password!!)
-            } else {
-                entity.password = originEntity.password
-                entity.salt = originEntity.salt
-            }
-
-            baseMapper.updateWOLogic(entity, EntityWrapper<SysUser>().eq("id", entity.id))
-//            throw ZenException(ZenExceptionEnum.SERVER_ERROR)
-            // 更新缓存
-            val cached = RedisCacheUtil.get(CACHEKEYS.USER, CACHE_KEY_ALL)?.get() as? MutableList<SysUser>
-            cached?.let {
-                val idx = it.indexOfFirst { it.id == entity.id }
-                if (idx != -1) {
-                    it[idx] = entity
-                }
-                RedisCacheUtil.put(CACHEKEYS.USER, CACHE_KEY_ALL, it)
-            }
-        }
-        return entity
-    }
-
-    @ZenTransactional
-    override fun physicalDeleteCacheable(id: Long) {
-        if (PlatformUtil.getPlatform() == PLATFORM.SYSTEM) {
-            if (baseMapper.physicalDelete(EntityWrapper<SysUser>().eq("id", id)) <= 0) {
-                throw ZenException(ZenExceptionEnum.BIZ_DELETE_ERROR)
-            }
-            // 删除与之关联的所有系统表数据
-            userRoleService.physicalDeleteByUserId(id)
-            //
-            val cached = RedisCacheUtil.get(CACHEKEYS.USER, CACHE_KEY_ALL)?.get() as? MutableList<SysUser>
-            cached?.let {
-                it.removeIf {
-                    it.id == id
-                }
-                RedisCacheUtil.put(CACHEKEYS.USER, CACHE_KEY_ALL, it)
-            }
-        }
-    }
+//    override fun getListCacheable(): MutableList<SysUser> {
+//        val cached = RedisCacheUtil.get(CACHEKEYS.USER, CACHE_KEY_ALL)?.get() as? MutableList<SysUser>
+//        if (cached != null) {
+//            return cached
+//        }
+////        val ret = baseMapper.selectByParams(null)
+//        val ret = baseMapper.selectWOLogic(null)
+//        if (PlatformUtil.getPlatform(platformProperties) == PLATFORM.SYSTEM) {
+//            RedisCacheUtil.put(CACHEKEYS.USER, CACHE_KEY_ALL, ret)
+//        }
+//        return ret
+//    }
+//
+//    override fun getUserByAccountCacheable(account: String): SysUser? {
+//        return getListCacheable().find {
+//            it.account == account
+//        }
+//    }
+//
+//    override fun getUserByIdCacheable(id: Long): SysUser? {
+//        return getListCacheable().find {
+//            it.id == id
+//        }
+//    }
+//
+//    @ZenTransactional
+//    override fun insertCacheable(entity: SysUser) {
+//        if (PlatformUtil.getPlatform() == PLATFORM.SYSTEM) {
+//            // 处理一下密码
+//            if (entity.password.isNullOrEmpty()) {
+//                throw ZenException(ZenExceptionEnum.REG_PASSWORD_ERROR)
+//            } else if (entity.password!!.length < 6) {
+//                throw ZenException(ZenExceptionEnum.REG_PASSWORD_ERROR)
+//            }
+//
+//            val salt = RandomStringUtils.randomAlphanumeric(9)!!
+//            entity.salt = salt
+//            entity.password = MD5Salt.md5SaltEncode(salt, entity.password!!)
+//
+//            if (baseMapper.insert(entity) == 0) {
+//                throw ZenException(ZenExceptionEnum.BIZ_INSERT_ERROR)
+//            }
+//
+//            // role
+//            val newRoleIdList = entity.roles?.map { it.id!! }
+//            if (newRoleIdList != null) {
+//                userRoleService.insertBatch(entity.id!!, newRoleIdList)
+//            }
+//
+//            val cached = RedisCacheUtil.get(CACHEKEYS.USER, CACHE_KEY_ALL)?.get() as? MutableList<SysUser>
+//            cached?.let {
+//                it.add(entity)
+//                RedisCacheUtil.put(CACHEKEYS.USER, CACHE_KEY_ALL, it)
+//            }
+//        }
+//    }
+//
+//    @ZenTransactional
+//    override fun modify(entity: SysUser): SysUser {
+//        if (PlatformUtil.getPlatform() == PLATFORM.SYSTEM) {
+//            /* 更新
+//             * 查询原有角色
+//             * 删除 / 新增 角色
+//             */
+//            val userRoleIdList = userRoleService.getUserRoleListByUserId(entity.id!!).map { it.id!! }
+//            val newRoleIdList = entity.roles?.map { it.id!! }
+//            if (newRoleIdList != null) {
+//                // del
+//                val delRoleIdList = userRoleIdList.toMutableList()
+//                delRoleIdList.removeAll(newRoleIdList)
+//                // addChild
+//                val addRoleIdList = newRoleIdList.toMutableList()
+//                addRoleIdList.removeAll(userRoleIdList)
+//
+//                userRoleService.physicalDeleteBatch(entity.id!!, delRoleIdList)
+//                userRoleService.insertBatch(entity.id!!, addRoleIdList)
+//            }
+//
+//            val originEntity = baseMapper.selectById(entity.id!!)
+//
+//            // 密码搞一下
+//            if (!entity.password.isNullOrEmpty() && entity.password!!.length >= 6) {
+//                val salt = RandomStringUtils.randomAlphanumeric(9)!!
+//                entity.salt = salt
+//                entity.password = MD5Salt.md5SaltEncode(salt, entity.password!!)
+//            } else {
+//                entity.password = originEntity.password
+//                entity.salt = originEntity.salt
+//            }
+//
+//            baseMapper.updateWOLogic(entity, EntityWrapper<SysUser>().eq("id", entity.id))
+////            throw ZenException(ZenExceptionEnum.SERVER_ERROR)
+//            // 更新缓存
+//            val cached = RedisCacheUtil.get(CACHEKEYS.USER, CACHE_KEY_ALL)?.get() as? MutableList<SysUser>
+//            cached?.let {
+//                val idx = it.indexOfFirst { it.id == entity.id }
+//                if (idx != -1) {
+//                    it[idx] = entity
+//                }
+//                RedisCacheUtil.put(CACHEKEYS.USER, CACHE_KEY_ALL, it)
+//            }
+//        }
+//        return entity
+//    }
+//
+//    @ZenTransactional
+//    override fun physicalDeleteCacheable(id: Long) {
+//        if (PlatformUtil.getPlatform() == PLATFORM.SYSTEM) {
+//            if (baseMapper.physicalDelete(EntityWrapper<SysUser>().eq("id", id)) <= 0) {
+//                throw ZenException(ZenExceptionEnum.BIZ_DELETE_ERROR)
+//            }
+//            // 删除与之关联的所有系统表数据
+//            userRoleService.physicalDeleteByUserId(id)
+//            //
+//            val cached = RedisCacheUtil.get(CACHEKEYS.USER, CACHE_KEY_ALL)?.get() as? MutableList<SysUser>
+//            cached?.let {
+//                it.removeIf {
+//                    it.id == id
+//                }
+//                RedisCacheUtil.put(CACHEKEYS.USER, CACHE_KEY_ALL, it)
+//            }
+//        }
+//    }
 }

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

@@ -1,16 +0,0 @@
-package com.gxzc.zen.api.util
-
-import com.gxzc.zen.api.shared.service.IShareTimeService
-import com.gxzc.zen.common.util.SpringContextHolder
-
-/**
- *
- * @author NorthLan
- * @date 2018/4/16
- * @url https://noahlan.com
- */
-object ShareTimeUtil {
-    private val shareTimeService: IShareTimeService = SpringContextHolder.getBean(IShareTimeService::class.java)
-
-
-}

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

@@ -1,28 +1,28 @@
-package com.gxzc.zen.api.util
-
-import com.gxzc.zen.api.sys.model.SysDic
-import com.gxzc.zen.api.sys.service.ISysDicService
-import com.gxzc.zen.common.util.SpringContextHolder
-
-/**
- * 系统字典工具类
- * 缓存中获取
- * @author NorthLan
- * @date 2018/3/17
- * @url https://noahlan.com
- */
-object SysDicUtil {
-    private val sysDicService: ISysDicService = SpringContextHolder.getBean(ISysDicService::class.java)
-
-    fun getAllList(): MutableList<SysDic> {
-        return sysDicService.getListCacheable()
-    }
-
-    fun getListByKey(key: String): MutableList<SysDic> {
-        return sysDicService.getListByKey(key)
-    }
-
-    fun getOne(key: String, value: String?, sort: Int?): SysDic? {
-        return sysDicService.getOneByKey(key, value, sort)
-    }
-}
+//package com.gxzc.zen.api.util
+//
+//import com.gxzc.zen.api.sys.model.SysDic
+//import com.gxzc.zen.api.sys.service.ISysDicService
+//import com.gxzc.zen.common.util.SpringContextHolder
+//
+///**
+// * 系统字典工具类
+// * 缓存中获取
+// * @author NorthLan
+// * @date 2018/3/17
+// * @url https://noahlan.com
+// */
+//object SysDicUtil {
+//    private val sysDicService: ISysDicService = SpringContextHolder.getBean(ISysDicService::class.java)
+//
+//    fun getAllList(): MutableList<SysDic> {
+//        return sysDicService.getListCacheable()
+//    }
+//
+//    fun getListByKey(key: String): MutableList<SysDic> {
+//        return sysDicService.getListByKey(key)
+//    }
+//
+//    fun getOne(key: String, value: String?, sort: Int?): SysDic? {
+//        return sysDicService.getOneByKey(key, value, sort)
+//    }
+//}

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

@@ -12,17 +12,23 @@ import com.gxzc.zen.common.util.SpringContextHolder
  * @url https://noahlan.com
  */
 object SysParamUtil {
-    private val sysParamService: ISysParamService = SpringContextHolder.getBean(ISysParamService::class.java)
+    private var sysParamService: ISysParamService? = SpringContextHolder.getBean(ISysParamService::class.java)
+        get() {
+            if (field == null) {
+                field = SpringContextHolder.getBean(ISysParamService::class.java)
+            }
+            return field
+        }
 
     fun getAllList(): MutableList<SysParam> {
-        return sysParamService.getListCacheable()
+        return sysParamService!!.getListCacheable()
     }
 
     fun getListByKey(key: String): MutableList<SysParam> {
-        return sysParamService.getListByKey(key)
+        return sysParamService!!.getListByKey(key)
     }
 
     fun getOne(key: String, value: String?, sort: Int?): SysParam? {
-        return sysParamService.getOneByKey(key, value, sort)
+        return sysParamService!!.getOneByKey(key, value, sort)
     }
 }

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

@@ -1,24 +0,0 @@
-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/kotlin/com/gxzc/zen/sso/aop/CurrentUserHandler.kt

@@ -1,45 +1,45 @@
-package com.gxzc.zen.sso.aop
-
-import com.gxzc.zen.api.util.SysUserUtil
-import com.gxzc.zen.umps.util.SSOUtil
-import org.slf4j.LoggerFactory
-import org.springframework.web.method.HandlerMethod
-import org.springframework.web.servlet.ModelAndView
-import org.springframework.web.servlet.handler.HandlerInterceptorAdapter
-import javax.servlet.http.HttpServletRequest
-import javax.servlet.http.HttpServletResponse
-
-/**
- * 当前用户暂存拦截器
- * 在Controller方法执行前调用
- * @author NorthLan
- * @date 2018/3/24
- * @url https://noahlan.com
- */
-class CurrentUserHandler : HandlerInterceptorAdapter() {
-    companion object {
-        private val logger = LoggerFactory.getLogger(CurrentUserHandler::class.java)
-    }
-
-    override fun preHandle(request: HttpServletRequest, response: HttpServletResponse, handler: Any): Boolean {
-        if (handler is HandlerMethod) {
-            val id = SSOUtil.getCurUserIdByToken(request)
-            val user = if (id == null) {
-                null
-            } else {
-                SysUserUtil.getById(id)
-            }
-            logger.trace("Caching Current User... ${user?.account}")
-            SSOUtil.TL.set(user)
-        }
-        return super.preHandle(request, response, handler)
-    }
-
-    override fun postHandle(request: HttpServletRequest?, response: HttpServletResponse?, handler: Any?, modelAndView: ModelAndView?) {
-        if (handler is HandlerMethod) {
-            logger.trace("Clear Current User...")
-            SSOUtil.TL.clear()
-        }
-        super.postHandle(request, response, handler, modelAndView)
-    }
-}
+//package com.gxzc.zen.sso.aop
+//
+//import com.gxzc.zen.api.util.SysUserUtil
+//import com.gxzc.zen.umps.util.SSOUtil
+//import org.slf4j.LoggerFactory
+//import org.springframework.web.method.HandlerMethod
+//import org.springframework.web.servlet.ModelAndView
+//import org.springframework.web.servlet.handler.HandlerInterceptorAdapter
+//import javax.servlet.http.HttpServletRequest
+//import javax.servlet.http.HttpServletResponse
+//
+///**
+// * 当前用户暂存拦截器
+// * 在Controller方法执行前调用
+// * @author NorthLan
+// * @date 2018/3/24
+// * @url https://noahlan.com
+// */
+//class CurrentUserHandler : HandlerInterceptorAdapter() {
+//    companion object {
+//        private val logger = LoggerFactory.getLogger(CurrentUserHandler::class.java)
+//    }
+//
+//    override fun preHandle(request: HttpServletRequest, response: HttpServletResponse, handler: Any): Boolean {
+//        if (handler is HandlerMethod) {
+//            val id = SSOUtil.getCurUserIdByToken(request)
+//            val user = if (id == null) {
+//                null
+//            } else {
+//                SysUserUtil.getById(id)
+//            }
+//            logger.trace("Caching Current User... ${user?.account}")
+//            SSOUtil.TL.set(user)
+//        }
+//        return super.preHandle(request, response, handler)
+//    }
+//
+//    override fun postHandle(request: HttpServletRequest?, response: HttpServletResponse?, handler: Any?, modelAndView: ModelAndView?) {
+//        if (handler is HandlerMethod) {
+//            logger.trace("Clear Current User...")
+//            SSOUtil.TL.clear()
+//        }
+//        super.postHandle(request, response, handler, modelAndView)
+//    }
+//}

zen-api/src/main/kotlin/com/gxzc/zen/sso/config/CurrentUserWebConfigurer.kt

@@ -1,21 +1,21 @@
-package com.gxzc.zen.sso.config
-
-import com.gxzc.zen.sso.aop.CurrentUserHandler
-import org.springframework.context.annotation.Configuration
-import org.springframework.web.servlet.config.annotation.InterceptorRegistry
-import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter
-
-/**
- *
- * @author NorthLan
- * @date 2018/3/24
- * @url https://noahlan.com
- */
-@Configuration
-class CurrentUserWebConfigurer : WebMvcConfigurerAdapter() {
-
-    override fun addInterceptors(registry: InterceptorRegistry?) {
-        registry?.addInterceptor(CurrentUserHandler())
-        super.addInterceptors(registry)
-    }
-}
+//package com.gxzc.zen.sso.config
+//
+//import com.gxzc.zen.sso.aop.CurrentUserHandler
+//import org.springframework.context.annotation.Configuration
+//import org.springframework.web.servlet.config.annotation.InterceptorRegistry
+//import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter
+//
+///**
+// *
+// * @author NorthLan
+// * @date 2018/3/24
+// * @url https://noahlan.com
+// */
+//@Configuration
+//class CurrentUserWebConfigurer : WebMvcConfigurerAdapter() {
+//
+//    override fun addInterceptors(registry: InterceptorRegistry?) {
+//        registry?.addInterceptor(CurrentUserHandler())
+//        super.addInterceptors(registry)
+//    }
+//}

zen-api/src/main/kotlin/com/gxzc/zen/umps/common/Permission.kt

@@ -1,30 +0,0 @@
-package com.gxzc.zen.umps.common
-
-/**
- *
- * @author NorthLan
- * @date 2018/2/6
- * @url https://noahlan.com
- */
-class Permission(private val permission: String) {
-    var platformId: Int = 0
-    var perm: String = ""
-    var crud: String = ""
-
-    init {
-        process()
-    }
-
-    private fun process() {
-        if (permission.isEmpty()) {
-            return
-        }
-        val splitList = permission.split(':')
-        if (splitList.size < 3) {
-            throw RuntimeException("permission字符串错误,必须为:分割且长度等于3")
-        }
-        platformId = splitList[0].toInt()
-        perm = splitList[1]
-        crud = splitList[2]
-    }
-}

zen-api/src/main/kotlin/com/gxzc/zen/umps/common/ZenAuthToken.kt

@@ -0,0 +1,61 @@
+package com.gxzc.zen.umps.common
+
+import com.gxzc.zen.api.sys.model.SysUser
+import org.apache.shiro.authc.UsernamePasswordToken
+
+/**
+ * 登陆用token
+ * @author NorthLan
+ * @date 2018/4/29
+ * @url https://noahlan.com
+ */
+class ZenAuthToken : UsernamePasswordToken {
+    var user: SysUser? = null
+
+    constructor() : super()
+    constructor(username: String, password: CharArray) : super(username, password)
+    constructor(username: String, password: String) : super(username, password)
+    constructor(username: String, password: CharArray, host: String) : super(username, password, host)
+    constructor(username: String, password: String, host: String) : super(username, password, host)
+    constructor(username: String, password: CharArray, rememberMe: Boolean) : super(username, password, rememberMe)
+    constructor(username: String, password: String, rememberMe: Boolean) : super(username, password, rememberMe)
+    constructor(username: String, password: CharArray, rememberMe: Boolean, host: String) : super(username, password, rememberMe, host)
+    constructor(username: String, password: String, rememberMe: Boolean, host: String) : super(username, password, rememberMe, host)
+
+    constructor(username: String, password: CharArray, user: SysUser?) : super(username, password) {
+        this.user = user
+    }
+
+    constructor(username: String, password: String, user: SysUser?) : super(username, password) {
+        this.user = user
+    }
+
+    constructor(username: String, password: CharArray, host: String, user: SysUser?) : super(username, password, host) {
+        this.user = user
+    }
+
+    constructor(username: String, password: String, host: String, user: SysUser?) : super(username, password, host) {
+        this.user = user
+    }
+
+    constructor(username: String, password: CharArray, rememberMe: Boolean, user: SysUser?) : super(username, password, rememberMe) {
+        this.user = user
+    }
+
+    constructor(username: String, password: String, rememberMe: Boolean, user: SysUser?) : super(username, password, rememberMe) {
+        this.user = user
+    }
+
+    constructor(username: String, password: CharArray, rememberMe: Boolean, host: String, user: SysUser?) : super(username, password, rememberMe, host) {
+        this.user = user
+    }
+
+    constructor(username: String, password: String, rememberMe: Boolean, host: String, user: SysUser?) : super(username, password, rememberMe, host) {
+        this.user = user
+    }
+
+    override fun clear() {
+        super.clear()
+        this.user = null
+    }
+}

zen-api/src/main/kotlin/com/gxzc/zen/umps/common/ZenPermission.kt

@@ -0,0 +1,48 @@
+package com.gxzc.zen.umps.common
+
+import java.io.Serializable
+
+/**
+ * 权限数据结构
+ *
+ * 从Resource/Menu抽象
+ *
+ * @author NorthLan
+ * @date 2018/4/29
+ * @url https://noahlan.com
+ */
+open class ZenPermission : Serializable {
+    companion object {
+        private const val serialVersionUID = 5640224091610186666L
+    }
+
+    /**
+     * 权限代码 (前端使用)
+     */
+    var code: String? = null
+
+    /**
+     * 请求地址
+     */
+    var uri: String? = null
+
+    /**
+     * 请求方法
+     */
+    var method: String? = null
+
+    /**
+     * 权限类型
+     * 1. 按钮 2.url
+     */
+    var type: Int? = null
+
+    /**
+     * 简短名称
+     */
+    var name: String? = null
+    /**
+     * 菜单ID
+     */
+    var menuId: Long? = null
+}

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

@@ -1,6 +1,5 @@
 package com.gxzc.zen.umps.config
 
-import com.gxzc.zen.umps.common.ZenShiroRealm
 import com.gxzc.zen.umps.constant.ZenHttpSession
 import com.gxzc.zen.umps.filter.AjaxAuthorizationFilter
 import com.gxzc.zen.umps.filter.UrlPermissionsFilter
@@ -86,11 +85,15 @@ class ShiroConfig {
                     "/auth/setcookie" to "canon", // 设置cookie
                     "/auth/hello" to "canon", // 获取cookie
                     "/auth/logout" to "logout", // 登出
-                    //
-                    "/base/**" to "canon",
-                    "/css/**" to "canon",
-                    "/layer/**" to "canon",
-                    "/**" to "cors,authc"
+                    ////////////////////// 静态资源 /////////////////////
+                    "/v2/api-docs" to "anon",
+                    "/swagger-resources/**" to "anon",
+                    "/swagger-ui.html" to "anon",
+                    "/webjars*" to "anon",
+                    "/webjars/**" to "anon",
+                    "/**/favicon.*" to "anon",
+                    ////////////////////// 静态资源 /////////////////////
+                    "/**" to "cors,authc,perms" // 对于其他未配置的所有url 先设置cors头 再进行登陆判定 最后判定权限
             )
         }
     }

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

@@ -45,6 +45,7 @@ class ShiroRedisSessionDAO : AbstractSessionDAO {
 
     override fun getActiveSessions(): MutableCollection<Session> {
         logger.debug("Get Active Sessions")
+        // TODO Get Active Sessions
         return mutableListOf()
     }
 

zen-api/src/main/kotlin/com/gxzc/zen/umps/common/ZenShiroRealm.kt → zen-api/src/main/kotlin/com/gxzc/zen/umps/config/ZenShiroRealm.kt

@@ -1,10 +1,9 @@
-package com.gxzc.zen.umps.common
+package com.gxzc.zen.umps.config
 
 import com.gxzc.zen.api.sys.service.ISysUserService
-import org.apache.shiro.authc.AuthenticationInfo
-import org.apache.shiro.authc.AuthenticationToken
-import org.apache.shiro.authc.SimpleAuthenticationInfo
-import org.apache.shiro.authc.UnknownAccountException
+import com.gxzc.zen.umps.common.ZenAuthToken
+import com.gxzc.zen.umps.common.ZenSimpleByteSource
+import org.apache.shiro.authc.*
 import org.apache.shiro.authz.AuthorizationInfo
 import org.apache.shiro.authz.SimpleAuthorizationInfo
 import org.apache.shiro.realm.AuthorizingRealm
@@ -27,7 +26,7 @@ class ZenShiroRealm : AuthorizingRealm() {
     private lateinit var userService: ISysUserService
 
     init {
-        this.name = "zenShiro"
+        this.name = "zen_realm"
     }
 
     /**
@@ -35,26 +34,27 @@ class ZenShiroRealm : AuthorizingRealm() {
      */
     override fun doGetAuthenticationInfo(token: AuthenticationToken): AuthenticationInfo {
         logger.debug("ZenShiroRealm doGetAuthenticationInfo [${token.principal}]")
-        val account = token.principal as String
-
+        if (token !is ZenAuthToken) {
+            throw AccountException("token must be ZenAuthToken")
+        }
         // 获取用户信息
-        val user = userService.getUserByAccountCacheable(account) ?: throw UnknownAccountException()
-
-        // TODO 账号锁定判定
-
-        // TODO 获取权限信息
-
+        val user = token.user ?: throw UnknownAccountException()
 
+        // 账号锁定判定
+        if (user.lock != null && user.lock!!) {
+            throw LockedAccountException()
+        }
         return SimpleAuthenticationInfo(user.account, user.password, ZenSimpleByteSource(user.account + user.salt), user.username)
     }
 
     /**
-     * 权限 角色 hasRoles hasPermission
+     * <p>调用subject的权限验证,如 hasRole,hasPermission <br>
+     *     将调用此方法给subject设置定义的权限
+     *     而后交由Realm处理 <br></p>
+     * 现改为集中式基于数据库的动态权限管理,此功能不做任何处理
      */
     override fun doGetAuthorizationInfo(principals: PrincipalCollection?): AuthorizationInfo {
-        logger.debug("ZenShiroRealm doGetAuthorizationInfo [$principals]")
-        return SimpleAuthorizationInfo().apply {
-            addRole("testRole")
-        }
+        logger.debug("ZenShiroRealm doGetAuthorizationInfo [${principals?.primaryPrincipal}]")
+        return SimpleAuthorizationInfo()
     }
 }

zen-api/src/main/kotlin/com/gxzc/zen/umps/constant/ZenHttpSession.kt

@@ -8,5 +8,14 @@ package com.gxzc.zen.umps.constant
  */
 object ZenHttpSession {
     const val DEFAULT_SESSION_ID_NAME = "ZENJSID"
-    const val DEFAULT_SESSION_USERINFO = "USERINFO"
+
+    /**
+     * 用户Session缓存数据key
+     */
+    const val SESSION_KEY_USER_INFO = "INFO" // 用户基本信息
+    const val SESSION_KEY_USER_PERMS = "PERMS" // 权限列表?
+    const val SESSION_KEY_USER_ID = "ID" // id
+    const val SESSION_KEY_USER_ROLES = "ROLES" // 角色列表
+//    const val SESSION_KEY_USER_RESOURCES = "RESOURCES" // 资源列表
+    const val SESSION_KEY_USER_MENU = "MENU" // 菜单
 }

zen-api/src/main/kotlin/com/gxzc/zen/umps/filter/UrlPermissionsFilter.kt

@@ -1,24 +1,99 @@
 package com.gxzc.zen.umps.filter
 
-import org.apache.shiro.web.filter.authz.PermissionsAuthorizationFilter
+import com.gxzc.zen.api.sys.service.ISysPermissionService
+import com.gxzc.zen.common.util.SpringContextHolder
+import com.gxzc.zen.umps.common.ZenPermission
+import org.apache.shiro.web.filter.PathMatchingFilter
 import org.springframework.http.HttpMethod
+import org.springframework.http.HttpStatus
+import java.util.regex.Pattern
 import javax.servlet.ServletRequest
 import javax.servlet.ServletResponse
 import javax.servlet.http.HttpServletRequest
+import javax.servlet.http.HttpServletResponse
 
 /**
- *
+ * Url拦截 集中式权限管理
+ * 权限判定自行处理, 不交给Realm处理
  * @author NorthLan
  * @date 2018/4/25
  * @url https://noahlan.com
  */
-class UrlPermissionsFilter : PermissionsAuthorizationFilter() {
-    override fun isAccessAllowed(request: ServletRequest, response: ServletResponse, mappedValue: Any?): Boolean {
-        if (request is HttpServletRequest) {
-            if (HttpMethod.valueOf(request.method) == HttpMethod.OPTIONS) {
-                return true
+class UrlPermissionsFilter : PathMatchingFilter() {
+
+    /**
+     * 此物只应天上有
+     * filter比servlet更先初始化,反正就是不能自动注入
+     */
+    private var sysPermissionService: ISysPermissionService? = null
+
+
+    // mappedValue 不需要
+    override fun onPreHandle(request: ServletRequest?, response: ServletResponse?, mappedValue: Any?): Boolean {
+        request as HttpServletRequest
+        if (request.method.equals(HttpMethod.OPTIONS.name, true)) {
+            return true
+        }
+
+        if (sysPermissionService == null) {
+            sysPermissionService = SpringContextHolder.getBean(ISysPermissionService::class.java)
+        }
+
+        // 获取系统权限列表(数据库中定义的)
+        val sysPerms = sysPermissionService!!.getAllSysPermission()
+
+        // 根据请求url获取 系统 需要判定权限的url
+        val permission = getPermissionIfs(sysPerms, request.requestURI, request.method)
+
+        // 该url在系统表内未配置 默认认为无需权限认证 移交给下边流程处理
+        if (permission.isEmpty()) {
+            return true
+        }
+
+        // 若需要权限判定,则获取用户权限进行判定 正常流程走完
+        if (!checkPermission(permission)) {
+            forbidden(response)
+            return false
+        }
+        return true
+    }
+
+    /**
+     * 根据requestUri
+     * 获取系统定义的权限列表
+     */
+    private fun getPermissionIfs(perms: MutableList<ZenPermission>, requestUri: String, method: String): List<ZenPermission> {
+        return perms.filter {
+            if (it.uri != null) {
+                val regEx = "^${it.uri!!.replace("\\{\\*}".toRegex(), "[a-zA-Z\\\\d]+")}\$"
+                (Pattern.compile(regEx).matcher(requestUri).find() || requestUri.startsWith(it.uri + "/")) && method.equals(it.method, false)
+            } else {
+                false
             }
         }
-        return super.isAccessAllowed(request, response, mappedValue)
+    }
+
+    /**
+     * 检查用户权限
+     */
+    private fun checkPermission(perms: List<ZenPermission>): Boolean {
+        val userPermission = sysPermissionService!!.getSubjectPermission()
+        if (userPermission.isEmpty()) {
+            return false
+        }
+        return perms.any { sys ->
+            userPermission.any { user ->
+                user.code == sys.code
+            }
+        }
+    }
+
+    private fun forbidden(response: ServletResponse?) {
+        response as HttpServletResponse
+        response.apply {
+            characterEncoding = "UTF-8"
+            contentType = "application/json"
+            sendError(HttpStatus.FORBIDDEN.value(), "FORBIDDEN") // 403
+        }
     }
 }

zen-api/src/main/kotlin/com/gxzc/zen/umps/filter/ZenCorsPathMatchingFilter.kt

@@ -8,7 +8,7 @@ import javax.servlet.ServletRequest
 import javax.servlet.ServletResponse
 
 /**
- *
+ * 允许cors头
  * @author NorthLan
  * @date 2018/4/25
  * @url https://noahlan.com

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

@@ -1,81 +0,0 @@
-package com.gxzc.zen.umps.util
-
-import com.gxzc.zen.umps.common.Permission
-import org.slf4j.LoggerFactory
-import org.springframework.util.Assert
-
-/**
- *
- * @author NorthLan
- * @date 2018/2/6
- * @url https://noahlan.com
- */
-object PermissionUtil {
-    private val logger = LoggerFactory.getLogger(PermissionUtil::class.java)
-
-    /**
-     * 权限判定
-     * @param needPermString 需要的权限
-     * @param userPerm 用户权限列表
-     */
-    fun isPermitted(needPermString: String, userPerm: HashSet<String>): Boolean {
-        try {
-            assertPermissionString(needPermString)
-            val userPermSet = convertToPermissionSet(userPerm)
-            val needPerm = convertToPermission(needPermString)
-            // 验证逻辑 platformId=0 为通用(超级)权限
-            userPermSet
-                    .filter { it.perm == needPerm.perm && verifyCRUD(needPerm.crud, it.crud) }
-                    .forEach {
-                        // 验证平台
-                        return if (it.platformId == 0) {
-                            true
-                        } else {
-                            it.platformId == needPerm.platformId
-                        }
-                    }
-        } catch (e: RuntimeException) {
-            logger.error("权限验证系统错误...", e)
-            return false
-        }
-        return false
-    }
-
-    /**
-     * 验证 CRUD 四项权限
-     */
-    private fun verifyCRUD(needCRUD: String, userCRUD: String): Boolean {
-        needCRUD.forEach {
-            if (it !in userCRUD) {
-                return false
-            }
-        }
-        return true
-    }
-
-    /**
-     * 批量将权限串转换为权限实体
-     */
-    private fun convertToPermissionSet(perms: HashSet<String>): HashSet<Permission> {
-        val result = hashSetOf<Permission>()
-        perms.forEach({
-            result.add(convertToPermission(it))
-        })
-        return result
-    }
-
-    /**
-     * 将权限串转换为权限实体
-     */
-    private fun convertToPermission(str: String): Permission {
-        return Permission(str)
-    }
-
-    private fun assertPermissionString(str: String) {
-        Assert.notNull(str, "Permission string not be null.")
-        val splitList = str.split(':')
-        if (splitList.size < 3) {
-            throw RuntimeException("permission字符串错误,必须为:分割且长度等于3")
-        }
-    }
-}

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

@@ -1,8 +1,14 @@
 package com.gxzc.zen.umps.util
 
+import com.gxzc.zen.api.sys.common.MenuTree
+import com.gxzc.zen.api.sys.model.SysRole
 import com.gxzc.zen.api.sys.model.SysUser
-import com.gxzc.zen.common.util.HttpUtil
-import javax.servlet.http.HttpServletRequest
+import com.gxzc.zen.api.sys.service.ISysPermissionService
+import com.gxzc.zen.common.util.SpringContextHolder
+import com.gxzc.zen.umps.common.ZenPermission
+import com.gxzc.zen.umps.constant.ZenHttpSession
+import org.apache.shiro.SecurityUtils
+import org.apache.shiro.session.Session
 
 /**
  * SSO 工具类
@@ -10,63 +16,60 @@ import javax.servlet.http.HttpServletRequest
  * @date 2018/3/15
  * @url https://noahlan.com
  */
+@Suppress("UNCHECKED_CAST")
 object SSOUtil {
+    private var permissionSerivce: ISysPermissionService? = SpringContextHolder.getBean(ISysPermissionService::class.java)
+
+    fun getSession(): Session? {
+        return SecurityUtils.getSubject().getSession(false)
+    }
+
+    fun setAttribute(key: Any, value: Any?) {
+        getSession()?.setAttribute(key, value)
+    }
+
     /**
-     * 从token中获取当前用户id
+     * 获取当前登陆 账号
      */
-    fun getCurUserIdByToken(): Long? {
-        return getCurUserIdByToken(HttpUtil.getRequest())
+    fun getCurAccount(): String? {
+        return SecurityUtils.getSubject().principal?.toString()
     }
 
     /**
-     * TODO 改改改
-     * 从token中获取当前用户id
+     * 获取当前登陆 userId
      */
-    fun getCurUserIdByToken(request: HttpServletRequest): Long? {
-        val token = try {
-//            SSOHelper.attrToken<SSOToken>(request) ?: SSOHelper.getToken(request)
-            1L
-        } catch (e: Throwable) {
-            null
-        }
-        return 1L
-//        return token?.uid?.toLong()
+    fun getCurUserId(): Long? {
+        return getSession()?.getAttribute(ZenHttpSession.SESSION_KEY_USER_ID) as? Long
     }
 
     /**
-     * 获取当前用户
+     * 获取当前登陆 基本信息
      */
-    fun getCurUser(): SysUser? {
-        return TL.get()
+    fun getCurUserInfo(): SysUser? {
+        return getSession()?.getAttribute(ZenHttpSession.SESSION_KEY_USER_INFO) as? SysUser
     }
 
     /**
-     * 获取当前用户id
+     * 获取当前登陆 角色列表
      */
-    fun getCurUserId(): Long? {
-        return getCurUser()?.id
+    fun getCurUserRoles(): MutableList<SysRole>? {
+        return getSession()?.getAttribute(ZenHttpSession.SESSION_KEY_USER_ROLES) as? MutableList<SysRole>
     }
 
-
-    object TL {
-        /**
-         * 180324
-         * 于MetaObjectHandler执行前 每个Controller方法拦截 暂存当前用户引用
-         */
-        private val CURRENT_USER_TL = ThreadLocal<SysUser>()
-
-        fun set(entity: SysUser?) {
-            CURRENT_USER_TL.set(entity)
-        }
-
-        fun clear() {
-            CURRENT_USER_TL.remove()
-        }
-
-        fun get(): SysUser? {
-            return CURRENT_USER_TL.get()
+    /**
+     * 获取当前用户 权限列表
+     */
+    fun getCurUserPerms(): MutableList<ZenPermission>? {
+        if (permissionSerivce == null) {
+            permissionSerivce = SpringContextHolder.getBean(ISysPermissionService::class.java)
         }
+        return permissionSerivce!!.getSubjectPermission()
     }
 
-
+    /**
+     * 获取当前用户 目录树
+     */
+    fun getCurUserMenuTree(platformId: Long): MutableList<MenuTree>? {
+        return getSession()?.getAttribute(ZenHttpSession.SESSION_KEY_USER_MENU + platformId) as? MutableList<MenuTree>
+    }
 }

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

@@ -44,7 +44,7 @@ object SerializeUtils {
         return result
     }
 
-    fun isEmpty(data: ByteArray?): Boolean {
+    private fun isEmpty(data: ByteArray?): Boolean {
         return data == null || data.isEmpty()
     }
 

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

@@ -12,6 +12,7 @@
     <result column="update_time" property="updateTime" />
     <result column="update_by" property="updateBy" />
         <result column="parent_id" property="parentId" />
+        <result column="path" property="path" />
         <result column="name" property="name" />
         <result column="principal" property="principal" />
         <result column="sort" property="sort" />

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

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.gxzc.zen.api.sys.mapper.SysDicMapper">
+<mapper namespace="com.gxzc.zen.api.sys.mapper.SysDictMapper">
 
     <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.gxzc.zen.api.sys.model.SysDic">
+    <resultMap id="BaseResultMap" type="com.gxzc.zen.api.sys.model.SysDict">
         <result column="id" property="id"/>
         <result column="enable" property="enable"/>
         <result column="remark" property="remark"/>
@@ -11,10 +11,19 @@
         <result column="create_by" property="createBy"/>
         <result column="update_time" property="updateTime"/>
         <result column="update_by" property="updateBy"/>
-        <result column="key" property="key"/>
+        <result column="code" property="code"/>
         <result column="value" property="value"/>
         <result column="label" property="label"/>
+        <result column="type" property="type"/>
+        <result column="parent_id" property="parentId"/>
+        <result column="path" property="path"/>
         <result column="sort" property="sort"/>
     </resultMap>
 
+    <update id="updatePath">
+        UPDATE `sys_dict`
+        SET path = CONCAT((SELECT path FROM (SELECT * FROM `sys_dict` WHERE id = #{parentId}) AS temp), '-', #{id})
+        WHERE id = #{id}
+    </update>
+
 </mapper>

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

@@ -4,22 +4,42 @@
 
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.gxzc.zen.api.sys.model.SysMenu">
-    <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="platform_id" property="platformId" />
-        <result column="parent_id" property="parentId" />
-        <result column="name" property="name" />
-        <result column="permission" property="permission" />
-        <result column="type" property="type" />
-        <result column="url" property="url" />
-        <result column="expand" property="expand" />
-        <result column="sort" property="sort" />
-        <result column="is_leaf" property="isLeaf" />
+        <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="path" property="path"/>
+        <result column="code" property="code"/>
+        <result column="type" property="type"/>
+        <result column="title" property="title"/>
+        <result column="uri" property="uri"/>
+        <result column="icon" property="icon"/>
+        <result column="sort" property="sort"/>
+        <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>
 
+    <select id="selectByRoleIds" resultType="com.gxzc.zen.api.sys.model.SysMenu">
+        SELECT A.* FROM
+        sys_menu AS A
+        INNER JOIN sys_menu_role AS B ON A.id = B.menu_id
+        WHERE B.role_id IN
+        <foreach collection="roleIds" separator="," item="item" open="(" close=")">
+            #{item}
+        </foreach>
+    </select>
+
+    <update id="updatePath">
+        UPDATE `sys_menu`
+        SET path = CONCAT((SELECT path FROM (SELECT * FROM `sys_menu` WHERE id = #{parentId}) AS temp), '-', #{id})
+        WHERE id = #{id}
+    </update>
+
 </mapper>

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

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

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

@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.gxzc.zen.api.sys.mapper.SysResourceMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.gxzc.zen.api.sys.model.SysResource">
+        <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="menu_id" property="menuId"/>
+        <result column="type" property="type"/>
+        <result column="code" property="code"/>
+        <result column="uri" property="uri"/>
+        <result column="name" property="name"/>
+        <result column="path" property="path"/>
+        <result column="method" property="method"/>
+        <result column="description" property="description"/>
+        <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>
+
+    <select id="selectByRoleIds" resultType="com.gxzc.zen.api.sys.model.SysResource">
+        SELECT DISTINCT A.*
+        FROM sys_resource AS A
+        INNER JOIN sys_resource_role AS B ON A.id = B.resource_id
+        WHERE B.role_id IN
+        <foreach collection="roleIds" open="(" close=")" item="item" separator=",">
+            #{item}
+        </foreach>
+    </select>
+
+</mapper>

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

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.gxzc.zen.api.sys.mapper.SysResourceRoleMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.gxzc.zen.api.sys.model.SysResourceRole">
+    <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="role_id" property="roleId" />
+        <result column="resource_id" property="resourceId" />
+    </resultMap>
+
+</mapper>

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

@@ -4,16 +4,29 @@
 
     <!-- 通用查询映射结果 -->
     <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="name" property="name"/>
-        <result column="code" property="code"/>
-        <result column="perms" property="perms"/>
+    <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>
 
+    <select id="selectByUserId" resultType="com.gxzc.zen.api.sys.model.SysRole">
+        SELECT A.*
+        FROM sys_role AS A
+        INNER JOIN sys_user_role AS B ON A.id = B.role_id
+        WHERE B.user_id = #{userId}
+    </select>
+
 </mapper>

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

@@ -4,34 +4,27 @@
 
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.gxzc.zen.api.sys.model.SysUser">
-        <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="account" property="account"/>
-        <result column="username" property="username"/>
-        <result column="password" property="password"/>
-        <result column="salt" property="salt"/>
-        <result column="phone" property="phone"/>
-        <result column="email" property="email"/>
-        <result column="position" property="position"/>
-        <result column="address" property="address"/>
-        <result column="staff_no" property="staffNo"/>
-        <result column="ext1" property="ext1"/>
-        <result column="ext2" property="ext2"/>
-        <result column="ext3" property="ext3"/>
-        <result column="ext4" property="ext4"/>
-        <result column="gender" property="gender"/>
+        <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="account" property="account" />
+        <result column="username" property="username" />
+        <result column="password" property="password" />
+        <result column="salt" property="salt" />
+        <result column="phone" property="phone" />
+        <result column="email" property="email" />
+        <result column="position" property="position" />
+        <result column="address" property="address" />
+        <result column="staff_no" property="staffNo" />
+        <result column="lock" property="lock" />
+        <result column="ext1" property="ext1" />
+        <result column="ext2" property="ext2" />
+        <result column="ext3" property="ext3" />
+        <result column="ext4" property="ext4" />
+        <result column="gender" property="gender" />
     </resultMap>
-
-    <select id="selectByAccount" resultMap="BaseResultMap">
-        SELECT *
-        FROM sys_user
-        WHERE
-          account = #{account}
-        LIMIT 1
-    </select>
 </mapper>

zen-api/src/test/kotlin/com.gxzc.zen.umps.security/PasswordGen.kt → zen-api/src/test/kotlin/com/gxzc/zen/api/PasswordGen.kt

@@ -1,4 +1,4 @@
-package com.gxzc.zen.umps.security
+package com.gxzc.zen.api
 
 import org.apache.shiro.crypto.hash.SimpleHash
 import org.junit.Test

zen-api/src/test/kotlin/com/gxzc/zen/api/TestDictTreeRedis.kt

@@ -0,0 +1,110 @@
+package com.gxzc.zen.api
+
+import com.fasterxml.jackson.databind.ObjectMapper
+import com.gxzc.zen.api.sys.common.DictTree
+import com.gxzc.zen.common.util.TreeUtil
+import org.junit.Test
+
+/**
+ *
+ * @author NorthLan
+ * @date 2018/4/28
+ * @url https://noahlan.com
+ */
+class TestDictTreeRedis {
+
+    fun buildData(): MutableList<DictTree> {
+        return mutableListOf<DictTree>().apply {
+            add(DictTree().apply {
+                id = 1
+                parentId = 0
+                type = 1
+            })
+            add(DictTree().apply {
+                id = 2
+                parentId = 1
+                type = 1
+            })
+            add(DictTree().apply {
+                id = 3
+                parentId = 1
+                type = 1
+            })
+            add(DictTree().apply {
+                id = 4
+                parentId = 2
+                type = 1
+                code = "test"
+            })
+            add(DictTree().apply {
+                id = 5
+                parentId = 4
+                type = 2
+                value = "1"
+                code = "test"
+            })
+            add(DictTree().apply {
+                id = 6
+                parentId = 4
+                type = 2
+                value = "2"
+                code = "test"
+            })
+            add(DictTree().apply {
+                id = 7
+                parentId = 4
+                type = 2
+                value = "3"
+                code = "test"
+            })
+            add(DictTree().apply {
+                id = 8
+                parentId = 4
+                type = 2
+                value = "4"
+                code = "test"
+            })
+            add(DictTree().apply {
+                id = 9
+                parentId = 4
+                type = 2
+                value = "5"
+                code = "test"
+            })
+            add(DictTree().apply {
+                id = 10
+                parentId = 4
+                type = 2
+                value = "6"
+                code = "test"
+            })
+        }
+    }
+
+    @Test
+    fun testTreeFind() {
+        val data = buildData()
+        val tree = TreeUtil.buildByRecursive(data, 0)
+
+        println(ObjectMapper().writeValueAsString(tree))
+
+        var now = System.currentTimeMillis()
+        val find = TreeUtil.findBFS(tree) {
+            it.type == 1 && it.code == "test"
+        }
+
+        println("BFS: ${System.currentTimeMillis() - now}")
+
+        println(ObjectMapper().writeValueAsString(find))
+
+        now = System.currentTimeMillis()
+        val find2 = TreeUtil.findDFS(tree) {
+            it.type == 1 && it.code == "test"
+        }
+
+        println("DFS: ${System.currentTimeMillis() - now}")
+
+
+        println(ObjectMapper().writeValueAsString(find2))
+    }
+}

zen-api/src/test/kotlin/com/gxzc/zen/api/TestKotlinReplace.kt

@@ -0,0 +1,24 @@
+package com.gxzc.zen.api
+
+import org.junit.Test
+import java.util.regex.Pattern
+
+/**
+ *
+ * @author NorthLan
+ * @date 2018/4/29
+ * @url https://noahlan.com
+ */
+class TestKotlinReplace {
+
+    @Test
+    fun testKotlinReplace() {
+        val url = "/user/info/{*}"
+        val patternUrl = url.replace("\\{\\*}".toRegex(), "[a-zA-Z\\\\d]+")
+        println("^$patternUrl\$")
+
+        println(Pattern.compile("^$patternUrl\$").matcher("/user/info/1").find())
+
+        println("/user/info/haha".startsWith("/user/info" + "/"))
+    }
+}

zen-api/src/test/kotlin/com/gxzc/zen/api/TestTreePath.kt

@@ -0,0 +1,22 @@
+package com.gxzc.zen.api
+
+import com.gxzc.zen.common.contants.ZenConstants
+import org.junit.Test
+
+/**
+ *
+ * @author NorthLan
+ * @date 2018/4/30
+ * @url https://noahlan.com
+ */
+class TestTreePath {
+    @Test
+    fun test1() {
+        val path = "1-2-3-4"
+        val paths = path.split(ZenConstants.TREE_PATH_SEPARATOR)
+        println(path)
+        println(paths)
+        val a = paths.subList(0, paths.size - 2)
+        println(a)
+    }
+}

zen-api/src/test/kotlin/com/gxzc/zen/api/base/BaseTestKt.kt

@@ -0,0 +1,39 @@
+package com.gxzc.zen.api.base
+
+import org.junit.Before
+import org.junit.runner.RunWith
+import org.springframework.beans.factory.annotation.Autowired
+import org.springframework.boot.test.context.SpringBootTest
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner
+import org.springframework.test.context.web.WebAppConfiguration
+import org.springframework.test.web.servlet.MockMvc
+import org.springframework.test.web.servlet.setup.MockMvcBuilders
+import org.springframework.web.context.WebApplicationContext
+
+/**
+ * Spring单元测试基类
+ * @author NorthLan
+ * @date 2018/1/26
+ * @url https://noahlan.com
+ */
+@RunWith(SpringJUnit4ClassRunner::class)
+@SpringBootTest
+@WebAppConfiguration
+//@Transactional  // 事物支持
+class BaseTestKt {
+
+    @Autowired
+    lateinit var webApplicationContext: WebApplicationContext
+
+    lateinit var mockMvc: MockMvc
+
+    @Before
+    fun setupMockMvc() {
+        mockMvc = MockMvcBuilders.webAppContextSetup(webApplicationContext).build()
+    }
+
+    @Before
+    fun initDataBase() {
+        // Nothing
+    }
+}

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

@@ -17,6 +17,9 @@ import java.util.*
  */
 @JsonInclude(JsonInclude.Include.NON_NULL) // jackson 忽略空值
 open class BaseModel : Serializable {
+    companion object {
+        private const val serialVersionUID = 1000000000000000001L
+    }
     // 主键
     @TableId(type = IdType.AUTO)
     var id: Long? = null
@@ -49,4 +52,32 @@ open class BaseModel : Serializable {
 
     @TableLogic(value = "1", delval = "0")
     var enable: Boolean? = null
+
+    override fun equals(other: Any?): Boolean {
+        if (this === other) return true
+        if (other !is BaseModel) return false
+
+        if (id != other.id) return false
+        if (createTime != other.createTime) return false
+        if (createBy != other.createBy) return false
+        if (updateTime != other.updateTime) return false
+        if (updateBy != other.updateBy) return false
+        if (remark != other.remark) return false
+        if (enable != other.enable) return false
+
+        return true
+    }
+
+    override fun hashCode(): Int {
+        var result = id?.hashCode() ?: 0
+        result = 31 * result + (createTime?.hashCode() ?: 0)
+        result = 31 * result + (createBy?.hashCode() ?: 0)
+        result = 31 * result + (updateTime?.hashCode() ?: 0)
+        result = 31 * result + (updateBy?.hashCode() ?: 0)
+        result = 31 * result + (remark?.hashCode() ?: 0)
+        result = 31 * result + (enable?.hashCode() ?: 0)
+        return result
+    }
+
+
 }

zen-core/src/main/kotlin/com/gxzc/zen/common/contants/ZenConstants.kt

@@ -0,0 +1,12 @@
+package com.gxzc.zen.common.contants
+
+/**
+ * 系统常量
+ * @author NorthLan
+ * @date 2018/4/28
+ * @url https://noahlan.com
+ */
+object ZenConstants {
+    const val TREE_ROOT_PID = 0L
+    const val TREE_PATH_SEPARATOR = "-"
+}

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

@@ -10,10 +10,13 @@ import com.gxzc.zen.common.properties.PlatformProperties
  * @url https://noahlan.com
  */
 object PlatformUtil {
-    private val properties = SpringContextHolder.getBean(PlatformProperties::class.java)
+    private var properties = SpringContextHolder.getBean(PlatformProperties::class.java)
 
     fun getPlatformId(): Int {
-        return properties.id!!
+        if (properties == null) {
+            properties = SpringContextHolder.getBean(PlatformProperties::class.java)
+        }
+        return properties!!.id!!
     }
 
     fun getPlatform(id: Int): PLATFORM {

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

@@ -10,10 +10,16 @@ import kotlin.reflect.KClass
  * @author NorthLan at 2018/2/8
  */
 object RedisCacheUtil {
-    private val cacheManager = SpringContextHolder.getBean<CacheManager>("redisCacheManager")
+    private var cacheManager = SpringContextHolder.getBean<CacheManager>("redisCacheManager")
+        get() {
+            if (field == null) {
+                field = SpringContextHolder.getBean<CacheManager>("redisCacheManager")
+            }
+            return field
+        }
 
     private fun getCahce(key: String): Cache? {
-        return cacheManager.getCache(key)
+        return cacheManager!!.getCache(key)
     }
 
     /**

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

@@ -1,6 +1,7 @@
 package com.gxzc.zen.common.util
 
 import org.slf4j.LoggerFactory
+import org.springframework.beans.BeansException
 import org.springframework.context.ApplicationContext
 import org.springframework.context.ApplicationContextAware
 import org.springframework.stereotype.Component
@@ -18,12 +19,22 @@ class SpringContextHolder : ApplicationContextAware {
         private lateinit var applicationContext: ApplicationContext
 
         @Suppress("UNCHECKED_CAST")
-        fun <T> getBean(beanName: String): T {
-            return applicationContext.getBean(beanName) as T
+        fun <T> getBean(beanName: String): T? {
+            return try {
+                applicationContext.getBean(beanName) as? T
+            } catch (e: BeansException) {
+                logger.warn("get bean [$beanName] error: ${e.message}")
+                null
+            }
         }
 
-        fun <T : Any> getBean(requiredType: Class<T>): T {
-            return applicationContext.getBean(requiredType)
+        fun <T : Any> getBean(requiredType: Class<T>): T? {
+            return try {
+                applicationContext.getBean(requiredType)
+            } catch (e: BeansException) {
+                logger.warn("get bean [${requiredType.name}] error: ${e.message}")
+                null
+            }
         }
     }
 

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

@@ -0,0 +1,124 @@
+package com.gxzc.zen.common.util
+
+import com.gxzc.zen.common.util.common.TreeNode
+import java.util.*
+
+
+@Suppress("UNCHECKED_CAST")
+/**
+ * 树 工具
+ * @author NorthLan
+ * @date 2018/4/28
+ * @url https://noahlan.com
+ */
+object TreeUtil {
+
+    /**
+     * 两层循环建树
+     * @param nodes 树节点列表
+     * @param rootParentId 根节点id
+     */
+    fun <T : TreeNode> build(nodes: MutableList<T>, rootParentId: Long): MutableList<T> {
+        val result = mutableListOf<T>()
+        nodes.forEach { node ->
+            // 构建根节点,由传入参数决定
+            if (rootParentId == node.parentId) {
+                result.add(node)
+            }
+
+            nodes.forEach {
+                if (it.parentId == node.id) {
+                    if (node.children == null) {
+                        node.children = mutableListOf()
+                    }
+                    node.addChild(it)
+                }
+            }
+        }
+        return result
+    }
+
+    /**
+     * 递归建树
+     * @param nodes 树节点列表
+     * @param rootParentId 根节点id
+     */
+    fun <T : TreeNode> buildByRecursive(nodes: MutableList<T>, rootParentId: Long): MutableList<T> {
+        val result = mutableListOf<T>()
+        nodes.forEach { node ->
+            if (rootParentId == node.parentId) {
+                result.add(findChildren(node, nodes))
+            }
+        }
+        return result
+    }
+
+    /**
+     * 递归查找子节点
+     *
+     * @param nodes 节点列表
+     * @param treeNode
+     */
+    private fun <T : TreeNode> findChildren(treeNode: T, nodes: MutableList<T>): T {
+        nodes.forEach {
+            if (treeNode.id == it.parentId) {
+                if (treeNode.children == null) {
+                    treeNode.children = mutableListOf()
+                }
+                treeNode.addChild(findChildren(it, nodes))
+            }
+        }
+        return treeNode
+    }
+
+    /**
+     * 深度优先搜索
+     * 搜索时只提取目录作为返回值
+     * 栈结构
+     */
+    fun <T : TreeNode> findDFS(nodes: MutableList<T>, transform: (T) -> Boolean): MutableList<T> {
+        val result: MutableList<T> = mutableListOf()
+        nodes.forEach { node ->
+            val stack = Stack<T>()
+            stack.add(node)
+            while (stack.isNotEmpty()) {
+                val temp = stack.pop()
+                if (transform(temp)) {
+                    result.add(temp)
+//                    break
+                }
+                temp.children?.let {
+                    it.forEach {
+                        stack.add(it as T)
+                    }
+                }
+            }
+        }
+        return result
+    }
+
+    /**
+     * 广度优先搜索
+     * 双端队列
+     */
+    fun <T : TreeNode> findBFS(nodes: MutableList<T>, transform: (T) -> Boolean): MutableList<T> {
+        val result: MutableList<T> = mutableListOf()
+        nodes.forEach {
+            val deque = ArrayDeque<T>()
+            deque.add(it)
+            while (deque.isNotEmpty()) {
+                val temp = deque.pop()
+                if (transform(temp)) {
+                    result.add(temp)
+//                    break
+                }
+                temp.children?.let {
+                    it.forEach {
+                        deque.add(it as T)
+                    }
+                }
+            }
+        }
+        return result
+    }
+}

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

@@ -0,0 +1,62 @@
+package com.gxzc.zen.common.util.common
+
+import java.io.Serializable
+
+/**
+ * 树 节点
+ * @author NorthLan
+ * @date 2018/4/28
+ * @url https://noahlan.com
+ */
+open class TreeNode : Serializable {
+    companion object {
+        private const val serialVersionUID = 5640224091610000001L
+    }
+
+    var id: Long? = null
+    var parentId: Long? = null
+    var children: MutableList<TreeNode>? = null
+    var sort: Int? = null
+
+    fun addChild(node: TreeNode) {
+        children?.add(node)
+    }
+
+    /**
+     * 通过sort排序
+     * @param comparator 比较器 若为null则默认比较sort
+     */
+    fun sortChildren(comparator: Comparator<in TreeNode>?) {
+        if (children != null) {
+            children!!.let { c ->
+                c.sortWith(comparator ?: Comparator { o1, o2 -> o1.sort!! - o2.sort!! })
+
+                // 所有子节点排个序
+                c.forEach {
+                    it.sortChildren(comparator)
+                }
+            }
+
+        }
+    }
+
+    override fun hashCode(): Int {
+        var result = id?.hashCode() ?: 0
+        result = 31 * result + (parentId?.hashCode() ?: 0)
+        result = 31 * result + (children?.hashCode() ?: 0)
+        result = 31 * result + (sort ?: 0)
+        return result
+    }
+
+    override fun equals(other: Any?): Boolean {
+        if (this === other) return true
+        if (other !is TreeNode) return false
+
+        if (id != other.id) return false
+        if (parentId != other.parentId) return false
+        if (children != other.children) return false
+        if (sort != other.sort) return false
+
+        return true
+    }
+}

zen-core/src/test/kotlin/com/gxzc/zen/TestTree.kt

@@ -0,0 +1,111 @@
+package com.gxzc.zen
+
+import com.fasterxml.jackson.databind.ObjectMapper
+import com.gxzc.zen.common.util.TreeUtil
+import com.gxzc.zen.common.util.common.TreeNode
+import org.junit.Test
+
+/**
+ *
+ * @author NorthLan
+ * @date 2018/4/28
+ * @url https://noahlan.com
+ */
+class TestTree {
+
+    private fun buildData(): MutableList<TreeNode> {
+        return mutableListOf<TreeNode>().apply {
+            add(TreeNode().apply {
+                id = 1
+                parentId = 0
+            })
+            add(TreeNode().apply {
+                id = 2
+                parentId = 1
+            })
+            add(TreeNode().apply {
+                id = 3
+                parentId = 1
+            })
+            add(TreeNode().apply {
+                id = 4
+                parentId = 2
+            })
+            add(TreeNode().apply {
+                id = 5
+                parentId = 4
+            })
+            add(TreeNode().apply {
+                id = 6
+                parentId = 4
+            })
+            add(TreeNode().apply {
+                id = 7
+                parentId = 4
+            })
+            add(TreeNode().apply {
+                id = 8
+                parentId = 4
+            })
+            add(TreeNode().apply {
+                id = 9
+                parentId = 4
+            })
+            add(TreeNode().apply {
+                id = 10
+                parentId = 4
+            })
+        }
+    }
+
+    @Test
+    fun testTree() {
+        val data = buildData()
+
+        // 时间
+        val now = System.currentTimeMillis()
+
+        val tree = TreeUtil.build(data, 0)
+
+        val n = System.currentTimeMillis()
+        println("循环时间: ${n - now}")
+
+        val tree2 = TreeUtil.buildByRecursive(data, 0)
+
+        println("递归时间: ${System.currentTimeMillis() - n}")
+
+        println(ObjectMapper().writeValueAsString(tree))
+
+        println(ObjectMapper().writeValueAsString(tree2))
+
+        // 数据量小的情况 循环时间>递归时间
+    }
+
+    @Test
+    fun testTreeFind() {
+        val data = buildData()
+        val tree = TreeUtil.buildByRecursive(data, 0)
+
+        println(ObjectMapper().writeValueAsString(tree))
+
+
+        var now = System.currentTimeMillis()
+        val find = TreeUtil.findBFS(tree) {
+            it.id == 4L && it.parentId == 2L
+        }
+
+        println("BFS: ${System.currentTimeMillis() - now}")
+
+        println(ObjectMapper().writeValueAsString(find))
+
+        now = System.currentTimeMillis()
+        val find2 = TreeUtil.findDFS(tree) {
+            it.id == 4L && it.parentId == 2L
+        }
+
+        println("DFS: ${System.currentTimeMillis() - now}")
+
+
+        println(ObjectMapper().writeValueAsString(find2))
+    }
+}

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

@@ -17,7 +17,7 @@ import java.io.File
  * @url https://noahlan.me
  */
 fun main(args: Array<String>) {
-    generate(true, "NorthLan", "shared", DataSourceConfig().also {
+    generate(true, "NorthLan", "newsys", DataSourceConfig().also {
         it.dbType = DbType.MYSQL
         it.typeConvert = object : MySqlTypeConvert() {
             override fun processTypeConvert(fieldType: String?): DbColumnType {
@@ -27,7 +27,7 @@ fun main(args: Array<String>) {
         it.driverName = "com.mysql.jdbc.Driver"
         it.username = "archives"
         it.password = "archives"
-        it.url = "jdbc:mysql://192.168.1.92:30002/archives_shared?characterEncoding=utf8"
+        it.url = "jdbc:mysql://192.168.1.10:3306/archives_sys?characterEncoding=utf8"
 //        it.url = "jdbc:mysql://127.0.0.1:3306/archives_mgr?characterEncoding=utf8"
 //        it.username = "root"
 //        it.password = "root"

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

@@ -22,14 +22,11 @@ import kotlin.reflect.KClass
 @Aspect
 @Suppress("unused")
 @Component
-//@ConditionalOnProperty(prefix = "orm", name = ["multi-datasource-enable"], havingValue = "true", matchIfMissing = true)
 class MultiTransactionAspect {
     companion object {
         private val logger = LoggerFactory.getLogger(MultiTransactionAspect::class.java)
     }
 
-//    private val counter: AtomicInteger = AtomicInteger(0)
-
     init {
         logger.info("MultiTransactionAspect initializing...")
     }
@@ -39,9 +36,6 @@ class MultiTransactionAspect {
      */
     @Around("@annotation(com.gxzc.zen.orm.annotation.ZenTransactional)")
     fun multiTransactionAround(joinPoint: ProceedingJoinPoint): Any? {
-//        if (counter.get() > 0) {
-//            return joinPoint.proceed()
-//        }
         logger.trace("@ZenTransactional aspect...")
         val methodName = joinPoint.signature.name
         val parameterTypes = (joinPoint.signature as MethodSignature).method.parameterTypes
@@ -50,7 +44,7 @@ class MultiTransactionAspect {
         if (method.isAnnotationPresent(ZenTransactional::class.java)) {
             val multiTransaction = method.getAnnotation(ZenTransactional::class.java)
             val transactionManager = SpringContextHolder.getBean(JtaTransactionManager::class.java)
-            val userTransaction = transactionManager.userTransaction
+            val userTransaction = transactionManager!!.userTransaction
 
             // 防止嵌套事务 多次拦截
             if (userTransaction.status == Status.STATUS_ACTIVE) {
@@ -59,7 +53,6 @@ class MultiTransactionAspect {
 //            logger.info(userTransaction.status.toString())
             return try {
                 userTransaction.begin()
-//                counter.addAndGet(1)
 //                logger.info(userTransaction.status.toString())
                 val r = joinPoint.proceed()
                 userTransaction.commit()

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

@@ -12,7 +12,7 @@ import org.springframework.transaction.annotation.EnableTransactionManagement
 import org.springframework.transaction.jta.JtaTransactionManager
 
 /**
- *
+ * 分布式事务 (jta) 配置 弱xa
  * @author NorthLan
  * @date 2018/4/2
  * @url https://noahlan.com

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

@@ -1,19 +1,12 @@
 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.DynamicMultipleDataSource
 import com.gxzc.zen.orm.contants.DSKey
-import org.apache.ibatis.plugin.Interceptor
 import org.slf4j.LoggerFactory
-import org.springframework.beans.factory.ObjectProvider
-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
@@ -24,11 +17,10 @@ import javax.sql.XADataSource
 
 
 /**
- *
+ * 多数据源配置
  * @author NorthLan at 2018/1/29
  */
 @Configuration
-// @ConditionalOnProperty(prefix = "orm", name = ["multi-datasource-enable"], havingValue = "true", matchIfMissing = true)
 class MultipleDataSourceConfig {
     companion object {
         private val logger = LoggerFactory.getLogger(MultipleDataSourceConfig::class.java)
@@ -44,13 +36,6 @@ class MultipleDataSourceConfig {
         return DruidXADataSource()
     }
 
-    @Bean(DSKey.DSKEY_BUSINESS + "druid")
-    @ConfigurationProperties(prefix = "datasource.bus")
-    @ConditionalOnProperty(prefix = "orm", name = ["multi-datasource-enable"], havingValue = "true", matchIfMissing = true)
-    fun dataSourceBusDruid(): XADataSource {
-        return DruidXADataSource()
-    }
-
     @Bean(DSKey.DSKEY_SHARED + "druid")
     @ConfigurationProperties(prefix = "datasource.shared")
     @ConditionalOnProperty(prefix = "orm", name = ["multi-datasource-enable"], havingValue = "true", matchIfMissing = true)
@@ -67,15 +52,6 @@ class MultipleDataSourceConfig {
         }
     }
 
-    @Bean(DSKey.DSKEY_BUSINESS)
-    @DependsOn(DSKey.DSKEY_BUSINESS + "druid")
-    @ConditionalOnProperty(prefix = "orm", name = ["multi-datasource-enable"], havingValue = "true", matchIfMissing = true)
-    fun dataSourceBus(): DataSource {
-        return AtomikosDataSourceBean().also {
-            it.xaDataSource = dataSourceBusDruid()
-        }
-    }
-
     @Bean(DSKey.DSKEY_SHARED)
     @DependsOn(DSKey.DSKEY_SHARED + "druid")
     @ConditionalOnProperty(prefix = "orm", name = ["multi-datasource-enable"], havingValue = "true", matchIfMissing = true)
@@ -88,12 +64,10 @@ class MultipleDataSourceConfig {
     @Bean
     @ConditionalOnProperty(prefix = "orm", name = ["multi-datasource-enable"], havingValue = "true", matchIfMissing = true)
     fun multipleDataSource(@Qualifier(DSKey.DSKEY_SYS) dataSourceSys: DataSource,
-                           @Qualifier(DSKey.DSKEY_BUSINESS) dataSourceBus: DataSource,
                            @Qualifier(DSKey.DSKEY_SHARED) dataSourceShared: DataSource): DynamicMultipleDataSource {
         return DynamicMultipleDataSource().apply {
             setTargetDataSources(mapOf(
                     DSKey.DSKEY_SYS to dataSourceSys,
-                    DSKey.DSKEY_BUSINESS to dataSourceBus,
                     DSKey.DSKEY_SHARED to dataSourceShared))
             setDefaultTargetDataSource(dataSourceSys)
         }

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

@@ -67,7 +67,7 @@ class MybatisPlusFactoryConfig {
         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 add config file or check your Mybatis configuration)")
+                    + " (please addChild config file or check your Mybatis configuration)")
         }
     }
 

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

@@ -6,12 +6,10 @@ package com.gxzc.zen.orm.contants
  */
 enum class DSKey(val dsKey: String, val pkgName: String) {
     DS_SYS("sysDataSource", "com.gxzc.zen.api.sys"),
-    DS_BUSINESS("busDataSource", "com.gxzc.zen.api.bus"),
     DS_SHARED("sharedDataSource", "com.gxzc.zen.api.shared");
 
     companion object {
         const val DSKEY_SYS = "sysDataSource"
-        const val DSKEY_BUSINESS = "busDataSource"
         const val DSKEY_SHARED = "sharedDataSource"
     }
 }

zen-web/src/main/kotlin/com/gxzc/zen/orm/CustomMetaObjectHandler.kt

@@ -20,10 +20,10 @@ class CustomMetaObjectHandler : MetaObjectHandler() {
     }
 
     override fun insertFill(metaObject: MetaObject?) {
-        val curUser = SSOUtil.getCurUser()
-        logger.debug("公共字段自动填充: insertFill ${curUser?.account}")
+        val curUser = SSOUtil.getCurAccount()
+        logger.debug("公共字段自动填充: insertFill $curUser")
         if (getFieldValByName("createBy", metaObject) == null) {
-            setFieldValByName("createBy", curUser?.account, metaObject)
+            setFieldValByName("createBy", curUser, metaObject)
         }
         if (getFieldValByName("createTime", metaObject) == null) {
             setFieldValByName("createTime", Date(), metaObject)
@@ -31,9 +31,9 @@ class CustomMetaObjectHandler : MetaObjectHandler() {
     }
 
     override fun updateFill(metaObject: MetaObject?) {
-        val curUser = SSOUtil.getCurUser()
-        logger.debug("公共字段自动填充: updateFill ${curUser?.account}")
-        setFieldValByName("updateBy", curUser?.account, metaObject)
+        val curUser = SSOUtil.getCurAccount()
+        logger.debug("公共字段自动填充: updateFill $curUser")
+        setFieldValByName("updateBy", curUser, metaObject)
         setFieldValByName("updateTime", Date(), metaObject)
     }
 }

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

@@ -1,18 +1,21 @@
 package com.gxzc.zen.web.sys.controller
 
+import com.gxzc.zen.api.sys.service.ISysRoleService
+import com.gxzc.zen.api.sys.service.ISysUserService
 import com.gxzc.zen.common.base.BaseController
 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.HttpUtil
+import com.gxzc.zen.umps.common.ZenAuthToken
 import com.gxzc.zen.umps.constant.ZenHttpSession
 import io.swagger.annotations.ApiOperation
 import org.apache.shiro.SecurityUtils
 import org.apache.shiro.authc.AuthenticationException
 import org.apache.shiro.authc.UnknownAccountException
-import org.apache.shiro.authc.UsernamePasswordToken
 import org.slf4j.LoggerFactory
+import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.http.ResponseEntity
 import org.springframework.web.bind.annotation.*
 import javax.servlet.http.Cookie
@@ -30,30 +33,41 @@ class AuthController : BaseController() {
         private val logger = LoggerFactory.getLogger(AuthController::class.java)
     }
 
-//    @Autowired
-//    private lateinit var userService: ISysUserService
+    @Autowired
+    private lateinit var userService: ISysUserService
+
+    @Autowired
+    private lateinit var roleService: ISysRoleService
 
     @ApiOperation(value = "登录")
     @PostMapping("/login")
     fun login(@RequestBody data: RequestDto): ResponseEntity<*> {
 //        val a = System.currentTimeMillis()
         // 验证输入合法性
-        val account = data["account"]?.toString()?.trim()
-        val password = data["password"]?.toString()
+        val account = data["account"]?.toString()?.trim() ?: throw ZenException(ZenExceptionEnum.REQUEST_NULL)
+        val password = data["password"]?.toString() ?: throw ZenException(ZenExceptionEnum.REQUEST_NULL)
         val rememberMe = data["rememberMe"] as? Boolean ?: false
 
-        if (account.isNullOrEmpty() || password.isNullOrEmpty()) {
-            throw ZenException(ZenExceptionEnum.REQUEST_NULL)
-        }
-
+        val user = userService.getUserByAccount(account)
         try {
-            SecurityUtils.getSubject().login(UsernamePasswordToken(account, password, rememberMe, getRequest().remoteHost))
+            SecurityUtils.getSubject().login(ZenAuthToken(account, password, rememberMe, getRequest().remoteHost, user))
         } catch (e: AuthenticationException) {
             logger.warn("login error,", e)
             throw ZenException(ZenExceptionEnum.AUTH_PASSWORD_ERROR)
         } catch (e: UnknownAccountException) {
 //            logger.warn("login error,", e)
             throw ZenException(ZenExceptionEnum.AUTH_ACCOUNT_NOT_EXISTS)
+        } finally {
+            // 能进到这里来 user 肯定 !=null
+            val session = SecurityUtils.getSubject().getSession(false)
+            session?.let {
+                // ID
+                it.setAttribute(ZenHttpSession.SESSION_KEY_USER_ID, user!!.id!!)
+                // 用户基本信息
+                it.setAttribute(ZenHttpSession.SESSION_KEY_USER_INFO, user)
+                // 角色列表
+                it.setAttribute(ZenHttpSession.SESSION_KEY_USER_ROLES, roleService.getRoleListByUserId(user.id))
+            }
         }
         return ResponseEntity.ok(ResponseDto())
     }

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

@@ -0,0 +1,68 @@
+package com.gxzc.zen.web.sys.controller
+
+import com.gxzc.zen.api.sys.model.SysMenu
+import com.gxzc.zen.api.sys.service.ISysMenuService
+import com.gxzc.zen.common.base.BaseController
+import com.gxzc.zen.common.dto.ResponseDto
+import io.swagger.annotations.ApiOperation
+import org.slf4j.LoggerFactory
+import org.springframework.beans.factory.annotation.Autowired
+import org.springframework.http.ResponseEntity
+import org.springframework.web.bind.annotation.*
+
+/**
+ * 菜单 控制器
+ * @author NorthLan
+ * @date 2018/5/1
+ * @url https://noahlan.com
+ */
+@RestController
+@RequestMapping("menu")
+class MenuController : BaseController() {
+    companion object {
+        private val logger = LoggerFactory.getLogger(MenuController::class.java)
+    }
+
+    @Autowired
+    private lateinit var menuService: ISysMenuService
+
+    @ApiOperation("获取系统菜单列表")
+    @GetMapping("list")
+    fun list(): ResponseEntity<*> {
+        return ResponseEntity.ok(ResponseDto().apply {
+            data = menuService.getSysMenuList()
+        })
+    }
+
+    @ApiOperation("获取系统菜单树")
+    @GetMapping("tree")
+    fun tree(): ResponseEntity<*> {
+        return ResponseEntity.ok(ResponseDto().apply {
+            data = menuService.getSysMenuTree()
+        })
+    }
+
+    @ApiOperation("新增菜单")
+    @PostMapping
+    fun create(@RequestBody entity: SysMenu): ResponseEntity<*> {
+        return ResponseEntity.ok(ResponseDto().apply {
+            data = menuService.createSysMenu(entity)
+        })
+    }
+
+    @ApiOperation("更新菜单项,不移动菜单")
+    @PutMapping("{id}")
+    fun udpate(@PathVariable id: Long, @RequestBody entity: SysMenu): ResponseEntity<*> {
+        return ResponseEntity.ok(ResponseDto().apply {
+            data = menuService.updateMenu(entity)
+        })
+    }
+
+    @ApiOperation("删除菜单以及子菜单")
+    @DeleteMapping("{id}")
+    fun delete(@PathVariable id: Long, @RequestBody entity: SysMenu): ResponseEntity<*> {
+        return ResponseEntity.ok(ResponseDto().apply {
+            data = menuService.deleteMenu(entity)
+        })
+    }
+}

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

@@ -0,0 +1,62 @@
+package com.gxzc.zen.web.sys.controller
+
+import com.gxzc.zen.api.sys.model.SysResource
+import com.gxzc.zen.api.sys.service.ISysResourceService
+import com.gxzc.zen.common.base.BaseController
+import com.gxzc.zen.common.dto.ResponseDto
+import io.swagger.annotations.ApiOperation
+import org.springframework.beans.factory.annotation.Autowired
+import org.springframework.http.ResponseEntity
+import org.springframework.web.bind.annotation.*
+
+/**
+ * 系统资源 管理器
+ * @author NorthLan
+ * @date 2018/5/2
+ * @url https://noahlan.com
+ */
+@RestController
+@RequestMapping("resource")
+class ResourceController : BaseController() {
+
+    @Autowired
+    private lateinit var resourceService: ISysResourceService
+
+    @ApiOperation("查询关联某菜单的所有资源")
+    @GetMapping("menu/{menuId}")
+    fun getResourceByMenuId(@PathVariable menuId: Long): ResponseEntity<*> {
+        return ResponseEntity.ok(ResponseDto().apply {
+            data = resourceService.getResourcesByMenuId(menuId)
+        })
+    }
+
+    @ApiOperation("在指定菜单下新增资源")
+    @PostMapping("menu/{menuId}")
+    fun insertResourceByMenuId(@PathVariable menuId: Long, @RequestBody sysResource: SysResource): ResponseEntity<*> {
+        return ResponseEntity.ok(ResponseDto().apply {
+            data = resourceService.insertResource(menuId, sysResource)
+        })
+    }
+
+    @ApiOperation("删除指定菜单下的所有资源")
+    @DeleteMapping("menu/{menuId}")
+    fun deleteResourceByMenuId(@PathVariable menuId: Long): ResponseEntity<*> {
+        resourceService.deleteResourcesByMenuId(menuId)
+        return ResponseEntity.ok(ResponseDto())
+    }
+
+    @ApiOperation("删除指定资源")
+    @DeleteMapping("{id}")
+    fun deleteResourceById(@PathVariable id: Long): ResponseEntity<*> {
+        resourceService.deleteResourceById(id)
+        return ResponseEntity.ok(ResponseDto())
+    }
+
+    @ApiOperation("修改指定资源")
+    @PutMapping("{id}")
+    fun updateResourceById(@PathVariable id: Long, @RequestBody sysResource: SysResource): ResponseEntity<*> {
+        return ResponseEntity.ok(ResponseDto().apply {
+            data = resourceService.updateResource(sysResource)
+        })
+    }
+}

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

@@ -34,34 +34,34 @@ class RoleController : BaseController() {
              @RequestParam(required = false) searchOption: Int?,
              @RequestParam(required = false) enable: Boolean?): ResponseEntity<*> {
         var result: Any? = null
-        if (!keyword.isNullOrEmpty() && searchOption != null) {
-            when (searchOption) {
-                1 -> {
-                    result = if (PaginationUtil.paginable(getRequest())) {
-                        roleService.getListByParamPage(keyword, null, enable, PaginationUtil.getCurrent(getRequest())!!, PaginationUtil.getPageSize(getRequest())!!)
-                    } else {
-                        roleService.getListByParam(keyword, null, enable)
-                    }
-                }
-                2 -> {
-                    result = if (PaginationUtil.paginable(getRequest())) {
-                        roleService.getListByParamPage(null, keyword, enable, PaginationUtil.getCurrent(getRequest())!!, PaginationUtil.getPageSize(getRequest())!!)
-                    } else {
-                        roleService.getListByParam(null, keyword, enable)
-                    }
-                }
-                else -> {
-                    // 未知的查询关键字类型
-                    logger.warn("Unknown searchOption: [$searchOption]")
-                }
-            }
-        } else {
-            result = if (PaginationUtil.paginable(getRequest())) {
-                roleService.getListByParamPage(null, null, enable, PaginationUtil.getCurrent(getRequest())!!, PaginationUtil.getPageSize(getRequest())!!)
-            } else {
-                roleService.getListByParam(null, null, enable)
-            }
-        }
+//        if (!keyword.isNullOrEmpty() && searchOption != null) {
+//            when (searchOption) {
+//                1 -> {
+//                    result = if (PaginationUtil.paginable(getRequest())) {
+//                        roleService.getListByParamPage(keyword, null, enable, PaginationUtil.getCurrent(getRequest())!!, PaginationUtil.getPageSize(getRequest())!!)
+//                    } else {
+//                        roleService.getListByParam(keyword, null, enable)
+//                    }
+//                }
+//                2 -> {
+//                    result = if (PaginationUtil.paginable(getRequest())) {
+//                        roleService.getListByParamPage(null, keyword, enable, PaginationUtil.getCurrent(getRequest())!!, PaginationUtil.getPageSize(getRequest())!!)
+//                    } else {
+//                        roleService.getListByParam(null, keyword, enable)
+//                    }
+//                }
+//                else -> {
+//                    // 未知的查询关键字类型
+//                    logger.warn("Unknown searchOption: [$searchOption]")
+//                }
+//            }
+//        } else {
+//            result = if (PaginationUtil.paginable(getRequest())) {
+//                roleService.getListByParamPage(null, null, enable, PaginationUtil.getCurrent(getRequest())!!, PaginationUtil.getPageSize(getRequest())!!)
+//            } else {
+//                roleService.getListByParam(null, null, enable)
+//            }
+//        }
         return ResponseEntity.ok(ResponseDto().apply { data = result })
     }
 
@@ -83,7 +83,7 @@ class RoleController : BaseController() {
         } else {
             // update
             ResponseEntity.ok(ResponseDto().apply {
-                this.data = roleService.modify(data) // 200
+//                this.data = roleService.modify(data) // 200
             })
         }
     }
@@ -91,7 +91,7 @@ class RoleController : BaseController() {
     @DeleteMapping("{id}")
     fun deleteDic(@PathVariable id: Long): ResponseEntity<*> {
         // 物理删除数据
-        roleService.physicalDelete(id)
+//        roleService.physicalDelete(id)
         return ResponseEntity.ok(ResponseDto())
     }
 }