update 优化pr redis工具代码
This commit is contained in:
parent
f45b50a796
commit
a6ba7d9093
|
@ -2,26 +2,35 @@ package com.ruoyi.demo.controller;
|
|||
|
||||
import com.ruoyi.common.annotation.RedisLock;
|
||||
import com.ruoyi.common.core.domain.AjaxResult;
|
||||
import com.ruoyi.common.core.redis.RedisLockManager;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.web.bind.annotation.GetMapping;
|
||||
import org.springframework.web.bind.annotation.RequestMapping;
|
||||
import org.springframework.web.bind.annotation.RestController;
|
||||
|
||||
import java.util.concurrent.TimeUnit;
|
||||
|
||||
|
||||
/**
|
||||
* 测试分布式锁的样例
|
||||
*
|
||||
* @author shenxinquan
|
||||
*/
|
||||
@Slf4j
|
||||
@RestController
|
||||
@RequestMapping("/demo/redisLock")
|
||||
public class RedisLockController {
|
||||
|
||||
@Autowired
|
||||
private RedisLockManager redisLockManager;
|
||||
|
||||
/**
|
||||
* #p0 标识取第一个参数为redis锁的key
|
||||
*/
|
||||
@GetMapping("/getLock")
|
||||
@GetMapping("/testLock1")
|
||||
@RedisLock(expireTime = 10, key = "#p0")
|
||||
public AjaxResult<String> getLock(String key, String value) {
|
||||
public AjaxResult<String> testLock1(String key, String value) {
|
||||
try {
|
||||
// 同时请求排队
|
||||
// Thread.sleep(5000);
|
||||
|
@ -32,4 +41,25 @@ public class RedisLockController {
|
|||
}
|
||||
return AjaxResult.success("操作成功",value);
|
||||
}
|
||||
|
||||
/**
|
||||
* 测试锁工具类
|
||||
*/
|
||||
@GetMapping("/testLock2")
|
||||
public AjaxResult<Void> testLock(String key, Long time) {
|
||||
try {
|
||||
boolean flag = redisLockManager.getLock(key, time, TimeUnit.SECONDS);
|
||||
if (flag) {
|
||||
log.info("获取锁成功: " + key);
|
||||
Thread.sleep(3000);
|
||||
redisLockManager.unLock();
|
||||
log.info("释放锁成功: " + key);
|
||||
} else {
|
||||
log.error("获取锁失败: " + key);
|
||||
}
|
||||
} catch (InterruptedException e) {
|
||||
log.error(e.getMessage());
|
||||
}
|
||||
return AjaxResult.success();
|
||||
}
|
||||
}
|
||||
|
|
|
@ -3,6 +3,7 @@ package com.ruoyi.framework.aspectj;
|
|||
|
||||
import com.ruoyi.common.annotation.RedisLock;
|
||||
import com.ruoyi.common.constant.Constants;
|
||||
import com.ruoyi.common.core.redis.RedisLockManager;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.aspectj.lang.ProceedingJoinPoint;
|
||||
import org.aspectj.lang.annotation.Around;
|
||||
|
@ -10,7 +11,6 @@ import org.aspectj.lang.annotation.Aspect;
|
|||
import org.aspectj.lang.annotation.Pointcut;
|
||||
import org.aspectj.lang.reflect.MethodSignature;
|
||||
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;
|
||||
|
@ -33,7 +33,7 @@ import java.util.concurrent.TimeUnit;
|
|||
public class RedisLockAspect {
|
||||
|
||||
@Autowired
|
||||
private RedissonClient redissonClient;
|
||||
private RedisLockManager redisLockManager;
|
||||
|
||||
@Pointcut("@annotation(com.ruoyi.common.annotation.RedisLock)")
|
||||
public void annotationPointcut() {
|
||||
|
@ -70,14 +70,16 @@ public class RedisLockAspect {
|
|||
key = Constants.REDIS_LOCK_KEY + key;
|
||||
Object res;
|
||||
try {
|
||||
if (acquire(key, expireTime, TimeUnit.SECONDS)) {
|
||||
if (redisLockManager.getLock(key, expireTime, TimeUnit.SECONDS)) {
|
||||
log.info("lock => key : " + key + " , ThreadName : " + Thread.currentThread().getName());
|
||||
try {
|
||||
res = joinPoint.proceed();
|
||||
return res;
|
||||
} catch (Exception e) {
|
||||
throw new RuntimeException(e);
|
||||
} finally {
|
||||
release(key);
|
||||
redisLockManager.unLock();
|
||||
log.info("unlock => key : " + key + " , ThreadName : " + Thread.currentThread().getName());
|
||||
}
|
||||
} else {
|
||||
throw new RuntimeException("redis分布式锁注解参数异常");
|
||||
|
@ -133,32 +135,4 @@ public class RedisLockAspect {
|
|||
return listPar;
|
||||
}
|
||||
|
||||
/**
|
||||
* 加锁(RLock)带超时时间的
|
||||
*/
|
||||
private boolean acquire(String key, long expire, TimeUnit expireUnit) {
|
||||
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) {
|
||||
//获取所对象
|
||||
RLock mylock = redissonClient.getLock(lockName);
|
||||
//释放锁(解锁)
|
||||
mylock.unlock();
|
||||
log.info("unlock => key : " + lockName + " , ThreadName : " + Thread.currentThread().getName());
|
||||
}
|
||||
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue