From a33898c2a0374c249862a2b996e33352e30c8caf Mon Sep 17 00:00:00 2001
From: KonBAI <1527468660@qq.com>
Date: 星期六, 02 四月 2022 13:02:56 +0800
Subject: [PATCH] !167 update 修改角色"菜单树选择项"和"部门树选择项"是否关联显示字段为Boolean类型 * fix 修改 postgres sql脚本，处理角色表字段类型错误问题。 * fix 修复postgreSQL新增或更新角色信息报错。修改角色"菜单树选择项"和"部门树选择项"是否关联显示字段为Boolean类型。
---
ruoyi-demo/src/main/java/com/ruoyi/demo/controller/RedisLockController.java | 10 +++++-----
1 files changed, 5 insertions(+), 5 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 7d30a18..c31925a 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,7 +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 com.ruoyi.common.core.domain.R;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
@@ -36,7 +36,7 @@
@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,7 +44,7 @@
e.printStackTrace();
}
System.out.println("end :" + key + ",time:" + LocalTime.now().toString());
- return AjaxResult.success("鎿嶄綔鎴愬姛", value);
+ return R.ok("鎿嶄綔鎴愬姛", value);
}
/**
@@ -52,7 +52,7 @@
*/
@ApiOperation("娴嬭瘯lock4j 宸ュ叿")
@GetMapping("/testLock4jLockTemplate")
- public AjaxResult<String> testLock4jLockTemplate(String key, String value) {
+ 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 +70,7 @@
lockTemplate.releaseLock(lockInfo);
}
//缁撴潫
- return AjaxResult.success("鎿嶄綔鎴愬姛", value);
+ return R.ok("鎿嶄綔鎴愬姛", value);
}
}
--
Gitblit v1.9.3