diff --git a/src/main/java/com/kwan/springbootkwan/aop/RedisLockAspect.java b/src/main/java/com/kwan/springbootkwan/aop/RedisLockAspect.java index 654b290758a40f6354237bfd67a073a79ab01d81..986784d79024cde253b406a254638732be21e948 100644 --- a/src/main/java/com/kwan/springbootkwan/aop/RedisLockAspect.java +++ b/src/main/java/com/kwan/springbootkwan/aop/RedisLockAspect.java @@ -41,7 +41,7 @@ public class RedisLockAspect { if (locked) { if (StringUtils.hasText(lockKey)) { redisTemplate.opsForValue().set(lockKey, "locked", redisLock.expire(), TimeUnit.MILLISECONDS); - redisLockRenewal.scheduleRenewal(lock, lockKey, 20000, redisLock.expire()); + redisLockRenewal.scheduleRenewal(lock, redisLock, 20000); } return joinPoint.proceed(); } else { diff --git a/src/main/java/com/kwan/springbootkwan/schedule/RedisLockRenewal.java b/src/main/java/com/kwan/springbootkwan/schedule/RedisLockRenewal.java index aa62c3b7549d912486d4bfff899960d341c8b699..47a097ad0b9ea1d6d7037f49016650d66b7e68a9 100644 --- a/src/main/java/com/kwan/springbootkwan/schedule/RedisLockRenewal.java +++ b/src/main/java/com/kwan/springbootkwan/schedule/RedisLockRenewal.java @@ -1,5 +1,6 @@ package com.kwan.springbootkwan.schedule; +import com.kwan.springbootkwan.annotation.RedisLock; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.redis.core.StringRedisTemplate; import org.springframework.stereotype.Component; @@ -22,13 +23,13 @@ public class RedisLockRenewal { this.redisTemplate = redisTemplate; } - public void scheduleRenewal(Lock lock, String lockKey, long renewalIntervalMillis, long lockExpireMillis) { + public void scheduleRenewal(Lock lock, RedisLock redisLock, long renewalIntervalMillis) { scheduler.scheduleAtFixedRate(() -> { try { - boolean locked = lock.tryLock(lockExpireMillis, TimeUnit.MILLISECONDS); + boolean locked = lock.tryLock(redisLock.timeout(), TimeUnit.MILLISECONDS); if (locked) { // 续期操作:设置新的过期时间 - redisTemplate.expire(lockKey, lockExpireMillis, TimeUnit.MILLISECONDS); + redisTemplate.expire(redisLock.key(), redisLock.expire(), TimeUnit.MILLISECONDS); } } catch (Exception e) { // 处理续期失败的情况,可以记录日志或采取其他操作