From 0b077806196ceb8a68af93f00880ccc70aee50c2 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期四, 07 七月 2022 18:08:14 +0800
Subject: [PATCH] add 整合 springdoc 移除 knife4j
---
ruoyi-demo/src/main/java/com/ruoyi/demo/controller/queue/BoundedQueueController.java | 34 +++++++++++++++++-----------------
1 files changed, 17 insertions(+), 17 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..d41f87e 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,10 @@
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 io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.web.bind.annotation.GetMapping;
@@ -23,17 +23,17 @@
* @version 3.6.0
*/
@Slf4j
-@Api(value = "鏈夌晫闃熷垪 婕旂ず妗堜緥", tags = {"鏈夌晫闃熷垪"})
+@Tag(name ="鏈夌晫闃熷垪 婕旂ず妗堜緥", description = "鏈夌晫闃熷垪")
@RequiredArgsConstructor
@RestController
@RequestMapping("/demo/queue/bounded")
public class BoundedQueueController {
- @ApiOperation("娣诲姞闃熷垪鏁版嵁")
+ @Operation(summary = "娣诲姞闃熷垪鏁版嵁")
@GetMapping("/add")
- public AjaxResult<Void> add(@ApiParam("闃熷垪鍚�") String queueName,
- @ApiParam("瀹归噺") int capacity) {
+ public R<Void> add(@Parameter(name = "闃熷垪鍚�") String queueName,
+ @Parameter(name = "瀹归噺") int capacity) {
// 鐢ㄥ畬浜嗕竴瀹氳閿�姣� 鍚﹀垯浼氫竴鐩村瓨鍦�
boolean b = QueueUtils.destroyBoundedQueueObject(queueName);
log.info("閫氶亾: {} , 鍒犻櫎: {}", queueName, b);
@@ -42,7 +42,7 @@
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,30 @@
log.info("閫氶亾: {} , 鍙戦�佹暟鎹�: {}", queueName, data);
}
}
- return AjaxResult.success("鎿嶄綔鎴愬姛");
+ return R.ok("鎿嶄綔鎴愬姛");
}
- @ApiOperation("鍒犻櫎闃熷垪鏁版嵁")
+ @Operation(summary = "鍒犻櫎闃熷垪鏁版嵁")
@GetMapping("/remove")
- public AjaxResult<Void> remove(@ApiParam("闃熷垪鍚�") String queueName) {
+ public R<Void> remove(@Parameter(name = "闃熷垪鍚�") String queueName) {
String data = "data-" + 5;
if (QueueUtils.removeBoundedQueueObject(queueName, data)) {
log.info("閫氶亾: {} , 鍒犻櫎鏁版嵁: {}", queueName, data);
} else {
- return AjaxResult.error("鎿嶄綔澶辫触");
+ return R.fail("鎿嶄綔澶辫触");
}
- return AjaxResult.success("鎿嶄綔鎴愬姛");
+ return R.ok("鎿嶄綔鎴愬姛");
}
- @ApiOperation("鑾峰彇闃熷垪鏁版嵁")
+ @Operation(summary = "鑾峰彇闃熷垪鏁版嵁")
@GetMapping("/get")
- public AjaxResult<Void> get(@ApiParam("闃熷垪鍚�") String queueName) {
+ public R<Void> get(@Parameter(name = "闃熷垪鍚�") String queueName) {
String data;
do {
data = QueueUtils.getBoundedQueueObject(queueName);
log.info("閫氶亾: {} , 鑾峰彇鏁版嵁: {}", queueName, data);
} while (data != null);
- return AjaxResult.success("鎿嶄綔鎴愬姛");
+ return R.ok("鎿嶄綔鎴愬姛");
}
}
--
Gitblit v1.9.3