Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Administrator
magic-api
Commits
f0cb6fbf
Commit
f0cb6fbf
authored
Dec 19, 2023
by
shengnan hu
Browse files
Fix/:判空方法替换
parent
c48248ca
Pipeline
#233
failed with stage
in 1 minute and 38 seconds
Changes
3
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
9 additions
and
3 deletions
+9
-3
magic-api/src/main/java/org/ssssssss/magicapi/utils/Assert.java
...api/src/main/java/org/ssssssss/magicapi/utils/Assert.java
+3
-1
magic-api/src/main/java/org/ssssssss/magicapi/utils/IpUtils.java
...pi/src/main/java/org/ssssssss/magicapi/utils/IpUtils.java
+2
-1
magic-api/src/main/java/org/ssssssss/magicapi/utils/PatternUtils.java
...c/main/java/org/ssssssss/magicapi/utils/PatternUtils.java
+4
-1
No files found.
magic-api/src/main/java/org/ssssssss/magicapi/utils/Assert.java
View file @
f0cb6fbf
package
org.ssssssss.magicapi.utils
;
import
java.util.Objects
;
import
org.apache.commons.lang3.StringUtils
;
import
org.ssssssss.magicapi.core.exception.MagicAPIException
;
...
...
@@ -42,7 +44,7 @@ public class Assert {
* 断言值不能为空字符串
*/
public
static
void
isNotBlanks
(
String
message
,
String
...
values
)
{
if
(
values
!=
null
)
{
if
(
!
Objects
.
isNull
(
values
)
)
{
for
(
String
value
:
values
)
{
isNotBlank
(
value
,
message
);
}
...
...
magic-api/src/main/java/org/ssssssss/magicapi/utils/IpUtils.java
View file @
f0cb6fbf
...
...
@@ -3,6 +3,7 @@ package org.ssssssss.magicapi.utils;
import
org.apache.commons.lang3.StringUtils
;
import
java.util.List
;
import
java.util.Objects
;
import
java.util.function.Function
;
import
java.util.stream.Collectors
;
import
java.util.stream.Stream
;
...
...
@@ -23,7 +24,7 @@ public class IpUtils {
}
private
static
String
processIp
(
String
ip
)
{
if
(
ip
!=
null
)
{
if
(
Objects
.
isNull
(
ip
)
)
{
ip
=
ip
.
trim
();
if
(
isUnknown
(
ip
))
{
return
null
;
...
...
magic-api/src/main/java/org/ssssssss/magicapi/utils/PatternUtils.java
View file @
f0cb6fbf
package
org.ssssssss.magicapi.utils
;
import
java.util.Map
;
import
java.util.Objects
;
import
java.util.concurrent.ConcurrentHashMap
;
import
java.util.regex.Pattern
;
import
org.apache.commons.lang3.ObjectUtils
;
/**
* 正则相关工具包
*
...
...
@@ -15,7 +18,7 @@ public class PatternUtils {
public
static
boolean
match
(
String
content
,
String
regex
)
{
Pattern
pattern
=
CACHED_PATTERNS
.
get
(
regex
);
if
(
pattern
==
null
)
{
if
(
!
Objects
.
isNull
(
pattern
)
)
{
pattern
=
Pattern
.
compile
(
regex
);
CACHED_PATTERNS
.
put
(
regex
,
pattern
);
}
...
...
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