From dcaf90d3c17138c3dd6f73941b57c39958d6442a Mon Sep 17 00:00:00 2001 From: JoseK <846939369@qq.com> Date: Tue, 6 Jun 2023 01:30:20 +0800 Subject: [PATCH 1/2] =?UTF-8?q?fix:RedisUtils=E7=9B=B8=E5=85=B3=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/common/config/RedisConfig.java | 6 +- .../common/common/utils/CursorUtils.java | 4 +- .../common/common/utils/RedisUtils.java | 167 +++++++++--------- .../user/service/impl/LoginServiceImpl.java | 10 +- 4 files changed, 96 insertions(+), 91 deletions(-) diff --git a/mallchat-common/src/main/java/com/abin/mallchat/common/common/config/RedisConfig.java b/mallchat-common/src/main/java/com/abin/mallchat/common/common/config/RedisConfig.java index 85518d5..ae52ae6 100644 --- a/mallchat-common/src/main/java/com/abin/mallchat/common/common/config/RedisConfig.java +++ b/mallchat-common/src/main/java/com/abin/mallchat/common/common/config/RedisConfig.java @@ -15,7 +15,8 @@ import java.util.Objects; @Configuration public class RedisConfig { - @Bean + + @Bean("myRedisTemplate") public RedisTemplate redisTemplate(RedisConnectionFactory redisConnectionFactory) { // 创建模板 RedisTemplate redisTemplate = new RedisTemplate<>(); @@ -30,10 +31,11 @@ public class RedisConfig { // value和 hashValue采用 JSON序列化 redisTemplate.setValueSerializer(jsonRedisSerializer); redisTemplate.setHashValueSerializer(jsonRedisSerializer); + redisTemplate.afterPropertiesSet(); return redisTemplate; } - public class MyRedisSerializerCustomized extends GenericJackson2JsonRedisSerializer { + private static class MyRedisSerializerCustomized extends GenericJackson2JsonRedisSerializer { @Override public byte[] serialize(Object source) throws SerializationException { if (Objects.nonNull(source)) { diff --git a/mallchat-common/src/main/java/com/abin/mallchat/common/common/utils/CursorUtils.java b/mallchat-common/src/main/java/com/abin/mallchat/common/common/utils/CursorUtils.java index 4eb2ff5..4d2a391 100644 --- a/mallchat-common/src/main/java/com/abin/mallchat/common/common/utils/CursorUtils.java +++ b/mallchat-common/src/main/java/com/abin/mallchat/common/common/utils/CursorUtils.java @@ -44,7 +44,7 @@ public class CursorUtils { .map(String::valueOf) .orElse(null); Boolean isLast = result.size() != cursorPageBaseReq.getPageSize(); - return new CursorPageBaseResp(cursor, isLast, result); + return new CursorPageBaseResp<>(cursor, isLast, result); } public CursorPageBaseResp getCursorPageByMysql(IService mapper, CursorPageBaseReq request, Consumer> initWrapper, SFunction cursorColumn) { @@ -60,7 +60,7 @@ public class CursorUtils { .map(String::valueOf) .orElse(null); Boolean isLast = page.getRecords().size() != request.getPageSize(); - return new CursorPageBaseResp(cursor, isLast, page.getRecords()); + return new CursorPageBaseResp<>(cursor, isLast, page.getRecords()); } } diff --git a/mallchat-common/src/main/java/com/abin/mallchat/common/common/utils/RedisUtils.java b/mallchat-common/src/main/java/com/abin/mallchat/common/common/utils/RedisUtils.java index 4300ce8..98b45bb 100644 --- a/mallchat-common/src/main/java/com/abin/mallchat/common/common/utils/RedisUtils.java +++ b/mallchat-common/src/main/java/com/abin/mallchat/common/common/utils/RedisUtils.java @@ -8,24 +8,20 @@ import org.springframework.data.redis.core.*; import org.springframework.data.redis.core.ZSetOperations.TypedTuple; import org.springframework.data.redis.core.script.DefaultRedisScript; import org.springframework.data.redis.core.script.RedisScript; -import org.springframework.stereotype.Component; -import javax.annotation.PostConstruct; import java.util.*; import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; - @Slf4j -@Component public class RedisUtils { - public RedisTemplate redisTemplate; private static StringRedisTemplate stringRedisTemplate; + private static RedisTemplate redisTemplate; - @PostConstruct - public void init() { - this.stringRedisTemplate = SpringUtil.getBean(StringRedisTemplate.class); + static { + RedisUtils.stringRedisTemplate = SpringUtil.getBean(StringRedisTemplate.class); + RedisUtils.redisTemplate = SpringUtil.getBean("myRedisTemplate"); } private static final String LUA_INCR_EXPIRE = @@ -49,7 +45,7 @@ public class RedisUtils { * @param key 键 * @param time 时间(秒) */ - public static boolean expire(String key, long time) { + public static Boolean expire(String key, long time) { try { if (time > 0) { stringRedisTemplate.expire(key, time, TimeUnit.SECONDS); @@ -68,7 +64,7 @@ public class RedisUtils { * @param time 时间(秒) * @param timeUnit 单位 */ - public boolean expire(String key, long time, TimeUnit timeUnit) { + public static Boolean expire(String key, long time, TimeUnit timeUnit) { try { if (time > 0) { redisTemplate.expire(key, time, timeUnit); @@ -86,7 +82,7 @@ public class RedisUtils { * @param key 键 不能为null * @return 时间(秒) 返回0代表为永久有效 */ - public static long getExpire(String key) { + public static Long getExpire(String key) { return stringRedisTemplate.getExpire(key, TimeUnit.SECONDS); } @@ -96,7 +92,7 @@ public class RedisUtils { * @param key 键 不能为null * @return 时间(秒) 返回0代表为永久有效 */ - public static long getExpire(String key, TimeUnit timeUnit) { + public static Long getExpire(String key, TimeUnit timeUnit) { return stringRedisTemplate.getExpire(key, timeUnit); } @@ -106,7 +102,7 @@ public class RedisUtils { * @param pattern key * @return / */ - public List scan(String pattern) { + public static List scan(String pattern) { ScanOptions options = ScanOptions.scanOptions().match(pattern).build(); RedisConnectionFactory factory = redisTemplate.getConnectionFactory(); RedisConnection rc = Objects.requireNonNull(factory).getConnection(); @@ -131,7 +127,7 @@ public class RedisUtils { * @param size 每页数目 * @return / */ - public List findKeysForPage(String patternKey, int page, int size) { + public static List findKeysForPage(String patternKey, int page, int size) { ScanOptions options = ScanOptions.scanOptions().match(patternKey).build(); RedisConnectionFactory factory = redisTemplate.getConnectionFactory(); RedisConnection rc = Objects.requireNonNull(factory).getConnection(); @@ -167,7 +163,7 @@ public class RedisUtils { * @param key 键 * @return true 存在 false不存在 */ - public boolean hasKey(String key) { + public static Boolean hasKey(String key) { try { return redisTemplate.hasKey(key); } catch (Exception e) { @@ -185,21 +181,23 @@ public class RedisUtils { public static void del(String... keys) { if (keys != null && keys.length > 0) { if (keys.length == 1) { - boolean result = stringRedisTemplate.delete(keys[0]); - log.debug("--------------------------------------------"); - log.debug(new StringBuilder("删除缓存：").append(keys[0]).append("，结果：").append(result).toString()); + Boolean result = stringRedisTemplate.delete(keys[0]); log.debug("--------------------------------------------"); + log.debug("删除缓存：" + keys[0] + "，结果：" + result); } else { Set keySet = new HashSet<>(); for (String key : keys) { - keySet.addAll(stringRedisTemplate.keys(key)); + Set stringSet = stringRedisTemplate.keys(key); + if(Objects.nonNull(stringSet) && !stringSet.isEmpty()){ + keySet.addAll(stringSet); + } } - long count = stringRedisTemplate.delete(keySet); + Long count = stringRedisTemplate.delete(keySet); log.debug("--------------------------------------------"); - log.debug("成功删除缓存：" + keySet.toString()); + log.debug("成功删除缓存：" + keySet); log.debug("缓存删除数量：" + count + "个"); - log.debug("--------------------------------------------"); } + log.debug("--------------------------------------------"); } } @@ -222,7 +220,7 @@ public class RedisUtils { * @param value 值 * @return true成功 false失败 */ - public static boolean set(String key, Object value) { + public static Boolean set(String key, Object value) { try { stringRedisTemplate.opsForValue().set(key, objToStr(value)); return true; @@ -243,7 +241,10 @@ public class RedisUtils { public static List mget(Collection keys, Class tClass) { List list = stringRedisTemplate.opsForValue().multiGet(keys); - return (List) list.stream().map(o -> toBeanOrNull(o, tClass)).collect(Collectors.toList()); + if (Objects.isNull(list)) { + return new ArrayList<>(); + } + return list.stream().map(o -> toBeanOrNull(o, tClass)).collect(Collectors.toList()); } static T toBeanOrNull(String json, Class tClass) { @@ -271,7 +272,7 @@ public class RedisUtils { * @param time 时间(秒) time要大于0 如果time小于等于0 将设置无限期 * @return true成功 false 失败 */ - public boolean set(String key, Object value, long time) { + public Boolean set(String key, Object value, long time) { try { if (time > 0) { redisTemplate.opsForValue().set(key, value, time, TimeUnit.SECONDS); @@ -294,7 +295,7 @@ public class RedisUtils { * @param timeUnit 类型 * @return true成功 false 失败 */ - public static boolean set(String key, Object value, long time, TimeUnit timeUnit) { + public static Boolean set(String key, Object value, long time, TimeUnit timeUnit) { try { if (time > 0) { stringRedisTemplate.opsForValue().set(key, objToStr(value), time, timeUnit); @@ -317,7 +318,7 @@ public class RedisUtils { * @param item 项 不能为null * @return 值 */ - public Object hget(String key, String item) { + public static Object hget(String key, String item) { return redisTemplate.opsForHash().get(key, item); } @@ -327,7 +328,7 @@ public class RedisUtils { * @param key 键 * @return 对应的多个键值 */ - public Map hmget(String key) { + public static Map hmget(String key) { return redisTemplate.opsForHash().entries(key); } @@ -339,7 +340,7 @@ public class RedisUtils { * @param map 对应多个键值 * @return true 成功 false 失败 */ - public boolean hmset(String key, Map map) { + public static Boolean hmset(String key, Map map) { try { redisTemplate.opsForHash().putAll(key, map); return true; @@ -357,7 +358,7 @@ public class RedisUtils { * @param time 时间(秒) * @return true成功 false失败 */ - public boolean hmset(String key, Map map, long time) { + public static Boolean hmset(String key, Map map, long time) { try { redisTemplate.opsForHash().putAll(key, map); if (time > 0) { @@ -378,7 +379,7 @@ public class RedisUtils { * @param value 值 * @return true 成功 false失败 */ - public boolean hset(String key, String item, Object value) { + public static Boolean hset(String key, String item, Object value) { try { redisTemplate.opsForHash().put(key, item, value); return true; @@ -397,7 +398,7 @@ public class RedisUtils { * @param time 时间(秒) 注意:如果已存在的hash表有时间,这里将会替换原有的时间 * @return true 成功 false失败 */ - public boolean hset(String key, String item, Object value, long time) { + public static Boolean hset(String key, String item, Object value, long time) { try { redisTemplate.opsForHash().put(key, item, value); if (time > 0) { @@ -416,7 +417,7 @@ public class RedisUtils { * @param key 键 不能为null * @param item 项 可以使多个 不能为null */ - public void hdel(String key, Object... item) { + public static void hdel(String key, Object... item) { redisTemplate.opsForHash().delete(key, item); } @@ -427,7 +428,7 @@ public class RedisUtils { * @param item 项 不能为null * @return true 存在 false不存在 */ - public boolean hHasKey(String key, String item) { + public static Boolean hHasKey(String key, String item) { return redisTemplate.opsForHash().hasKey(key, item); } @@ -439,7 +440,7 @@ public class RedisUtils { * @param by 要增加几(大于0) * @return */ - public double hincr(String key, String item, double by) { + public static Double hincr(String key, String item, double by) { return redisTemplate.opsForHash().increment(key, item, by); } @@ -451,7 +452,7 @@ public class RedisUtils { * @param by 要减少记(小于0) * @return */ - public double hdecr(String key, String item, double by) { + public static Double hdecr(String key, String item, double by) { return redisTemplate.opsForHash().increment(key, item, -by); } @@ -463,7 +464,7 @@ public class RedisUtils { * @param key 键 * @return */ - public Set sGet(String key) { + public static Set sGet(String key) { try { return redisTemplate.opsForSet().members(key); } catch (Exception e) { @@ -479,7 +480,7 @@ public class RedisUtils { * @param value 值 * @return true 存在 false不存在 */ - public boolean sHasKey(String key, Object value) { + public static Boolean sHasKey(String key, Object value) { try { return redisTemplate.opsForSet().isMember(key, value); } catch (Exception e) { @@ -495,12 +496,12 @@ public class RedisUtils { * @param values 值 可以是多个 * @return 成功个数 */ - public long sSet(String key, Object... values) { + public static Long sSet(String key, Object... values) { try { return redisTemplate.opsForSet().add(key, values); } catch (Exception e) { log.error(e.getMessage(), e); - return 0; + return 0L; } } @@ -512,7 +513,7 @@ public class RedisUtils { * @param values 值 可以是多个 * @return 成功个数 */ - public long sSetAndTime(String key, long time, Object... values) { + public static Long sSetAndTime(String key, long time, Object... values) { try { Long count = redisTemplate.opsForSet().add(key, values); if (time > 0) { @@ -521,7 +522,7 @@ public class RedisUtils { return count; } catch (Exception e) { log.error(e.getMessage(), e); - return 0; + return 0L; } } @@ -531,12 +532,12 @@ public class RedisUtils { * @param key 键 * @return */ - public long sGetSetSize(String key) { + public static Long sGetSetSize(String key) { try { return redisTemplate.opsForSet().size(key); } catch (Exception e) { log.error(e.getMessage(), e); - return 0; + return 0L; } } @@ -547,13 +548,12 @@ public class RedisUtils { * @param values 值 可以是多个 * @return 移除的个数 */ - public long setRemove(String key, Object... values) { + public static Long setRemove(String key, Object... values) { try { - Long count = redisTemplate.opsForSet().remove(key, values); - return count; + return redisTemplate.opsForSet().remove(key, values); } catch (Exception e) { log.error(e.getMessage(), e); - return 0; + return 0L; } } @@ -567,7 +567,7 @@ public class RedisUtils { * @param end 结束 0 到 -1代表所有值 * @return */ - public List lGet(String key, long start, long end) { + public static List lGet(String key, long start, long end) { try { return redisTemplate.opsForList().range(key, start, end); } catch (Exception e) { @@ -582,12 +582,12 @@ public class RedisUtils { * @param key 键 * @return */ - public long lGetListSize(String key) { + public static Long lGetListSize(String key) { try { return redisTemplate.opsForList().size(key); } catch (Exception e) { log.error(e.getMessage(), e); - return 0; + return 0L; } } @@ -598,7 +598,7 @@ public class RedisUtils { * @param index 索引 index>=0时， 0 表头，1 第二个元素，依次类推；index<0时，-1，表尾，-2倒数第二个元素，依次类推 * @return */ - public Object lGetIndex(String key, long index) { + public static Object lGetIndex(String key, long index) { try { return redisTemplate.opsForList().index(key, index); } catch (Exception e) { @@ -614,7 +614,7 @@ public class RedisUtils { * @param value 值 * @return */ - public boolean lSet(String key, Object value) { + public static Boolean lSet(String key, Object value) { try { redisTemplate.opsForList().rightPush(key, value); return true; @@ -632,7 +632,7 @@ public class RedisUtils { * @param time 时间(秒) * @return */ - public boolean lSet(String key, Object value, long time) { + public static Boolean lSet(String key, Object value, long time) { try { redisTemplate.opsForList().rightPush(key, value); if (time > 0) { @@ -652,7 +652,7 @@ public class RedisUtils { * @param value 值 * @return */ - public boolean lSet(String key, List value) { + public static Boolean lSet(String key, List value) { try { redisTemplate.opsForList().rightPushAll(key, value); return true; @@ -670,7 +670,7 @@ public class RedisUtils { * @param time 时间(秒) * @return */ - public boolean lSet(String key, List value, long time) { + public static Boolean lSet(String key, List value, long time) { try { redisTemplate.opsForList().rightPushAll(key, value); if (time > 0) { @@ -691,7 +691,7 @@ public class RedisUtils { * @param value 值 * @return / */ - public boolean lUpdateIndex(String key, long index, Object value) { + public static Boolean lUpdateIndex(String key, long index, Object value) { try { redisTemplate.opsForList().set(key, index, value); return true; @@ -709,12 +709,12 @@ public class RedisUtils { * @param value 值 * @return 移除的个数 */ - public long lRemove(String key, long count, Object value) { + public static Long lRemove(String key, long count, Object value) { try { return redisTemplate.opsForList().remove(key, count, value); } catch (Exception e) { log.error(e.getMessage(), e); - return 0; + return 0L; } } @@ -723,11 +723,14 @@ public class RedisUtils { * @param ids id */ public void delByKeys(String prefix, Set ids) { - Set keys = new HashSet<>(); + Set keys = new HashSet<>(); for (Long id : ids) { - keys.addAll(redisTemplate.keys(new StringBuffer(prefix).append(id).toString())); + Set stringSet = redisTemplate.keys(prefix + id); + if (Objects.nonNull(stringSet) && !stringSet.isEmpty()) { + keys.addAll(stringSet); + } } - long count = redisTemplate.delete(keys); + Long count = redisTemplate.delete(keys); // 此处提示可自行删除 log.debug("--------------------------------------------"); log.debug("成功删除缓存：" + keys.toString()); @@ -761,7 +764,7 @@ public class RedisUtils { * @param values * @return */ - public Long zAdd(String key, Set> values) { + public static Long zAdd(String key, Set> values) { return redisTemplate.opsForZSet().add(key, values); } @@ -770,7 +773,7 @@ public class RedisUtils { * @param values * @return */ - public Long zRemove(String key, Object... values) { + public static Long zRemove(String key, Object... values) { return redisTemplate.opsForZSet().remove(key, values); } @@ -790,7 +793,7 @@ public class RedisUtils { * @param delta * @return */ - public Double zIncrementScore(String key, String value, double delta) { + public static Double zIncrementScore(String key, String value, double delta) { return redisTemplate.opsForZSet().incrementScore(key, value, delta); } @@ -801,7 +804,7 @@ public class RedisUtils { * @param value * @return 0表示第一位 */ - public Long zRank(String key, Object value) { + public static Long zRank(String key, Object value) { return redisTemplate.opsForZSet().rank(key, value); } @@ -812,7 +815,7 @@ public class RedisUtils { * @param value * @return */ - public Long zReverseRank(String key, Object value) { + public static Long zReverseRank(String key, Object value) { return redisTemplate.opsForZSet().reverseRank(key, value); } @@ -824,7 +827,7 @@ public class RedisUtils { * @param end 结束位置, -1查询所有 * @return */ - public Set zRange(String key, long start, long end) { + public static Set zRange(String key, long start, long end) { return redisTemplate.opsForZSet().range(key, start, end); } @@ -836,7 +839,7 @@ public class RedisUtils { * @param end * @return */ - public Set> zRangeWithScores(String key, long start, + public static Set> zRangeWithScores(String key, long start, long end) { return redisTemplate.opsForZSet().rangeWithScores(key, start, end); } @@ -849,7 +852,7 @@ public class RedisUtils { * @param max 最大值 * @return */ - public Set zRangeByScore(String key, double min, double max) { + public static Set zRangeByScore(String key, double min, double max) { return redisTemplate.opsForZSet().rangeByScore(key, min, max); } @@ -861,7 +864,7 @@ public class RedisUtils { * @param max 最大值 * @return */ - public Set> zRangeByScoreWithScores(String key, + public Set> zRangeByScoreWithScores(String key, double min, double max) { return redisTemplate.opsForZSet().rangeByScoreWithScores(key, min, max); } @@ -874,7 +877,7 @@ public class RedisUtils { * @param end * @return */ - public Set> zRangeByScoreWithScores(String key, + public static Set> zRangeByScoreWithScores(String key, double min, double max, long start, long end) { return redisTemplate.opsForZSet().rangeByScoreWithScores(key, min, max, start, end); @@ -888,7 +891,7 @@ public class RedisUtils { * @param end * @return */ - public Set zReverseRange(String key, long start, long end) { + public static Set zReverseRange(String key, long start, long end) { return redisTemplate.opsForZSet().reverseRange(key, start, end); } @@ -967,7 +970,7 @@ public class RedisUtils { * @param max * @return */ - public Long zCount(String key, double min, double max) { + public static Long zCount(String key, double min, double max) { return redisTemplate.opsForZSet().count(key, min, max); } @@ -977,7 +980,7 @@ public class RedisUtils { * @param key * @return */ - public Long zSize(String key) { + public static Long zSize(String key) { return redisTemplate.opsForZSet().size(key); } @@ -998,7 +1001,7 @@ public class RedisUtils { * @param value * @return */ - public Double zScore(String key, Object value) { + public static Double zScore(String key, Object value) { return redisTemplate.opsForZSet().score(key, value); } @@ -1010,7 +1013,7 @@ public class RedisUtils { * @param end * @return */ - public Long zRemoveRange(String key, long start, long end) { + public static Long zRemoveRange(String key, long start, long end) { return redisTemplate.opsForZSet().removeRange(key, start, end); } @@ -1022,7 +1025,7 @@ public class RedisUtils { * @param max * @return */ - public Long zRemoveRangeByScore(String key, double min, double max) { + public static Long zRemoveRangeByScore(String key, double min, double max) { return redisTemplate.opsForZSet().removeRangeByScore(key, min, max); } @@ -1034,7 +1037,7 @@ public class RedisUtils { * @param destKey * @return */ - public Long zUnionAndStore(String key, String otherKey, String destKey) { + public static Long zUnionAndStore(String key, String otherKey, String destKey) { return redisTemplate.opsForZSet().unionAndStore(key, otherKey, destKey); } @@ -1044,7 +1047,7 @@ public class RedisUtils { * @param destKey * @return */ - public Long zUnionAndStore(String key, Collection otherKeys, + public static Long zUnionAndStore(String key, Collection otherKeys, String destKey) { return redisTemplate.opsForZSet() .unionAndStore(key, otherKeys, destKey); @@ -1058,7 +1061,7 @@ public class RedisUtils { * @param destKey * @return */ - public Long zIntersectAndStore(String key, String otherKey, + public static Long zIntersectAndStore(String key, String otherKey, String destKey) { return redisTemplate.opsForZSet().intersectAndStore(key, otherKey, destKey); @@ -1072,7 +1075,7 @@ public class RedisUtils { * @param destKey * @return */ - public Long zIntersectAndStore(String key, Collection otherKeys, + public static Long zIntersectAndStore(String key, Collection otherKeys, String destKey) { return redisTemplate.opsForZSet().intersectAndStore(key, otherKeys, destKey); diff --git a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/user/service/impl/LoginServiceImpl.java b/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/user/service/impl/LoginServiceImpl.java index d5beaa8..3ab066d 100644 --- a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/user/service/impl/LoginServiceImpl.java +++ b/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/user/service/impl/LoginServiceImpl.java @@ -24,8 +24,6 @@ public class LoginServiceImpl implements LoginService { @Autowired private JwtUtils jwtUtils; - @Autowired - private RedisUtils redisUtils; //token过期时间 private static final Integer TOKEN_EXPIRE_DAYS = 5; //token续期时间 @@ -37,6 +35,7 @@ public class LoginServiceImpl implements LoginService { * @param token * @return */ + @Override public boolean verify(String token) { Long uid = jwtUtils.getUidOrNull(token); if (Objects.isNull(uid)) { @@ -48,25 +47,26 @@ public class LoginServiceImpl implements LoginService { } @Async + @Override public void renewalTokenIfNecessary(String token) { Long uid = jwtUtils.getUidOrNull(token); if (Objects.isNull(uid)) { return; } String key = RedisKey.getKey(RedisKey.USER_TOKEN_STRING, uid); - long expireDays = redisUtils.getExpire(key, TimeUnit.DAYS); + long expireDays = RedisUtils.getExpire(key, TimeUnit.DAYS); if (expireDays == -2) {//不存在的key return; } if (expireDays < TOKEN_RENEWAL_DAYS) {//小于一天的token帮忙续期 - redisUtils.expire(key, TOKEN_EXPIRE_DAYS, TimeUnit.DAYS); + RedisUtils.expire(key, TOKEN_EXPIRE_DAYS, TimeUnit.DAYS); } } @Override public String login(Long uid) { String key = RedisKey.getKey(RedisKey.USER_TOKEN_STRING, uid); - String token = redisUtils.getStr(key); + String token = RedisUtils.getStr(key); if (StrUtil.isNotBlank(token)) { return token; } From 14637a903122bb2056cb8a05f0bcd53d4477c28a Mon Sep 17 00:00:00 2001 From: JoseK <846939369@qq.com> Date: Wed, 7 Jun 2023 00:07:22 +0800 Subject: [PATCH 2/2] =?UTF-8?q?fix:RedisUtils=E7=9B=B8=E5=85=B3=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/common/utils/RedisUtils.java | 156 ++++++++++-------- 1 file changed, 85 insertions(+), 71 deletions(-) diff --git a/mallchat-common/src/main/java/com/abin/mallchat/common/common/utils/RedisUtils.java b/mallchat-common/src/main/java/com/abin/mallchat/common/common/utils/RedisUtils.java index 98b45bb..415c676 100644 --- a/mallchat-common/src/main/java/com/abin/mallchat/common/common/utils/RedisUtils.java +++ b/mallchat-common/src/main/java/com/abin/mallchat/common/common/utils/RedisUtils.java @@ -17,11 +17,9 @@ import java.util.stream.Collectors; public class RedisUtils { private static StringRedisTemplate stringRedisTemplate; - private static RedisTemplate redisTemplate; static { RedisUtils.stringRedisTemplate = SpringUtil.getBean(StringRedisTemplate.class); - RedisUtils.redisTemplate = SpringUtil.getBean("myRedisTemplate"); } private static final String LUA_INCR_EXPIRE = @@ -67,7 +65,7 @@ public class RedisUtils { public static Boolean expire(String key, long time, TimeUnit timeUnit) { try { if (time > 0) { - redisTemplate.expire(key, time, timeUnit); + stringRedisTemplate.expire(key, time, timeUnit); } } catch (Exception e) { log.error(e.getMessage(), e); @@ -104,7 +102,7 @@ public class RedisUtils { */ public static List scan(String pattern) { ScanOptions options = ScanOptions.scanOptions().match(pattern).build(); - RedisConnectionFactory factory = redisTemplate.getConnectionFactory(); + RedisConnectionFactory factory = stringRedisTemplate.getConnectionFactory(); RedisConnection rc = Objects.requireNonNull(factory).getConnection(); Cursor cursor = rc.scan(options); List result = new ArrayList<>(); @@ -129,7 +127,7 @@ public class RedisUtils { */ public static List findKeysForPage(String patternKey, int page, int size) { ScanOptions options = ScanOptions.scanOptions().match(patternKey).build(); - RedisConnectionFactory factory = redisTemplate.getConnectionFactory(); + RedisConnectionFactory factory = stringRedisTemplate.getConnectionFactory(); RedisConnection rc = Objects.requireNonNull(factory).getConnection(); Cursor cursor = rc.scan(options); List result = new ArrayList<>(size); @@ -165,7 +163,7 @@ public class RedisUtils { */ public static Boolean hasKey(String key) { try { - return redisTemplate.hasKey(key); + return stringRedisTemplate.hasKey(key); } catch (Exception e) { log.error(e.getMessage(), e); return false; @@ -188,7 +186,7 @@ public class RedisUtils { Set keySet = new HashSet<>(); for (String key : keys) { Set stringSet = stringRedisTemplate.keys(key); - if(Objects.nonNull(stringSet) && !stringSet.isEmpty()){ + if (Objects.nonNull(stringSet) && !stringSet.isEmpty()) { keySet.addAll(stringSet); } } @@ -272,10 +270,10 @@ public class RedisUtils { * @param time 时间(秒) time要大于0 如果time小于等于0 将设置无限期 * @return true成功 false 失败 */ - public Boolean set(String key, Object value, long time) { + public static Boolean set(String key, Object value, long time) { try { if (time > 0) { - redisTemplate.opsForValue().set(key, value, time, TimeUnit.SECONDS); + stringRedisTemplate.opsForValue().set(key, objToStr(value), time, TimeUnit.SECONDS); } else { set(key, value); } @@ -319,7 +317,7 @@ public class RedisUtils { * @return 值 */ public static Object hget(String key, String item) { - return redisTemplate.opsForHash().get(key, item); + return stringRedisTemplate.opsForHash().get(key, item); } /** @@ -329,7 +327,7 @@ public class RedisUtils { * @return 对应的多个键值 */ public static Map hmget(String key) { - return redisTemplate.opsForHash().entries(key); + return stringRedisTemplate.opsForHash().entries(key); } @@ -342,7 +340,7 @@ public class RedisUtils { */ public static Boolean hmset(String key, Map map) { try { - redisTemplate.opsForHash().putAll(key, map); + stringRedisTemplate.opsForHash().putAll(key, map); return true; } catch (Exception e) { log.error(e.getMessage(), e); @@ -360,7 +358,7 @@ public class RedisUtils { */ public static Boolean hmset(String key, Map map, long time) { try { - redisTemplate.opsForHash().putAll(key, map); + stringRedisTemplate.opsForHash().putAll(key, map); if (time > 0) { expire(key, time); } @@ -381,7 +379,7 @@ public class RedisUtils { */ public static Boolean hset(String key, String item, Object value) { try { - redisTemplate.opsForHash().put(key, item, value); + stringRedisTemplate.opsForHash().put(key, item, value); return true; } catch (Exception e) { log.error(e.getMessage(), e); @@ -400,7 +398,7 @@ public class RedisUtils { */ public static Boolean hset(String key, String item, Object value, long time) { try { - redisTemplate.opsForHash().put(key, item, value); + stringRedisTemplate.opsForHash().put(key, item, value); if (time > 0) { expire(key, time); } @@ -418,7 +416,7 @@ public class RedisUtils { * @param item 项 可以使多个 不能为null */ public static void hdel(String key, Object... item) { - redisTemplate.opsForHash().delete(key, item); + stringRedisTemplate.opsForHash().delete(key, item); } /** @@ -429,7 +427,7 @@ public class RedisUtils { * @return true 存在 false不存在 */ public static Boolean hHasKey(String key, String item) { - return redisTemplate.opsForHash().hasKey(key, item); + return stringRedisTemplate.opsForHash().hasKey(key, item); } /** @@ -441,7 +439,7 @@ public class RedisUtils { * @return */ public static Double hincr(String key, String item, double by) { - return redisTemplate.opsForHash().increment(key, item, by); + return stringRedisTemplate.opsForHash().increment(key, item, by); } /** @@ -453,7 +451,7 @@ public class RedisUtils { * @return */ public static Double hdecr(String key, String item, double by) { - return redisTemplate.opsForHash().increment(key, item, -by); + return stringRedisTemplate.opsForHash().increment(key, item, -by); } // ============================set============================= @@ -464,9 +462,9 @@ public class RedisUtils { * @param key 键 * @return */ - public static Set sGet(String key) { + public static Set sGet(String key) { try { - return redisTemplate.opsForSet().members(key); + return stringRedisTemplate.opsForSet().members(key); } catch (Exception e) { log.error(e.getMessage(), e); return null; @@ -482,7 +480,7 @@ public class RedisUtils { */ public static Boolean sHasKey(String key, Object value) { try { - return redisTemplate.opsForSet().isMember(key, value); + return stringRedisTemplate.opsForSet().isMember(key, value); } catch (Exception e) { log.error(e.getMessage(), e); return false; @@ -498,7 +496,11 @@ public class RedisUtils { */ public static Long sSet(String key, Object... values) { try { - return redisTemplate.opsForSet().add(key, values); + String[] s = new String[values.length]; + for (int i = 0; i < values.length; i++) { + s[i] = objToStr(values[i]); + } + return stringRedisTemplate.opsForSet().add(key, s); } catch (Exception e) { log.error(e.getMessage(), e); return 0L; @@ -515,7 +517,11 @@ public class RedisUtils { */ public static Long sSetAndTime(String key, long time, Object... values) { try { - Long count = redisTemplate.opsForSet().add(key, values); + String[] s = new String[values.length]; + for (int i = 0; i < values.length; i++) { + s[i] = objToStr(values[i]); + } + Long count = stringRedisTemplate.opsForSet().add(key, s); if (time > 0) { expire(key, time); } @@ -534,7 +540,7 @@ public class RedisUtils { */ public static Long sGetSetSize(String key) { try { - return redisTemplate.opsForSet().size(key); + return stringRedisTemplate.opsForSet().size(key); } catch (Exception e) { log.error(e.getMessage(), e); return 0L; @@ -550,7 +556,7 @@ public class RedisUtils { */ public static Long setRemove(String key, Object... values) { try { - return redisTemplate.opsForSet().remove(key, values); + return stringRedisTemplate.opsForSet().remove(key, values); } catch (Exception e) { log.error(e.getMessage(), e); return 0L; @@ -567,9 +573,9 @@ public class RedisUtils { * @param end 结束 0 到 -1代表所有值 * @return */ - public static List lGet(String key, long start, long end) { + public static List lGet(String key, long start, long end) { try { - return redisTemplate.opsForList().range(key, start, end); + return stringRedisTemplate.opsForList().range(key, start, end); } catch (Exception e) { log.error(e.getMessage(), e); return null; @@ -584,7 +590,7 @@ public class RedisUtils { */ public static Long lGetListSize(String key) { try { - return redisTemplate.opsForList().size(key); + return stringRedisTemplate.opsForList().size(key); } catch (Exception e) { log.error(e.getMessage(), e); return 0L; @@ -598,9 +604,9 @@ public class RedisUtils { * @param index 索引 index>=0时， 0 表头，1 第二个元素，依次类推；index<0时，-1，表尾，-2倒数第二个元素，依次类推 * @return */ - public static Object lGetIndex(String key, long index) { + public static String lGetIndex(String key, long index) { try { - return redisTemplate.opsForList().index(key, index); + return stringRedisTemplate.opsForList().index(key, index); } catch (Exception e) { log.error(e.getMessage(), e); return null; @@ -616,7 +622,7 @@ public class RedisUtils { */ public static Boolean lSet(String key, Object value) { try { - redisTemplate.opsForList().rightPush(key, value); + stringRedisTemplate.opsForList().rightPush(key, objToStr(value)); return true; } catch (Exception e) { log.error(e.getMessage(), e); @@ -634,7 +640,7 @@ public class RedisUtils { */ public static Boolean lSet(String key, Object value, long time) { try { - redisTemplate.opsForList().rightPush(key, value); + stringRedisTemplate.opsForList().rightPush(key, objToStr(value)); if (time > 0) { expire(key, time); } @@ -654,7 +660,11 @@ public class RedisUtils { */ public static Boolean lSet(String key, List value) { try { - redisTemplate.opsForList().rightPushAll(key, value); + List list = new ArrayList<>(); + for (Object item : value) { + list.add(objToStr(item)); + } + stringRedisTemplate.opsForList().rightPushAll(key, list); return true; } catch (Exception e) { log.error(e.getMessage(), e); @@ -672,7 +682,11 @@ public class RedisUtils { */ public static Boolean lSet(String key, List value, long time) { try { - redisTemplate.opsForList().rightPushAll(key, value); + List list = new ArrayList<>(); + for (Object item : value) { + list.add(objToStr(item)); + } + stringRedisTemplate.opsForList().rightPushAll(key, list); if (time > 0) { expire(key, time); } @@ -693,7 +707,7 @@ public class RedisUtils { */ public static Boolean lUpdateIndex(String key, long index, Object value) { try { - redisTemplate.opsForList().set(key, index, value); + stringRedisTemplate.opsForList().set(key, index, objToStr(value)); return true; } catch (Exception e) { log.error(e.getMessage(), e); @@ -711,7 +725,7 @@ public class RedisUtils { */ public static Long lRemove(String key, long count, Object value) { try { - return redisTemplate.opsForList().remove(key, count, value); + return stringRedisTemplate.opsForList().remove(key, count, value); } catch (Exception e) { log.error(e.getMessage(), e); return 0L; @@ -725,12 +739,12 @@ public class RedisUtils { public void delByKeys(String prefix, Set ids) { Set keys = new HashSet<>(); for (Long id : ids) { - Set stringSet = redisTemplate.keys(prefix + id); + Set stringSet = stringRedisTemplate.keys(prefix + id); if (Objects.nonNull(stringSet) && !stringSet.isEmpty()) { keys.addAll(stringSet); } } - Long count = redisTemplate.delete(keys); + Long count = stringRedisTemplate.delete(keys); // 此处提示可自行删除 log.debug("--------------------------------------------"); log.debug("成功删除缓存：" + keys.toString()); @@ -764,8 +778,8 @@ public class RedisUtils { * @param values * @return */ - public static Long zAdd(String key, Set> values) { - return redisTemplate.opsForZSet().add(key, values); + public Long zAdd(String key, Set> values) { + return stringRedisTemplate.opsForZSet().add(key, values); } /** @@ -774,7 +788,7 @@ public class RedisUtils { * @return */ public static Long zRemove(String key, Object... values) { - return redisTemplate.opsForZSet().remove(key, values); + return stringRedisTemplate.opsForZSet().remove(key, values); } public static Long zRemove(String key, Object value) { @@ -794,7 +808,7 @@ public class RedisUtils { * @return */ public static Double zIncrementScore(String key, String value, double delta) { - return redisTemplate.opsForZSet().incrementScore(key, value, delta); + return stringRedisTemplate.opsForZSet().incrementScore(key, value, delta); } /** @@ -805,7 +819,7 @@ public class RedisUtils { * @return 0表示第一位 */ public static Long zRank(String key, Object value) { - return redisTemplate.opsForZSet().rank(key, value); + return stringRedisTemplate.opsForZSet().rank(key, value); } /** @@ -816,7 +830,7 @@ public class RedisUtils { * @return */ public static Long zReverseRank(String key, Object value) { - return redisTemplate.opsForZSet().reverseRank(key, value); + return stringRedisTemplate.opsForZSet().reverseRank(key, value); } /** @@ -827,8 +841,8 @@ public class RedisUtils { * @param end 结束位置, -1查询所有 * @return */ - public static Set zRange(String key, long start, long end) { - return redisTemplate.opsForZSet().range(key, start, end); + public static Set zRange(String key, long start, long end) { + return stringRedisTemplate.opsForZSet().range(key, start, end); } /** @@ -839,9 +853,9 @@ public class RedisUtils { * @param end * @return */ - public static Set> zRangeWithScores(String key, long start, - long end) { - return redisTemplate.opsForZSet().rangeWithScores(key, start, end); + public static Set> zRangeWithScores(String key, long start, + long end) { + return stringRedisTemplate.opsForZSet().rangeWithScores(key, start, end); } /** @@ -852,8 +866,8 @@ public class RedisUtils { * @param max 最大值 * @return */ - public static Set zRangeByScore(String key, double min, double max) { - return redisTemplate.opsForZSet().rangeByScore(key, min, max); + public static Set zRangeByScore(String key, double min, double max) { + return stringRedisTemplate.opsForZSet().rangeByScore(key, min, max); } /** @@ -864,9 +878,9 @@ public class RedisUtils { * @param max 最大值 * @return */ - public Set> zRangeByScoreWithScores(String key, + public Set> zRangeByScoreWithScores(String key, double min, double max) { - return redisTemplate.opsForZSet().rangeByScoreWithScores(key, min, max); + return stringRedisTemplate.opsForZSet().rangeByScoreWithScores(key, min, max); } /** @@ -877,9 +891,9 @@ public class RedisUtils { * @param end * @return */ - public static Set> zRangeByScoreWithScores(String key, - double min, double max, long start, long end) { - return redisTemplate.opsForZSet().rangeByScoreWithScores(key, min, max, + public static Set> zRangeByScoreWithScores(String key, + double min, double max, long start, long end) { + return stringRedisTemplate.opsForZSet().rangeByScoreWithScores(key, min, max, start, end); } @@ -891,8 +905,8 @@ public class RedisUtils { * @param end * @return */ - public static Set zReverseRange(String key, long start, long end) { - return redisTemplate.opsForZSet().reverseRange(key, start, end); + public static Set zReverseRange(String key, long start, long end) { + return stringRedisTemplate.opsForZSet().reverseRange(key, start, end); } // /** @@ -971,7 +985,7 @@ public class RedisUtils { * @return */ public static Long zCount(String key, double min, double max) { - return redisTemplate.opsForZSet().count(key, min, max); + return stringRedisTemplate.opsForZSet().count(key, min, max); } /** @@ -981,7 +995,7 @@ public class RedisUtils { * @return */ public static Long zSize(String key) { - return redisTemplate.opsForZSet().size(key); + return stringRedisTemplate.opsForZSet().size(key); } /** @@ -1002,7 +1016,7 @@ public class RedisUtils { * @return */ public static Double zScore(String key, Object value) { - return redisTemplate.opsForZSet().score(key, value); + return stringRedisTemplate.opsForZSet().score(key, value); } /** @@ -1014,7 +1028,7 @@ public class RedisUtils { * @return */ public static Long zRemoveRange(String key, long start, long end) { - return redisTemplate.opsForZSet().removeRange(key, start, end); + return stringRedisTemplate.opsForZSet().removeRange(key, start, end); } /** @@ -1026,7 +1040,7 @@ public class RedisUtils { * @return */ public static Long zRemoveRangeByScore(String key, double min, double max) { - return redisTemplate.opsForZSet().removeRangeByScore(key, min, max); + return stringRedisTemplate.opsForZSet().removeRangeByScore(key, min, max); } /** @@ -1038,7 +1052,7 @@ public class RedisUtils { * @return */ public static Long zUnionAndStore(String key, String otherKey, String destKey) { - return redisTemplate.opsForZSet().unionAndStore(key, otherKey, destKey); + return stringRedisTemplate.opsForZSet().unionAndStore(key, otherKey, destKey); } /** @@ -1048,8 +1062,8 @@ public class RedisUtils { * @return */ public static Long zUnionAndStore(String key, Collection otherKeys, - String destKey) { - return redisTemplate.opsForZSet() + String destKey) { + return stringRedisTemplate.opsForZSet() .unionAndStore(key, otherKeys, destKey); } @@ -1062,8 +1076,8 @@ public class RedisUtils { * @return */ public static Long zIntersectAndStore(String key, String otherKey, - String destKey) { - return redisTemplate.opsForZSet().intersectAndStore(key, otherKey, + String destKey) { + return stringRedisTemplate.opsForZSet().intersectAndStore(key, otherKey, destKey); } @@ -1076,8 +1090,8 @@ public class RedisUtils { * @return */ public static Long zIntersectAndStore(String key, Collection otherKeys, - String destKey) { - return redisTemplate.opsForZSet().intersectAndStore(key, otherKeys, + String destKey) { + return stringRedisTemplate.opsForZSet().intersectAndStore(key, otherKeys, destKey); }