From a4328e3d4fe2894c0ddf378eea9b3c2a3498d62b Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期四, 23 三月 2023 08:52:35 +0800
Subject: [PATCH] 修复关闭接口鉴权后跨域设置失效的问题
---
src/main/java/com/genersoft/iot/vmp/utils/redis/RedisUtil.java | 25 +++++++++----------------
1 files changed, 9 insertions(+), 16 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/utils/redis/RedisUtil.java b/src/main/java/com/genersoft/iot/vmp/utils/redis/RedisUtil.java
index c5be52c..e54ed53 100644
--- a/src/main/java/com/genersoft/iot/vmp/utils/redis/RedisUtil.java
+++ b/src/main/java/com/genersoft/iot/vmp/utils/redis/RedisUtil.java
@@ -238,7 +238,7 @@
* @param time 鏃堕棿
* @return true / false
*/
- public static boolean hmset(String key, Map<Object, Object> map, long time) {
+ public static boolean hmset(String key, Map<?, ?> map, long time) {
if (redisTemplate == null) {
redisTemplate = SpringBeanFactory.getBean("redisTemplate");
}
@@ -864,16 +864,12 @@
* @param query 鏌ヨ鍙傛暟
* @return
*/
- public static List<Object> scan(String query, Integer count) {
+ public static List<Object> scan(String query) {
if (redisTemplate == null) {
redisTemplate = SpringBeanFactory.getBean("redisTemplate");
}
Set<String> resultKeys = (Set<String>) redisTemplate.execute((RedisCallback<Set<String>>) connection -> {
- ScanOptions.ScanOptionsBuilder match = ScanOptions.scanOptions().match("*" + query + "*");
- if (count != null) {
- match.count(count);
- }
- ScanOptions scanOptions = match.build();
+ ScanOptions scanOptions = ScanOptions.scanOptions().match("*" + query + "*").count(1000).build();
Cursor<byte[]> scan = connection.scan(scanOptions);
Set<String> keys = new HashSet<>();
while (scan.hasNext()) {
@@ -885,16 +881,13 @@
return new ArrayList<>(resultKeys);
}
-
- /**
- * 妯＄硦鏌ヨ
- * @param query 鏌ヨ鍙傛暟
- * @return
- */
- public static List<Object> scan(String query) {
- return scan(query, null);
+ public static List<Object> scan2(String query) {
+ if (redisTemplate == null) {
+ redisTemplate = SpringBeanFactory.getBean("redisTemplate");
+ }
+ Set<String> keys = redisTemplate.keys(query);
+ return new ArrayList<>(keys);
}
-
// ============================== 娑堟伅鍙戦�佷笌璁㈤槄 ==============================
public static void convertAndSend(String channel, JSONObject msg) {
if (redisTemplate == null) {
--
Gitblit v1.8.0