From 3f8aa824f04331cb7da945849067c9852275cba9 Mon Sep 17 00:00:00 2001
From: xiaofanku <xiaofanku@live.cn>
Date: Tue, 22 Sep 2020 23:34:35 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3TipMessage.Builder?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/apobates/forum/utils/TipMessage.java    | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/utils/src/main/java/com/apobates/forum/utils/TipMessage.java b/utils/src/main/java/com/apobates/forum/utils/TipMessage.java
index 1238052a..fa334a38 100644
--- a/utils/src/main/java/com/apobates/forum/utils/TipMessage.java
+++ b/utils/src/main/java/com/apobates/forum/utils/TipMessage.java
@@ -117,6 +117,7 @@ public final class TipMessage {
                 return new Builder(false, e.getMessage());
             }
         }
+
         public static Builder or(Supplier<Boolean> condition){
             try{
                 return new Builder(condition.get());
@@ -124,6 +125,7 @@ public final class TipMessage {
                 return new Builder(false, e.getMessage());
             }
         }
+
         /**
          * 若不调用默认为:操作成功
          *
@@ -131,11 +133,12 @@ public final class TipMessage {
          * @return
          */
         public Builder success(String successMessage){
-            if(!this.condition){
+            if(!isCondition()){
                 return this;
             }
-            return new Builder(this.condition, successMessage);
+            return new Builder(isCondition(), successMessage);
         }
+
         /**
          * 生成TipMessage
          *
@@ -143,7 +146,15 @@ public final class TipMessage {
          * @return
          */
         public TipMessage error(String errorMessage){
-            return this.condition?TipMessage.ofSuccess(Optional.ofNullable(message).orElse("操作成功")):TipMessage.ofError(Optional.ofNullable(message).orElse(errorMessage));
+            return isCondition()?TipMessage.ofSuccess(Optional.ofNullable(getMessage()).orElse("操作成功")):TipMessage.ofError(Optional.ofNullable(getMessage()).orElse(errorMessage));
+        }
+
+        public boolean isCondition() {
+            return condition;
+        }
+
+        public String getMessage() {
+            return message;
         }
     }
 }
\ No newline at end of file
-- 
GitLab