From cc3a764aaf1c9f0ed9a505697e4d01c34d6f070a Mon Sep 17 00:00:00 2001
From: limeng <limeng@leoao.com>
Date: Thu, 6 Jul 2023 16:28:09 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B0=86=E5=BA=9F=E5=BC=83=E7=9A=84ServerHands?=
 =?UTF-8?q?hakeStateEvent.HANDSHAKE=5FCOMPLETE=E5=8D=87=E7=BA=A7=E4=B8=BAH?=
 =?UTF-8?q?andshakeComplete?=
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<Tex
                 // 关闭用户的连接
                 userOffLine(ctx);
             }
-        } else if (evt == WebSocketServerProtocolHandler.ServerHandshakeStateEvent.HANDSHAKE_COMPLETE) {
+        } else if (evt instanceof WebSocketServerProtocolHandler.HandshakeComplete) {
             this.webSocketService.connect(ctx.channel());
-            String token = NettyUtil.getAttr(ctx.channel(), NettyUtil.TOKEN);
+            WebSocketServerProtocolHandler.HandshakeComplete handshakeComplete = (WebSocketServerProtocolHandler.HandshakeComplete)evt;
+            String token = handshakeComplete.requestHeaders().get("token");
             if (StrUtil.isNotBlank(token)) {
                 this.webSocketService.authorize(ctx.channel(), new WSAuthorize(token));
             }