diff --git a/src/main/java/org/springblade/common/cache/DictBizCache.java b/src/main/java/org/springblade/common/cache/DictBizCache.java index 89f2d1d..1b5c1c3 100644 --- a/src/main/java/org/springblade/common/cache/DictBizCache.java +++ b/src/main/java/org/springblade/common/cache/DictBizCache.java @@ -54,7 +54,8 @@ public class DictBizCache { * @return DictBiz */ public static DictBiz getById(Long id) { - String keyPrefix = DICT_ID.concat(StringPool.DASH).concat(AuthUtil.getTenantId()).concat(StringPool.COLON); + // String keyPrefix = DICT_VALUE.concat(StringPool.DASH).concat(AuthUtil.getTenantId()).concat(StringPool.COLON); + String keyPrefix = DICT_VALUE; return CacheUtil.get(DICT_CACHE, keyPrefix, id, () -> dictService.getById(id), BusinessConstant.TENANT_MODE); } @@ -77,7 +78,8 @@ public class DictBizCache { * @return String */ public static String getValue(String code, Integer dictKey) { - String keyPrefix = DICT_VALUE.concat(StringPool.DASH).concat(AuthUtil.getTenantId()).concat(StringPool.COLON); + // String keyPrefix = DICT_VALUE.concat(StringPool.DASH).concat(AuthUtil.getTenantId()).concat(StringPool.COLON); + String keyPrefix = DICT_VALUE; return CacheUtil.get(DICT_CACHE, keyPrefix + code + StringPool.COLON, String.valueOf(dictKey), () -> dictService.getValue(code, String.valueOf(dictKey)), BusinessConstant.TENANT_MODE); } @@ -100,7 +102,8 @@ public class DictBizCache { * @return String */ public static String getValue(String code, String dictKey) { - String keyPrefix = DICT_VALUE.concat(StringPool.DASH).concat(AuthUtil.getTenantId()).concat(StringPool.COLON); +// String keyPrefix = DICT_VALUE.concat(StringPool.DASH).concat(AuthUtil.getTenantId()).concat(StringPool.COLON); + String keyPrefix = DICT_VALUE; return CacheUtil.get(DICT_CACHE, keyPrefix + code + StringPool.COLON, dictKey, () -> dictService.getValue(code, dictKey), BusinessConstant.TENANT_MODE); } @@ -111,7 +114,8 @@ public class DictBizCache { * @return List */ public static List getList(String code) { - String keyPrefix = DICT_LIST.concat(StringPool.DASH).concat(AuthUtil.getTenantId()).concat(StringPool.COLON); + // String keyPrefix = DICT_VALUE.concat(StringPool.DASH).concat(AuthUtil.getTenantId()).concat(StringPool.COLON); + String keyPrefix = DICT_VALUE; return CacheUtil.get(DICT_CACHE, keyPrefix, code, () -> dictService.getList(code), BusinessConstant.TENANT_MODE); } diff --git a/src/main/java/org/springblade/modules/business/controller/CommonApiController.java b/src/main/java/org/springblade/modules/business/controller/CommonApiController.java index ba152c4..08bee7c 100644 --- a/src/main/java/org/springblade/modules/business/controller/CommonApiController.java +++ b/src/main/java/org/springblade/modules/business/controller/CommonApiController.java @@ -42,8 +42,8 @@ public class CommonApiController extends BladeController { return R.data(CommonDateUtil.getNowString()); } - @GetMapping("/test") - public R test() { - return R.data(DictBizCache.getDictValueWithOffset(BusinessConstant.DICT_KEY_BLACKLIST_OUTDATE)); - } +// @GetMapping("/test") +// public R test() { +// return R.data(DictBizCache.getDictValueWithOffset(BusinessConstant.DICT_KEY_BLACKLIST_OUTDATE)); +// } } diff --git a/src/main/java/org/springblade/modules/business/service/impl/ApmRecordServiceImpl.java b/src/main/java/org/springblade/modules/business/service/impl/ApmRecordServiceImpl.java index f359883..226eda5 100644 --- a/src/main/java/org/springblade/modules/business/service/impl/ApmRecordServiceImpl.java +++ b/src/main/java/org/springblade/modules/business/service/impl/ApmRecordServiceImpl.java @@ -121,7 +121,6 @@ public class ApmRecordServiceImpl extends BaseServiceImpl