diff --git a/blade-ops/blade-flow/src/main/java/org/springblade/flow/engine/utils/FlowCache.java b/blade-ops/blade-flow/src/main/java/org/springblade/flow/engine/utils/FlowCache.java index 9e43acdd..8cc797ba 100644 --- a/blade-ops/blade-flow/src/main/java/org/springblade/flow/engine/utils/FlowCache.java +++ b/blade-ops/blade-flow/src/main/java/org/springblade/flow/engine/utils/FlowCache.java @@ -36,8 +36,11 @@ public class FlowCache { private static final String FLOW_DEFINITION_ID = "definition:id:"; private static RepositoryService repositoryService; - static { - repositoryService = SpringUtil.getBean(RepositoryService.class); + private static RepositoryService getRepositoryService() { + if (repositoryService == null) { + repositoryService = SpringUtil.getBean(RepositoryService.class); + } + return repositoryService; } /** @@ -47,7 +50,7 @@ public class FlowCache { * @return */ public static ProcessDefinition getProcessDefinition(String processDefinitionId) { - return CacheUtil.get(FLOW_CACHE, FLOW_DEFINITION_ID , processDefinitionId, () -> repositoryService.createProcessDefinitionQuery().processDefinitionId(processDefinitionId).singleResult()); + return CacheUtil.get(FLOW_CACHE, FLOW_DEFINITION_ID , processDefinitionId, () -> getRepositoryService().createProcessDefinitionQuery().processDefinitionId(processDefinitionId).singleResult()); } /** 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 cfc5f55e..336b6047 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 @@ -40,8 +40,11 @@ public class DictCache { private static IDictClient dictClient; - static { - dictClient = SpringUtil.getBean(IDictClient.class); + private static IDictClient getDictClient() { + if (dictClient == null) { + dictClient = SpringUtil.getBean(IDictClient.class); + } + return dictClient; } /** @@ -52,7 +55,7 @@ public class DictCache { */ public static Dict getById(Long id) { return CacheUtil.get(DICT_CACHE, DICT_ID, id, () -> { - R result = dictClient.getById(id); + R result = getDictClient().getById(id); return result.getData(); }); } @@ -66,7 +69,7 @@ public class DictCache { */ public static String getValue(String code, Integer dictKey) { return CacheUtil.get(DICT_CACHE, DICT_VALUE + code + StringPool.COLON, dictKey, () -> { - R result = dictClient.getValue(code, dictKey); + R result = getDictClient().getValue(code, dictKey); return result.getData(); }); } @@ -79,7 +82,7 @@ public class DictCache { */ public static List getList(String code) { return CacheUtil.get(DICT_CACHE, DICT_LIST, code, () -> { - R> result = dictClient.getList(code); + R> result = getDictClient().getList(code); return result.getData(); }); } diff --git a/blade-service-api/blade-scope-api/src/main/java/org/springblade/system/cache/ApiScopeCache.java b/blade-service-api/blade-scope-api/src/main/java/org/springblade/system/cache/ApiScopeCache.java index 9495a2b6..4d1c186c 100644 --- a/blade-service-api/blade-scope-api/src/main/java/org/springblade/system/cache/ApiScopeCache.java +++ b/blade-service-api/blade-scope-api/src/main/java/org/springblade/system/cache/ApiScopeCache.java @@ -36,8 +36,11 @@ public class ApiScopeCache { private static IApiScopeClient apiScopeClient; - static { - apiScopeClient = SpringUtil.getBean(IApiScopeClient.class); + private static IApiScopeClient getApiScopeClient() { + if (apiScopeClient == null) { + apiScopeClient = SpringUtil.getBean(IApiScopeClient.class); + } + return apiScopeClient; } /** @@ -49,7 +52,7 @@ public class ApiScopeCache { public static List permissionPath(String roleId) { List permissions = CacheUtil.get(SYS_CACHE, SCOPE_CACHE_CODE, roleId, List.class); if (permissions == null) { - permissions = apiScopeClient.permissionPath(roleId); + permissions = getApiScopeClient().permissionPath(roleId); CacheUtil.put(SYS_CACHE, SCOPE_CACHE_CODE, roleId, permissions); } return permissions; @@ -65,7 +68,7 @@ public class ApiScopeCache { public static List permissionCode(String permission, String roleId) { List permissions = CacheUtil.get(SYS_CACHE, SCOPE_CACHE_CODE, permission + StringPool.COLON + roleId, List.class); if (permissions == null) { - permissions = apiScopeClient.permissionCode(permission, roleId); + permissions = getApiScopeClient().permissionCode(permission, roleId); CacheUtil.put(SYS_CACHE, SCOPE_CACHE_CODE, permission + StringPool.COLON + roleId, permissions); } return permissions; diff --git a/blade-service-api/blade-scope-api/src/main/java/org/springblade/system/cache/DataScopeCache.java b/blade-service-api/blade-scope-api/src/main/java/org/springblade/system/cache/DataScopeCache.java index 895d3a5a..05168eba 100644 --- a/blade-service-api/blade-scope-api/src/main/java/org/springblade/system/cache/DataScopeCache.java +++ b/blade-service-api/blade-scope-api/src/main/java/org/springblade/system/cache/DataScopeCache.java @@ -40,8 +40,11 @@ public class DataScopeCache { private static IDataScopeClient dataScopeClient; - static { - dataScopeClient = SpringUtil.getBean(IDataScopeClient.class); + private static IDataScopeClient getDataScopeClient() { + if (dataScopeClient == null) { + dataScopeClient = SpringUtil.getBean(IDataScopeClient.class); + } + return dataScopeClient; } /** @@ -54,7 +57,7 @@ public class DataScopeCache { public static DataScopeModel getDataScopeByMapper(String mapperId, String roleId) { DataScopeModel dataScope = CacheUtil.get(SYS_CACHE, SCOPE_CACHE_CLASS, mapperId + StringPool.COLON + roleId, DataScopeModel.class); if (dataScope == null) { - dataScope = dataScopeClient.getDataScopeByMapper(mapperId, roleId); + dataScope = getDataScopeClient().getDataScopeByMapper(mapperId, roleId); CacheUtil.put(SYS_CACHE, SCOPE_CACHE_CLASS, mapperId + StringPool.COLON + roleId, dataScope); } return dataScope; @@ -69,7 +72,7 @@ public class DataScopeCache { public static DataScopeModel getDataScopeByCode(String code) { DataScopeModel dataScope = CacheUtil.get(SYS_CACHE, SCOPE_CACHE_CODE, code, DataScopeModel.class); if (dataScope == null) { - dataScope = dataScopeClient.getDataScopeByCode(code); + dataScope = getDataScopeClient().getDataScopeByCode(code); CacheUtil.put(SYS_CACHE, SCOPE_CACHE_CODE, code, dataScope); } return dataScope; @@ -84,7 +87,7 @@ public class DataScopeCache { public static List getDeptAncestors(Long deptId) { List ancestors = CacheUtil.get(SYS_CACHE, DEPT_CACHE_ANCESTORS, deptId, List.class); if (CollectionUtil.isEmpty(ancestors)) { - ancestors = dataScopeClient.getDeptAncestors(deptId); + ancestors = getDataScopeClient().getDeptAncestors(deptId); CacheUtil.put(SYS_CACHE, DEPT_CACHE_ANCESTORS, deptId, ancestors); } return ancestors; 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 0c6aed5b..dc603688 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 @@ -48,8 +48,11 @@ public class SysCache { private static ISysClient sysClient; - static { - sysClient = SpringUtil.getBean(ISysClient.class); + private static ISysClient getSysClient() { + if (sysClient == null) { + sysClient = SpringUtil.getBean(ISysClient.class); + } + return sysClient; } /** @@ -60,7 +63,7 @@ public class SysCache { */ public static Menu getMenu(Long id) { return CacheUtil.get(SYS_CACHE, MENU_ID, id, () -> { - R result = sysClient.getMenu(id); + R result = getSysClient().getMenu(id); return result.getData(); }); } @@ -73,7 +76,7 @@ public class SysCache { */ public static Dept getDept(Long id) { return CacheUtil.get(SYS_CACHE, DEPT_ID, id, () -> { - R result = sysClient.getDept(id); + R result = getSysClient().getDept(id); return result.getData(); }); } @@ -86,7 +89,7 @@ public class SysCache { */ public static String getDeptName(Long id) { return CacheUtil.get(SYS_CACHE, DEPT_NAME_ID, id, () -> { - R result = sysClient.getDeptName(id); + R result = getSysClient().getDeptName(id); return result.getData(); }); } @@ -99,7 +102,7 @@ public class SysCache { */ public static Role getRole(Long id) { return CacheUtil.get(SYS_CACHE, ROLE_ID, id, () -> { - R result = sysClient.getRole(id); + R result = getSysClient().getRole(id); return result.getData(); }); } @@ -112,7 +115,7 @@ public class SysCache { */ public static String getRoleName(Long id) { return CacheUtil.get(SYS_CACHE, ROLE_NAME_ID, id, () -> { - R result = sysClient.getRoleName(id); + R result = getSysClient().getRoleName(id); return result.getData(); }); } @@ -125,7 +128,7 @@ public class SysCache { */ public static String getRoleAlias(Long id) { return CacheUtil.get(SYS_CACHE, ROLE_ALIAS_ID, id, () -> { - R result = sysClient.getRoleAlias(id); + R result = getSysClient().getRoleAlias(id); return result.getData(); }); } @@ -139,7 +142,7 @@ public class SysCache { */ public static List getDeptNames(String deptIds) { return CacheUtil.get(SYS_CACHE, DEPT_NAMES_ID, deptIds, () -> { - R> result = sysClient.getDeptNames(deptIds); + R> result = getSysClient().getDeptNames(deptIds); return result.getData(); }); } @@ -152,7 +155,7 @@ public class SysCache { */ public static List getRoleNames(String roleIds) { return CacheUtil.get(SYS_CACHE, ROLE_NAMES_ID, roleIds, () -> { - R> result = sysClient.getRoleNames(roleIds); + R> result = getSysClient().getRoleNames(roleIds); return result.getData(); }); } @@ -165,7 +168,7 @@ public class SysCache { */ public static List getRoleAliases(String roleIds) { return CacheUtil.get(SYS_CACHE, ROLE_ALIASES_ID, roleIds, () -> { - R> result = sysClient.getRoleAliases(roleIds); + R> result = getSysClient().getRoleAliases(roleIds); return result.getData(); }); } @@ -178,7 +181,7 @@ public class SysCache { */ public static Tenant getTenant(Long id) { return CacheUtil.get(SYS_CACHE, TENANT_ID, id, () -> { - R result = sysClient.getTenant(id); + R result = getSysClient().getTenant(id); 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 3b0e1b59..643ddbc8 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 @@ -37,8 +37,11 @@ public class UserCache { private static IUserClient userClient; - static { - userClient = SpringUtil.getBean(IUserClient.class); + private static IUserClient getUserClient() { + if (userClient == null) { + userClient = SpringUtil.getBean(IUserClient.class); + } + return userClient; } /** @@ -60,7 +63,7 @@ public class UserCache { */ public static User getUser(Long userId) { return CacheUtil.get(USER_CACHE, USER_CACHE_ID, userId, () -> { - R result = userClient.userInfoById(userId); + R result = getUserClient().userInfoById(userId); return result.getData(); }); }