From 05aee9f5dfeceea080fe2b33e5088982a18a46d5 Mon Sep 17 00:00:00 2001 From: wangxiang <1827945911@qq.com> Date: Tue, 21 Nov 2023 21:46:25 +0800 Subject: [PATCH] chore: Optimize dict cache --- .../kicc/common/core/constant/CacheConstants.java | 10 +++++----- .../core/util/UniversalCacheKeyGeneratorUtil.java | 3 ++- .../kicc/system/controller/DictDataController.java | 12 +++++++++--- 3 files changed, 16 insertions(+), 9 deletions(-) diff --git a/kicc-common/kicc-common-core/src/main/java/com/cloud/kicc/common/core/constant/CacheConstants.java b/kicc-common/kicc-common-core/src/main/java/com/cloud/kicc/common/core/constant/CacheConstants.java index 7c4b6c09..bd40bf2b 100644 --- a/kicc-common/kicc-common-core/src/main/java/com/cloud/kicc/common/core/constant/CacheConstants.java +++ b/kicc-common/kicc-common-core/src/main/java/com/cloud/kicc/common/core/constant/CacheConstants.java @@ -28,26 +28,26 @@ public interface CacheConstants { /** * oauth 客户端信息缓存 */ - String OAUTH_CLIENT_DETAILS = ServiceNameConstants.AUTH_SERVICE + ":client_details"; + String OAUTH_CLIENT_DETAILS = ServiceNameConstants.SYSTEM_SERVICE + ":client_details"; /** * 菜单信息缓存 */ - String MENU_DETAILS = ServiceNameConstants.AUTH_SERVICE + ":menu_details"; + String MENU_DETAILS = ServiceNameConstants.SYSTEM_SERVICE + ":menu_details"; /** * 用户信息缓存 */ - String USER_DETAILS = ServiceNameConstants.AUTH_SERVICE + ":user_details"; + String USER_DETAILS = ServiceNameConstants.SYSTEM_SERVICE + ":user_details"; /** * 字典信息缓存 */ - String DICT_DETAILS = ServiceNameConstants.AUTH_SERVICE + ":dict_details"; + String DICT_DETAILS = ServiceNameConstants.SYSTEM_SERVICE + ":dict_details"; /** * 全局配置缓存 */ - String CONFIG_PARAM = ServiceNameConstants.AUTH_SERVICE + ":config_param"; + String CONFIG_PARAM = ServiceNameConstants.SYSTEM_SERVICE + ":config_param"; } diff --git a/kicc-common/kicc-common-core/src/main/java/com/cloud/kicc/common/core/util/UniversalCacheKeyGeneratorUtil.java b/kicc-common/kicc-common-core/src/main/java/com/cloud/kicc/common/core/util/UniversalCacheKeyGeneratorUtil.java index 304f2e0b..0e0814ca 100644 --- a/kicc-common/kicc-common-core/src/main/java/com/cloud/kicc/common/core/util/UniversalCacheKeyGeneratorUtil.java +++ b/kicc-common/kicc-common-core/src/main/java/com/cloud/kicc/common/core/util/UniversalCacheKeyGeneratorUtil.java @@ -1,5 +1,6 @@ package com.cloud.kicc.common.core.util; +import com.cloud.kicc.common.core.constant.CommonConstants; import org.springframework.cache.interceptor.KeyGenerator; import org.springframework.lang.NonNull; import org.springframework.stereotype.Component; @@ -22,7 +23,7 @@ public class UniversalCacheKeyGeneratorUtil implements KeyGenerator { keyBuilder.append(separator).append(param); } else { // 如果参数为空，可以添加一个特殊标记，以区分不同情况 - keyBuilder.append(separator).append("Empty"); + keyBuilder.append(separator).append(CommonConstants.BACK_END_PROJECT); } } return keyBuilder.toString(); diff --git a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/controller/DictDataController.java b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/controller/DictDataController.java index 7d688be1..056d1a1e 100644 --- a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/controller/DictDataController.java +++ b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/controller/DictDataController.java @@ -55,14 +55,20 @@ public class DictDataController { } @Inner(false) - @GetMapping("/dictType") - @Cacheable(value = CacheConstants.DICT_DETAILS, keyGenerator = "universalCacheKeyGeneratorUtil") - public R dictType(String type, String tenantId) { + @GetMapping("/anonymousGetDictType") + public R anonymousGetDictType(String type, String tenantId) { return R.ok(dictDataService.list(Wrappers.query().lambda() .eq(DictData::getDictType, type) .eq(StrUtil.isNotBlank(tenantId), DictData::getTenantId, tenantId))); } + @GetMapping("/dictType") + @Cacheable(value = CacheConstants.DICT_DETAILS, keyGenerator = "universalCacheKeyGeneratorUtil") + public R dictType(String type) { + return R.ok(dictDataService.list(Wrappers.query().lambda() + .eq(DictData::getDictType, type))); + } + @SysLog("字典数据新增") @PostMapping("/save") @PreAuthorize("@pms.hasPermission('dictData_add')")