From af9ff9dbaea8d464496076befe93e035a974bdef Mon Sep 17 00:00:00 2001 From: yinpeng Date: Wed, 31 May 2023 11:51:08 +0800 Subject: [PATCH 1/2] =?UTF-8?q?[fix]=20String=E7=B1=BB=E5=9E=8B=E5=88=A4?= =?UTF-8?q?=E6=96=AD=E4=BD=BF=E7=94=A8StringUtils.isNotEmpty()=20=E8=80=8C?= =?UTF-8?q?=E4=B8=8D=E6=98=AFObjects.isNull()?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/common/domain/vo/request/CursorPageBaseReq.java | 4 ++-- .../java/com/abin/mallchat/common/common/utils/JwtUtils.java | 4 ++-- .../common/utils/discover/AbstractUrlTitleDiscover.java | 3 ++- .../com/abin/mallchat/custom/user/service/WxMsgService.java | 5 +++-- .../mallchat/custom/user/websocket/HttpHeadersHandler.java | 4 ++-- 5 files changed, 11 insertions(+), 9 deletions(-) diff --git a/mallchat-common/src/main/java/com/abin/mallchat/common/common/domain/vo/request/CursorPageBaseReq.java b/mallchat-common/src/main/java/com/abin/mallchat/common/common/domain/vo/request/CursorPageBaseReq.java index 54c4cf7..fe4b1f6 100644 --- a/mallchat-common/src/main/java/com/abin/mallchat/common/common/domain/vo/request/CursorPageBaseReq.java +++ b/mallchat-common/src/main/java/com/abin/mallchat/common/common/domain/vo/request/CursorPageBaseReq.java @@ -7,9 +7,9 @@ import io.swagger.annotations.ApiModelProperty; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; +import org.apache.commons.lang3.StringUtils; import javax.validation.constraints.Max; -import java.util.Objects; /** * @author abin @@ -34,6 +34,6 @@ public class CursorPageBaseReq { @JsonIgnore public Boolean isFirstPage() { - return Objects.isNull(cursor); + return StringUtils.isNotEmpty(cursor); } } diff --git a/mallchat-common/src/main/java/com/abin/mallchat/common/common/utils/JwtUtils.java b/mallchat-common/src/main/java/com/abin/mallchat/common/common/utils/JwtUtils.java index dd2443e..af02421 100644 --- a/mallchat-common/src/main/java/com/abin/mallchat/common/common/utils/JwtUtils.java +++ b/mallchat-common/src/main/java/com/abin/mallchat/common/common/utils/JwtUtils.java @@ -6,12 +6,12 @@ import com.auth0.jwt.interfaces.Claim; import com.auth0.jwt.interfaces.DecodedJWT; import com.auth0.jwt.interfaces.JWTVerifier; import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Component; import java.util.Date; import java.util.Map; -import java.util.Objects; import java.util.Optional; /** @@ -59,7 +59,7 @@ public class JwtUtils { * @return */ public Map verifyToken(String token) { - if (Objects.isNull(token)) { + if (StringUtils.isEmpty(token)) { return null; } try { diff --git a/mallchat-common/src/main/java/com/abin/mallchat/common/common/utils/discover/AbstractUrlTitleDiscover.java b/mallchat-common/src/main/java/com/abin/mallchat/common/common/utils/discover/AbstractUrlTitleDiscover.java index b6ebe0c..cb13478 100644 --- a/mallchat-common/src/main/java/com/abin/mallchat/common/common/utils/discover/AbstractUrlTitleDiscover.java +++ b/mallchat-common/src/main/java/com/abin/mallchat/common/common/utils/discover/AbstractUrlTitleDiscover.java @@ -4,6 +4,7 @@ import cn.hutool.core.util.ReUtil; import cn.hutool.core.util.StrUtil; import com.abin.mallchat.common.common.utils.FutureUtils; import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang3.StringUtils; import org.jsoup.Connection; import org.jsoup.Jsoup; import org.jsoup.nodes.Document; @@ -38,7 +39,7 @@ public abstract class AbstractUrlTitleDiscover implements UrlTitleDiscover { //并行请求 List>> futures = matchList.stream().map(match -> CompletableFuture.supplyAsync(() -> { String title = getUrlTitle(match); - return Objects.nonNull(title) ? Pair.of(match, title) : null; + return StringUtils.isNotEmpty(title) ? Pair.of(match, title) : null; })).collect(Collectors.toList()); CompletableFuture>> future = FutureUtils.sequenceNonNull(futures); //结果组装 diff --git a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/user/service/WxMsgService.java b/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/user/service/WxMsgService.java index f0318b2..80a1f93 100644 --- a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/user/service/WxMsgService.java +++ b/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/user/service/WxMsgService.java @@ -10,6 +10,7 @@ import me.chanjar.weixin.common.bean.WxOAuth2UserInfo; import me.chanjar.weixin.mp.api.WxMpService; import me.chanjar.weixin.mp.bean.message.WxMpXmlMessage; import me.chanjar.weixin.mp.bean.message.WxMpXmlOutMessage; +import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Lazy; @@ -53,7 +54,7 @@ public class WxMsgService { String fromUser = wxMpXmlMessage.getFromUser(); Integer eventKey = Integer.parseInt(getEventKey(wxMpXmlMessage)); User user = userDao.getByOpenId(fromUser); - if (Objects.nonNull(user) && Objects.nonNull(user.getAvatar())) { + if (Objects.nonNull(user) && StringUtils.isNotEmpty(user.getAvatar())) { //注册且已经授权的用户，直接登录成功 login(user.getId(), eventKey); return null; @@ -84,7 +85,7 @@ public class WxMsgService { public void authorize(WxOAuth2UserInfo userInfo) { User user = userDao.getByOpenId(userInfo.getOpenid()); //更新用户信息 - if (Objects.isNull(user.getName())) { + if (StringUtils.isNotEmpty(user.getName())) { fillUserInfo(user.getId(), userInfo); } //触发用户登录成功操作 diff --git a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/user/websocket/HttpHeadersHandler.java b/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/user/websocket/HttpHeadersHandler.java index 1543617..447cd64 100644 --- a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/user/websocket/HttpHeadersHandler.java +++ b/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/user/websocket/HttpHeadersHandler.java @@ -5,9 +5,9 @@ import io.netty.channel.ChannelInboundHandlerAdapter; import io.netty.handler.codec.http.FullHttpRequest; import io.netty.handler.codec.http.HttpHeaders; import io.netty.util.AttributeKey; +import org.apache.commons.lang3.StringUtils; import java.net.InetSocketAddress; -import java.util.Objects; public class HttpHeadersHandler extends ChannelInboundHandlerAdapter { private AttributeKey key = AttributeKey.valueOf("Id"); @@ -17,7 +17,7 @@ public class HttpHeadersHandler extends ChannelInboundHandlerAdapter { if (msg instanceof FullHttpRequest) { HttpHeaders headers = ((FullHttpRequest) msg).headers(); String ip = headers.get("X-Real-IP"); - if (Objects.isNull(ip)) {//如果没经过nginx，就直接获取远端地址 + if (StringUtils.isNotEmpty(ip)) {//如果没经过nginx，就直接获取远端地址 InetSocketAddress address = (InetSocketAddress) ctx.channel().remoteAddress(); ip = address.getAddress().getHostAddress(); } From 6986fdfca39925aad57a9c31c6ee18f2e95a4649 Mon Sep 17 00:00:00 2001 From: yinpeng Date: Wed, 31 May 2023 20:51:31 +0800 Subject: [PATCH 2/2] =?UTF-8?q?[fix]=20String=E7=B1=BB=E5=9E=8B=E5=88=A4?= =?UTF-8?q?=E6=96=AD=E4=BD=BF=E7=94=A8StringUtils.isNotEmpty()=20=E8=80=8C?= =?UTF-8?q?=E4=B8=8D=E6=98=AFObjects.isNull()?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/common/domain/vo/request/CursorPageBaseReq.java | 2 +- .../com/abin/mallchat/custom/user/service/WxMsgService.java | 2 +- .../abin/mallchat/custom/user/websocket/HttpHeadersHandler.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/mallchat-common/src/main/java/com/abin/mallchat/common/common/domain/vo/request/CursorPageBaseReq.java b/mallchat-common/src/main/java/com/abin/mallchat/common/common/domain/vo/request/CursorPageBaseReq.java index fe4b1f6..d0a4381 100644 --- a/mallchat-common/src/main/java/com/abin/mallchat/common/common/domain/vo/request/CursorPageBaseReq.java +++ b/mallchat-common/src/main/java/com/abin/mallchat/common/common/domain/vo/request/CursorPageBaseReq.java @@ -34,6 +34,6 @@ public class CursorPageBaseReq { @JsonIgnore public Boolean isFirstPage() { - return StringUtils.isNotEmpty(cursor); + return StringUtils.isEmpty(cursor); } } diff --git a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/user/service/WxMsgService.java b/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/user/service/WxMsgService.java index 80a1f93..065c026 100644 --- a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/user/service/WxMsgService.java +++ b/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/user/service/WxMsgService.java @@ -85,7 +85,7 @@ public class WxMsgService { public void authorize(WxOAuth2UserInfo userInfo) { User user = userDao.getByOpenId(userInfo.getOpenid()); //更新用户信息 - if (StringUtils.isNotEmpty(user.getName())) { + if (StringUtils.isEmpty(user.getName())) { fillUserInfo(user.getId(), userInfo); } //触发用户登录成功操作 diff --git a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/user/websocket/HttpHeadersHandler.java b/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/user/websocket/HttpHeadersHandler.java index 447cd64..72f4b3c 100644 --- a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/user/websocket/HttpHeadersHandler.java +++ b/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/user/websocket/HttpHeadersHandler.java @@ -17,7 +17,7 @@ public class HttpHeadersHandler extends ChannelInboundHandlerAdapter { if (msg instanceof FullHttpRequest) { HttpHeaders headers = ((FullHttpRequest) msg).headers(); String ip = headers.get("X-Real-IP"); - if (StringUtils.isNotEmpty(ip)) {//如果没经过nginx，就直接获取远端地址 + if (StringUtils.isEmpty(ip)) {//如果没经过nginx，就直接获取远端地址 InetSocketAddress address = (InetSocketAddress) ctx.channel().remoteAddress(); ip = address.getAddress().getHostAddress(); }