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-common/src/main/java/com/ruoyi/common/core/domain/R.java | 19 +++++++++----------
1 files changed, 9 insertions(+), 10 deletions(-)
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/R.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/R.java
index f868e8e..999974d 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/R.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/R.java
@@ -1,7 +1,6 @@
package com.ruoyi.common.core.domain;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import lombok.NoArgsConstructor;
@@ -14,7 +13,7 @@
*/
@Data
@NoArgsConstructor
-@ApiModel("璇锋眰鍝嶅簲瀵硅薄")
+@Schema(name = "璇锋眰鍝嶅簲瀵硅薄")
public class R<T> implements Serializable {
private static final long serialVersionUID = 1L;
@@ -28,21 +27,21 @@
*/
public static final int FAIL = 500;
- @ApiModelProperty("娑堟伅鐘舵�佺爜")
+ @Schema(name = "娑堟伅鐘舵�佺爜")
private int code;
- @ApiModelProperty("娑堟伅鍐呭")
+ @Schema(name = "娑堟伅鍐呭")
private String msg;
- @ApiModelProperty("鏁版嵁瀵硅薄")
+ @Schema(name = "鏁版嵁瀵硅薄")
private T data;
public static <T> R<T> ok() {
- return restResult(null, SUCCESS, null);
+ return restResult(null, SUCCESS, "鎿嶄綔鎴愬姛");
}
public static <T> R<T> ok(T data) {
- return restResult(data, SUCCESS, null);
+ return restResult(data, SUCCESS, "鎿嶄綔鎴愬姛");
}
public static <T> R<T> ok(String msg) {
@@ -54,7 +53,7 @@
}
public static <T> R<T> fail() {
- return restResult(null, FAIL, null);
+ return restResult(null, FAIL, "鎿嶄綔澶辫触");
}
public static <T> R<T> fail(String msg) {
@@ -62,7 +61,7 @@
}
public static <T> R<T> fail(T data) {
- return restResult(data, FAIL, null);
+ return restResult(data, FAIL, "鎿嶄綔澶辫触");
}
public static <T> R<T> fail(String msg, T data) {
--
Gitblit v1.9.3