权限缓存刷新ok

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

@@ -35,21 +35,18 @@ interface ISysDicService : BaseService<SysDic> {
     /**
      * 修改SysDic项
      * 更新缓存项
-     * TODO 同时通知其他系统
      */
     fun modify(data: SysDic): SysDic
 
     /**
      * 新增字典
      * 刷新缓存
-     * TODO 通知其他系统
      */
     fun insertCacheable(data: SysDic)
 
     /**
      * 物理删除字典项
      * 刷新缓存
-     * TODO 通知其他系统
      */
     fun physicalDeleteCacheable(id: Long)
 }

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

@@ -35,21 +35,18 @@ interface ISysParamService : BaseService<SysParam> {
     /**
      * 修改SysDic项
      * 更新缓存项
-     * TODO 同时通知其他系统
      */
     fun modify(data: SysParam): SysParam
 
     /**
      * 新增字典
      * 刷新缓存
-     * TODO 通知其他系统
      */
     fun insertCacheable(data: SysParam)
 
     /**
      * 物理删除字典项
      * 刷新缓存
-     * TODO 通知其他系统
      */
     fun physicalDeleteCacheable(id: Long)
 }

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

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

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

@@ -26,13 +26,11 @@ interface ISysRoleService : BaseService<SysRole> {
 
     /**
      * 修改 角色信息
-     * TODO 通知
      */
     fun modify(entity: SysRole): SysRole
 
     /**
      * 物理删除
-     * TODO 通知
      */
     fun physicalDelete(id: Long)
 }

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

@@ -5,7 +5,6 @@ import com.gxzc.zen.api.sys.service.ISysUserRoleService
 import com.gxzc.zen.common.contants.CACHEKEYS
 import com.gxzc.zen.common.util.RedisCacheUtil
 import org.springframework.beans.factory.annotation.Autowired
-import org.springframework.cache.annotation.CacheEvict
 import org.springframework.cache.annotation.Cacheable
 import org.springframework.stereotype.Service
 
@@ -38,6 +37,10 @@ class SysPermissionServiceImpl : ISysPermissionService {
         RedisCacheUtil.evict(CACHEKEYS.USER_PERM, "${CACHEKEYS.USER_PERM}:uid_$id")
     }
 
+    override fun clearCache() {
+        RedisCacheUtil.clear(CACHEKEYS.USER_PERM)
+    }
+
 //    @PostConstruct
 //    override fun initAllUserPermissionCache() {
 //        val cache = cacheManager.getCache(CACHEKEYS.USER_PERM)

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

@@ -5,10 +5,12 @@ 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.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
 
 /**
@@ -22,6 +24,9 @@ import org.springframework.stereotype.Service
 @Service
 class SysRoleServiceImpl : ServiceImpl<SysRoleMapper, SysRole>(), ISysRoleService {
 
+    @Autowired
+    private lateinit var sysPermissionService: ISysPermissionService
+
     override fun getListByParam(name: String?, code: String?, enable: Boolean?): MutableList<SysRole> {
         val wrapper = EntityWrapper<SysRole>().apply {
             if (!name.isNullOrEmpty()) {
@@ -60,6 +65,8 @@ class SysRoleServiceImpl : ServiceImpl<SysRoleMapper, SysRole>(), ISysRoleServic
     override fun modify(entity: SysRole): SysRole {
 //        baseMapper.updateById(entity)
         baseMapper.updateWOLogic(entity, EntityWrapper<SysRole>().eq("id", entity.id))
+        // 修改role表需要直接清理所有缓存项
+        sysPermissionService.clearCache()
         return entity
     }
 
@@ -68,5 +75,7 @@ class SysRoleServiceImpl : ServiceImpl<SysRoleMapper, SysRole>(), ISysRoleServic
         if (baseMapper.physicalDeleteById(id) <= 0) {
             throw ZenException(ZenExceptionEnum.BIZ_DELETE_ERROR)
         }
+        // 修改role表需要直接清理所有缓存项
+        sysPermissionService.clearCache()
     }
 }

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

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.service.impl.ServiceImpl
 import com.gxzc.zen.api.sys.mapper.SysUserRoleMapper
 import com.gxzc.zen.api.sys.model.SysRole
 import com.gxzc.zen.api.sys.model.SysUserRole
+import com.gxzc.zen.api.sys.service.ISysPermissionService
 import com.gxzc.zen.api.sys.service.ISysUserRoleService
 import com.gxzc.zen.common.contants.CACHEKEYS
 import com.gxzc.zen.common.exception.ZenException
@@ -13,10 +14,9 @@ import com.gxzc.zen.common.util.RedisCacheUtil
 import com.gxzc.zen.orm.annotation.DynamicDataSource
 import com.gxzc.zen.orm.annotation.ZenTransactional
 import com.gxzc.zen.orm.contants.DSKey
-import org.springframework.cache.annotation.CacheEvict
+import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.cache.annotation.Cacheable
 import org.springframework.stereotype.Service
-import org.springframework.transaction.annotation.Transactional
 
 /**
  * <p>
@@ -28,8 +28,10 @@ import org.springframework.transaction.annotation.Transactional
  */
 @Service
 class SysUserRoleServiceImpl : ServiceImpl<SysUserRoleMapper, SysUserRole>(), ISysUserRoleService {
-//    @Autowired
+    //    @Autowired
 //    private lateinit var sysRoleService: ISysRoleService
+    @Autowired
+    private lateinit var sysPermissionService: ISysPermissionService
 
     @Cacheable(CACHEKEYS.USER_ROLE, key = "'${CACHEKEYS.USER_ROLE}:uid_'+ #id")
     override fun getUserRoleListByUserId(id: Long): MutableList<SysRole> {
@@ -84,6 +86,7 @@ class SysUserRoleServiceImpl : ServiceImpl<SysUserRoleMapper, SysUserRole>(), IS
     // @CacheEvict(CACHEKEYS.USER_ROLE, key = "'${CACHEKEYS.USER_ROLE}:uid_'+ #id")
     override fun evictCache(id: Long) {
         RedisCacheUtil.evict(CACHEKEYS.USER_ROLE, "${CACHEKEYS.USER_ROLE}:uid_$id")
+        sysPermissionService.evictCache(id)
     }
 
 //    override fun getUserRoleList(): Map<Long, MutableList<SysRole>> {

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

@@ -50,4 +50,11 @@ object RedisCacheUtil {
     fun evict(cacheKey: String, key: String) {
         getCahce(cacheKey)?.evict(key)
     }
+
+    /**
+     * 清除缓存
+     */
+    fun clear(cacheKey: String) {
+        getCahce(cacheKey)?.clear()
+    }
 }

zen-job/src/main/kotlin/com/gxzc/zen/job/config/XxlJobConfig.kt

@@ -41,7 +41,7 @@ class XxlJobConfig {
     @Value("\${xxl.job.executor.logretentiondays}")
     private val logRetentionDays: Int = 0
 
-    @Bean(initMethod = "start",destroyMethod = "destroy")
+    @Bean(initMethod = "start", destroyMethod = "destroy")
     fun xxlJobExecutor(): XxlJobExecutor {
         logger.info(">>>>>>>>>>>> xxl-job executor config init...")
         return XxlJobExecutor().also {

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

@@ -31,22 +31,23 @@ class RoleController : BaseController() {
     @GetMapping("list")
     @ZenResponseFilter(type = SysRole::class, filter = ["createBy", "createTime", "updateBy", "updateTime"])
     fun list(@RequestParam(required = false) keyword: String?,
-             @RequestParam(required = false) searchOption: Int?): ResponseEntity<*> {
+             @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, null, PaginationUtil.getCurrent(getRequest())!!, PaginationUtil.getPageSize(getRequest())!!)
+                        roleService.getListByParamPage(keyword, null, enable, PaginationUtil.getCurrent(getRequest())!!, PaginationUtil.getPageSize(getRequest())!!)
                     } else {
-                        roleService.getListByParam(keyword, null, null)
+                        roleService.getListByParam(keyword, null, enable)
                     }
                 }
                 2 -> {
                     result = if (PaginationUtil.paginable(getRequest())) {
-                        roleService.getListByParamPage(null, keyword, null, PaginationUtil.getCurrent(getRequest())!!, PaginationUtil.getPageSize(getRequest())!!)
+                        roleService.getListByParamPage(null, keyword, enable, PaginationUtil.getCurrent(getRequest())!!, PaginationUtil.getPageSize(getRequest())!!)
                     } else {
-                        roleService.getListByParam(null, keyword, null)
+                        roleService.getListByParam(null, keyword, enable)
                     }
                 }
                 else -> {
@@ -56,11 +57,10 @@ class RoleController : BaseController() {
             }
         } else {
             result = if (PaginationUtil.paginable(getRequest())) {
-                roleService.getListByParamPage(null, null, null, PaginationUtil.getCurrent(getRequest())!!, PaginationUtil.getPageSize(getRequest())!!)
+                roleService.getListByParamPage(null, null, enable, PaginationUtil.getCurrent(getRequest())!!, PaginationUtil.getPageSize(getRequest())!!)
             } else {
-                roleService.getListByParam(null, null, null)
+                roleService.getListByParam(null, null, enable)
             }
-
         }
         return ResponseEntity.ok(ResponseDto().apply { data = result })
     }

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

@@ -16,6 +16,9 @@ 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.orm.annotation.ZenTransactional
+import com.xxl.job.core.biz.AdminBiz
+import com.xxl.job.core.biz.model.ReturnT
+import com.xxl.job.core.rpc.netcom.NetComClientProxy
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.core.io.InputStreamResource
 import org.springframework.core.io.Resource
@@ -140,6 +143,15 @@ class TestController : BaseController() {
     @GetMapping("/testpermission2")
     @Permission("backup2:c")
     fun testpermission2() {
+    }
+
+    @GetMapping("job")
+    @Login(action = Action.Skip)
+    fun job() {
+        val biz = NetComClientProxy(AdminBiz::class.java, "http://127.0.0.1:8090${AdminBiz.MAPPING}", null).`object` as AdminBiz
+        val result = biz.triggerJob(1)
 
+        println(result)
+        println(result.toString())
     }
 }

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

@@ -2,11 +2,11 @@ xxl:
   job:
     enable: false
     admin:
-      address: http://127.0.0.1:8080
+      address: http://127.0.0.1:8090
     executor:
-      appname: xxl-job-executor-sample
-      ip: 127.0.0.1
-      port: 9999
+      appname: xxl-job-sys
+      ip: 0.0.0.0
+      port: 10001
       logpath: /data/applogs/xxl-job/jobhandler
       logretentiondays: -1
     accessToken: