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 1238052a86c7e63c2ce789350c545f28c2ac742d..fa334a38778029a8c41db383445c9011f26cbd30 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 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