From 4c89c8d77ad4d82ba20cbcab67953a2c682fd14c Mon Sep 17 00:00:00 2001 From: MaxKey Date: Mon, 28 Jul 2025 22:21:26 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BC=93=E5=AD=98=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../persistence/redis/RedisConnection.java | 2 +- .../redis/RedisConnectionFactory.java | 47 ++----------------- .../persistence/redis/RedisDefaultConfig.java | 42 +++++++++++++++++ 3 files changed, 46 insertions(+), 45 deletions(-) create mode 100644 maxkey-commons/maxkey-cache/src/main/java/org/dromara/maxkey/persistence/redis/RedisDefaultConfig.java diff --git a/maxkey-commons/maxkey-cache/src/main/java/org/dromara/maxkey/persistence/redis/RedisConnection.java b/maxkey-commons/maxkey-cache/src/main/java/org/dromara/maxkey/persistence/redis/RedisConnection.java index c37319f60..9cccf77b5 100644 --- a/maxkey-commons/maxkey-cache/src/main/java/org/dromara/maxkey/persistence/redis/RedisConnection.java +++ b/maxkey-commons/maxkey-cache/src/main/java/org/dromara/maxkey/persistence/redis/RedisConnection.java @@ -81,7 +81,7 @@ public class RedisConnection { public void setex(String key,long seconds, String value){ _logger.trace("setex key {} ..." , key); if(seconds==0){ - conn.setex(key, RedisConnectionFactory.DEFAULT_CONFIG.DEFAULT_LIFETIME, value); + conn.setex(key, RedisDefaultConfig.DEFAULT_LIFETIME, value); }else{ conn.setex(key, seconds, value); } diff --git a/maxkey-commons/maxkey-cache/src/main/java/org/dromara/maxkey/persistence/redis/RedisConnectionFactory.java b/maxkey-commons/maxkey-cache/src/main/java/org/dromara/maxkey/persistence/redis/RedisConnectionFactory.java index a8ca38d81..d882d3499 100644 --- a/maxkey-commons/maxkey-cache/src/main/java/org/dromara/maxkey/persistence/redis/RedisConnectionFactory.java +++ b/maxkey-commons/maxkey-cache/src/main/java/org/dromara/maxkey/persistence/redis/RedisConnectionFactory.java @@ -27,47 +27,6 @@ import redis.clients.jedis.JedisPoolConfig; public class RedisConnectionFactory { private static final Logger _logger = LoggerFactory.getLogger(RedisConnectionFactory.class); - public static class DEFAULT_CONFIG { - /** - * Redis默认服务器IP - */ - public static final String DEFAULT_ADDRESS = "127.0.0.1"; - /** - * Redis默认端口号 - */ - public static final int DEFAULT_PORT = 6379; - /** - * 访问密码 - */ - public static final String DEFAULT_AUTH = "admin"; - /** - * 可用连接实例的最大数目，默认值为8；
- * 如果赋值为-1，则表示不限制；如果pool已经分配了maxActive个jedis实例，则此时pool的状态为exhausted(耗尽)。 - **/ - public static final int DEFAULT_MAX_ACTIVE = 5000; - - /** - * 控制一个pool最多有多少个状态为idle(空闲的)的jedis实例，默认值也是8。 - */ - public static final int DEFAULT_MAX_IDLE = 5000; - - /** - * 等待可用连接的最大时间，单位毫秒，默认值为-1，表示永不超时。如果超过等待时间，则直接抛出JedisConnectionException； - */ - public static final int DEFAULT_MAX_WAIT_MILLIS = 10000; - - public static final int DEFAULT_TIMEOUT = 10000; - - /** - * 在borrow一个jedis实例时，是否提前进行validate操作；如果为true，则得到的jedis实例均是可用的； - */ - public static final boolean DEFAULT_TEST_ON_BORROW = true; - /** - * 默认过期时间 - */ - public static final long DEFAULT_LIFETIME = 600; - } - JedisPoolConfig poolConfig; private JedisPool jedisPool = null; @@ -86,13 +45,13 @@ public class RedisConnectionFactory { _logger.debug("init Jedis Pool ."); try { if (this.hostName == null || hostName.equals("")) { - hostName = DEFAULT_CONFIG.DEFAULT_ADDRESS; + hostName = RedisDefaultConfig.DEFAULT_ADDRESS; } if (port == 0) { - port = DEFAULT_CONFIG.DEFAULT_PORT; + port = RedisDefaultConfig.DEFAULT_PORT; } if (timeOut == 0) { - timeOut = DEFAULT_CONFIG.DEFAULT_TIMEOUT; + timeOut = RedisDefaultConfig.DEFAULT_TIMEOUT; } if (this.password == null || this.password.equals("")) { diff --git a/maxkey-commons/maxkey-cache/src/main/java/org/dromara/maxkey/persistence/redis/RedisDefaultConfig.java b/maxkey-commons/maxkey-cache/src/main/java/org/dromara/maxkey/persistence/redis/RedisDefaultConfig.java new file mode 100644 index 000000000..6d54e8937 --- /dev/null +++ b/maxkey-commons/maxkey-cache/src/main/java/org/dromara/maxkey/persistence/redis/RedisDefaultConfig.java @@ -0,0 +1,42 @@ +package org.dromara.maxkey.persistence.redis; + +public class RedisDefaultConfig { + /** + * Redis默认服务器IP + */ + public static final String DEFAULT_ADDRESS = "127.0.0.1"; + /** + * Redis默认端口号 + */ + public static final int DEFAULT_PORT = 6379; + /** + * 访问密码 + */ + public static final String DEFAULT_AUTH = "admin"; + /** + * 可用连接实例的最大数目，默认值为8；
+ * 如果赋值为-1，则表示不限制；如果pool已经分配了maxActive个jedis实例，则此时pool的状态为exhausted(耗尽)。 + **/ + public static final int DEFAULT_MAX_ACTIVE = 5000; + + /** + * 控制一个pool最多有多少个状态为idle(空闲的)的jedis实例，默认值也是8。 + */ + public static final int DEFAULT_MAX_IDLE = 5000; + + /** + * 等待可用连接的最大时间，单位毫秒，默认值为-1，表示永不超时。如果超过等待时间，则直接抛出JedisConnectionException； + */ + public static final int DEFAULT_MAX_WAIT_MILLIS = 10000; + + public static final int DEFAULT_TIMEOUT = 10000; + + /** + * 在borrow一个jedis实例时，是否提前进行validate操作；如果为true，则得到的jedis实例均是可用的； + */ + public static final boolean DEFAULT_TEST_ON_BORROW = true; + /** + * 默认过期时间 + */ + public static final long DEFAULT_LIFETIME = 600; +}