update 优化 锁切面代码 key到常量类

This commit is contained in:
疯狂的狮子li 2021-06-04 16:46:28 +08:00
parent 450c6759eb
commit f087b37cb3
2 changed files with 11 additions and 9 deletions

View File

@ -2,7 +2,7 @@ package com.ruoyi.common.constant;
/** /**
* 通用常量信息 * 通用常量信息
* *
* @author ruoyi * @author ruoyi
*/ */
public class Constants public class Constants
@ -126,4 +126,9 @@ public class Constants
* 资源映射路径 前缀 * 资源映射路径 前缀
*/ */
public static final String RESOURCE_PREFIX = "/profile"; public static final String RESOURCE_PREFIX = "/profile";
/**
* 资源映射路径 前缀
*/
public static final String REDIS_LOCK_KEY = "redis_lock:";
} }

View File

@ -2,6 +2,7 @@ package com.ruoyi.framework.aspectj;
import com.ruoyi.common.annotation.RedisLock; import com.ruoyi.common.annotation.RedisLock;
import com.ruoyi.common.constant.Constants;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.aspectj.lang.ProceedingJoinPoint; import org.aspectj.lang.ProceedingJoinPoint;
import org.aspectj.lang.annotation.Around; import org.aspectj.lang.annotation.Around;
@ -34,8 +35,6 @@ public class RedisLockAspect {
@Autowired @Autowired
private RedissonClient redissonClient; private RedissonClient redissonClient;
private static final String LOCK_TITLE = "RedisLock_";
@Pointcut("@annotation(com.ruoyi.common.annotation.RedisLock)") @Pointcut("@annotation(com.ruoyi.common.annotation.RedisLock)")
public void annotationPointcut() { public void annotationPointcut() {
} }
@ -67,6 +66,8 @@ public class RedisLockAspect {
throw new RuntimeException("redis分布式锁注解参数异常", e); throw new RuntimeException("redis分布式锁注解参数异常", e);
} }
// 声明锁名称
key = Constants.REDIS_LOCK_KEY + key;
Object res; Object res;
try { try {
if (acquire(key, expireTime, TimeUnit.SECONDS)) { if (acquire(key, expireTime, TimeUnit.SECONDS)) {
@ -136,8 +137,6 @@ public class RedisLockAspect {
* 加锁RLock带超时时间的 * 加锁RLock带超时时间的
*/ */
private boolean acquire(String key, long expire, TimeUnit expireUnit) { private boolean acquire(String key, long expire, TimeUnit expireUnit) {
//声明key对象
key = LOCK_TITLE + key;
try { try {
//获取锁对象 //获取锁对象
RLock mylock = redissonClient.getLock(key); RLock mylock = redissonClient.getLock(key);
@ -155,13 +154,11 @@ public class RedisLockAspect {
* 锁的释放 * 锁的释放
*/ */
private void release(String lockName) { private void release(String lockName) {
//必须是和加锁时的同一个key
String key = LOCK_TITLE + lockName;
//获取所对象 //获取所对象
RLock mylock = redissonClient.getLock(key); RLock mylock = redissonClient.getLock(lockName);
//释放锁(解锁) //释放锁(解锁)
mylock.unlock(); mylock.unlock();
log.info("unlock => key : " + key + " , ThreadName : " + Thread.currentThread().getName()); log.info("unlock => key : " + lockName + " , ThreadName : " + Thread.currentThread().getName());
} }
} }