diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/resources/templates/orion-server-module-service-impl.java.vm b/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/resources/templates/orion-server-module-service-impl.java.vm index 50227646..2bec589f 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/resources/templates/orion-server-module-service-impl.java.vm +++ b/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/resources/templates/orion-server-module-service-impl.java.vm @@ -32,6 +32,7 @@ import org.dromara.visor.common.constant.ErrorMessage; import org.dromara.visor.common.utils.Assert; #if($meta.enableCache) import org.dromara.visor.framework.redis.core.utils.RedisMaps; +import org.dromara.visor.framework.redis.core.utils.RedisUtils; import org.dromara.visor.framework.redis.core.utils.barrier.CacheBarriers; #end #foreach($pkg in ${customModuleFilePackages}) @@ -76,7 +77,7 @@ public class ${table.serviceImplName} implements ${table.serviceName} { log.info("${type}Service-create${type} id: {}, effect: {}", id, effect); #if($meta.enableCache) // 删除缓存 - RedisMaps.delete(${type}CacheKeyDefine.${typeConst}); + RedisUtils.delete(${type}CacheKeyDefine.${typeConst}); #end return id; } @@ -98,7 +99,7 @@ public class ${table.serviceImplName} implements ${table.serviceName} { log.info("${type}Service-update${type}ById effect: {}", effect); #if($meta.enableCache) // 删除缓存 - RedisMaps.delete(${type}CacheKeyDefine.${typeConst}); + RedisUtils.delete(${type}CacheKeyDefine.${typeConst}); #end return effect; } @@ -116,7 +117,7 @@ public class ${table.serviceImplName} implements ${table.serviceName} { log.info("${type}Service.update${type} effect: {}", effect); #if($meta.enableCache) // 删除缓存 - RedisMaps.delete(${type}CacheKeyDefine.${typeConst}); + RedisUtils.delete(${type}CacheKeyDefine.${typeConst}); #end return effect; } @@ -237,7 +238,7 @@ public class ${table.serviceImplName} implements ${table.serviceName} { log.info("${type}Service.delete${type} effect: {}", effect); #if($meta.enableCache) // 删除缓存 - RedisMaps.delete(${type}CacheKeyDefine.${typeConst}); + RedisUtils.delete(${type}CacheKeyDefine.${typeConst}); #end return effect; } diff --git a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/impl/HostIdentityServiceImpl.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/impl/HostIdentityServiceImpl.java index b9878a39..f86e9647 100644 --- a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/impl/HostIdentityServiceImpl.java +++ b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/impl/HostIdentityServiceImpl.java @@ -110,7 +110,7 @@ public class HostIdentityServiceImpl implements HostIdentityService { int effect = hostIdentityDAO.insert(record); log.info("HostIdentityService-createHostIdentity effect: {}", effect); // 删除缓存 - RedisMaps.delete(HostCacheKeyDefine.HOST_IDENTITY); + RedisUtils.delete(HostCacheKeyDefine.HOST_IDENTITY); return record.getId(); } @@ -143,7 +143,7 @@ public class HostIdentityServiceImpl implements HostIdentityService { int effect = hostIdentityDAO.update(updateRecord, wrapper); log.info("HostIdentityService-updateHostIdentityById effect: {}", effect); // 删除缓存 - RedisMaps.delete(HostCacheKeyDefine.HOST_IDENTITY); + RedisUtils.delete(HostCacheKeyDefine.HOST_IDENTITY); return effect; } diff --git a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/impl/HostKeyServiceImpl.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/impl/HostKeyServiceImpl.java index 94830dac..d2ad3393 100644 --- a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/impl/HostKeyServiceImpl.java +++ b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/impl/HostKeyServiceImpl.java @@ -104,7 +104,7 @@ public class HostKeyServiceImpl implements HostKeyService { log.info("HostKeyService-createHostKey effect: {}", effect); Long id = record.getId(); // 删除缓存 - RedisMaps.delete(HostCacheKeyDefine.HOST_KEY); + RedisUtils.delete(HostCacheKeyDefine.HOST_KEY); return id; } @@ -128,7 +128,7 @@ public class HostKeyServiceImpl implements HostKeyService { int effect = hostKeyDAO.updateById(updateRecord); // 删除缓存 if (!record.getName().equals(updateRecord.getName())) { - RedisMaps.delete(HostCacheKeyDefine.HOST_KEY); + RedisUtils.delete(HostCacheKeyDefine.HOST_KEY); } log.info("HostKeyService-updateHostKeyById effect: {}", effect); return effect; diff --git a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/impl/HostServiceImpl.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/impl/HostServiceImpl.java index 5c729a8a..505c1fab 100644 --- a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/impl/HostServiceImpl.java +++ b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/impl/HostServiceImpl.java @@ -39,6 +39,7 @@ import org.dromara.visor.common.utils.Assert; import org.dromara.visor.framework.biz.operator.log.core.utils.OperatorLogs; import org.dromara.visor.framework.mybatis.core.query.DataQuery; import org.dromara.visor.framework.redis.core.utils.RedisMaps; +import org.dromara.visor.framework.redis.core.utils.RedisUtils; import org.dromara.visor.framework.redis.core.utils.barrier.CacheBarriers; import org.dromara.visor.module.asset.convert.HostConvert; import org.dromara.visor.module.asset.dao.HostConfigDAO; @@ -376,7 +377,7 @@ public class HostServiceImpl implements HostService { @Override public void clearCache() { - RedisMaps.scanKeysDelete(HostCacheKeyDefine.HOST_INFO.format("*")); + RedisUtils.scanKeysDelete(HostCacheKeyDefine.HOST_INFO.format("*")); } /** diff --git a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/AuthenticationServiceImpl.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/AuthenticationServiceImpl.java index 85543cae..8c787ed3 100644 --- a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/AuthenticationServiceImpl.java +++ b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/AuthenticationServiceImpl.java @@ -42,6 +42,7 @@ import org.dromara.visor.common.utils.Assert; import org.dromara.visor.common.utils.Requests; import org.dromara.visor.framework.biz.operator.log.core.utils.OperatorLogs; import org.dromara.visor.framework.redis.core.utils.RedisStrings; +import org.dromara.visor.framework.redis.core.utils.RedisUtils; import org.dromara.visor.framework.security.core.utils.SecurityUtils; import org.dromara.visor.module.common.config.AppLoginConfig; import org.dromara.visor.module.infra.api.SystemMessageApi; @@ -420,7 +421,7 @@ public class AuthenticationServiceImpl implements AuthenticationService { } // 删除续签信息 if (Booleans.isTrue(appLoginConfig.getAllowRefresh())) { - RedisStrings.scanKeysDelete(UserCacheKeyDefine.LOGIN_REFRESH.format(id, "*")); + RedisUtils.scanKeysDelete(UserCacheKeyDefine.LOGIN_REFRESH.format(id, "*")); } } diff --git a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/DataExtraServiceImpl.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/DataExtraServiceImpl.java index 7a8b4749..15ccab33 100644 --- a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/DataExtraServiceImpl.java +++ b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/DataExtraServiceImpl.java @@ -30,6 +30,7 @@ import lombok.extern.slf4j.Slf4j; import org.dromara.visor.common.constant.Const; import org.dromara.visor.framework.mybatis.core.query.ThenLambdaWrapper; import org.dromara.visor.framework.redis.core.utils.RedisMaps; +import org.dromara.visor.framework.redis.core.utils.RedisUtils; import org.dromara.visor.framework.redis.core.utils.barrier.CacheBarriers; import org.dromara.visor.module.infra.dao.DataExtraDAO; import org.dromara.visor.module.infra.define.cache.DataExtraCacheKeyDefine; @@ -92,7 +93,7 @@ public class DataExtraServiceImpl implements DataExtraService { insert.setValue(request.getValue()); dataExtraDAO.insert(insert); // 删除缓存 - RedisMaps.delete(DataExtraCacheKeyDefine.DATA_EXTRA.format(request.getUserId(), request.getType(), request.getItem())); + RedisUtils.delete(DataExtraCacheKeyDefine.DATA_EXTRA.format(request.getUserId(), request.getType(), request.getItem())); return insert.getId(); } @@ -114,7 +115,7 @@ public class DataExtraServiceImpl implements DataExtraService { Set keys = rows.stream() .map(s -> DataExtraCacheKeyDefine.DATA_EXTRA.format(s.getUserId(), s.getType(), s.getItem())) .collect(Collectors.toSet()); - RedisMaps.delete(keys); + RedisUtils.delete(keys); } @Override @@ -133,7 +134,7 @@ public class DataExtraServiceImpl implements DataExtraService { // 更新 int effect = dataExtraDAO.updateById(update); // 删除缓存 - RedisMaps.delete(DataExtraCacheKeyDefine.DATA_EXTRA.format(data.getUserId(), data.getType(), data.getItem())); + RedisUtils.delete(DataExtraCacheKeyDefine.DATA_EXTRA.format(data.getUserId(), data.getType(), data.getItem())); return effect; } @@ -315,7 +316,7 @@ public class DataExtraServiceImpl implements DataExtraService { .map(s -> DataExtraCacheKeyDefine.DATA_EXTRA.format(s.getUserId(), s.getType(), s.getItem())) .distinct() .collect(Collectors.toList()); - RedisMaps.delete(keys); + RedisUtils.delete(keys); } /** diff --git a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/DataPermissionServiceImpl.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/DataPermissionServiceImpl.java index e730345a..8140525f 100644 --- a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/DataPermissionServiceImpl.java +++ b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/DataPermissionServiceImpl.java @@ -346,7 +346,7 @@ public class DataPermissionServiceImpl implements DataPermissionService { .map(s -> DataPermissionCacheKeyDefine.DATA_PERMISSION_USER.format(value, s)) .forEach(keys::add); } - RedisLists.delete(keys); + RedisUtils.delete(keys); } } diff --git a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/FavoriteServiceImpl.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/FavoriteServiceImpl.java index bd95032d..dd1b0a6a 100644 --- a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/FavoriteServiceImpl.java +++ b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/FavoriteServiceImpl.java @@ -27,6 +27,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import lombok.extern.slf4j.Slf4j; import org.dromara.visor.common.utils.Assert; import org.dromara.visor.framework.redis.core.utils.RedisLists; +import org.dromara.visor.framework.redis.core.utils.RedisUtils; import org.dromara.visor.framework.redis.core.utils.barrier.CacheBarriers; import org.dromara.visor.framework.security.core.utils.SecurityUtils; import org.dromara.visor.module.infra.convert.FavoriteConvert; @@ -79,7 +80,7 @@ public class FavoriteServiceImpl implements FavoriteService { // 插入 favoriteDAO.insert(record); // 删除缓存 - RedisLists.delete(FavoriteCacheKeyDefine.FAVORITE.format(type, userId)); + RedisUtils.delete(FavoriteCacheKeyDefine.FAVORITE.format(type, userId)); return record.getId(); } @@ -91,7 +92,7 @@ public class FavoriteServiceImpl implements FavoriteService { // 删除库 int effect = favoriteDAO.deleteFavorite(type, userId, relId); // 删除缓存 - RedisLists.delete(FavoriteCacheKeyDefine.FAVORITE.format(type, userId)); + RedisUtils.delete(FavoriteCacheKeyDefine.FAVORITE.format(type, userId)); return effect; } diff --git a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/TagServiceImpl.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/TagServiceImpl.java index e7125b82..ed61b99d 100644 --- a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/TagServiceImpl.java +++ b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/TagServiceImpl.java @@ -34,6 +34,7 @@ import org.dromara.visor.common.utils.Assert; import org.dromara.visor.framework.biz.operator.log.core.utils.OperatorLogs; import org.dromara.visor.framework.mybatis.core.query.Conditions; import org.dromara.visor.framework.redis.core.utils.RedisLists; +import org.dromara.visor.framework.redis.core.utils.RedisUtils; import org.dromara.visor.framework.redis.core.utils.barrier.CacheBarriers; import org.dromara.visor.module.infra.convert.TagConvert; import org.dromara.visor.module.infra.dao.TagDAO; @@ -116,7 +117,7 @@ public class TagServiceImpl implements TagService { int effect = tagDAO.updateById(updateRecord); log.info("HostProxyService-updateHostProxyById effect: {}", effect); // 删除缓存 - RedisLists.delete(TagCacheKeyDefine.TAG_NAME.format(record.getType())); + RedisUtils.delete(TagCacheKeyDefine.TAG_NAME.format(record.getType())); return effect; } @@ -201,7 +202,7 @@ public class TagServiceImpl implements TagService { .distinct() .map(TagCacheKeyDefine.TAG_NAME::format) .collect(Collectors.toList()); - RedisLists.delete(deleteKeys); + RedisUtils.delete(deleteKeys); return effect; } @@ -225,7 +226,7 @@ public class TagServiceImpl implements TagService { .distinct() .map(TagCacheKeyDefine.TAG_NAME::format) .collect(Collectors.toList()); - RedisLists.delete(cacheKeys); + RedisUtils.delete(cacheKeys); } /** diff --git a/orion-visor-modules/orion-visor-module-monitor/orion-visor-module-monitor-service/src/main/java/org/dromara/visor/module/monitor/service/impl/AlarmPolicyServiceImpl.java b/orion-visor-modules/orion-visor-module-monitor/orion-visor-module-monitor-service/src/main/java/org/dromara/visor/module/monitor/service/impl/AlarmPolicyServiceImpl.java index f205b5b6..c3ffb28b 100644 --- a/orion-visor-modules/orion-visor-module-monitor/orion-visor-module-monitor-service/src/main/java/org/dromara/visor/module/monitor/service/impl/AlarmPolicyServiceImpl.java +++ b/orion-visor-modules/orion-visor-module-monitor/orion-visor-module-monitor-service/src/main/java/org/dromara/visor/module/monitor/service/impl/AlarmPolicyServiceImpl.java @@ -32,6 +32,7 @@ import org.dromara.visor.common.constant.ErrorMessage; import org.dromara.visor.common.utils.Assert; import org.dromara.visor.framework.biz.operator.log.core.utils.OperatorLogs; import org.dromara.visor.framework.redis.core.utils.RedisMaps; +import org.dromara.visor.framework.redis.core.utils.RedisUtils; import org.dromara.visor.framework.redis.core.utils.barrier.CacheBarriers; import org.dromara.visor.module.monitor.convert.AlarmPolicyConvert; import org.dromara.visor.module.monitor.dao.AlarmPolicyDAO; @@ -114,7 +115,7 @@ public class AlarmPolicyServiceImpl implements AlarmPolicyService { // 重新加载上下文 alarmEngineContext.reloadPolicy(id); // 删除缓存 - RedisMaps.delete(AlarmPolicyCacheKeyDefine.ALARM_POLICY.format(record.getType()), + RedisUtils.delete(AlarmPolicyCacheKeyDefine.ALARM_POLICY.format(record.getType()), AlarmPolicyCacheKeyDefine.ALARM_POLICY.format(Const.ALL)); // 设置日志参数 OperatorLogs.add(OperatorLogs.ID, id); @@ -137,7 +138,7 @@ public class AlarmPolicyServiceImpl implements AlarmPolicyService { // 重新加载上下文 alarmEngineContext.reloadPolicy(id); // 删除缓存 - RedisMaps.delete(AlarmPolicyCacheKeyDefine.ALARM_POLICY.format(record.getType()), + RedisUtils.delete(AlarmPolicyCacheKeyDefine.ALARM_POLICY.format(record.getType()), AlarmPolicyCacheKeyDefine.ALARM_POLICY.format(Const.ALL)); return newId; } @@ -165,7 +166,7 @@ public class AlarmPolicyServiceImpl implements AlarmPolicyService { // 重新加载上下文 alarmEngineContext.reloadPolicy(id); // 删除缓存 - RedisMaps.delete(AlarmPolicyCacheKeyDefine.ALARM_POLICY.format(record.getType()), + RedisUtils.delete(AlarmPolicyCacheKeyDefine.ALARM_POLICY.format(record.getType()), AlarmPolicyCacheKeyDefine.ALARM_POLICY.format(Const.ALL)); return effect; } diff --git a/orion-visor-modules/orion-visor-module-monitor/orion-visor-module-monitor-service/src/main/java/org/dromara/visor/module/monitor/service/impl/MonitorMetricsServiceImpl.java b/orion-visor-modules/orion-visor-module-monitor/orion-visor-module-monitor-service/src/main/java/org/dromara/visor/module/monitor/service/impl/MonitorMetricsServiceImpl.java index adf112ee..f5e2bd8d 100644 --- a/orion-visor-modules/orion-visor-module-monitor/orion-visor-module-monitor-service/src/main/java/org/dromara/visor/module/monitor/service/impl/MonitorMetricsServiceImpl.java +++ b/orion-visor-modules/orion-visor-module-monitor/orion-visor-module-monitor-service/src/main/java/org/dromara/visor/module/monitor/service/impl/MonitorMetricsServiceImpl.java @@ -30,6 +30,7 @@ import org.dromara.visor.common.constant.ErrorMessage; import org.dromara.visor.common.utils.Assert; import org.dromara.visor.framework.biz.operator.log.core.utils.OperatorLogs; import org.dromara.visor.framework.redis.core.utils.RedisMaps; +import org.dromara.visor.framework.redis.core.utils.RedisUtils; import org.dromara.visor.framework.redis.core.utils.barrier.CacheBarriers; import org.dromara.visor.module.monitor.context.MonitorMetricsContext; import org.dromara.visor.module.monitor.convert.MonitorMetricsConvert; @@ -84,7 +85,7 @@ public class MonitorMetricsServiceImpl implements MonitorMetricsService { int effect = monitorMetricsDAO.insert(record); Long id = record.getId(); // 删除缓存 - RedisMaps.delete(MonitorMetricsCacheKeyDefine.MONITOR_METRICS); + RedisUtils.delete(MonitorMetricsCacheKeyDefine.MONITOR_METRICS); // 设置日志参数 OperatorLogs.add(OperatorLogs.ID, id); // 重新加载本地缓存 @@ -110,7 +111,7 @@ public class MonitorMetricsServiceImpl implements MonitorMetricsService { int effect = monitorMetricsDAO.updateById(updateRecord); log.info("MonitorMetricsService-updateMonitorMetricsById effect: {}", effect); // 删除缓存 - RedisMaps.delete(MonitorMetricsCacheKeyDefine.MONITOR_METRICS); + RedisUtils.delete(MonitorMetricsCacheKeyDefine.MONITOR_METRICS); // 重新加载本地缓存 monitorMetricsContext.reloadMonitorMetrics(id); return effect; diff --git a/orion-visor-modules/orion-visor-module-terminal/orion-visor-module-terminal-service/src/main/java/org/dromara/visor/module/terminal/service/impl/CommandSnippetServiceImpl.java b/orion-visor-modules/orion-visor-module-terminal/orion-visor-module-terminal-service/src/main/java/org/dromara/visor/module/terminal/service/impl/CommandSnippetServiceImpl.java index cc74b314..b9690feb 100644 --- a/orion-visor-modules/orion-visor-module-terminal/orion-visor-module-terminal-service/src/main/java/org/dromara/visor/module/terminal/service/impl/CommandSnippetServiceImpl.java +++ b/orion-visor-modules/orion-visor-module-terminal/orion-visor-module-terminal-service/src/main/java/org/dromara/visor/module/terminal/service/impl/CommandSnippetServiceImpl.java @@ -30,6 +30,7 @@ import lombok.extern.slf4j.Slf4j; import org.dromara.visor.common.constant.ErrorMessage; import org.dromara.visor.common.utils.Assert; import org.dromara.visor.framework.redis.core.utils.RedisMaps; +import org.dromara.visor.framework.redis.core.utils.RedisUtils; import org.dromara.visor.framework.redis.core.utils.barrier.CacheBarriers; import org.dromara.visor.framework.security.core.utils.SecurityUtils; import org.dromara.visor.module.terminal.convert.CommandSnippetConvert; @@ -84,7 +85,7 @@ public class CommandSnippetServiceImpl implements CommandSnippetService { Long id = record.getId(); log.info("CommandSnippetService-createCommandSnippet id: {}, effect: {}", id, effect); // 删除缓存 - RedisMaps.delete(CommandSnippetCacheKeyDefine.SNIPPET.format(userId)); + RedisUtils.delete(CommandSnippetCacheKeyDefine.SNIPPET.format(userId)); return id; } @@ -109,7 +110,7 @@ public class CommandSnippetServiceImpl implements CommandSnippetService { int effect = commandSnippetDAO.update(null, update); log.info("CommandSnippetService-updateCommandSnippetById effect: {}", effect); // 删除缓存 - RedisMaps.delete(CommandSnippetCacheKeyDefine.SNIPPET.format(userId)); + RedisUtils.delete(CommandSnippetCacheKeyDefine.SNIPPET.format(userId)); return effect; } @@ -169,7 +170,7 @@ public class CommandSnippetServiceImpl implements CommandSnippetService { public Integer setGroupNull(Long userId, Long groupId) { int effect = commandSnippetDAO.setGroupIdWithNull(groupId); // 删除缓存 - RedisMaps.delete(CommandSnippetCacheKeyDefine.SNIPPET.format(userId)); + RedisUtils.delete(CommandSnippetCacheKeyDefine.SNIPPET.format(userId)); return effect; } @@ -192,7 +193,7 @@ public class CommandSnippetServiceImpl implements CommandSnippetService { public Integer deleteByGroupId(Long userId, Long groupId) { int effect = commandSnippetDAO.deleteByGroupId(groupId); // 删除缓存 - RedisMaps.delete(CommandSnippetCacheKeyDefine.SNIPPET.format(userId)); + RedisUtils.delete(CommandSnippetCacheKeyDefine.SNIPPET.format(userId)); return effect; } diff --git a/orion-visor-modules/orion-visor-module-terminal/orion-visor-module-terminal-service/src/main/java/org/dromara/visor/module/terminal/service/impl/PathBookmarkServiceImpl.java b/orion-visor-modules/orion-visor-module-terminal/orion-visor-module-terminal-service/src/main/java/org/dromara/visor/module/terminal/service/impl/PathBookmarkServiceImpl.java index 10dcda14..236a8e0c 100644 --- a/orion-visor-modules/orion-visor-module-terminal/orion-visor-module-terminal-service/src/main/java/org/dromara/visor/module/terminal/service/impl/PathBookmarkServiceImpl.java +++ b/orion-visor-modules/orion-visor-module-terminal/orion-visor-module-terminal-service/src/main/java/org/dromara/visor/module/terminal/service/impl/PathBookmarkServiceImpl.java @@ -30,6 +30,7 @@ import lombok.extern.slf4j.Slf4j; import org.dromara.visor.common.constant.ErrorMessage; import org.dromara.visor.common.utils.Assert; import org.dromara.visor.framework.redis.core.utils.RedisMaps; +import org.dromara.visor.framework.redis.core.utils.RedisUtils; import org.dromara.visor.framework.redis.core.utils.barrier.CacheBarriers; import org.dromara.visor.framework.security.core.utils.SecurityUtils; import org.dromara.visor.module.terminal.convert.PathBookmarkConvert; @@ -84,7 +85,7 @@ public class PathBookmarkServiceImpl implements PathBookmarkService { Long id = record.getId(); log.info("PathBookmarkService-createPathBookmark id: {}, effect: {}", id, effect); // 删除缓存 - RedisMaps.delete(PathBookmarkCacheKeyDefine.PATH_BOOKMARK.format(userId)); + RedisUtils.delete(PathBookmarkCacheKeyDefine.PATH_BOOKMARK.format(userId)); return id; } @@ -109,7 +110,7 @@ public class PathBookmarkServiceImpl implements PathBookmarkService { int effect = pathBookmarkDAO.update(null, update); log.info("PathBookmarkService-updatePathBookmarkById effect: {}", effect); // 删除缓存 - RedisMaps.delete(PathBookmarkCacheKeyDefine.PATH_BOOKMARK.format(userId)); + RedisUtils.delete(PathBookmarkCacheKeyDefine.PATH_BOOKMARK.format(userId)); return effect; } @@ -169,7 +170,7 @@ public class PathBookmarkServiceImpl implements PathBookmarkService { public Integer setGroupNull(Long userId, Long groupId) { int effect = pathBookmarkDAO.setGroupIdWithNull(groupId); // 删除缓存 - RedisMaps.delete(PathBookmarkCacheKeyDefine.PATH_BOOKMARK.format(userId)); + RedisUtils.delete(PathBookmarkCacheKeyDefine.PATH_BOOKMARK.format(userId)); return effect; } @@ -192,7 +193,7 @@ public class PathBookmarkServiceImpl implements PathBookmarkService { public Integer deleteByGroupId(Long userId, Long groupId) { int effect = pathBookmarkDAO.deleteByGroupId(groupId); // 删除缓存 - RedisMaps.delete(PathBookmarkCacheKeyDefine.PATH_BOOKMARK.format(userId)); + RedisUtils.delete(PathBookmarkCacheKeyDefine.PATH_BOOKMARK.format(userId)); return effect; }