From 68e57803f3386ab4f5211dd30e4d8ade9d24f0a4 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期五, 13 一月 2023 23:04:08 +0800
Subject: [PATCH] update 适配 springboot-admin 改为最新 spring-security 写法
---
ruoyi-demo/src/main/java/com/ruoyi/demo/controller/queue/BoundedQueueController.java | 48 ++++++++++++++++++++++++++++--------------------
1 files changed, 28 insertions(+), 20 deletions(-)
diff --git a/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/queue/BoundedQueueController.java b/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/queue/BoundedQueueController.java
index f698a14..968a419 100644
--- a/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/queue/BoundedQueueController.java
+++ b/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/queue/BoundedQueueController.java
@@ -1,10 +1,7 @@
package com.ruoyi.demo.controller.queue;
-import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.utils.redis.QueueUtils;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.web.bind.annotation.GetMapping;
@@ -23,26 +20,29 @@
* @version 3.6.0
*/
@Slf4j
-@Api(value = "鏈夌晫闃熷垪 婕旂ず妗堜緥", tags = {"鏈夌晫闃熷垪"})
@RequiredArgsConstructor
@RestController
@RequestMapping("/demo/queue/bounded")
public class BoundedQueueController {
- @ApiOperation("娣诲姞闃熷垪鏁版嵁")
+ /**
+ * 娣诲姞闃熷垪鏁版嵁
+ *
+ * @param queueName 闃熷垪鍚�
+ * @param capacity 瀹归噺
+ */
@GetMapping("/add")
- public AjaxResult<Void> add(@ApiParam("闃熷垪鍚�") String queueName,
- @ApiParam("瀹归噺") int capacity) {
+ public R<Void> add(String queueName, int capacity) {
// 鐢ㄥ畬浜嗕竴瀹氳閿�姣� 鍚﹀垯浼氫竴鐩村瓨鍦�
- boolean b = QueueUtils.destroyBoundedQueueObject(queueName);
+ boolean b = QueueUtils.destroyQueue(queueName);
log.info("閫氶亾: {} , 鍒犻櫎: {}", queueName, b);
// 鍒濆鍖栬缃竴娆″嵆鍙�
if (QueueUtils.trySetBoundedQueueCapacity(queueName, capacity)) {
log.info("閫氶亾: {} , 璁剧疆瀹归噺: {}", queueName, capacity);
} else {
log.info("閫氶亾: {} , 璁剧疆瀹归噺澶辫触", queueName);
- return AjaxResult.error("鎿嶄綔澶辫触");
+ return R.fail("鎿嶄綔澶辫触");
}
for (int i = 0; i < 11; i++) {
String data = "data-" + i;
@@ -53,30 +53,38 @@
log.info("閫氶亾: {} , 鍙戦�佹暟鎹�: {}", queueName, data);
}
}
- return AjaxResult.success("鎿嶄綔鎴愬姛");
+ return R.ok("鎿嶄綔鎴愬姛");
}
- @ApiOperation("鍒犻櫎闃熷垪鏁版嵁")
+ /**
+ * 鍒犻櫎闃熷垪鏁版嵁
+ *
+ * @param queueName 闃熷垪鍚�
+ */
@GetMapping("/remove")
- public AjaxResult<Void> remove(@ApiParam("闃熷垪鍚�") String queueName) {
+ public R<Void> remove(String queueName) {
String data = "data-" + 5;
- if (QueueUtils.removeBoundedQueueObject(queueName, data)) {
+ if (QueueUtils.removeQueueObject(queueName, data)) {
log.info("閫氶亾: {} , 鍒犻櫎鏁版嵁: {}", queueName, data);
} else {
- return AjaxResult.error("鎿嶄綔澶辫触");
+ return R.fail("鎿嶄綔澶辫触");
}
- return AjaxResult.success("鎿嶄綔鎴愬姛");
+ return R.ok("鎿嶄綔鎴愬姛");
}
- @ApiOperation("鑾峰彇闃熷垪鏁版嵁")
+ /**
+ * 鑾峰彇闃熷垪鏁版嵁
+ *
+ * @param queueName 闃熷垪鍚�
+ */
@GetMapping("/get")
- public AjaxResult<Void> get(@ApiParam("闃熷垪鍚�") String queueName) {
+ public R<Void> get(String queueName) {
String data;
do {
- data = QueueUtils.getBoundedQueueObject(queueName);
+ data = QueueUtils.getQueueObject(queueName);
log.info("閫氶亾: {} , 鑾峰彇鏁版嵁: {}", queueName, data);
} while (data != null);
- return AjaxResult.success("鎿嶄綔鎴愬姛");
+ return R.ok("鎿嶄綔鎴愬姛");
}
}
--
Gitblit v1.9.3