diff --git a/src/main/java/net/lamgc/cgj/CQProcess.java b/src/main/java/net/lamgc/cgj/CQProcess.java index 3d4919a..0bea45c 100644 --- a/src/main/java/net/lamgc/cgj/CQProcess.java +++ b/src/main/java/net/lamgc/cgj/CQProcess.java @@ -43,15 +43,15 @@ public class CQProcess { private final static Hashtable imageCache = new Hashtable<>(); - private final static JsonRedisCacheDatabase illustInfoCache = new JsonRedisCacheDatabase(redisServerUri, "illustInfo", gson); + private final static JsonRedisCacheStore illustInfoCache = new JsonRedisCacheStore(redisServerUri, "illustInfo", gson); - private final static JsonRedisCacheDatabase illustPreLoadDataCache = new JsonRedisCacheDatabase(redisServerUri, "illustPreLoadData", gson); + private final static JsonRedisCacheStore illustPreLoadDataCache = new JsonRedisCacheStore(redisServerUri, "illustPreLoadData", gson); - private final static JsonRedisCacheDatabase searchBodyCache = new JsonRedisCacheDatabase(redisServerUri, "searchBody", gson); + private final static JsonRedisCacheStore searchBodyCache = new JsonRedisCacheStore(redisServerUri, "searchBody", gson); private final static CacheStore> pagesCache = new LocalHashCacheStore<>(); - private final static JsonRedisCacheDatabase rankingCache = new JsonRedisCacheDatabase(redisServerUri, "ranking", gson); + private final static JsonRedisCacheStore rankingCache = new JsonRedisCacheStore(redisServerUri, "ranking", gson); private final static EventExecutor imageCacheExecutor = new EventExecutor(new ThreadPoolExecutor( 1, diff --git a/src/main/java/net/lamgc/cgj/cache/JsonRedisCacheDatabase.java b/src/main/java/net/lamgc/cgj/cache/JsonRedisCacheStore.java similarity index 74% rename from src/main/java/net/lamgc/cgj/cache/JsonRedisCacheDatabase.java rename to src/main/java/net/lamgc/cgj/cache/JsonRedisCacheStore.java index fa43cf9..0e15c4d 100644 --- a/src/main/java/net/lamgc/cgj/cache/JsonRedisCacheDatabase.java +++ b/src/main/java/net/lamgc/cgj/cache/JsonRedisCacheStore.java @@ -5,11 +5,11 @@ import com.google.gson.JsonElement; import java.net.URI; -public class JsonRedisCacheDatabase extends RedisPoolCacheStore { +public class JsonRedisCacheStore extends RedisPoolCacheStore { private final Gson gson; - public JsonRedisCacheDatabase(URI redisServerUri, String prefix, Gson gson) { + public JsonRedisCacheStore(URI redisServerUri, String prefix, Gson gson) { super(redisServerUri, prefix); this.gson = gson; } diff --git a/src/main/java/net/lamgc/cgj/cache/RedisCacheDatabase.java b/src/main/java/net/lamgc/cgj/cache/RedisCacheStore.java similarity index 90% rename from src/main/java/net/lamgc/cgj/cache/RedisCacheDatabase.java rename to src/main/java/net/lamgc/cgj/cache/RedisCacheStore.java index a5a5d98..ac54527 100644 --- a/src/main/java/net/lamgc/cgj/cache/RedisCacheDatabase.java +++ b/src/main/java/net/lamgc/cgj/cache/RedisCacheStore.java @@ -9,13 +9,13 @@ import redis.clients.jedis.exceptions.JedisConnectionException; import java.net.URI; import java.util.Date; -public abstract class RedisCacheDatabase implements CacheStore { +public abstract class RedisCacheStore implements CacheStore { private final Jedis jedis; private final Logger log; private final String keyPrefix; - public RedisCacheDatabase(URI redisServerUri, String prefix) { + public RedisCacheStore(URI redisServerUri, String prefix) { this(redisServerUri, null, prefix); } @@ -25,7 +25,7 @@ public abstract class RedisCacheDatabase implements CacheStore { * @param password 登录密码(如果有) * @throws JedisConnectionException 当连接失败时抛出 */ - public RedisCacheDatabase(URI redisServerUri, String password, String prefix) throws JedisConnectionException { + public RedisCacheStore(URI redisServerUri, String password, String prefix) throws JedisConnectionException { this.jedis = new Jedis(redisServerUri.getHost(), redisServerUri.getPort() <= 0 ? 6379 : redisServerUri.getPort()); log = LoggerFactory.getLogger("RedisCacheDatabase@" + Integer.toHexString(jedis.hashCode())); log.info("Redis数据库连接状态: {}", jedis.ping());