From afc60c8476a3c380bcc1c51a875da6ed6d88b125 Mon Sep 17 00:00:00 2001 From: smallchill Date: Tue, 14 May 2019 13:45:46 +0800 Subject: [PATCH] =?UTF-8?q?:zap:=20=E4=BC=98=E5=8C=96=E7=BC=93=E5=AD=98?= =?UTF-8?q?=E5=B7=A5=E5=85=B7=E7=B1=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../springblade/system/cache/DictCache.java | 6 +++--- .../org/springblade/system/cache/SysCache.java | 18 +++++++++--------- .../system/user/cache/UserCache.java | 4 ++-- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/blade-service-api/blade-dict-api/src/main/java/org/springblade/system/cache/DictCache.java b/blade-service-api/blade-dict-api/src/main/java/org/springblade/system/cache/DictCache.java index 156cd10e..cfc5f55e 100644 --- a/blade-service-api/blade-dict-api/src/main/java/org/springblade/system/cache/DictCache.java +++ b/blade-service-api/blade-dict-api/src/main/java/org/springblade/system/cache/DictCache.java @@ -51,7 +51,7 @@ public class DictCache { * @return */ public static Dict getById(Long id) { - return CacheUtil.get(DICT_CACHE, DICT_ID + id, () -> { + return CacheUtil.get(DICT_CACHE, DICT_ID, id, () -> { R result = dictClient.getById(id); return result.getData(); }); @@ -65,7 +65,7 @@ public class DictCache { * @return */ public static String getValue(String code, Integer dictKey) { - return CacheUtil.get(DICT_CACHE, DICT_VALUE + code + StringPool.COLON + dictKey, () -> { + return CacheUtil.get(DICT_CACHE, DICT_VALUE + code + StringPool.COLON, dictKey, () -> { R result = dictClient.getValue(code, dictKey); return result.getData(); }); @@ -78,7 +78,7 @@ public class DictCache { * @return */ public static List getList(String code) { - return CacheUtil.get(DICT_CACHE, DICT_LIST + code, () -> { + return CacheUtil.get(DICT_CACHE, DICT_LIST, code, () -> { R> result = dictClient.getList(code); return result.getData(); }); diff --git a/blade-service-api/blade-system-api/src/main/java/org/springblade/system/cache/SysCache.java b/blade-service-api/blade-system-api/src/main/java/org/springblade/system/cache/SysCache.java index 68fad448..2f7b21c0 100644 --- a/blade-service-api/blade-system-api/src/main/java/org/springblade/system/cache/SysCache.java +++ b/blade-service-api/blade-system-api/src/main/java/org/springblade/system/cache/SysCache.java @@ -57,7 +57,7 @@ public class SysCache { * @return */ public static Menu getMenu(Long id) { - return CacheUtil.get(SYS_CACHE, MENU_ID + id, () -> { + return CacheUtil.get(SYS_CACHE, MENU_ID, id, () -> { R result = sysClient.getMenu(id); return result.getData(); }); @@ -70,7 +70,7 @@ public class SysCache { * @return */ public static Dept getDept(Long id) { - return CacheUtil.get(SYS_CACHE, DEPT_ID + id, () -> { + return CacheUtil.get(SYS_CACHE, DEPT_ID, id, () -> { R result = sysClient.getDept(id); return result.getData(); }); @@ -83,7 +83,7 @@ public class SysCache { * @return 部门名 */ public static String getDeptName(Long id) { - return CacheUtil.get(SYS_CACHE, DEPT_NAME_ID + id, () -> { + return CacheUtil.get(SYS_CACHE, DEPT_NAME_ID, id, () -> { R result = sysClient.getDeptName(id); return result.getData(); }); @@ -96,7 +96,7 @@ public class SysCache { * @return Role */ public static Role getRole(Long id) { - return CacheUtil.get(SYS_CACHE, ROLE_ID + id, () -> { + return CacheUtil.get(SYS_CACHE, ROLE_ID, id, () -> { R result = sysClient.getRole(id); return result.getData(); }); @@ -109,7 +109,7 @@ public class SysCache { * @return 角色名 */ public static String getRoleName(Long id) { - return CacheUtil.get(SYS_CACHE, ROLE_NAME_ID + id, () -> { + return CacheUtil.get(SYS_CACHE, ROLE_NAME_ID, id, () -> { R result = sysClient.getRoleName(id); return result.getData(); }); @@ -122,7 +122,7 @@ public class SysCache { * @return 角色别名 */ public static String getRoleAlias(Long id) { - return CacheUtil.get(SYS_CACHE, ROLE_ALIAS_ID + id, () -> { + return CacheUtil.get(SYS_CACHE, ROLE_ALIAS_ID, id, () -> { R result = sysClient.getRoleAlias(id); return result.getData(); }); @@ -136,7 +136,7 @@ public class SysCache { * @return 部门名 */ public static List getDeptNames(String deptIds) { - return CacheUtil.get(SYS_CACHE, DEPT_NAMES_ID + deptIds, () -> { + return CacheUtil.get(SYS_CACHE, DEPT_NAMES_ID, deptIds, () -> { R> result = sysClient.getDeptNames(deptIds); return result.getData(); }); @@ -149,7 +149,7 @@ public class SysCache { * @return 角色名 */ public static List getRoleNames(String roleIds) { - return CacheUtil.get(SYS_CACHE, ROLE_NAMES_ID + roleIds, () -> { + return CacheUtil.get(SYS_CACHE, ROLE_NAMES_ID, roleIds, () -> { R> result = sysClient.getRoleNames(roleIds); return result.getData(); }); @@ -162,7 +162,7 @@ public class SysCache { * @return 角色别名 */ public static List getRoleAliases(String roleIds) { - return CacheUtil.get(SYS_CACHE, ROLE_ALIASES_ID + roleIds, () -> { + return CacheUtil.get(SYS_CACHE, ROLE_ALIASES_ID, roleIds, () -> { R> result = sysClient.getRoleAliases(roleIds); return result.getData(); }); diff --git a/blade-service-api/blade-user-api/src/main/java/org/springblade/system/user/cache/UserCache.java b/blade-service-api/blade-user-api/src/main/java/org/springblade/system/user/cache/UserCache.java index c6afd146..3b0e1b59 100644 --- a/blade-service-api/blade-user-api/src/main/java/org/springblade/system/user/cache/UserCache.java +++ b/blade-service-api/blade-user-api/src/main/java/org/springblade/system/user/cache/UserCache.java @@ -33,7 +33,7 @@ import static org.springblade.core.launch.constant.FlowConstant.TASK_USR_PREFIX; * @author Chill */ public class UserCache { - private static final String USER_CACHE_ID_ = "user:id:"; + private static final String USER_CACHE_ID = "user:id:"; private static IUserClient userClient; @@ -59,7 +59,7 @@ public class UserCache { * @return */ public static User getUser(Long userId) { - return CacheUtil.get(USER_CACHE, USER_CACHE_ID_ + userId, () -> { + return CacheUtil.get(USER_CACHE, USER_CACHE_ID, userId, () -> { R result = userClient.userInfoById(userId); return result.getData(); });