From 5d8e32abf86646fc962801fe09d5d3268f2d2359 Mon Sep 17 00:00:00 2001
From: zbzbzzz <zbzbzzz@dianhun.cn>
Date: Tue, 4 Jul 2023 09:56:35 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E4=BC=98=E5=8C=96ws=E6=8F=A1=E6=89=8B?=
 =?UTF-8?q?=E5=90=8C=E6=97=B6=E8=AE=A4=E8=AF=81=20=E5=8A=A0=E4=B8=8Atoken?=
 =?UTF-8?q?=E4=B8=BA=E7=A9=BA=E5=88=A4=E6=96=AD=20=E5=8E=BB=E6=8E=89?=
 =?UTF-8?q?=E5=BC=82=E6=AD=A5=E8=AE=A4=E8=AF=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../custom/user/service/impl/WebSocketServiceImpl.java | 10 +++++-----
 .../user/websocket/NettyWebSocketServerHandler.java    |  9 ++++++---
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/user/service/impl/WebSocketServiceImpl.java b/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/user/service/impl/WebSocketServiceImpl.java
index 96d0f68..8515083 100644
--- a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/user/service/impl/WebSocketServiceImpl.java
+++ b/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/user/service/impl/WebSocketServiceImpl.java
@@ -29,11 +29,14 @@ import me.chanjar.weixin.mp.bean.result.WxMpQrCodeTicket;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.context.ApplicationEventPublisher;
-import org.springframework.scheduling.annotation.Async;
 import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
 import org.springframework.stereotype.Component;
 
-import java.util.*;
+import java.util.Date;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.CopyOnWriteArrayList;
 import java.util.concurrent.locks.Condition;
@@ -141,10 +144,7 @@ public class WebSocketServiceImpl implements WebSocketService {
         }
     }
 
-    // 这里可以加异步或者事件去处理登录
-    // 因为登录和推送消息其实是不用同步的两个步骤 这样可以加快连接的速度不占用nio线程
     @Override
-    @Async
     public void authorize(Channel channel, WSAuthorize wsAuthorize) {
         //校验token
         boolean verifySuccess = loginService.verify(wsAuthorize.getToken());
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 b4fbb0a..ecbbb24 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
@@ -1,5 +1,6 @@
 package com.abin.mallchat.custom.user.websocket;
 
+import cn.hutool.core.util.StrUtil;
 import cn.hutool.extra.spring.SpringUtil;
 import cn.hutool.json.JSONUtil;
 import com.abin.mallchat.custom.user.domain.enums.WSReqTypeEnum;
@@ -19,6 +20,7 @@ import lombok.extern.slf4j.Slf4j;
 public class NettyWebSocketServerHandler extends SimpleChannelInboundHandler<TextWebSocketFrame> {
 
     private WebSocketService webSocketService;
+
     // 当web客户端连接后，触发该方法
     @Override
     public void handlerAdded(ChannelHandlerContext ctx) throws Exception {
@@ -67,9 +69,10 @@ public class NettyWebSocketServerHandler extends SimpleChannelInboundHandler<Tex
             }
         } else if (evt == WebSocketServerProtocolHandler.ServerHandshakeStateEvent.HANDSHAKE_COMPLETE) {
             this.webSocketService.connect(ctx.channel());
-            // 这里不用判断token是否为空 交给authorize方法中去判断
-            // 在为空或者验证不通过的时候给前端返回相应的状态码
-            this.webSocketService.authorize(ctx.channel(), new WSAuthorize(NettyUtil.getAttr(ctx.channel(), NettyUtil.TOKEN)));
+            String token = NettyUtil.getAttr(ctx.channel(), NettyUtil.TOKEN);
+            if (StrUtil.isNotBlank(token)) {
+                this.webSocketService.authorize(ctx.channel(), new WSAuthorize());
+            }
         }
         super.userEventTriggered(ctx, evt);
     }