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 5e92cde8f..3d5661151 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; @@ -204,7 +205,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")); }