From 645c926bbd52baa90c0a4af0d253047709c5e02c Mon Sep 17 00:00:00 2001
From: sxq <812980466@qq.com>
Date: 星期二, 22 六月 2021 16:06:02 +0800
Subject: [PATCH] 集成lock4j框架，删除redisson锁，使用lock4j的锁。
---
ruoyi-demo/src/main/java/com/ruoyi/demo/controller/RedisLockController.java | 52 ++++++++++++++++------------------------------------
1 files changed, 16 insertions(+), 36 deletions(-)
diff --git a/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/RedisLockController.java b/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/RedisLockController.java
index c3c71ef..b872a5f 100644
--- a/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/RedisLockController.java
+++ b/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/RedisLockController.java
@@ -1,16 +1,14 @@
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 com.ruoyi.demo.service.ITestDemoService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.cache.annotation.Cacheable;
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;
/**
@@ -24,45 +22,27 @@
public class RedisLockController {
@Autowired
- private RedisLockManager redisLockManager;
+ private ITestDemoService testDemoService;
/**
- * #p0 鏍囪瘑鍙栫涓�涓弬鏁颁负redis閿佺殑key
+ * 娴嬭瘯lock4j
+ * @param key
+ * @param value
+ * @return
*/
- @GetMapping("/testLock1")
- @RedisLock(expireTime = 10, key = "#p0")
- public AjaxResult<String> testLock1(String key, String value) {
- try {
- // 鍚屾椂璇锋眰鎺掗槦
-// Thread.sleep(5000);
- // 閿佽秴鏃舵祴璇�
- Thread.sleep(11000);
- } catch (InterruptedException e) {
- e.printStackTrace();
- }
+ @GetMapping("/testLock4j")
+ public AjaxResult<String> testLock4j(String key,String value){
+ testDemoService.testLock4j(key);
+ return AjaxResult.success("鎿嶄綔鎴愬姛",value);
+ }
+ @GetMapping("/testLock4jLockTemaplate")
+ public AjaxResult<String> testLock4jLockTemaplate(String key,String value){
+ testDemoService.testLock4jLockTemaplate(key);
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(key);
- log.info("閲婃斁閿佹垚鍔�: " + key);
- } else {
- log.error("鑾峰彇閿佸け璐�: " + key);
- }
- } catch (InterruptedException e) {
- log.error(e.getMessage());
- }
- return AjaxResult.success();
- }
+
+
/**
* 娴嬭瘯spring-cache娉ㄨВ
--
Gitblit v1.9.3