From 95010d4a4c21cd53b78f51cbd518a315a8861fbc Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期三, 12 十月 2022 10:55:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'ruoyi-vue/master' into dev
---
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/R.java | 21 +++++++++++----------
1 files changed, 11 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..1c7b1d8 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,5 @@
package com.ruoyi.common.core.domain;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.NoArgsConstructor;
@@ -14,7 +12,6 @@
*/
@Data
@NoArgsConstructor
-@ApiModel("璇锋眰鍝嶅簲瀵硅薄")
public class R<T> implements Serializable {
private static final long serialVersionUID = 1L;
@@ -28,21 +25,18 @@
*/
public static final int FAIL = 500;
- @ApiModelProperty("娑堟伅鐘舵�佺爜")
private int code;
- @ApiModelProperty("娑堟伅鍐呭")
private String msg;
- @ApiModelProperty("鏁版嵁瀵硅薄")
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 +48,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 +56,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) {
@@ -81,4 +75,11 @@
return r;
}
+ public static <T> Boolean isError(R<T> ret) {
+ return !isSuccess(ret);
+ }
+
+ public static <T> Boolean isSuccess(R<T> ret) {
+ return R.SUCCESS == ret.getCode();
+ }
}
--
Gitblit v1.9.3