Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
jinli gu
RuoYi Vue
Commits
90970eb9
Commit
90970eb9
authored
Feb 22, 2023
by
RuoYi
Browse files
修复isMatchedIp的参数判断产生空指针的问题
parent
3402b695
Changes
2
Show whitespace changes
Inline
Side-by-side
ruoyi-common/src/main/java/com/ruoyi/common/utils/DateUtils.java
View file @
90970eb9
...
...
@@ -145,7 +145,7 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils
}
/**
* 计算时间差
(单位:分钟)
* 计算时间差
*
* @param endTime 最后时间
* @param startTime 开始时间
...
...
ruoyi-common/src/main/java/com/ruoyi/common/utils/ip/IpUtils.java
View file @
90970eb9
...
...
@@ -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
;
}
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment