From 212aa4ae1f54fe4d3e51b9695224f9f86cd1bd22 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期二, 11 七月 2023 10:58:48 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
java110-core/src/main/java/com/java110/core/cache/JedisClientTemplate.java | 18 +++++++++++-------
1 files changed, 11 insertions(+), 7 deletions(-)
diff --git a/java110-core/src/main/java/com/java110/core/cache/JedisClientTemplate.java b/java110-core/src/main/java/com/java110/core/cache/JedisClientTemplate.java
index 3bb029b..b55edff 100644
--- a/java110-core/src/main/java/com/java110/core/cache/JedisClientTemplate.java
+++ b/java110-core/src/main/java/com/java110/core/cache/JedisClientTemplate.java
@@ -40,9 +40,9 @@
public String set(String key, String value, String nxxx, String expx, int time) {
// redisTemplate.opsForValue().set(key, value,nxxx,expx,time);
// return "";
- return redisTemplate.execute(new RedisCallback() {
+ Object ext = redisTemplate.execute(new RedisCallback() {
public String doInRedis(RedisConnection connection) {
- redis.clients.jedis.Jedis jedis = (redis.clients.jedis.Jedis) connection.getNativeConnection();
+ //redis.clients.jedis.Jedis jedis = (redis.clients.jedis.Jedis) connection.getNativeConnection();
Object nativeConnection = connection.getNativeConnection();
// 闆嗙兢
if (nativeConnection instanceof JedisCluster) {
@@ -50,12 +50,16 @@
}
// 鍗曟満
- if (nativeConnection instanceof Jedis) {
- return ((Jedis) nativeConnection).set(key, value, nxxx, expx, time);
+ if (nativeConnection instanceof redis.clients.jedis.Jedis) {
+ return ((redis.clients.jedis.Jedis) nativeConnection).set(key, value, nxxx, expx, time);
}
return "";
}
- }, true).toString();
+ }, true);
+ if (ext == null) {
+ return "";
+ }
+ return ext.toString();
}
@@ -159,8 +163,8 @@
}
// 鍗曟満
- if (nativeConnection instanceof Jedis) {
- return ((Jedis) nativeConnection).eval(script, keys, args);
+ if (nativeConnection instanceof redis.clients.jedis.Jedis) {
+ return ((redis.clients.jedis.Jedis) nativeConnection).eval(script, keys, args);
}
return null;
--
Gitblit v1.8.0