From 2985312ffa80adaf144c44c35bb03a3d26010187 Mon Sep 17 00:00:00 2001 From: smallchill Date: Wed, 26 Feb 2020 16:44:33 +0800 Subject: [PATCH] =?UTF-8?q?:zap:=20=E4=B8=9A=E5=8A=A1=E5=AD=97=E5=85=B8?= =?UTF-8?q?=E7=BC=93=E5=AD=98=E5=8A=A0=E4=B8=8A=E7=A7=9F=E6=88=B7=E5=8C=BA?= =?UTF-8?q?=E5=88=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../system/cache/DictBizCache.java | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/blade-service-api/blade-dict-api/src/main/java/org/springblade/system/cache/DictBizCache.java b/blade-service-api/blade-dict-api/src/main/java/org/springblade/system/cache/DictBizCache.java index 759d2577..c32dadf7 100644 --- a/blade-service-api/blade-dict-api/src/main/java/org/springblade/system/cache/DictBizCache.java +++ b/blade-service-api/blade-dict-api/src/main/java/org/springblade/system/cache/DictBizCache.java @@ -17,6 +17,7 @@ package org.springblade.system.cache; import org.springblade.core.cache.utils.CacheUtil; +import org.springblade.core.secure.utils.AuthUtil; import org.springblade.core.tool.api.R; import org.springblade.core.tool.utils.SpringUtil; import org.springblade.core.tool.utils.StringPool; @@ -34,9 +35,9 @@ import static org.springblade.core.cache.constant.CacheConstant.DICT_CACHE; */ public class DictBizCache { - private static final String DICT_ID = "dictBiz:id:"; - private static final String DICT_VALUE = "dictBiz:value:"; - private static final String DICT_LIST = "dictBiz:list:"; + private static final String DICT_ID = "dictBiz:id"; + private static final String DICT_VALUE = "dictBiz:value"; + private static final String DICT_LIST = "dictBiz:list"; private static IDictBizClient dictClient; @@ -54,7 +55,8 @@ public class DictBizCache { * @return */ public static DictBiz getById(Long id) { - return CacheUtil.get(DICT_CACHE, DICT_ID, id, () -> { + String keyPrefix = DICT_ID.concat(StringPool.DASH).concat(AuthUtil.getTenantId()).concat(StringPool.COLON); + return CacheUtil.get(DICT_CACHE, keyPrefix, id, () -> { R result = getDictClient().getById(id); return result.getData(); }); @@ -68,7 +70,8 @@ public class DictBizCache { * @return */ public static String getValue(String code, Integer dictKey) { - return CacheUtil.get(DICT_CACHE, DICT_VALUE + code + StringPool.COLON, String.valueOf(dictKey), () -> { + String keyPrefix = DICT_VALUE.concat(StringPool.DASH).concat(AuthUtil.getTenantId()).concat(StringPool.COLON); + return CacheUtil.get(DICT_CACHE, keyPrefix + code + StringPool.COLON, String.valueOf(dictKey), () -> { R result = getDictClient().getValue(code, String.valueOf(dictKey)); return result.getData(); }); @@ -82,7 +85,8 @@ public class DictBizCache { * @return */ public static String getValue(String code, String dictKey) { - return CacheUtil.get(DICT_CACHE, DICT_VALUE + code + StringPool.COLON, dictKey, () -> { + String keyPrefix = DICT_VALUE.concat(StringPool.DASH).concat(AuthUtil.getTenantId()).concat(StringPool.COLON); + return CacheUtil.get(DICT_CACHE, keyPrefix + code + StringPool.COLON, dictKey, () -> { R result = getDictClient().getValue(code, dictKey); return result.getData(); }); @@ -95,7 +99,8 @@ public class DictBizCache { * @return */ public static List getList(String code) { - return CacheUtil.get(DICT_CACHE, DICT_LIST, code, () -> { + String keyPrefix = DICT_LIST.concat(StringPool.DASH).concat(AuthUtil.getTenantId()).concat(StringPool.COLON); + return CacheUtil.get(DICT_CACHE, keyPrefix, code, () -> { R> result = getDictClient().getList(code); return result.getData(); });