From f63a6974d76797d2c9cc2bd0ccb04dc93a20b41a Mon Sep 17 00:00:00 2001
From: limeng <limeng@leoao.com>
Date: Thu, 6 Jul 2023 21:04:59 +0800
Subject: [PATCH] =?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<Tex
             }
         } else if (evt instanceof WebSocketServerProtocolHandler.HandshakeComplete) {
             this.webSocketService.connect(ctx.channel());
-            WebSocketServerProtocolHandler.HandshakeComplete handshakeComplete = (WebSocketServerProtocolHandler.HandshakeComplete)evt;
-            String token = handshakeComplete.requestHeaders().get("token");
+            String token = NettyUtil.getAttr(ctx.channel(), NettyUtil.TOKEN);
             if (StrUtil.isNotBlank(token)) {
                 this.webSocketService.authorize(ctx.channel(), new WSAuthorize(token));
             }