From 0764c10d1796176b73d40f1156d0749b87e9cf9e Mon Sep 17 00:00:00 2001
From: gi1tee <gouzhonglin@huawei.com>
Date: Wed, 12 Jun 2024 10:07:12 +0800
Subject: [PATCH] f

---
 src/main/java/com/easysoftware/common/utils/ClientUtil.java | 4 ++--
 src/test/java/com/easysoftware/common/utils/CommonUtil.java | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/easysoftware/common/utils/ClientUtil.java b/src/main/java/com/easysoftware/common/utils/ClientUtil.java
index 1c3d423..92d46b0 100644
--- a/src/main/java/com/easysoftware/common/utils/ClientUtil.java
+++ b/src/main/java/com/easysoftware/common/utils/ClientUtil.java
@@ -43,7 +43,7 @@ public final class ClientUtil {
         // 获取请求主机IP地址,如果通过代理进来，则透过防火墙获取真实IP地址
         String headerName = "x-forwarded-for";
         String ip = request.getHeader(headerName);
-        if (null != ip && ip.length() != 0 && !"unknown".equalsIgnoreCase(ip)) {
+        if (ip != null && ip.length() != 0 && !"unknown".equalsIgnoreCase(ip)) {
             // 多次反向代理后会有多个IP值，第一个IP才是真实IP,它们按照英文逗号','分割
             if (ip.contains(",")) {
                 ip = ip.split(",")[0];
@@ -95,6 +95,6 @@ public final class ClientUtil {
      * @return true if the IP address is valid, false otherwise.
      */
     private static boolean checkIp(final String ip) {
-        return null == ip || ip.length() == 0 || "unknown".equalsIgnoreCase(ip);
+        return ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip);
     }
 }
diff --git a/src/test/java/com/easysoftware/common/utils/CommonUtil.java b/src/test/java/com/easysoftware/common/utils/CommonUtil.java
index a114c5c..223c985 100644
--- a/src/test/java/com/easysoftware/common/utils/CommonUtil.java
+++ b/src/test/java/com/easysoftware/common/utils/CommonUtil.java
@@ -32,7 +32,7 @@ import com.easysoftware.common.entity.ResultVo;
 public class CommonUtil {
     public static ResultVo executeGet(MockMvc mockMvc, String url, MultiValueMap<String, String> paramMap) throws Exception {
         String content = "";
-        if (null == paramMap) {
+        if (paramMap == null) {
             content = mockMvc.perform(MockMvcRequestBuilders.get(url)
                     .accept(MediaType.APPLICATION_JSON))
                     .andReturn().getResponse().getContentAsString(StandardCharsets.UTF_8);
-- 
Gitee