Merge remote-tracking branch 'origin/master'

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) {

src/main/java/com/muyu/common/core/web/controller/BaseController.java

@@ -18,6 +18,7 @@ import java.util.List;
  * web层通用数据处理
  *
  * @author muyu
+ *
  */
 public class BaseController {
     protected final Logger logger = LoggerFactory.getLogger(this.getClass());
@@ -66,14 +67,14 @@ 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);
     }
 
@@ -87,21 +88,21 @@ public class BaseController {
     /**
      * 返回失败消息
      */
-    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 +113,7 @@ public class BaseController {
      *
      * @return 操作结果
      */
-    protected Result toAjax (int rows) {
+    protected Result  toAjax (int rows) {
         return rows > 0 ? Result.success() : Result.error();
     }
 
@@ -123,7 +124,7 @@ public class BaseController {
      *
      * @return 操作结果
      */
-    protected Result toAjax (boolean result) {
+    protected Result  toAjax (boolean result) {
         return result ? success() : error();
     }
 }