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; }