From 4f95cbeedb1a265f70f2fd5e1045384ae32df633 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B0=91=E5=B9=B4=E6=A2=A6=E4=B8=8E=E7=A0=96?=
 <2847127106@qq.com>
Date: Wed, 21 Aug 2024 20:43:58 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/muyu/common/core/domain/Result.java | 12 ++++++------
 .../core/web/controller/BaseController.java      | 16 ++++++++--------
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/src/main/java/com/muyu/common/core/domain/Result.java b/src/main/java/com/muyu/common/core/domain/Result.java
index 2a93801..1f63b23 100644
--- a/src/main/java/com/muyu/common/core/domain/Result.java
+++ b/src/main/java/com/muyu/common/core/domain/Result.java
@@ -61,11 +61,11 @@ public class Result<T> implements Serializable {
     private T data;
 
     public static <T> Result<T> success () {
-        return restResult(null, SUCCESS, null);
+        return restResult(null, SUCCESS, "操作成功");
     }
 
     public static <T> Result<T> success (T data) {
-        return restResult(data, SUCCESS, null);
+        return restResult(null, SUCCESS, "操作成功");
     }
 
     public static <T> Result<T> success (T data, String msg) {
@@ -73,7 +73,7 @@ public class Result<T> implements Serializable {
     }
 
     public static <T> Result<T> error () {
-        return restResult(null, FAIL, null);
+        return restResult(null, FAIL, "操作失败");
     }
 
     public static <T> Result<T> error (String msg) {
@@ -81,7 +81,7 @@ public class Result<T> implements Serializable {
     }
 
     public static <T> Result<T> error (T data) {
-        return restResult(data, FAIL, null);
+        return restResult(data, FAIL, "操作失败");
     }
 
     public static <T> Result<T> error (T data, String msg) {
@@ -95,7 +95,7 @@ public class Result<T> implements Serializable {
 
 
     public static <T> Result<T> warn () {
-        return restResult(null, WARN, null);
+        return restResult(null, FAIL, "警告");
     }
 
     public static <T> Result<T> warn (String msg) {
@@ -103,7 +103,7 @@ public class Result<T> implements Serializable {
     }
 
     public static <T> Result<T> warn (T data) {
-        return restResult(data, WARN, null);
+        return restResult(data, FAIL, "警告");
     }
 
     public static <T> Result<T> warn (T data, String msg) {
diff --git a/src/main/java/com/muyu/common/core/web/controller/BaseController.java b/src/main/java/com/muyu/common/core/web/controller/BaseController.java
index 3789a82..47ad961 100644
--- a/src/main/java/com/muyu/common/core/web/controller/BaseController.java
+++ b/src/main/java/com/muyu/common/core/web/controller/BaseController.java
@@ -66,42 +66,42 @@ public class BaseController {
     /**
      * 返回成功
      */
-    public Result success () {
+    public Result<?> success () {
         return Result.success();
     }
 
     /**
      * 返回成功消息
      */
-    public Result success (String message) {
+    public Result<?> success (String message) {
         return Result.success(message);
     }
 
     /**
      * 返回成功消息
      */
-    public Result success (Object data) {
+    public <T> Result<T> success (T data) {
         return Result.success(data);
     }
 
     /**
      * 返回失败消息
      */
-    public Result error () {
+    public Result<?> error () {
         return Result.error();
     }
 
     /**
      * 返回失败消息
      */
-    public Result error (String message) {
+    public Result<?> error (String message) {
         return Result.error(message);
     }
 
     /**
      * 返回警告消息
      */
-    public Result warn (String message) {
+    public Result<?> warn (String message) {
         return Result.warn(message);
     }
 
@@ -112,7 +112,7 @@ public class BaseController {
      *
      * @return 操作结果
      */
-    protected Result toAjax (int rows) {
+    protected Result<?> toAjax (int rows) {
         return rows > 0 ? Result.success() : Result.error();
     }
 
@@ -123,7 +123,7 @@ public class BaseController {
      *
      * @return 操作结果
      */
-    protected Result toAjax (boolean result) {
+    protected Result<?> toAjax (boolean result) {
         return result ? success() : error();
     }
 }