From a1e2c6e1e669770bde267e3c02804089aa9d4cb6 Mon Sep 17 00:00:00 2001 From: RuoYi Date: Wed, 22 Feb 2023 10:30:49 +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 --- .../com/ruoyi/common/exception/file/FileUploadException.java | 2 ++ .../src/main/java/com/ruoyi/common/utils/DateUtils.java | 2 +- ruoyi-common/src/main/java/com/ruoyi/common/utils/IpUtils.java | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/exception/file/FileUploadException.java b/ruoyi-common/src/main/java/com/ruoyi/common/exception/file/FileUploadException.java index b5108ff60..f45e7ef40 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/exception/file/FileUploadException.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/exception/file/FileUploadException.java @@ -5,6 +5,8 @@ import java.io.PrintWriter; /** * 文件上传异常类 + * + * @author ruoyi */ public class FileUploadException extends Exception { 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 4394f03b4..04c87d8a9 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/IpUtils.java b/ruoyi-common/src/main/java/com/ruoyi/common/utils/IpUtils.java index a8c282d91..1a3f210cd 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 @@ -345,7 +345,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; }