重构缓存,新增几个页面

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

@@ -16,4 +16,5 @@ import org.springframework.stereotype.Repository
 @Repository
 interface SysResourceMapper : BaseMapper<SysResource> {
     fun selectByRoleIds(@Param("roleIds") roleIds: List<Long>): MutableList<SysResource>
+    fun selectByRoleId(@Param("roleId") roleId: Long): MutableList<SysResource>
 }

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

@@ -2,6 +2,7 @@ package com.gxzc.zen.api.sys.mapper
 
 import com.gxzc.zen.api.sys.model.SysResourceRole
 import com.gxzc.zen.common.base.BaseMapper
+import org.apache.ibatis.annotations.Param
 import org.springframework.stereotype.Repository
 
 /**
@@ -13,4 +14,6 @@ import org.springframework.stereotype.Repository
  * @since 2018-04-28
  */
 @Repository
-interface SysResourceRoleMapper : BaseMapper<SysResourceRole>
+interface SysResourceRoleMapper : BaseMapper<SysResourceRole> {
+    fun zenInsertOrUpdateBatch(@Param("list") list: MutableList<SysResourceRole>): Long
+}

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

@@ -2,6 +2,7 @@ package com.gxzc.zen.api.sys.service
 
 import com.gxzc.zen.api.sys.model.SysMenuRole
 import com.gxzc.zen.common.base.BaseService
+
 /**
  * <p>
  * 用户菜单表 服务类
@@ -10,4 +11,6 @@ import com.gxzc.zen.common.base.BaseService
  * @author NorthLan123
  * @since 2018-02-06
  */
-interface ISysMenuRoleService : BaseService<SysMenuRole>
+interface ISysMenuRoleService : BaseService<SysMenuRole> {
+    fun removeByMenuId(menuId: Long)
+}

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

@@ -37,7 +37,7 @@ interface ISysPermissionService {
     fun updateAllSysPermission()
 
     /**
-     * 更新用户主体权限
+     * 更新所有用户权限
      */
-    fun updateSubjectPermissionByAccount(account: String)
+    fun updateAllSessionPermission()
 }

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

@@ -11,4 +11,6 @@ import com.gxzc.zen.common.base.BaseService
  * @author NorthLan
  * @since 2018-04-28
  */
-interface ISysResourceRoleService : BaseService<SysResourceRole>
+interface ISysResourceRoleService : BaseService<SysResourceRole> {
+    fun saveResourceRoleByRoleId(roleId: Long, menuId: Long, resList: List<Long>)
+}

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

@@ -17,6 +17,11 @@ interface ISysResourceService : BaseService<SysResource> {
      */
     fun getResourcesByRoleIds(roleIds: List<Long>): MutableList<SysResource>
 
+    /**
+     * 通过role id 获取 resource
+     */
+    fun getResourcesByRoleId(roleId: Long): MutableList<SysResource>
+
     fun getResourcesByMenuId(menuId: Long): MutableList<SysResource>
 
     fun insertResource(menuId: Long, sysResource: SysResource): SysResource

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

@@ -1,7 +1,9 @@
 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
+import java.io.Serializable
 
 /**
  * <p>
@@ -15,24 +17,17 @@ interface ISysRoleService : BaseService<SysRole> {
 
     fun getRoleListByUserId(userId: Long?): MutableList<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 modify(entity: SysRole): SysRole
-//
-//    /**
-//     * 物理删除
-//     */
-//    fun physicalDelete(id: Long)
+    /**
+     * 获取角色列表(分页)
+     */
+    fun getRoleListPage(keyword: String?, searchOption: Int?, page: Page<SysRole>, enable: Boolean?): Page<SysRole>
+
+    /**
+     * 获取角色列表
+     */
+    fun getRoleList(keyword: String?, searchOption: Int?, enable: Boolean?): MutableList<SysRole>
+
+    fun physicalDeleteById(id: Serializable)
+
+    fun updateLogicById(entity: SysRole)
 }

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

@@ -1,9 +1,10 @@
 package com.gxzc.zen.api.sys.service.impl
 
-import com.gxzc.zen.api.sys.model.SysMenuRole
+import com.baomidou.mybatisplus.mapper.EntityWrapper
+import com.baomidou.mybatisplus.service.impl.ServiceImpl
 import com.gxzc.zen.api.sys.mapper.SysMenuRoleMapper
+import com.gxzc.zen.api.sys.model.SysMenuRole
 import com.gxzc.zen.api.sys.service.ISysMenuRoleService
-import com.baomidou.mybatisplus.service.impl.ServiceImpl
 import org.springframework.stereotype.Service
 
 /**
@@ -17,4 +18,11 @@ import org.springframework.stereotype.Service
 @Service
 class SysMenuRoleServiceImpl : ServiceImpl<SysMenuRoleMapper, SysMenuRole>(), ISysMenuRoleService {
 
+    override fun removeByMenuId(menuId: Long) {
+        val condition = SysMenuRole().apply {
+            this.menuId = menuId
+        }
+        baseMapper.physicalDelete(EntityWrapper(condition))
+    }
+
 }

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

@@ -5,6 +5,7 @@ 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.ISysMenuRoleService
 import com.gxzc.zen.api.sys.service.ISysMenuService
 import com.gxzc.zen.common.contants.ZenConstants
 import com.gxzc.zen.common.exception.ZenException
@@ -13,7 +14,9 @@ import com.gxzc.zen.common.util.TreeUtil
 import com.gxzc.zen.orm.annotation.ZenTransactional
 import com.gxzc.zen.umps.constant.ZenHttpSession
 import com.gxzc.zen.umps.util.SSOUtil
+import com.gxzc.zen.umps.util.ShiroRedisUtil
 import org.springframework.beans.BeanUtils
+import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.stereotype.Service
 
 /**
@@ -26,6 +29,8 @@ import org.springframework.stereotype.Service
  */
 @Service
 class SysMenuServiceImpl : ServiceImpl<SysMenuMapper, SysMenu>(), ISysMenuService {
+    @Autowired
+    private lateinit var menuRoleService: ISysMenuRoleService
 
     private fun getTree(data: List<SysMenu>): MutableList<MenuTree> {
         val nodes = mutableListOf<MenuTree>()
@@ -67,14 +72,15 @@ class SysMenuServiceImpl : ServiceImpl<SysMenuMapper, SysMenu>(), ISysMenuServic
     }
 
     override fun getUserMenuTree(platformId: Long): MutableList<MenuTree> {
-        var menu = SSOUtil.getCurUserMenuTree(platformId)
+        var menu = SSOUtil.getCurUserMenuTree()
         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)
+                // 所有需要修改
+                // TIP 所有修改了 用户角色 用户资源 菜单信息 均需要刷新此缓存
+                SSOUtil.setAttribute(ZenHttpSession.SESSION_KEY_USER_MENU, menu)
             } else {
                 return mutableListOf()
             }
@@ -120,6 +126,7 @@ class SysMenuServiceImpl : ServiceImpl<SysMenuMapper, SysMenu>(), ISysMenuServic
         if (baseMapper.updateById(entity) <= 0) {
             throw ZenException(ZenExceptionEnum.BIZ_UPDATE_ERROR)
         }
+        ShiroRedisUtil.removeAllSessionsAttributeKey(ZenHttpSession.SESSION_KEY_USER_MENU)
         return entity
     }
 
@@ -134,5 +141,9 @@ class SysMenuServiceImpl : ServiceImpl<SysMenuMapper, SysMenu>(), ISysMenuServic
         if (baseMapper.physicalDelete(EntityWrapper<SysMenu>().like("path", "${stored.path!!}%")) <= 0) {
             throw ZenException(ZenExceptionEnum.BIZ_DELETE_ERROR)
         }
+        // 删除menu对应的 menu_role 表相关信息
+        menuRoleService.removeByMenuId(stored.id!!)
+        // 
+        ShiroRedisUtil.removeAllSessionsAttributeKey(ZenHttpSession.SESSION_KEY_USER_MENU)
     }
 }

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

@@ -10,6 +10,7 @@ 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 com.gxzc.zen.umps.util.ShiroRedisUtil
 import org.apache.shiro.session.Session
 import org.springframework.beans.BeanUtils
 import org.springframework.beans.factory.annotation.Autowired
@@ -89,11 +90,11 @@ class SysPermissionServiceImpl : ISysPermissionService {
         return temp
     }
 
-    // TODO 更新缓存
     override fun updateAllSysPermission() {
+        RedisCacheUtil.evict(CACHEKEYS.SYS, "allPerms")
     }
 
-    // TODO 更新缓存
-    override fun updateSubjectPermissionByAccount(account: String) {
+    override fun updateAllSessionPermission() {
+        ShiroRedisUtil.removeAllSessionsAttributeKey(ZenHttpSession.SESSION_KEY_USER_PERMS)
     }
 }

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

@@ -1,9 +1,17 @@
 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.SysResourceRoleMapper
 import com.gxzc.zen.api.sys.model.SysResourceRole
 import com.gxzc.zen.api.sys.service.ISysResourceRoleService
+import com.gxzc.zen.api.sys.service.ISysResourceService
+import com.gxzc.zen.common.exception.ZenException
+import com.gxzc.zen.common.exception.ZenExceptionEnum
+import com.gxzc.zen.orm.annotation.ZenTransactional
+import com.gxzc.zen.umps.constant.ZenHttpSession
+import com.gxzc.zen.umps.util.ShiroRedisUtil
+import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.stereotype.Service
 
 /**
@@ -16,5 +24,47 @@ import org.springframework.stereotype.Service
  */
 @Service
 class SysResourceRoleServiceImpl : ServiceImpl<SysResourceRoleMapper, SysResourceRole>(), ISysResourceRoleService {
+    @Autowired
+    private lateinit var sysResourceService: ISysResourceService
+
+    @ZenTransactional
+    override fun saveResourceRoleByRoleId(roleId: Long, menuId: Long, resList: List<Long>) {
+        // 先获取roleid下的所有对应menuId下的所有resid
+        val menuResIdList = sysResourceService.getResourcesByMenuId(menuId).map { it.id!! }
+        val ret = baseMapper.selectList(EntityWrapper<SysResourceRole>()
+                .eq("role_id", roleId)
+                .`in`("resource_id", menuResIdList)).map { it.resourceId!! }
+        //
+        val deleteIds = ret.subtract(resList)
+        val insertIds = resList.subtract(ret)
+
+        if (deleteIds.isEmpty() && insertIds.isEmpty() && resList.isNotEmpty()) {
+            throw ZenException(ZenExceptionEnum.BIZ_UPDATE_ERROR)
+        }
+
+        var eff = false
+        if (deleteIds.isNotEmpty()) {
+            // 删除啊 批量啊
+            baseMapper.physicalDelete(EntityWrapper<SysResourceRole>().eq("role_id", roleId).`in`("resource_id", deleteIds))
+            eff = true
+        }
+        //
+        if (insertIds.isNotEmpty()) {
+            val entityList = mutableListOf<SysResourceRole>()
+            insertIds.forEach {
+                entityList.add(SysResourceRole().apply {
+                    this.resourceId = it
+                    this.roleId = roleId
+                })
+            }
+            this.insertBatch(entityList)
+            eff = true
+        }
+
+        if (eff) {
+            // 需要更新一下缓存
+            ShiroRedisUtil.removeAllSessionsAttributeKey(ZenHttpSession.SESSION_KEY_USER_PERMS)
+        }
+    }
 
 }

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

@@ -4,9 +4,11 @@ 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.ISysPermissionService
 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.beans.factory.annotation.Autowired
 import org.springframework.stereotype.Service
 
 /**
@@ -19,11 +21,17 @@ import org.springframework.stereotype.Service
  */
 @Service
 class SysResourceServiceImpl : ServiceImpl<SysResourceMapper, SysResource>(), ISysResourceService {
+    @Autowired
+    private lateinit var permissionService: ISysPermissionService
 
     override fun getResourcesByRoleIds(roleIds: List<Long>): MutableList<SysResource> {
         return baseMapper.selectByRoleIds(roleIds)
     }
 
+    override fun getResourcesByRoleId(roleId: Long): MutableList<SysResource> {
+        return baseMapper.selectByRoleId(roleId)
+    }
+
     override fun getResourcesByMenuId(menuId: Long): MutableList<SysResource> {
         val condition = SysResource().apply {
             this.menuId = menuId
@@ -36,6 +44,9 @@ class SysResourceServiceImpl : ServiceImpl<SysResourceMapper, SysResource>(), IS
         if (baseMapper.insert(sysResource) <= 0) {
             throw ZenException(ZenExceptionEnum.BIZ_INSERT_ERROR)
         }
+
+        permissionService.updateAllSysPermission()
+
         return sysResource
     }
 
@@ -43,11 +54,19 @@ class SysResourceServiceImpl : ServiceImpl<SysResourceMapper, SysResource>(), IS
         if (baseMapper.updateById(sysResource) <= 0) {
             throw ZenException(ZenExceptionEnum.BIZ_INSERT_ERROR)
         }
+
+        /////
+        permissionService.updateAllSysPermission()
+        permissionService.updateAllSessionPermission()
+
         return sysResource
     }
 
     override fun deleteResourceById(id: Long) {
         baseMapper.physicalDeleteById(id)
+        ////
+        permissionService.updateAllSysPermission()
+        permissionService.updateAllSessionPermission()
     }
 
     override fun deleteResourcesByMenuId(menuId: Long) {
@@ -55,5 +74,8 @@ class SysResourceServiceImpl : ServiceImpl<SysResourceMapper, SysResource>(), IS
             this.menuId = menuId
         }
         baseMapper.physicalDelete(EntityWrapper(condition))
+        ////
+        permissionService.updateAllSysPermission()
+        permissionService.updateAllSessionPermission()
     }
 }

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

@@ -1,10 +1,15 @@
 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.ISysRoleService
+import com.gxzc.zen.common.exception.ZenException
+import com.gxzc.zen.common.exception.ZenExceptionEnum
 import org.springframework.stereotype.Service
+import java.io.Serializable
 
 /**
  * <p>
@@ -16,7 +21,6 @@ import org.springframework.stereotype.Service
  */
 @Service
 class SysRoleServiceImpl : ServiceImpl<SysRoleMapper, SysRole>(), ISysRoleService {
-
     override fun getRoleListByUserId(userId: Long?): MutableList<SysRole> {
         if (userId == null) {
             return mutableListOf()
@@ -24,59 +28,66 @@ class SysRoleServiceImpl : ServiceImpl<SysRoleMapper, SysRole>(), ISysRoleServic
         return baseMapper.selectByUserId(userId)
     }
 
-//    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)
-//    }
+    override fun getRoleListPage(keyword: String?, searchOption: Int?, page: Page<SysRole>, enable: Boolean?): Page<SysRole> {
+        val condition = EntityWrapper<SysRole>().apply {
+            if (!keyword.isNullOrEmpty() && searchOption != null) {
+                when (searchOption) {
+                    1 -> {
+                        // 角色名称
+                        like("name", "%$keyword%")
+                    }
+                    2 -> {
+                        // 角色代码
+                        like("code", "%$keyword%")
+                    }
+                }
+            }
+            if (enable != null) {
+                if (enable) {
+                    eq("enable", 1)
+                } else {
+                    eq("enable", 0)
+                }
+            }
+        }
+        page.records = baseMapper.selectWOLogicPage(page, condition)
+        return page
+    }
+
+    override fun getRoleList(keyword: String?, searchOption: Int?, enable: Boolean?): MutableList<SysRole> {
+        val condition = EntityWrapper<SysRole>().apply {
+            if (!keyword.isNullOrEmpty() && searchOption != null) {
+                when (searchOption) {
+                    1 -> {
+                        // 角色名称
+                        like("name", "%$keyword%")
+                    }
+                    2 -> {
+                        // 角色代码
+                        like("code", "%$keyword%")
+                    }
+                }
+            }
+            if (enable != null) {
+                if (enable) {
+                    eq("enable", 1)
+                } else {
+                    eq("enable", 0)
+                }
+            }
+        }
+        return baseMapper.selectWOLogic(condition)
+    }
+
+    override fun physicalDeleteById(id: Serializable) {
+        if (baseMapper.physicalDeleteById(id) <= 0) {
+            throw ZenException(ZenExceptionEnum.BIZ_DELETE_ERROR)
+        }
+    }
+
+    override fun updateLogicById(entity: SysRole) {
+        if (baseMapper.updateWOLogic(entity, EntityWrapper<SysRole>().eq("id", entity.id)) <= 0) {
+            throw ZenException(ZenExceptionEnum.BIZ_UPDATE_ERROR)
+        }
+    }
 }

zen-api/src/main/kotlin/com/gxzc/zen/sso/aop/CurrentUserHandler.kt

@@ -1,45 +0,0 @@
-//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 +0,0 @@
-//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/ZenPermission.kt

@@ -16,6 +16,11 @@ open class ZenPermission : Serializable {
         private const val serialVersionUID = 5640224091610186666L
     }
 
+    /**
+     * ResourceId
+     */
+    var id: Long? = null
+
     /**
      * 权限代码 (前端使用)
      */

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

@@ -12,7 +12,7 @@ import java.util.concurrent.TimeUnit
 
 /**
  * Shiro SessionDAO
- * 若继承自 AbstractSessionDAO 则不会将Session缓存(shiro-activeSessioCache:xxx)
+ * 若继承自 AbstractSessionDAO 则不会将Session缓存(shiro-activeSessioCache:xxxx)
  * 继承自 EnterpriseCacheSessionDAO 或 CachingSessionDAO 则自动将session缓存
  * 由于本项目使用Redis作为缓存框架,所以不需要额外缓存开销
  * @author NorthLan
@@ -45,8 +45,17 @@ class ShiroRedisSessionDAO : AbstractSessionDAO {
 
     override fun getActiveSessions(): MutableCollection<Session> {
         logger.debug("Get Active Sessions")
-        // TODO Get Active Sessions
-        return mutableListOf()
+        val result = mutableListOf<Session>()
+        val keys = redisTemplate.keys(getKey("*"))
+        if (keys != null && keys.isNotEmpty()) {
+            keys.forEach {
+                val session = redisTemplate.opsForValue().get(it) as? Session
+                if (session != null) {
+                    result.add(session)
+                }
+            }
+        }
+        return result
     }
 
     override fun doReadSession(sessionId: Serializable): Session? {

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

@@ -243,7 +243,7 @@ class ZenWebSessionManager : DefaultSessionManager {
             val sessionId = session.id
             storeSessionId(sessionId, request, response)
         } else {
-            log.debug("Session ID cookie is disabled.  No cookie has been set for new session with id {}", session!!.id)
+            log.debug("Session ID cookie is disabled.  No cookie has been set for new session with id {}", session.id)
         }
 
         request.removeAttribute(ShiroHttpServletRequest.REFERENCED_SESSION_ID_SOURCE)

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

@@ -13,9 +13,9 @@ object ZenHttpSession {
      * 用户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_PERMS = "PERMS" // 权限列表?
+    //    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

@@ -26,6 +26,12 @@ class UrlPermissionsFilter : PathMatchingFilter() {
      * filter比servlet更先初始化,反正就是不能自动注入
      */
     private var sysPermissionService: ISysPermissionService? = null
+        get() {
+            if (field == null) {
+                field = SpringContextHolder.getBean(ISysPermissionService::class.java)
+            }
+            return field
+        }
 
 
     // mappedValue 不需要
@@ -35,10 +41,6 @@ class UrlPermissionsFilter : PathMatchingFilter() {
             return true
         }
 
-        if (sysPermissionService == null) {
-            sysPermissionService = SpringContextHolder.getBean(ISysPermissionService::class.java)
-        }
-
         // 获取系统权限列表(数据库中定义的)
         val sysPerms = sysPermissionService!!.getAllSysPermission()
 

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

@@ -69,7 +69,7 @@ object SSOUtil {
     /**
      * 获取当前用户 目录树
      */
-    fun getCurUserMenuTree(platformId: Long): MutableList<MenuTree>? {
-        return getSession()?.getAttribute(ZenHttpSession.SESSION_KEY_USER_MENU + platformId) as? MutableList<MenuTree>
+    fun getCurUserMenuTree(): MutableList<MenuTree>? {
+        return getSession()?.getAttribute(ZenHttpSession.SESSION_KEY_USER_MENU) as? MutableList<MenuTree>
     }
 }

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

@@ -0,0 +1,42 @@
+package com.gxzc.zen.umps.util
+
+import com.gxzc.zen.common.util.SpringContextHolder
+import org.apache.shiro.session.Session
+import org.apache.shiro.session.mgt.eis.SessionDAO
+
+/**
+ * Shiro redis 工具类
+ * @author NorthLan
+ * @date 2018/5/3
+ * @url https://noahlan.com
+ */
+object ShiroRedisUtil {
+    private var sessionDAO = SpringContextHolder.getBean(SessionDAO::class.java)
+        get() {
+            if (field == null) {
+                field = SpringContextHolder.getBean(SessionDAO::class.java)
+            }
+            return field
+        }
+
+    fun getActiveSessions(): MutableCollection<Session> {
+        return sessionDAO!!.activeSessions
+    }
+
+    private fun updateSession(session: Session) {
+        sessionDAO!!.update(session)
+    }
+
+    fun removeAllSessionsAttributeKey(key: Any?) {
+        val sessions = getActiveSessions()
+        sessions.forEach { s ->
+            s.setAttribute(key, null)
+            updateSession(s)
+        }
+    }
+
+    fun removeSessionAttributeKey(session: Session, key: Any?) {
+        session.setAttribute(key, null)
+        updateSession(session)
+    }
+}

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

@@ -37,4 +37,11 @@
         </foreach>
     </select>
 
+    <select id="selectByRoleId" resultType="com.gxzc.zen.api.sys.model.SysResource">
+        SELECT A.*
+        FROM sys_resource AS A
+        INNER JOIN sys_resource_role AS B ON A.id = B.resource_id
+        WHERE B.role_id = #{roleId}
+    </select>
+
 </mapper>

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

@@ -4,15 +4,28 @@
 
     <!-- 通用查询映射结果 -->
     <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" />
+        <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>
 
+    <insert id="zenInsertOrUpdateBatch">
+        INSERT INTO `sys_resource_role`
+        (`remark`,`create_time`,`create_by`,`update_time`,`update_by`,`role_id`,`resource_id`)
+        VALUES
+        <foreach collection="list" item="item" separator=",">
+            (#{item.remark},#{item.createTime},#{item.createBy},#{item.updateTime},#{item.updateBy},#{item.roleId},#{item.resourceId})
+        </foreach>
+        ON DUPLICATE KEY UPDATE
+        update_time = VALUES(update_time),
+        update_by = VALUES(update_by),
+        remark = VALUES(remark)
+    </insert>
+
 </mapper>

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

@@ -0,0 +1,34 @@
+package com.gxzc.zen.api
+
+import org.apache.commons.collections.CollectionUtils
+import org.junit.Test
+
+/**
+ *
+ * @author NorthLan
+ * @date 2018/5/4
+ * @url https://noahlan.com
+ */
+class TestCollectionUtil {
+    @Test
+    fun testJiao() {
+        val a = mutableListOf<Int>().apply {
+            add(1)
+            add(2)
+            add(3)
+        }
+
+        val b = mutableListOf<Int>().apply {
+            add(1)
+            add(4)
+        }
+        // 差集 a b
+        val asubb = CollectionUtils.subtract(b, a)
+        // 并集
+        val union = CollectionUtils.union(a, b)
+        // 交集
+        val ins = CollectionUtils.intersection(a, b)
+
+        println("test")
+    }
+}

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

@@ -2,8 +2,8 @@ package com.gxzc.zen.common.base
 
 import com.baomidou.mybatisplus.mapper.BaseMapper
 import com.baomidou.mybatisplus.mapper.Wrapper
-import com.baomidou.mybatisplus.plugins.pagination.Pagination
 import org.apache.ibatis.annotations.Param
+import org.apache.ibatis.session.RowBounds
 import java.io.Serializable
 
 /**
@@ -26,7 +26,7 @@ interface BaseMapper<T> : BaseMapper<T> {
      * 自定义SQL查询 分页
      * 忽略 全局 逻辑删除
      */
-    fun selectWOLogicPage(page: Pagination, @Param("ew") wrapper: Wrapper<T>?): MutableList<T>
+    fun selectWOLogicPage(rowBounds: RowBounds, @Param("ew") wrapper: Wrapper<T>?): MutableList<T>
 
     /**
      * 自定义更新逻辑 更新enable字段时使用

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

@@ -1,7 +1,6 @@
 package com.gxzc.zen.common.util
 
 import com.baomidou.mybatisplus.plugins.Page
-import com.baomidou.mybatisplus.plugins.pagination.Pagination
 import javax.servlet.http.HttpServletRequest
 
 /**
@@ -22,6 +21,16 @@ object PaginationUtil {
         return request.getParameter(KEY_PAGESIZE)?.toInt()
     }
 
+    fun <T> getRequestPage(request: HttpServletRequest): Page<T>? {
+        if (!paginable(request)) {
+            return null
+        }
+        return Page<T>().apply {
+            current = getCurrent(request)!!
+            size = getPageSize(request)!!
+        }
+    }
+
     /**
      * 逻辑分页 获取分页后的list
      * @param current 当前页码
@@ -61,11 +70,14 @@ object PaginationUtil {
      *   ]
      * }
      */
-    fun <T> logicPaging(data: MutableList<T>, current: Int?, size: Int?): Pagination {
-        return Page<T>(current!!, size!!).setRecords(logicPagingList(data, current, size)).setTotal(data.size.toLong())
+    fun <T> logicPaging(data: MutableList<T>, current: Int?, size: Int?): Page<T> {
+        return Page<T>(current!!, size!!).apply {
+            records = logicPagingList(data, current, size)
+            setTotal(data.size.toLong())
+        }
     }
 
-    fun <T> logicPaging(data: MutableList<T>, request: HttpServletRequest): Pagination {
+    fun <T> logicPaging(data: MutableList<T>, request: HttpServletRequest): Page<T> {
         return logicPaging(data, getCurrent(request), getPageSize(request))
     }
 

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

@@ -0,0 +1,49 @@
+package com.gxzc.zen.web.sys.controller
+
+import com.gxzc.zen.api.sys.service.ISysResourceRoleService
+import com.gxzc.zen.api.sys.service.ISysResourceService
+import com.gxzc.zen.common.base.BaseController
+import com.gxzc.zen.common.config.request.annotation.KVType
+import com.gxzc.zen.common.config.request.annotation.KVTypeEnum
+import com.gxzc.zen.common.config.request.annotation.ZenRequestTypes
+import com.gxzc.zen.common.dto.RequestDto
+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/4
+ * @url https://noahlan.com
+ */
+@RestController
+@RequestMapping
+class ResourceRoleController : BaseController() {
+    @Autowired
+    private lateinit var resourceService: ISysResourceService
+
+    @Autowired
+    private lateinit var resourceRoleService: ISysResourceRoleService
+
+    @ApiOperation("获取某角色拥有的资源列表")
+    @GetMapping("/role/{rid}/resource")
+    fun getResourceByRoleId(@PathVariable rid: Long): ResponseEntity<*> {
+        return ResponseEntity.ok(ResponseDto().apply {
+            this.data = resourceService.getResourcesByRoleId(rid)
+        })
+    }
+
+    @Suppress("UNCHECKED_CAST")
+    @ApiOperation("保存(新增或更新用户资源映射表)")
+    @PostMapping("/role/{rid}/resource")
+    @ZenRequestTypes(KVType(key = "list", value = Long::class, type = KVTypeEnum.LIST), KVType(key = "menuId", value = Long::class))
+    fun postResourceByRoleId(@PathVariable rid: Long, @RequestBody requestDto: RequestDto): ResponseEntity<*> {
+        val menuId = requestDto["menuId"] as Long
+        val list = requestDto["list"] as List<Long>
+        resourceRoleService.saveResourceRoleByRoleId(rid, menuId, list)
+        return ResponseEntity.ok(ResponseDto())
+    }
+}

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

@@ -5,12 +5,14 @@ import com.gxzc.zen.api.sys.service.ISysRoleService
 import com.gxzc.zen.common.base.BaseController
 import com.gxzc.zen.common.config.response.annotation.ZenResponseFilter
 import com.gxzc.zen.common.dto.ResponseDto
+import com.gxzc.zen.common.exception.ZenException
+import com.gxzc.zen.common.exception.ZenExceptionEnum
 import com.gxzc.zen.common.util.PaginationUtil
+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.*
-import java.net.URI
 
 /**
  * 角色 控制器
@@ -28,43 +30,22 @@ class RoleController : BaseController() {
     @Autowired
     private lateinit var roleService: ISysRoleService
 
+
+    @ApiOperation("查询role列表")
     @GetMapping("list")
     @ZenResponseFilter(type = SysRole::class, filter = ["createBy", "createTime", "updateBy", "updateTime"])
     fun list(@RequestParam(required = false) keyword: String?,
              @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)
-//            }
-//        }
+        val result: Any = if (PaginationUtil.paginable(getRequest())) {
+            roleService.getRoleListPage(keyword, searchOption, PaginationUtil.getRequestPage(getRequest())!!, enable)
+        } else {
+            roleService.getRoleList(keyword, searchOption, enable)
+        }
         return ResponseEntity.ok(ResponseDto().apply { data = result })
     }
 
+    @ApiOperation("查询指定id的role")
     @GetMapping("{id}")
     @ZenResponseFilter(type = SysRole::class, filter = ["createBy", "updateBy", "createTime", "updateTime"])
     fun getById(@PathVariable id: Long): ResponseEntity<*> {
@@ -73,25 +54,30 @@ class RoleController : BaseController() {
         })
     }
 
+    @PostMapping
+    @ZenResponseFilter(type = SysRole::class, filter = ["createBy", "updateBy", "createTime", "updateTime"])
+    fun insertRole(@RequestBody data: SysRole): ResponseEntity<*> {
+        if (!roleService.insert(data)) {
+            throw ZenException(ZenExceptionEnum.BIZ_INSERT_ERROR)
+        }
+        return ResponseEntity.ok(ResponseDto().apply {
+            this.data = data
+        }) // 201
+    }
+
     @PutMapping
     @ZenResponseFilter(type = SysRole::class, filter = ["createBy", "updateBy", "createTime", "updateTime"])
     fun putDic(@RequestBody data: SysRole): ResponseEntity<*> {
-        return if (data.id == null) {
-            // insert
-            roleService.insert(data)
-            ResponseEntity.created(URI.create("/sys/dic/${data.id}")).body(ResponseDto()) // 201
-        } else {
-            // update
-            ResponseEntity.ok(ResponseDto().apply {
-//                this.data = roleService.modify(data) // 200
-            })
-        }
+        roleService.updateLogicById(data)
+        return ResponseEntity.ok(ResponseDto().apply {
+            this.data = data
+        })
     }
 
     @DeleteMapping("{id}")
     fun deleteDic(@PathVariable id: Long): ResponseEntity<*> {
         // 物理删除数据
-//        roleService.physicalDelete(id)
+        roleService.physicalDeleteById(id)
         return ResponseEntity.ok(ResponseDto())
     }
 }

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

@@ -10,6 +10,7 @@ import com.gxzc.zen.common.config.response.annotation.ZenResponseFilters
 import com.gxzc.zen.common.dto.RequestDto
 import com.gxzc.zen.common.dto.ResponseDto
 import com.gxzc.zen.umps.util.SSOUtil
+import io.swagger.annotations.ApiOperation
 import org.slf4j.LoggerFactory
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.http.ResponseEntity
@@ -138,6 +139,14 @@ class UserController : BaseController() {
         })
     }
 
+    @ApiOperation("获取自身拥有的资源列表")
+    @GetMapping("/resource")
+    fun getResourceByUserId(): ResponseEntity<*> {
+        return ResponseEntity.ok(ResponseDto().apply {
+            this.data = SSOUtil.getCurUserPerms()
+        })
+    }
+
     @PutMapping("/info")
     fun modifyUserInfo(@RequestBody requestDto: RequestDto): ResponseEntity<*> {
         return ResponseEntity.ok(ResponseDto())