From 9a891adc80dc90249bdbde343acd4d6c46b10bb0 Mon Sep 17 00:00:00 2001
From: zhangchuanxi <zhangchuanxi@cdzhnf.com>
Date: Tue, 2 Apr 2019 19:09:56 +0800
Subject: [PATCH] # fix修改返回结果提示消息

---
 pom.xml                                                 |  2 +-
 src/main/java/com/irrigation/icl/entity/RestResult.java | 11 +++++++----
 src/main/java/com/irrigation/icl/enums/ResultEnum.java  |  6 ++++--
 3 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/pom.xml b/pom.xml
index 10f697a..1a9e240 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>com.irrigation</groupId>
     <artifactId>common-lib</artifactId>
-    <version>2.0.1</version>
+    <version>2.0.2</version>
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
diff --git a/src/main/java/com/irrigation/icl/entity/RestResult.java b/src/main/java/com/irrigation/icl/entity/RestResult.java
index f06d1d1..10d61fa 100644
--- a/src/main/java/com/irrigation/icl/entity/RestResult.java
+++ b/src/main/java/com/irrigation/icl/entity/RestResult.java
@@ -12,6 +12,7 @@ import lombok.NoArgsConstructor;
 
 /**
  * 公共返回类
+ *
  * @param <T>
  */
 @Data
@@ -19,17 +20,19 @@ import lombok.NoArgsConstructor;
 @NoArgsConstructor
 @ApiModel(value = "RestResult")
 public class RestResult<T> {
-    @ApiModelProperty(value = "返回编码类型",example = "200",allowableValues = "200,400")
+    @ApiModelProperty(value = "返回编码类型", example = "200", allowableValues = "200,400")
     private int code;
-    @ApiModelProperty(value = "返回提示消息",example = "成功")
+    @ApiModelProperty(value = "返回提示消息", example = "成功")
     private String message;
     @ApiModelProperty(value = "返回请求数据对象")
     private T data;
 
     public String getMessage() {
-        return message != null?message: ResultEnum.getCode(code).getMessage();
+        return message != null ? message : ResultEnum.getCode(code).getMessage();
     }
-    public String toString(){
+
+    @Override
+    public String toString() {
         return JSON.toJSONString(this);
     }
 }
diff --git a/src/main/java/com/irrigation/icl/enums/ResultEnum.java b/src/main/java/com/irrigation/icl/enums/ResultEnum.java
index 2d0e818..3a19bf6 100644
--- a/src/main/java/com/irrigation/icl/enums/ResultEnum.java
+++ b/src/main/java/com/irrigation/icl/enums/ResultEnum.java
@@ -5,9 +5,11 @@ import java.util.Optional;
 
 public enum ResultEnum {
 
-    SUCCESS(200, "success"),
+    SUCCESS(200, "操作成功"),
+
     SUCCESS_NO_DATA(202,"查询成功，无数据"),
-    ERROR(400, "failed"),
+
+    ERROR(400, "操作失败"),
 
     PARAMETER_MISMATCH(402, "参数不匹配！"),
 
--
libgit2 0.21.4