From 9bc2d2981b540aa291cfecde5d33615df56a078b Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期五, 22 七月 2022 09:59:19 +0800
Subject: [PATCH] update springboot 2.7.1 => 2.7.2 update hutool 5.8.3 => 5.8.4 update okhttp 4.9.1 => 4.10.0 update lock4j 2.2.1 => 2.2.2 update aws-java-sdk-s3 1.12.248 => 1.12.264 修复依赖安全漏洞 update aliyun.sms 2.0.9 => 2.0.16 update tencent.sms 3.1.537 => 3.1.555 update guava 30.0-jre => 31.1-jre
---
ruoyi-demo/src/main/java/com/ruoyi/demo/controller/RedisLockController.java | 17 ++++++-----------
1 files changed, 6 insertions(+), 11 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 94ad3c3..ebc923d 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
@@ -4,9 +4,7 @@
import com.baomidou.lock.LockTemplate;
import com.baomidou.lock.annotation.Lock4j;
import com.baomidou.lock.executor.RedissonLockExecutor;
-import com.ruoyi.common.core.domain.AjaxResult;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
+import com.ruoyi.common.core.domain.R;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
@@ -21,7 +19,6 @@
*
* @author shenxinquan
*/
-@Api(value = "娴嬭瘯鍒嗗竷寮忛攣鐨勬牱渚�", tags = {"娴嬭瘯鍒嗗竷寮忛攣鐨勬牱渚�"})
@Slf4j
@RestController
@RequestMapping("/demo/redisLock")
@@ -33,10 +30,9 @@
/**
* 娴嬭瘯lock4j 娉ㄨВ
*/
- @ApiOperation("娴嬭瘯lock4j 娉ㄨВ")
@Lock4j(keys = {"#key"})
@GetMapping("/testLock4j")
- public AjaxResult<String> testLock4j(String key, String value) {
+ public R<String> testLock4j(String key, String value) {
System.out.println("start:" + key + ",time:" + LocalTime.now().toString());
try {
Thread.sleep(10000);
@@ -44,15 +40,14 @@
e.printStackTrace();
}
System.out.println("end :" + key + ",time:" + LocalTime.now().toString());
- return AjaxResult.success("鎿嶄綔鎴愬姛", value);
+ return R.ok("鎿嶄綔鎴愬姛", value);
}
/**
* 娴嬭瘯lock4j 宸ュ叿
*/
- @ApiOperation("娴嬭瘯lock4j 宸ュ叿")
- @GetMapping("/testLock4jLockTemaplate")
- public AjaxResult<String> testLock4jLockTemaplate(String key, String value) {
+ @GetMapping("/testLock4jLockTemplate")
+ public R<String> testLock4jLockTemplate(String key, String value) {
final LockInfo lockInfo = lockTemplate.lock(key, 30000L, 5000L, RedissonLockExecutor.class);
if (null == lockInfo) {
throw new RuntimeException("涓氬姟澶勭悊涓�,璇风◢鍚庡啀璇�");
@@ -70,7 +65,7 @@
lockTemplate.releaseLock(lockInfo);
}
//缁撴潫
- return AjaxResult.success("鎿嶄綔鎴愬姛", value);
+ return R.ok("鎿嶄綔鎴愬姛", value);
}
}
--
Gitblit v1.9.3