From 428a6ed71b6cb571585f69fd6f4ac6868c5d7ab8 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期五, 04 六月 2021 16:49:33 +0800
Subject: [PATCH] update 优化 锁切面代码 key到常量类
---
ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/RedisLockAspect.java | 13 +++++--------
ruoyi-common/src/main/java/com/ruoyi/common/constant/Constants.java | 7 ++++++-
2 files changed, 11 insertions(+), 9 deletions(-)
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/constant/Constants.java b/ruoyi-common/src/main/java/com/ruoyi/common/constant/Constants.java
index 5342919..137969a 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/constant/Constants.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/constant/Constants.java
@@ -2,7 +2,7 @@
/**
* 閫氱敤甯搁噺淇℃伅
- *
+ *
* @author ruoyi
*/
public class Constants
@@ -126,4 +126,9 @@
* 璧勬簮鏄犲皠璺緞 鍓嶇紑
*/
public static final String RESOURCE_PREFIX = "/profile";
+
+ /**
+ * 璧勬簮鏄犲皠璺緞 鍓嶇紑
+ */
+ public static final String REDIS_LOCK_KEY = "redis_lock:";
}
diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/RedisLockAspect.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/RedisLockAspect.java
index 0ff695f..0af3844 100644
--- a/ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/RedisLockAspect.java
+++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/RedisLockAspect.java
@@ -2,6 +2,7 @@
import com.ruoyi.common.annotation.RedisLock;
+import com.ruoyi.common.constant.Constants;
import lombok.extern.slf4j.Slf4j;
import org.aspectj.lang.ProceedingJoinPoint;
import org.aspectj.lang.annotation.Around;
@@ -34,8 +35,6 @@
@Autowired
private RedissonClient redissonClient;
- private static final String LOCK_TITLE = "RedisLock_";
-
@Pointcut("@annotation(com.ruoyi.common.annotation.RedisLock)")
public void annotationPointcut() {
}
@@ -67,6 +66,8 @@
throw new RuntimeException("redis鍒嗗竷寮忛攣娉ㄨВ鍙傛暟寮傚父", e);
}
+ // 澹版槑閿佸悕绉�
+ key = Constants.REDIS_LOCK_KEY + key;
Object res;
try {
if (acquire(key, expireTime, TimeUnit.SECONDS)) {
@@ -136,8 +137,6 @@
* 鍔犻攣锛圧Lock锛夊甫瓒呮椂鏃堕棿鐨�
*/
private boolean acquire(String key, long expire, TimeUnit expireUnit) {
- //澹版槑key瀵硅薄
- key = LOCK_TITLE + key;
try {
//鑾峰彇閿佸璞�
RLock mylock = redissonClient.getLock(key);
@@ -155,13 +154,11 @@
* 閿佺殑閲婃斁
*/
private void release(String lockName) {
- //蹇呴』鏄拰鍔犻攣鏃剁殑鍚屼竴涓猭ey
- String key = LOCK_TITLE + lockName;
//鑾峰彇鎵�瀵硅薄
- RLock mylock = redissonClient.getLock(key);
+ RLock mylock = redissonClient.getLock(lockName);
//閲婃斁閿侊紙瑙ｉ攣锛�
mylock.unlock();
- log.info("unlock => key : " + key + " , ThreadName : " + Thread.currentThread().getName());
+ log.info("unlock => key : " + lockName + " , ThreadName : " + Thread.currentThread().getName());
}
}
--
Gitblit v1.9.3