From dcf125a08ad3f0694815265850df78d62f1444fa Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期五, 04 六月 2021 16:09:43 +0800
Subject: [PATCH] update 优化 redis锁pr 代码
---
ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/RedisLockAspect.java | 89 +++++++++++++++++++++++++++++++++-----------
1 files changed, 66 insertions(+), 23 deletions(-)
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/redis/RedisLockAspect.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/RedisLockAspect.java
similarity index 61%
rename from ruoyi-common/src/main/java/com/ruoyi/common/core/redis/RedisLockAspect.java
rename to ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/RedisLockAspect.java
index c249dfe..0ff695f 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/core/redis/RedisLockAspect.java
+++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/RedisLockAspect.java
@@ -1,15 +1,15 @@
-package com.ruoyi.common.core.redis;
+package com.ruoyi.framework.aspectj;
import com.ruoyi.common.annotation.RedisLock;
-import com.ruoyi.common.utils.file.ImageUtils;
+import lombok.extern.slf4j.Slf4j;
import org.aspectj.lang.ProceedingJoinPoint;
import org.aspectj.lang.annotation.Around;
import org.aspectj.lang.annotation.Aspect;
import org.aspectj.lang.annotation.Pointcut;
import org.aspectj.lang.reflect.MethodSignature;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.redisson.api.RLock;
+import org.redisson.api.RedissonClient;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.core.annotation.Order;
import org.springframework.stereotype.Component;
@@ -21,15 +21,20 @@
/**
* 鍒嗗竷寮忛攣锛堟敞瑙ｅ疄鐜扮増鏈級
+ *
+ * @author shenxinquan
*/
-@Component
+
+@Slf4j
@Aspect
@Order(9)
+@Component
public class RedisLockAspect {
- @Autowired
- private RedisLockUtil redisUtil;
- private static final Logger log = LoggerFactory.getLogger(RedisLockAspect.class);
+ @Autowired
+ private RedissonClient redissonClient;
+
+ private static final String LOCK_TITLE = "RedisLock_";
@Pointcut("@annotation(com.ruoyi.common.annotation.RedisLock)")
public void annotationPointcut() {
@@ -47,6 +52,7 @@
String key = "";
// 榛樿30绉掕繃鏈熸椂闂�
int expireTime = 30;
+
try {
// 寰楀埌璁块棶鐨勬柟娉曞璞�
Method method = className.getMethod(methodName, argClass);
@@ -60,18 +66,26 @@
} catch (Exception e) {
throw new RuntimeException("redis鍒嗗竷寮忛攣娉ㄨВ鍙傛暟寮傚父", e);
}
- Object res = new Object();
- if (redisUtil.acquire(key, expireTime, TimeUnit.SECONDS)) {
- try {
- res = joinPoint.proceed();
- return res;
- } catch (Exception e) {
- throw new RuntimeException(e);
- } finally {
- redisUtil.release(key);
+
+ Object res;
+ try {
+ if (acquire(key, expireTime, TimeUnit.SECONDS)) {
+ try {
+ res = joinPoint.proceed();
+ return res;
+ } catch (Exception e) {
+ throw new RuntimeException(e);
+ } finally {
+ release(key);
+ }
+ } else {
+ throw new RuntimeException("redis鍒嗗竷寮忛攣娉ㄨВ鍙傛暟寮傚父");
}
- }else {
- throw new RuntimeException("redis鍒嗗竷寮忛攣娉ㄨВ鍙傛暟寮傚父");
+ } catch (IllegalMonitorStateException e) {
+ log.error("lock timeout => key : " + key + " , ThreadName : " + Thread.currentThread().getName());
+ throw new RuntimeException("lock timeout => key : " + key);
+ } catch (Exception e) {
+ throw new Exception("redis鍒嗗竷寮忔湭鐭ュ紓甯�", e);
}
}
@@ -95,9 +109,6 @@
/**
* 鑾峰彇key涓�#p0涓殑鍙傛暟鍚嶇О
- *
- * @param key
- * @return
*/
private static List<String> getKeyParsList(String key) {
List<String> listPar = new ArrayList<>();
@@ -107,7 +118,7 @@
String parName;
int indexPre = key.indexOf("#");
if (plusIndex > 0) {
- indexNext = key.indexOf("#") + key.substring(key.indexOf("#")).indexOf("+");
+ indexNext = key.indexOf("#") + plusIndex;
parName = key.substring(indexPre, indexNext);
} else {
parName = key.substring(indexPre);
@@ -121,4 +132,36 @@
return listPar;
}
+ /**
+ * 鍔犻攣锛圧Lock锛夊甫瓒呮椂鏃堕棿鐨�
+ */
+ private boolean acquire(String key, long expire, TimeUnit expireUnit) {
+ //澹版槑key瀵硅薄
+ key = LOCK_TITLE + key;
+ try {
+ //鑾峰彇閿佸璞�
+ RLock mylock = redissonClient.getLock(key);
+ //鍔犻攣锛屽苟涓旇缃攣杩囨湡鏃堕棿锛岄槻姝㈡閿佺殑浜х敓
+ mylock.tryLock(expire, expire, expireUnit);
+ } catch (InterruptedException e) {
+ return false;
+ }
+ log.info("lock => key : " + key + " , ThreadName : " + Thread.currentThread().getName());
+ //鍔犻攣鎴愬姛
+ return true;
+ }
+
+ /**
+ * 閿佺殑閲婃斁
+ */
+ private void release(String lockName) {
+ //蹇呴』鏄拰鍔犻攣鏃剁殑鍚屼竴涓猭ey
+ String key = LOCK_TITLE + lockName;
+ //鑾峰彇鎵�瀵硅薄
+ RLock mylock = redissonClient.getLock(key);
+ //閲婃斁閿侊紙瑙ｉ攣锛�
+ mylock.unlock();
+ log.info("unlock => key : " + key + " , ThreadName : " + Thread.currentThread().getName());
+ }
+
}
--
Gitblit v1.9.3