diff --git a/core/core-backend/src/main/java/io/dataease/menu/manage/MenuManage.java b/core/core-backend/src/main/java/io/dataease/menu/manage/MenuManage.java index 2f4128090e..c0c11a81f2 100644 --- a/core/core-backend/src/main/java/io/dataease/menu/manage/MenuManage.java +++ b/core/core-backend/src/main/java/io/dataease/menu/manage/MenuManage.java @@ -36,7 +36,6 @@ public class MenuManage { return convertTree(treeNodes); } - // @Cacheable(cacheNames = CORE_MENU_CACHE, key = "'-dataease-'") public List coreMenus() { QueryWrapper wrapper = new QueryWrapper<>(); wrapper.orderByAsc("menu_sort"); diff --git a/core/core-backend/src/main/resources/ehcache/ehcache.xml b/core/core-backend/src/main/resources/ehcache/ehcache.xml index 05361056d6..fdaae43386 100644 --- a/core/core-backend/src/main/resources/ehcache/ehcache.xml +++ b/core/core-backend/src/main/resources/ehcache/ehcache.xml @@ -21,77 +21,77 @@ - + java.lang.String io.dataease.rsa.dao.entity.CoreRsa - + java.lang.String java.util.List - + java.lang.String java.util.List - + java.lang.String java.util.List - + java.lang.String java.util.List - + java.lang.String java.util.List - + java.lang.String java.util.List - + java.lang.String java.lang.Integer - + java.lang.String java.util.List - + java.lang.String java.util.List - + java.lang.String java.util.List - + java.lang.String io.dataease.license.bo.F2CLicResult - + java.lang.String io.dataease.api.map.vo.AreaNode - + java.lang.String java.lang.Object - + java.lang.String java.lang.Integer @@ -115,10 +115,7 @@ - - java.lang.String - java.util.List - + diff --git a/de-xpack b/de-xpack index 67bf46dbdd..629e33f358 160000 --- a/de-xpack +++ b/de-xpack @@ -1 +1 @@ -Subproject commit 67bf46dbdd54fb9148f1ed01001207764fbef874 +Subproject commit 629e33f358d666620602a14b54aef96fd9bdb805 diff --git a/sdk/common/src/main/java/io/dataease/constant/CacheConstant.java b/sdk/common/src/main/java/io/dataease/constant/CacheConstant.java index 4fe29e928b..65e0cd8468 100644 --- a/sdk/common/src/main/java/io/dataease/constant/CacheConstant.java +++ b/sdk/common/src/main/java/io/dataease/constant/CacheConstant.java @@ -2,38 +2,37 @@ package io.dataease.constant; public class CacheConstant { public static class UserCacheConstant { - public static final String USER_COUNT_CACHE = "user_count"; - public static final String USER_ECHELON_CACHE = "user_echelon"; - public static final String LOGIN_USER_CACHE = "login_user_cache"; - public static final String USER_ROLES_CACHE = "user_roles"; - public static final String USER_BUSI_PERS_CACHE = "user_busi_pers"; - public static final String USER_BUSI_PERS_INTERACTIVE_CACHE = "user_busi_pers_interactive"; + public static final String USER_COUNT_CACHE = "de_v2_user_count"; + public static final String USER_ECHELON_CACHE = "de_v2_user_echelon"; + public static final String LOGIN_USER_CACHE = "de_v2_login_user_cache"; + public static final String USER_ROLES_CACHE = "de_v2_user_roles"; + public static final String USER_BUSI_PERS_CACHE = "de_v2_user_busi_pers"; + public static final String USER_BUSI_PERS_INTERACTIVE_CACHE = "de_v2_user_busi_pers_interactive"; } public static class RoleCacheConstant { - public static final String ROLE_MENU_PERS_CACHE = "role_menu_pers"; - public static final String ROLE_BUSI_PERS_CACHE = "role_busi_pers"; - public static final String ROLE_BUSI_PERS_INTERACTIVE_CACHE = "role_busi_pers_interactive"; + public static final String ROLE_MENU_PERS_CACHE = "de_v2_role_menu_pers"; + public static final String ROLE_BUSI_PERS_CACHE = "de_v2_role_busi_pers"; + public static final String ROLE_BUSI_PERS_INTERACTIVE_CACHE = "de_v2_role_busi_pers_interactive"; } public static class OrgCacheConstant { - public static final String ORG_GLOBAL_RESOURCE_CACHE = "org_global_resource"; - public static final String ALL_OID_FLAG_RESOURCE_CACHE = "all_oid_flag_resource"; - public static final String CORE_MENU_CACHE = "core_menu_cache"; + public static final String ORG_GLOBAL_RESOURCE_CACHE = "de_v2_org_global_resource"; + public static final String ALL_OID_FLAG_RESOURCE_CACHE = "de_v2_all_oid_flag_resource"; } public static class CommonCacheConstant { - public static final String WORLD_MAP_CACHE = "world_map"; - public static final String RSA_CACHE = "rsa"; - public static final String PER_MENU_ID_CACHE = "per_menu_id"; + public static final String WORLD_MAP_CACHE = "de_v2_world_map"; + public static final String RSA_CACHE = "de_v2_rsa"; + public static final String PER_MENU_ID_CACHE = "de_v2_per_menu_id"; } public static class LicenseCacheConstant { - public static final String cacheName = "lic_cache_db"; - public static final String LIC_RESULT_CACHE = "lic_cache_result"; + public static final String cacheName = "de_v2_lic_cache_db"; + public static final String LIC_RESULT_CACHE = "de_v2_lic_cache_result"; - public static final String cacheKey = "lic_key"; + public static final String cacheKey = "de_v2_lic_key"; } } diff --git a/sdk/common/src/main/java/io/dataease/rsa/manage/RsaManage.java b/sdk/common/src/main/java/io/dataease/rsa/manage/RsaManage.java index ff346505b8..ac37a5126e 100644 --- a/sdk/common/src/main/java/io/dataease/rsa/manage/RsaManage.java +++ b/sdk/common/src/main/java/io/dataease/rsa/manage/RsaManage.java @@ -1,8 +1,8 @@ package io.dataease.rsa.manage; +import io.dataease.model.RSAModel; import io.dataease.rsa.dao.entity.CoreRsa; import io.dataease.rsa.dao.mapper.CoreRsaMapper; -import io.dataease.model.RSAModel; import io.dataease.utils.CommonBeanFactory; import io.dataease.utils.RsaUtils; import jakarta.annotation.Resource; @@ -27,7 +27,7 @@ public class RsaManage { } } - @CacheEvict(value = "rsa", key = "'-de-'") + @CacheEvict(value = RSA_CACHE, key = "'-de-'") public void save() { RSAModel model = RsaUtils.generate(); CoreRsa coreRsa = new CoreRsa(); @@ -41,12 +41,10 @@ public class RsaManage { @Cacheable(value = RSA_CACHE, key = "'-de-'", unless = "#result == null") public CoreRsa query() { - CoreRsa coreRsa = coreRsaMapper.selectById(1); - return coreRsa; + return coreRsaMapper.selectById(1); } private RsaManage proxy() { - RsaManage rsaManage = CommonBeanFactory.getBean(RsaManage.class); - return rsaManage; + return CommonBeanFactory.getBean(RsaManage.class); } }