From 86b9c76a79814e21fbbd627b6e7d83be8d27733f Mon Sep 17 00:00:00 2001
From: liuhuan <79523503@qq.com>
Date: Sun, 5 Jan 2020 16:51:31 +0800
Subject: [PATCH] =?UTF-8?q?Object=E7=9A=84equals=E6=96=B9=E6=B3=95?=
 =?UTF-8?q?=E5=AE=B9=E6=98=93=E6=8A=9B=E7=A9=BA=E6=8C=87=E9=92=88=E5=BC=82?=
 =?UTF-8?q?=E5=B8=B8=EF=BC=8C=E7=94=A8java8=E7=9A=84Objects.equals?=
 =?UTF-8?q?=E6=9B=BF=E6=8D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/ruoyi/common/utils/YamlUtil.java        | 4 +++-
 .../src/main/java/com/ruoyi/common/utils/http/HttpUtils.java  | 3 ++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/YamlUtil.java b/ruoyi-common/src/main/java/com/ruoyi/common/utils/YamlUtil.java
index bb8a4ed68..6e5aa755a 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/YamlUtil.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/utils/YamlUtil.java
@@ -6,6 +6,8 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.util.LinkedHashMap;
 import java.util.Map;
+import java.util.Objects;
+
 import org.yaml.snakeyaml.DumperOptions;
 import org.yaml.snakeyaml.Yaml;
 import com.ruoyi.common.utils.StringUtils;
@@ -68,7 +70,7 @@ public class YamlUtil
         if (map != null && !map.isEmpty() && qualifiedKey != null)
         {
             String input = String.valueOf(qualifiedKey);
-            if (!input.equals(""))
+            if (!Objects.equals(input, ""))
             {
                 if (input.contains("."))
                 {
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/http/HttpUtils.java b/ruoyi-common/src/main/java/com/ruoyi/common/utils/http/HttpUtils.java
index 323dbc1a3..de3e39520 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/http/HttpUtils.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/utils/http/HttpUtils.java
@@ -10,6 +10,7 @@ import java.net.SocketTimeoutException;
 import java.net.URL;
 import java.net.URLConnection;
 import java.security.cert.X509Certificate;
+import java.util.Objects;
 import javax.net.ssl.HostnameVerifier;
 import javax.net.ssl.HttpsURLConnection;
 import javax.net.ssl.SSLContext;
@@ -190,7 +191,7 @@ public class HttpUtils
             String ret = "";
             while ((ret = br.readLine()) != null)
             {
-                if (ret != null && !ret.trim().equals(""))
+                if (!Objects.equals(ret.trim(), ""))
                 {
                     result.append(new String(ret.getBytes("ISO-8859-1"), "utf-8"));
                 }