From cc3a764aaf1c9f0ed9a505697e4d01c34d6f070a Mon Sep 17 00:00:00 2001 From: limeng Date: Thu, 6 Jul 2023 16:28:09 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E5=B0=86=E5=BA=9F=E5=BC=83=E7=9A=84ServerH?= =?UTF-8?q?andshakeStateEvent.HANDSHAKE=5FCOMPLETE=E5=8D=87=E7=BA=A7?= =?UTF-8?q?=E4=B8=BAHandshakeComplete?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mallchat/custom/user/websocket/HttpHeadersHandler.java | 3 ++- .../custom/user/websocket/NettyWebSocketServerHandler.java | 5 +++-- 2 files changed, 5 insertions(+), 3 deletions(-) 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 b6cdd43..b60f78b 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 @@ -19,11 +19,12 @@ public class HttpHeadersHandler extends ChannelInboundHandlerAdapter { // 获取token参数 String token = urlBuilder.getQuery().get("token").toString(); - NettyUtil.setAttr(ctx.channel(), NettyUtil.TOKEN, token); + //NettyUtil.setAttr(ctx.channel(), NettyUtil.TOKEN, token); // 获取请求路径 request.setUri(urlBuilder.getPath().toString()); HttpHeaders headers = request.headers(); + headers.set("token", token); String ip = headers.get("X-Real-IP"); if (StringUtils.isEmpty(ip)) {//如果没经过nginx，就直接获取远端地址 InetSocketAddress address = (InetSocketAddress) ctx.channel().remoteAddress(); diff --git a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/user/websocket/NettyWebSocketServerHandler.java b/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/user/websocket/NettyWebSocketServerHandler.java index dbc62f9..d97122c 100644 --- a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/user/websocket/NettyWebSocketServerHandler.java +++ b/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/user/websocket/NettyWebSocketServerHandler.java @@ -67,9 +67,10 @@ public class NettyWebSocketServerHandler extends SimpleChannelInboundHandler Date: Thu, 6 Jul 2023 21:04:59 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E6=81=A2=E5=A4=8D=E4=BB=8Echannel=E4=B8=AD?= =?UTF-8?q?=E5=AD=98=E6=94=BEtoken?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mallchat/custom/user/websocket/HttpHeadersHandler.java | 3 +-- .../custom/user/websocket/NettyWebSocketServerHandler.java | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) 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 b60f78b..b6cdd43 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 @@ -19,12 +19,11 @@ public class HttpHeadersHandler extends ChannelInboundHandlerAdapter { // 获取token参数 String token = urlBuilder.getQuery().get("token").toString(); - //NettyUtil.setAttr(ctx.channel(), NettyUtil.TOKEN, token); + NettyUtil.setAttr(ctx.channel(), NettyUtil.TOKEN, token); // 获取请求路径 request.setUri(urlBuilder.getPath().toString()); HttpHeaders headers = request.headers(); - headers.set("token", token); String ip = headers.get("X-Real-IP"); if (StringUtils.isEmpty(ip)) {//如果没经过nginx，就直接获取远端地址 InetSocketAddress address = (InetSocketAddress) ctx.channel().remoteAddress(); diff --git a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/user/websocket/NettyWebSocketServerHandler.java b/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/user/websocket/NettyWebSocketServerHandler.java index d97122c..fe8a92a 100644 --- a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/user/websocket/NettyWebSocketServerHandler.java +++ b/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/user/websocket/NettyWebSocketServerHandler.java @@ -69,8 +69,7 @@ public class NettyWebSocketServerHandler extends SimpleChannelInboundHandler Date: Thu, 6 Jul 2023 21:51:16 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E9=BB=98=E8=AE=A4?= =?UTF-8?q?=E4=B8=8D=E4=BC=A0token=E5=87=BA=E7=8E=B0NPE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../abin/mallchat/custom/user/service/LoginService.java | 1 + .../custom/user/websocket/HttpHeadersHandler.java | 8 ++++++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/user/service/LoginService.java b/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/user/service/LoginService.java index ed28384..3f57542 100644 --- a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/user/service/LoginService.java +++ b/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/user/service/LoginService.java @@ -38,4 +38,5 @@ public interface LoginService { * @return */ Long getValidUid(String token); + } 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 b6cdd43..5434151 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 @@ -8,6 +8,7 @@ import io.netty.handler.codec.http.HttpHeaders; import org.apache.commons.lang3.StringUtils; import java.net.InetSocketAddress; +import java.util.Objects; public class HttpHeadersHandler extends ChannelInboundHandlerAdapter { @@ -18,8 +19,11 @@ public class HttpHeadersHandler extends ChannelInboundHandlerAdapter { UrlBuilder urlBuilder = UrlBuilder.ofHttp(request.uri()); // 获取token参数 - String token = urlBuilder.getQuery().get("token").toString(); - NettyUtil.setAttr(ctx.channel(), NettyUtil.TOKEN, token); + CharSequence sequence = urlBuilder.getQuery().get("token"); + if (Objects.nonNull(sequence)) { + String token = sequence.toString(); + NettyUtil.setAttr(ctx.channel(), NettyUtil.TOKEN, token); + } // 获取请求路径 request.setUri(urlBuilder.getPath().toString()); From dacc458ad280a88cdefb967e593db21030a16a2e Mon Sep 17 00:00:00 2001 From: limeng Date: Thu, 6 Jul 2023 22:03:09 +0800 Subject: [PATCH 4/4] =?UTF-8?q?token=E8=A7=A3=E6=9E=90=E5=A4=B1=E8=B4=A5?= =?UTF-8?q?=E6=89=93=E5=8D=B0error=E6=97=A5=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/abin/mallchat/common/common/utils/JwtUtils.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 fe2a97e..f9ce4d5 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 @@ -67,7 +67,7 @@ public class JwtUtils { DecodedJWT jwt = verifier.verify(token); return jwt.getClaims(); } catch (Exception e) { - log.info("decode error,token:{}", token, e); + log.error("decode error,token:{}", token, e); } return null; }