From 42295ef2ac0a5e78674cf24b62d6834138f0ffdc Mon Sep 17 00:00:00 2001 From: 疯狂的狮子li <15040126243@163.com> Date: 星期一, 29 十一月 2021 13:56:25 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into satoken --- ruoyi-demo/src/main/java/com/ruoyi/demo/controller/RedisLockController.java | 96 +++++++++++++++++++++-------------------------- 1 files changed, 43 insertions(+), 53 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 a720246..94ad3c3 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 @@ -9,7 +9,6 @@ import io.swagger.annotations.ApiOperation; 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; @@ -28,59 +27,50 @@ @RequestMapping("/demo/redisLock") public class RedisLockController { - @Autowired - private LockTemplate lockTemplate; + @Autowired + private LockTemplate lockTemplate; - /** - * 娴嬭瘯lock4j 娉ㄨВ - */ - @ApiOperation("娴嬭瘯lock4j 娉ㄨВ") - @Lock4j(keys = {"#key"}) - @GetMapping("/testLock4j") - public AjaxResult<String> testLock4j(String key,String value){ - System.out.println("start:"+key+",time:"+ LocalTime.now().toString()); - try { - Thread.sleep(10000); - } catch (InterruptedException e) { - e.printStackTrace(); - } - System.out.println("end :"+key+",time:"+LocalTime.now().toString()); - return AjaxResult.success("鎿嶄綔鎴愬姛",value); - } + /** + * 娴嬭瘯lock4j 娉ㄨВ + */ + @ApiOperation("娴嬭瘯lock4j 娉ㄨВ") + @Lock4j(keys = {"#key"}) + @GetMapping("/testLock4j") + public AjaxResult<String> testLock4j(String key, String value) { + System.out.println("start:" + key + ",time:" + LocalTime.now().toString()); + try { + Thread.sleep(10000); + } catch (InterruptedException e) { + e.printStackTrace(); + } + System.out.println("end :" + key + ",time:" + LocalTime.now().toString()); + return AjaxResult.success("鎿嶄綔鎴愬姛", value); + } - /** - * 娴嬭瘯lock4j 宸ュ叿 - */ - @ApiOperation("娴嬭瘯lock4j 宸ュ叿") - @GetMapping("/testLock4jLockTemaplate") - public AjaxResult<String> testLock4jLockTemaplate(String key,String value){ - final LockInfo lockInfo = lockTemplate.lock(key, 30000L, 5000L, RedissonLockExecutor.class); - if (null == lockInfo) { - throw new RuntimeException("涓氬姟澶勭悊涓�,璇风◢鍚庡啀璇�"); - } - // 鑾峰彇閿佹垚鍔燂紝澶勭悊涓氬姟 - try { - try { - Thread.sleep(8000); - } catch (InterruptedException e) { - // - } - System.out.println("鎵ц绠�鍗曟柟娉�1 , 褰撳墠绾跨▼:" + Thread.currentThread().getName()); - } finally { - //閲婃斁閿� - lockTemplate.releaseLock(lockInfo); - } - //缁撴潫 - return AjaxResult.success("鎿嶄綔鎴愬姛",value); - } + /** + * 娴嬭瘯lock4j 宸ュ叿 + */ + @ApiOperation("娴嬭瘯lock4j 宸ュ叿") + @GetMapping("/testLock4jLockTemaplate") + public AjaxResult<String> testLock4jLockTemaplate(String key, String value) { + final LockInfo lockInfo = lockTemplate.lock(key, 30000L, 5000L, RedissonLockExecutor.class); + if (null == lockInfo) { + throw new RuntimeException("涓氬姟澶勭悊涓�,璇风◢鍚庡啀璇�"); + } + // 鑾峰彇閿佹垚鍔燂紝澶勭悊涓氬姟 + try { + try { + Thread.sleep(8000); + } catch (InterruptedException e) { + // + } + System.out.println("鎵ц绠�鍗曟柟娉�1 , 褰撳墠绾跨▼:" + Thread.currentThread().getName()); + } finally { + //閲婃斁閿� + lockTemplate.releaseLock(lockInfo); + } + //缁撴潫 + return AjaxResult.success("鎿嶄綔鎴愬姛", value); + } - /** - * 娴嬭瘯spring-cache娉ㄨВ - */ - @ApiOperation("娴嬭瘯spring-cache娉ㄨВ") - @Cacheable(value = "test", key = "#key") - @GetMapping("/testCache") - public AjaxResult<String> testCache(String key) { - return AjaxResult.success("鎿嶄綔鎴愬姛", key); - } } -- Gitblit v1.9.3