Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in
Toggle navigation
S
sts网站
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
liyang
sts网站
Commits
90970eb9
Commit
90970eb9
authored
Feb 22, 2023
by
RuoYi
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修复isMatchedIp的参数判断产生空指针的问题
parent
3402b695
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
2 deletions
+2
-2
DateUtils.java
...ommon/src/main/java/com/ruoyi/common/utils/DateUtils.java
+1
-1
IpUtils.java
...mmon/src/main/java/com/ruoyi/common/utils/ip/IpUtils.java
+1
-1
No files found.
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
...
@@ -145,7 +145,7 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils
}
}
/**
/**
* 计算时间差
(单位:分钟)
* 计算时间差
*
*
* @param endTime 最后时间
* @param endTime 最后时间
* @param startTime 开始时间
* @param startTime 开始时间
...
...
ruoyi-common/src/main/java/com/ruoyi/common/utils/ip/IpUtils.java
View file @
90970eb9
...
@@ -357,7 +357,7 @@ public class IpUtils
...
@@ -357,7 +357,7 @@ public class IpUtils
*/
*/
public
static
boolean
isMatchedIp
(
String
filter
,
String
ip
)
public
static
boolean
isMatchedIp
(
String
filter
,
String
ip
)
{
{
if
(
StringUtils
.
isEmpty
(
filter
)
&&
StringUtils
.
isEmpty
(
ip
))
if
(
StringUtils
.
isEmpty
(
filter
)
||
StringUtils
.
isEmpty
(
ip
))
{
{
return
false
;
return
false
;
}
}
...
...
Write
Preview
Markdown
is supported
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