center/dataease-dm
center/dataease-dm
13
0
Fork 0
forked from github/dataease
Code Pull Requests Activity

perf: 缓存增加前缀避免重复

Browse Source
This commit is contained in:
fit2cloud-chenyw 2024-04-11 18:22:35 +08:00
parent 6954856ce8
commit cf11f561c4
5 changed files with 38 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
core/core-backend/src/main/java/io/dataease/menu/manage/MenuManage.java
View File

@ -36,7 +36,6 @@ public class MenuManage {
return convertTree(treeNodes);
}
// @Cacheable(cacheNames = CORE_MENU_CACHE, key = "'-dataease-'")
public List<CoreMenu> coreMenus() {
QueryWrapper<CoreMenu> wrapper = new QueryWrapper<>();
wrapper.orderByAsc("menu_sort");

35
core/core-backend/src/main/resources/ehcache/ehcache.xml
View File

@ -21,77 +21,77 @@
</cache-template>
<cache alias="rsa" uses-template="common-cache">
<cache alias="de_v2_rsa" uses-template="common-cache">
<key-type>java.lang.String</key-type>
<value-type>io.dataease.rsa.dao.entity.CoreRsa</value-type>
</cache>
<!--以下属于权限系统缓存-->
<!--用户角色缓存-->
<cache alias="user_roles" uses-template="common-cache">
<cache alias="de_v2_user_roles" uses-template="common-cache">
<key-type>java.lang.String</key-type>
<value-type>java.util.List</value-type>
</cache>
<!--用户资源权限缓存-->
<cache alias="user_busi_pers" uses-template="common-cache">
<cache alias="de_v2_user_busi_pers" uses-template="common-cache">
<key-type>java.lang.String</key-type>
<value-type>java.util.List</value-type>
</cache>
<!--角色资源权限缓存-->
<cache alias="role_busi_pers" uses-template="common-cache">
<cache alias="de_v2_role_busi_pers" uses-template="common-cache">
<key-type>java.lang.String</key-type>
<value-type>java.util.List</value-type>
</cache>
<!--角色菜单权限缓存-->
<cache alias="role_menu_pers" uses-template="common-cache">
<cache alias="de_v2_role_menu_pers" uses-template="common-cache">
<key-type>java.lang.String</key-type>
<value-type>java.util.List</value-type>
</cache>
<!--组织内所有资源缓存 包括 用户 角色 数据源 数据集 仪表板 大屏 key由什么组成？组织id+flag 例如orgid + '1'-->
<cache alias="org_global_resource" uses-template="common-cache">
<cache alias="de_v2_org_global_resource" uses-template="common-cache">
<key-type>java.lang.String</key-type>
<value-type>java.util.List</value-type>
</cache>
<cache alias="all_oid_flag_resource" uses-template="common-cache">
<cache alias="de_v2_all_oid_flag_resource" uses-template="common-cache">
<key-type>java.lang.String</key-type>
<value-type>java.util.List</value-type>
</cache>
<cache alias="user_count" uses-template="common-cache">
<cache alias="de_v2_user_count" uses-template="common-cache">
<key-type>java.lang.String</key-type>
<value-type>java.lang.Integer</value-type>
</cache>
<cache alias="user_echelon" uses-template="common-cache">
<cache alias="de_v2_user_echelon" uses-template="common-cache">
<key-type>java.lang.String</key-type>
<value-type>java.util.List</value-type>
</cache>
<cache alias="role_busi_pers_interactive" uses-template="common-cache">
<cache alias="de_v2_role_busi_pers_interactive" uses-template="common-cache">
<key-type>java.lang.String</key-type>
<value-type>java.util.List</value-type>
</cache>
<cache alias="user_busi_pers_interactive" uses-template="common-cache">
<cache alias="de_v2_user_busi_pers_interactive" uses-template="common-cache">
<key-type>java.lang.String</key-type>
<value-type>java.util.List</value-type>
</cache>
<cache alias="lic_cache_result" uses-template="common-cache">
<cache alias="de_v2_lic_cache_result" uses-template="common-cache">
<key-type>java.lang.String</key-type>
<value-type>io.dataease.license.bo.F2CLicResult</value-type>
</cache>
<cache alias="world_map" uses-template="common-cache">
<cache alias="de_v2_world_map" uses-template="common-cache">
<key-type>java.lang.String</key-type>
<value-type>io.dataease.api.map.vo.AreaNode</value-type>
</cache>
<cache alias="login_user_cache" uses-template="common-cache">
<cache alias="de_v2_login_user_cache" uses-template="common-cache">
<key-type>java.lang.String</key-type>
<value-type>java.lang.Object</value-type>
</cache>
<cache alias="user_token_cache">
<cache alias="de_v2_user_token_cache">
<key-type>java.lang.String</key-type>
<value-type>java.lang.Integer</value-type>
<expiry>
@ -115,10 +115,7 @@
</resources>
</cache>
<cache alias="core_menu_cache" uses-template="common-cache">
<key-type>java.lang.String</key-type>
<value-type>java.util.List</value-type>
</cache>
</config>

2
de-xpack

@ -1 +1 @@
Subproject commit 67bf46dbdd54fb9148f1ed01001207764fbef874
Subproject commit 629e33f358d666620602a14b54aef96fd9bdb805

35
sdk/common/src/main/java/io/dataease/constant/CacheConstant.java
View File

@ -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";
}
}

10
sdk/common/src/main/java/io/dataease/rsa/manage/RsaManage.java
View File

@ -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);
}
}