From 8dfb858b9fffa7655e0c483f9a86ca16ddafc7ca Mon Sep 17 00:00:00 2001
From: LamGC <lam827@lamgc.net>
Date: Sat, 13 Jun 2020 17:24:06 +0800
Subject: [PATCH] =?UTF-8?q?[Change]=20RedisPoolCacheStore=20=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96=E5=86=85=E9=83=A8=E6=96=B9=E6=B3=95=E5=AE=9E=E7=8E=B0?=
 =?UTF-8?q?;?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cgj/bot/cache/RedisPoolCacheStore.java    | 24 +++++++++----------
 1 file changed, 11 insertions(+), 13 deletions(-)

diff --git a/src/main/java/net/lamgc/cgj/bot/cache/RedisPoolCacheStore.java b/src/main/java/net/lamgc/cgj/bot/cache/RedisPoolCacheStore.java
index dea8d63..7969bda 100644
--- a/src/main/java/net/lamgc/cgj/bot/cache/RedisPoolCacheStore.java
+++ b/src/main/java/net/lamgc/cgj/bot/cache/RedisPoolCacheStore.java
@@ -51,27 +51,27 @@ abstract class RedisPoolCacheStore<T> implements CacheStore<T> {
 
     @Override
     public void update(String key, T value, Date expire) {
-        try (Jedis jedis = jedisPool.getResource()) {
+        executeJedisCommand(jedis -> {
             jedis.set(keyPrefix + key, parse(value));
             if(expire != null) {
                 jedis.pexpireAt(keyPrefix + key, expire.getTime());
                 log.debug("已设置Key {} 的过期时间(Expire: {})", key, expire.getTime());
             }
-        }
+        });
     }
 
     @Override
     public T getCache(String key) {
-        try (Jedis jedis = jedisPool.getResource()) {
+        return executeJedisCommand(jedis -> {
             return analysis(jedis.get(keyPrefix + key));
-        }
+        });
     }
 
     @Override
     public boolean exists(String key) {
-        try (Jedis jedis = jedisPool.getResource()) {
+        return executeJedisCommand(jedis -> {
             return jedis.exists(keyPrefix + key);
-        }
+        });
     }
 
     @Override
@@ -81,23 +81,21 @@ abstract class RedisPoolCacheStore<T> implements CacheStore<T> {
 
     @Override
     public boolean clear() {
-        try (Jedis jedis = jedisPool.getResource()) {
+        return executeJedisCommand(jedis -> {
             return jedis.flushDB().equalsIgnoreCase("ok");
-        }
+        });
     }
 
     @Override
     public Set<String> keys() {
-        try (Jedis jedis = jedisPool.getResource()) {
+        return executeJedisCommand(jedis -> {
             return jedis.keys(keyPrefix + "*");
-        }
+        });
     }
 
     @Override
     public boolean remove(String key) {
-        try (Jedis jedis = jedisPool.getResource()) {
-            return jedis.del(keyPrefix + key) == 1;
-        }
+        return executeJedisCommand(jedis -> jedis.del(keyPrefix + key) == 1);
     }
 
     /**