From e33b663dcf2d8d9e92d742cefb0469c1a1676b38 Mon Sep 17 00:00:00 2001 From: fengshuonan Date: Fri, 14 Jul 2023 22:28:27 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=908.0=E3=80=91=E3=80=90sys=E3=80=91?= =?UTF-8?q?=E3=80=90org=E3=80=91=E6=9B=B4=E6=96=B0sys=E6=A8=A1=E5=9D=97?= =?UTF-8?q?=E7=BC=93=E5=AD=98=E7=9A=84=E8=BF=87=E6=9C=9F=E6=97=B6=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../roses/kernel/sys/api/constants/SysConstants.java | 5 +++++ .../modular/org/service/impl/HrOrganizationServiceImpl.java | 5 +++-- .../modular/user/service/impl/SysUserRoleServiceImpl.java | 3 ++- .../starter/cache/org/OrgMemoryCacheAutoConfiguration.java | 3 ++- .../starter/cache/user/UserMemoryCacheAutoConfiguration.java | 3 ++- 5 files changed, 14 insertions(+), 5 deletions(-) diff --git a/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/sys/api/constants/SysConstants.java b/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/sys/api/constants/SysConstants.java index 942fbdb9c..4d8a232cb 100644 --- a/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/sys/api/constants/SysConstants.java +++ b/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/sys/api/constants/SysConstants.java @@ -67,4 +67,9 @@ public interface SysConstants { */ String ADMIN_USER_ACCOUNT = "admin"; + /** + * 默认的sys模块的缓存超时时间 + */ + Long DEFAULT_SYS_CACHE_TIMEOUT_SECONDS = 3600L; + } diff --git a/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/sys/modular/org/service/impl/HrOrganizationServiceImpl.java b/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/sys/modular/org/service/impl/HrOrganizationServiceImpl.java index d97fefb64..a33964939 100644 --- a/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/sys/modular/org/service/impl/HrOrganizationServiceImpl.java +++ b/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/sys/modular/org/service/impl/HrOrganizationServiceImpl.java @@ -17,6 +17,7 @@ import cn.stylefeng.roses.kernel.rule.constants.TreeConstants; import cn.stylefeng.roses.kernel.rule.exception.base.ServiceException; import cn.stylefeng.roses.kernel.rule.tree.factory.DefaultTreeBuildFactory; import cn.stylefeng.roses.kernel.sys.api.callback.RemoveOrgCallbackApi; +import cn.stylefeng.roses.kernel.sys.api.constants.SysConstants; import cn.stylefeng.roses.kernel.sys.api.enums.org.OrgTypeEnum; import cn.stylefeng.roses.kernel.sys.api.exception.enums.OrgExceptionEnum; import cn.stylefeng.roses.kernel.sys.api.pojo.org.CompanyDeptDTO; @@ -433,11 +434,11 @@ public class HrOrganizationServiceImpl extends ServiceImpl 0) { // 过期时间3600秒 - sysOrgSubFlagCache.put(orgId.toString(), true, 3600L); + sysOrgSubFlagCache.put(orgId.toString(), true, SysConstants.DEFAULT_SYS_CACHE_TIMEOUT_SECONDS); return true; } else { // 过期时间3600秒 - sysOrgSubFlagCache.put(orgId.toString(), false, 3600L); + sysOrgSubFlagCache.put(orgId.toString(), false, SysConstants.DEFAULT_SYS_CACHE_TIMEOUT_SECONDS); return false; } } diff --git a/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/sys/modular/user/service/impl/SysUserRoleServiceImpl.java b/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/sys/modular/user/service/impl/SysUserRoleServiceImpl.java index db2df5241..6c17e59cb 100644 --- a/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/sys/modular/user/service/impl/SysUserRoleServiceImpl.java +++ b/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/sys/modular/user/service/impl/SysUserRoleServiceImpl.java @@ -7,6 +7,7 @@ import cn.stylefeng.roses.kernel.rule.exception.base.ServiceException; import cn.stylefeng.roses.kernel.sys.api.SysRoleServiceApi; import cn.stylefeng.roses.kernel.sys.api.callback.RemoveRoleCallbackApi; import cn.stylefeng.roses.kernel.sys.api.callback.RemoveUserCallbackApi; +import cn.stylefeng.roses.kernel.sys.api.constants.SysConstants; import cn.stylefeng.roses.kernel.sys.modular.user.entity.SysUserRole; import cn.stylefeng.roses.kernel.sys.modular.user.enums.SysUserExceptionEnum; import cn.stylefeng.roses.kernel.sys.modular.user.mapper.SysUserRoleMapper; @@ -137,7 +138,7 @@ public class SysUserRoleServiceImpl extends ServiceImpl sysOrgSubFlagCache() { // 1小时过期 - TimedCache themeCache = CacheUtil.newTimedCache(1000 * 3600); + TimedCache themeCache = CacheUtil.newTimedCache(1000 * SysConstants.DEFAULT_SYS_CACHE_TIMEOUT_SECONDS); return new SysOrgSubFlagMemoryCache(themeCache); } diff --git a/kernel-s-system/system-spring-boot-starter/src/main/java/cn/stylefeng/roses/kernel/sys/starter/cache/user/UserMemoryCacheAutoConfiguration.java b/kernel-s-system/system-spring-boot-starter/src/main/java/cn/stylefeng/roses/kernel/sys/starter/cache/user/UserMemoryCacheAutoConfiguration.java index 12f9a50da..83b219ae0 100644 --- a/kernel-s-system/system-spring-boot-starter/src/main/java/cn/stylefeng/roses/kernel/sys/starter/cache/user/UserMemoryCacheAutoConfiguration.java +++ b/kernel-s-system/system-spring-boot-starter/src/main/java/cn/stylefeng/roses/kernel/sys/starter/cache/user/UserMemoryCacheAutoConfiguration.java @@ -27,6 +27,7 @@ package cn.stylefeng.roses.kernel.sys.starter.cache.user; import cn.hutool.cache.CacheUtil; import cn.hutool.cache.impl.TimedCache; import cn.stylefeng.roses.kernel.cache.api.CacheOperatorApi; +import cn.stylefeng.roses.kernel.sys.api.constants.SysConstants; import cn.stylefeng.roses.kernel.sys.modular.user.cache.userrole.UserRoleMemoryCache; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingClass; import org.springframework.context.annotation.Bean; @@ -53,7 +54,7 @@ public class UserMemoryCacheAutoConfiguration { @Bean public CacheOperatorApi> userRoleCache() { // 1小时过期 - TimedCache> cache = CacheUtil.newTimedCache(1000 * 3600); + TimedCache> cache = CacheUtil.newTimedCache(1000 * SysConstants.DEFAULT_SYS_CACHE_TIMEOUT_SECONDS); return new UserRoleMemoryCache(cache); }