From 0ffa5fbe983c3aac35a2566dcd4e88fcdc2e0a79 Mon Sep 17 00:00:00 2001
From: wangsiyuan <2392948297@qq.com>
Date: Wed, 6 Dec 2023 10:39:25 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20SMSInfo.java?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/kimgo/wepush/model/SMSInfo.java     | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/src/main/java/com/kimgo/wepush/model/SMSInfo.java b/src/main/java/com/kimgo/wepush/model/SMSInfo.java
index 46dc914..05213a8 100644
--- a/src/main/java/com/kimgo/wepush/model/SMSInfo.java
+++ b/src/main/java/com/kimgo/wepush/model/SMSInfo.java
@@ -24,16 +24,12 @@ public class SMSInfo {
      * @return 如果所有字段都非空，则返回 true，否则返回 false。
      */
     public boolean validateFields() {
-        return StringUtils.isNotBlank(smsNumber) &&
-                StringUtils.isNotBlank(smsAcceptanceTime) &&
-                StringUtils.isNotBlank(smsContent);
+        return isNotBlankAndNotLiteralNull(smsNumber) &&
+                isNotBlankAndNotLiteralNull(smsAcceptanceTime) &&
+                isNotBlankAndNotLiteralNull(smsContent);
     }
-    public boolean isNullString(){
-        String nullString = "null";
-        if (this.smsNumber.equals(nullString) || this.smsContent.equals(nullString) || this.smsAcceptanceTime.equals(nullString)){
-            logger.info("SMSInfo has null String.");
-            return true;
-        }
-        return false;
+
+    private boolean isNotBlankAndNotLiteralNull(String value) {
+        return StringUtils.isNotBlank(value) && !"null".equals(value);
     }
 }
\ No newline at end of file