diff --git a/src/main/java/com/ruoyi/common/utils/AddressUtils.java b/src/main/java/com/ruoyi/common/utils/AddressUtils.java
index 03ab3649..056a97d6 100644
--- a/src/main/java/com/ruoyi/common/utils/AddressUtils.java
+++ b/src/main/java/com/ruoyi/common/utils/AddressUtils.java
@@ -24,7 +24,6 @@ public class AddressUtils
public static String getRealAddressByIP(String ip)
{
- String address = UNKNOWN;
// 内网不查询
if (IpUtils.internalIp(ip))
{
@@ -50,6 +49,6 @@ public class AddressUtils
log.error("获取地理位置异常 {}", e);
}
}
- return address;
+ return UNKNOWN;
}
}
diff --git a/src/main/java/com/ruoyi/common/utils/ExceptionUtil.java b/src/main/java/com/ruoyi/common/utils/ExceptionUtil.java
index 95662037..33e4e05b 100644
--- a/src/main/java/com/ruoyi/common/utils/ExceptionUtil.java
+++ b/src/main/java/com/ruoyi/common/utils/ExceptionUtil.java
@@ -19,8 +19,7 @@ public class ExceptionUtil
{
StringWriter sw = new StringWriter();
e.printStackTrace(new PrintWriter(sw, true));
- String str = sw.toString();
- return str;
+ return sw.toString();
}
public static String getRootErrorMessage(Exception e)
diff --git a/src/main/java/com/ruoyi/common/utils/Md5Utils.java b/src/main/java/com/ruoyi/common/utils/Md5Utils.java
index d709ab17..1ecd82f4 100644
--- a/src/main/java/com/ruoyi/common/utils/Md5Utils.java
+++ b/src/main/java/com/ruoyi/common/utils/Md5Utils.java
@@ -1,5 +1,6 @@
package com.ruoyi.common.utils;
+import java.nio.charset.StandardCharsets;
import java.security.MessageDigest;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -55,7 +56,7 @@ public class Md5Utils
{
try
{
- return new String(toHex(md5(s)).getBytes("UTF-8"), "UTF-8");
+ return new String(toHex(md5(s)).getBytes(StandardCharsets.UTF_8), StandardCharsets.UTF_8);
}
catch (Exception e)
{
diff --git a/src/main/java/com/ruoyi/common/utils/ServletUtils.java b/src/main/java/com/ruoyi/common/utils/ServletUtils.java
index 17a04923..a647a224 100644
--- a/src/main/java/com/ruoyi/common/utils/ServletUtils.java
+++ b/src/main/java/com/ruoyi/common/utils/ServletUtils.java
@@ -129,13 +129,13 @@ public class ServletUtils
public static boolean isAjaxRequest(HttpServletRequest request)
{
String accept = request.getHeader("accept");
- if (accept != null && accept.indexOf("application/json") != -1)
+ if (accept != null && accept.contains("application/json"))
{
return true;
}
String xRequestedWith = request.getHeader("X-Requested-With");
- if (xRequestedWith != null && xRequestedWith.indexOf("XMLHttpRequest") != -1)
+ if (xRequestedWith != null && xRequestedWith.contains("XMLHttpRequest"))
{
return true;
}
@@ -147,11 +147,7 @@ public class ServletUtils
}
String ajax = request.getParameter("__ajax");
- if (StringUtils.inStringIgnoreCase(ajax, "json", "xml"))
- {
- return true;
- }
- return false;
+ return StringUtils.inStringIgnoreCase(ajax, "json", "xml");
}
/**
diff --git a/src/main/java/com/ruoyi/common/utils/TreeUtils.java b/src/main/java/com/ruoyi/common/utils/TreeUtils.java
index 8620e9d2..4a980640 100644
--- a/src/main/java/com/ruoyi/common/utils/TreeUtils.java
+++ b/src/main/java/com/ruoyi/common/utils/TreeUtils.java
@@ -132,6 +132,6 @@ public class TreeUtils
*/
private static boolean hasChild(List