From 90970eb9fef42f1f02ea60c9522f4d7dd6a6c128 Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: Wed, 22 Feb 2023 10:29:28 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8DisMatchedIp=E7=9A=84=E5=8F=82?=
=?UTF-8?q?=E6=95=B0=E5=88=A4=E6=96=AD=E4=BA=A7=E7=94=9F=E7=A9=BA=E6=8C=87?=
=?UTF-8?q?=E9=92=88=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../src/main/java/com/ruoyi/common/utils/DateUtils.java | 2 +-
.../src/main/java/com/ruoyi/common/utils/ip/IpUtils.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/DateUtils.java b/ruoyi-common/src/main/java/com/ruoyi/common/utils/DateUtils.java
index 4394f03..04c87d8 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/DateUtils.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/utils/DateUtils.java
@@ -145,7 +145,7 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils
}
/**
- * 计算时间差（单位：分钟）
+ * 计算时间差
*
* @param endTime 最后时间
* @param startTime 开始时间
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/ip/IpUtils.java b/ruoyi-common/src/main/java/com/ruoyi/common/utils/ip/IpUtils.java
index b410fda..3316240 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/ip/IpUtils.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/utils/ip/IpUtils.java
@@ -357,7 +357,7 @@ public class IpUtils
*/
public static boolean isMatchedIp(String filter, String ip)
{
- if (StringUtils.isEmpty(filter) && StringUtils.isEmpty(ip))
+ if (StringUtils.isEmpty(filter) || StringUtils.isEmpty(ip))
{
return false;
}