From cf38d8b3002607d755a418feb78ebf2bd5ef3e4f Mon Sep 17 00:00:00 2001
From: XiaoHH <1431984546@qq.com>
Date: Thu, 6 Jul 2023 19:57:43 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/greateme/util/StringUtil.java | 17 -----------------
 .../impl/VerificationCodeServiceImpl.java       |  3 ++-
 2 files changed, 2 insertions(+), 18 deletions(-)

diff --git a/common/common-util/src/main/java/com/greateme/util/StringUtil.java b/common/common-util/src/main/java/com/greateme/util/StringUtil.java
index 3cabc70..d8e40f6 100644
--- a/common/common-util/src/main/java/com/greateme/util/StringUtil.java
+++ b/common/common-util/src/main/java/com/greateme/util/StringUtil.java
@@ -27,21 +27,4 @@ public class StringUtil {
     public static String generationVerificationCode(int length) {
         return String.valueOf((int) ((Math.random() * 9 + 1) * Math.pow(10, length - 1)));
     }
-
-    /**
-     * 判断两个字符串是否相等，如果都为空，那么返回true
-     *
-     * @param str1 字符串1
-     * @param str2 字符串2
-     * @return 判断结果
-     */
-    public static boolean equal(String str1, String str2) {
-        if (null == str1 && null == str2) {
-            return true;
-        } else if (null != str1) {
-            return str1.equals(str2);
-        } else {
-            return false;
-        }
-    }
 }
diff --git a/service/service-verification-code/src/main/java/com/greateme/verification/service/impl/VerificationCodeServiceImpl.java b/service/service-verification-code/src/main/java/com/greateme/verification/service/impl/VerificationCodeServiceImpl.java
index e29731e..38121e6 100644
--- a/service/service-verification-code/src/main/java/com/greateme/verification/service/impl/VerificationCodeServiceImpl.java
+++ b/service/service-verification-code/src/main/java/com/greateme/verification/service/impl/VerificationCodeServiceImpl.java
@@ -12,6 +12,7 @@ import org.springframework.beans.factory.annotation.Value;
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.stereotype.Service;
 
+import java.util.Objects;
 import java.util.UUID;
 import java.util.concurrent.TimeUnit;
 
@@ -79,7 +80,7 @@ public class VerificationCodeServiceImpl implements VerificationCodeService {
             return new CheckPhoneVerificationCodeVO(VerificationCodeConstant.VERIFICATION_CODE_TIMEOUT);
         } else {
             String verificationCode = verificationCodeRedis.getVerificationCode();
-            if (StringUtil.equal(verificationCode, passengerVerificationCode.getVerificationCode())) {
+            if (Objects.equals(verificationCode, passengerVerificationCode.getVerificationCode())) {
                 this.redisTemplate.delete(VerificationCodeConstant.PASSENGER_PHONE_VERIFICATION_CODE_PREFIX + verificationToken);
                 return new CheckPhoneVerificationCodeVO(VerificationCodeConstant.VERIFICATION_CODE_RIGHT, verificationCodeRedis.getPassengerPhone());
             } else {