From 420bb3b84e4cc04c92e29c00a3b6bf5be3093a2b Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: 星期三, 17 五月 2023 09:53:54 +0800
Subject: [PATCH] 优化费用统计表
---
java110-core/src/main/java/com/java110/core/cache/JedisClientTemplate.java | 46 ++++++++++++++++++++++++++++++++++++++++------
1 files changed, 40 insertions(+), 6 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 d9c7be9..9cc7102 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
@@ -8,6 +8,7 @@
import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.data.redis.core.script.DefaultRedisScript;
import org.springframework.stereotype.Component;
+import redis.clients.jedis.JedisCluster;
import redis.clients.jedis.JedisPool;
import java.util.List;
@@ -41,8 +42,18 @@
// return "";
return redisTemplate.execute(new RedisCallback() {
public String doInRedis(RedisConnection connection) {
- Jedis jedis = (Jedis) connection.getNativeConnection();
- return jedis.set(key, value, nxxx, expx, time);
+ //redis.clients.jedis.Jedis jedis = (redis.clients.jedis.Jedis) connection.getNativeConnection();
+ Object nativeConnection = connection.getNativeConnection();
+ // 闆嗙兢
+ if (nativeConnection instanceof JedisCluster) {
+ return ((JedisCluster) 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();
}
@@ -50,12 +61,21 @@
@Override
public String get(String key) {
- return redisTemplate.opsForValue().get(key).toString();
+ Object value = redisTemplate.opsForValue().get(key);
+ if (value == null) {
+ return null;
+ }
+
+ return value.toString();
}
@Override
public byte[] get(byte[] key) {
- return (byte[]) redisTemplate.opsForValue().get(key);
+ Object value = redisTemplate.opsForValue().get(key);
+ if (value == null) {
+ return null;
+ }
+ return (byte[]) value;
}
@Override
@@ -131,7 +151,21 @@
@Override
public Object eval(String script, List<String> keys, List<String> args) {
- DefaultRedisScript redisScript = new DefaultRedisScript(script);
- return redisTemplate.execute(redisScript, keys, args);
+ Object exeRet = redisTemplate.execute((RedisCallback<Object>) connection -> {
+ Object nativeConnection = connection.getNativeConnection();
+ // 闆嗙兢
+ if (nativeConnection instanceof JedisCluster) {
+ return ((JedisCluster) nativeConnection).eval(script, keys, args);
+ }
+
+ // 鍗曟満
+ if (nativeConnection instanceof redis.clients.jedis.Jedis) {
+ return ((redis.clients.jedis.Jedis) nativeConnection).eval(script, keys, args);
+ }
+
+ return null;
+ });
+ //return redisTemplate.execute(redisScript, keys, args);
+ return exeRet;
}
}
--
Gitblit v1.8.0