From 12b5bf5e3f7265f4bb981807350dd38208f646ad Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Fri, 9 Jan 2026 06:23:17 +0000
Subject: [PATCH 1/3] Initial plan


From 61a514d9c4aa40407648bbca7ed71ddec0f57a04 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Fri, 9 Jan 2026 06:33:20 +0000
Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=20Spring=20Boot=203=20?=
 =?UTF-8?q?=E4=B8=AD=20RedisTemplate=20=E7=BC=93=E5=AD=98=E5=A4=B1?=
 =?UTF-8?q?=E6=95=88=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: binarywang <1343140+binarywang@users.noreply.github.com>
---
 .../weixin/common/redis/RedisTemplateWxRedisOps.java   |  2 +-
 .../weixin/common/redis/CommonWxRedisOpsTest.java      | 10 ++++++++++
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/weixin-java-common/src/main/java/me/chanjar/weixin/common/redis/RedisTemplateWxRedisOps.java b/weixin-java-common/src/main/java/me/chanjar/weixin/common/redis/RedisTemplateWxRedisOps.java
index 19d4046c92..d531a2a307 100644
--- a/weixin-java-common/src/main/java/me/chanjar/weixin/common/redis/RedisTemplateWxRedisOps.java
+++ b/weixin-java-common/src/main/java/me/chanjar/weixin/common/redis/RedisTemplateWxRedisOps.java
@@ -29,7 +29,7 @@ public void setValue(String key, String value, int expire, TimeUnit timeUnit) {
 
   @Override
   public Long getExpire(String key) {
-    return redisTemplate.getExpire(key);
+    return redisTemplate.getExpire(key, TimeUnit.SECONDS);
   }
 
   @Override
diff --git a/weixin-java-common/src/test/java/me/chanjar/weixin/common/redis/CommonWxRedisOpsTest.java b/weixin-java-common/src/test/java/me/chanjar/weixin/common/redis/CommonWxRedisOpsTest.java
index 96ba20ba2b..7098a2e95a 100644
--- a/weixin-java-common/src/test/java/me/chanjar/weixin/common/redis/CommonWxRedisOpsTest.java
+++ b/weixin-java-common/src/test/java/me/chanjar/weixin/common/redis/CommonWxRedisOpsTest.java
@@ -35,6 +35,16 @@ public void testGetExpire() {
     Assert.assertTrue(expireSeconds <= 4 && expireSeconds >= 0);
   }
 
+  @Test
+  public void testGetExpireForNonExistentKey() {
+    String nonExistentKey = "non_existent_key_" + System.currentTimeMillis();
+    Long expire = wxRedisOps.getExpire(nonExistentKey);
+    // For non-existent keys, getExpire should return a negative value
+    // In Spring Data Redis 2.x: may return null (but our implementation should handle this)
+    // In Spring Data Redis 3.x: returns -2
+    Assert.assertTrue(expire == null || expire < 0, "Non-existent key should have null or negative expiration");
+  }
+
   @Test
   public void testExpire() {
     String key = "access_token", value = String.valueOf(System.currentTimeMillis());

From ab557b62722c92d1e0cdae8d6f17c05f8048549c Mon Sep 17 00:00:00 2001
From: Binary Wang <binarywang@users.noreply.github.com>
Date: Wed, 14 Jan 2026 17:04:44 +0800
Subject: [PATCH 3/3] Update
 weixin-java-common/src/test/java/me/chanjar/weixin/common/redis/CommonWxRedisOpsTest.java

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
---
 .../weixin/common/redis/CommonWxRedisOpsTest.java        | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/weixin-java-common/src/test/java/me/chanjar/weixin/common/redis/CommonWxRedisOpsTest.java b/weixin-java-common/src/test/java/me/chanjar/weixin/common/redis/CommonWxRedisOpsTest.java
index 7098a2e95a..fb53c8c4b6 100644
--- a/weixin-java-common/src/test/java/me/chanjar/weixin/common/redis/CommonWxRedisOpsTest.java
+++ b/weixin-java-common/src/test/java/me/chanjar/weixin/common/redis/CommonWxRedisOpsTest.java
@@ -39,10 +39,11 @@ public void testGetExpire() {
   public void testGetExpireForNonExistentKey() {
     String nonExistentKey = "non_existent_key_" + System.currentTimeMillis();
     Long expire = wxRedisOps.getExpire(nonExistentKey);
-    // For non-existent keys, getExpire should return a negative value
-    // In Spring Data Redis 2.x: may return null (but our implementation should handle this)
-    // In Spring Data Redis 3.x: returns -2
-    Assert.assertTrue(expire == null || expire < 0, "Non-existent key should have null or negative expiration");
+    // 对于不存在的 key，底层使用 getExpire(key, TimeUnit.SECONDS) 时应返回负值
+    // Spring Data Redis 2.x 和 3.x 约定：-2 表示 key 不存在，-1 表示 key 没有过期时间
+    // 因此这里不应返回 null，而应返回一个小于 0 的值
+    Assert.assertNotNull(expire, "Non-existent key should not have null expiration");
+    Assert.assertTrue(expire < 0, "Non-existent key should have negative expiration");
   }
 
   @Test