From 4b21a3bc48963ef6e85de832ca05f7b6ee40f6dc Mon Sep 17 00:00:00 2001
From: wangfeiyu <wangfeiyu@cscec.com>
Date: Wed, 22 Feb 2023 08:54:10 +0800
Subject: [PATCH] 在方法isMatchedIp的参数中，当filter为null而ip非null/空时，报filter为null异常。把判断条件由&&改为||解决此bug。
---
ruoyi-common/ruoyi-common-redis/src/main/java/com/ruoyi/common/redis/service/RedisService.java | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/ruoyi-common/ruoyi-common-redis/src/main/java/com/ruoyi/common/redis/service/RedisService.java b/ruoyi-common/ruoyi-common-redis/src/main/java/com/ruoyi/common/redis/service/RedisService.java
index 64cc702..67ac6e3 100644
--- a/ruoyi-common/ruoyi-common-redis/src/main/java/com/ruoyi/common/redis/service/RedisService.java
+++ b/ruoyi-common/ruoyi-common-redis/src/main/java/com/ruoyi/common/redis/service/RedisService.java
@@ -124,9 +124,9 @@
* @param collection 多个对象
* @return
*/
- public long deleteObject(final Collection collection)
+ public boolean deleteObject(final Collection collection)
{
- return redisTemplate.delete(collection);
+ return redisTemplate.delete(collection) > 0;
}
/**
@@ -247,17 +247,17 @@
* 删除Hash中的某条数据
*
* @param key Redis键
- * @param hKey Hash键
+ * @param hKey Hash键
* @return 是否成功
*/
public boolean deleteCacheMapValue(final String key, final String hKey)
{
- return Boolean.TRUE.equals(redisTemplate.opsForHash().delete(key, hKey));
+ return redisTemplate.opsForHash().delete(key, hKey) > 0;
}
/**
* 获得缓存的基本对象列表
- *
+ *
* @param pattern 字符串前缀
* @return 对象列表
*/
--
Gitblit v1.9.3