diff --git a/ruoyi-admin/src/main/resources/templates/main_v1.html b/ruoyi-admin/src/main/resources/templates/main_v1.html index 582453db..f0e434bc 100644 --- a/ruoyi-admin/src/main/resources/templates/main_v1.html +++ b/ruoyi-admin/src/main/resources/templates/main_v1.html @@ -12,7 +12,6 @@ -
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/IpUtils.java b/ruoyi-common/src/main/java/com/ruoyi/common/utils/IpUtils.java index b9cfa028..a2a7011b 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/IpUtils.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/utils/IpUtils.java @@ -51,6 +51,10 @@ public class IpUtils private static boolean internalIp(byte[] addr) { + if (StringUtils.isNull(addr) || addr.length < 2) + { + return true; + } final byte b0 = addr[0]; final byte b1 = addr[1]; // 10.x.x.x/8