diff --git a/mallchat-common/src/main/java/com/abin/mallchat/common/common/exception/CommonErrorEnum.java b/mallchat-common/src/main/java/com/abin/mallchat/common/common/exception/CommonErrorEnum.java index edcd880..b1b7ec8 100644 --- a/mallchat-common/src/main/java/com/abin/mallchat/common/common/exception/CommonErrorEnum.java +++ b/mallchat-common/src/main/java/com/abin/mallchat/common/common/exception/CommonErrorEnum.java @@ -13,7 +13,7 @@ import lombok.Getter; public enum CommonErrorEnum implements ErrorEnum { SYSTEM_ERROR(-1, "系统出小差了，请稍后再试哦~~"), - PARAM_VALID(-2, "参数校验失败"), + PARAM_VALID(-2, "参数校验失败{0}"), FREQUENCY_LIMIT(-3, "请求太频繁了，请稍后再试哦~~"), LOCK_LIMIT(-4, "请求太频繁了，请稍后再试哦~~"), ; diff --git a/mallchat-common/src/test/java/com/abin/mallchat/common/common/algorithm/ac/CreateTokenTest.java b/mallchat-common/src/test/java/com/abin/mallchat/common/common/algorithm/ac/CreateTokenTest.java index 50908e4..e73a9a9 100644 --- a/mallchat-common/src/test/java/com/abin/mallchat/common/common/algorithm/ac/CreateTokenTest.java +++ b/mallchat-common/src/test/java/com/abin/mallchat/common/common/algorithm/ac/CreateTokenTest.java @@ -6,7 +6,6 @@ import com.auth0.jwt.algorithms.Algorithm; 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.junit.Test; import java.util.Date; @@ -18,27 +17,18 @@ public class CreateTokenTest { @Test public void create(){ String token = JWT.create() - .withClaim("uid", 123L) // 只存一个uid信息，其他的自己去redis查 + .withClaim("uid", 10004L) // 只存一个uid信息，其他的自己去redis查 .withClaim("createTime", new Date()) .sign(Algorithm.HMAC256("dsfsdfsdfsdfsd")); // signature log.info("生成的token为 {}",token); try { - JWTVerifier verifier = JWT.require(Algorithm.HMAC256("dsfsdfsdfsdfsd")).build(); + JWTVerifier verifier = JWT.require(Algorithm.HMAC256("dsfsdfsdfsdfsc")).build(); DecodedJWT jwt = verifier.verify(token); log.info(jwt.getClaims().toString()); } catch (Exception e) { log.info("decode error,token:{}", token, e); } } - - @Test - public void verifyToken(){ - String token = JWT.create() - .withClaim("uid", 1) // 只存一个uid信息，其他的自己去redis查 - .withClaim("createTime", new Date()) - .sign(Algorithm.HMAC256("dsfsdfsdfsdfsd")); // signature - log.info("生成的token为{}",token); - } } diff --git a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/chat/controller/ChatController.java b/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/chat/controller/ChatController.java index a74ed2b..1f32401 100644 --- a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/chat/controller/ChatController.java +++ b/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/chat/controller/ChatController.java @@ -94,7 +94,6 @@ public class ChatController { private void filterBlackMsg(CursorPageBaseResp memberPage) { Set blackMembers = getBlackUidSet(); memberPage.getList().removeIf(a -> blackMembers.contains(a.getFromUser().getUid().toString())); - System.out.println(1); } @PostMapping("/msg") diff --git a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/chatai/handler/AbstractChatAIHandler.java b/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/chatai/handler/AbstractChatAIHandler.java index e644b4d..598e621 100644 --- a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/chatai/handler/AbstractChatAIHandler.java +++ b/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/chatai/handler/AbstractChatAIHandler.java @@ -29,13 +29,21 @@ public abstract class AbstractChatAIHandler { protected UserService userService; @PostConstruct - private void init() { - ChatAIHandlerFactory.register(getChatAIUserId(), getChatAIName(), this); + protected void init() { + if (isUse()) { + ChatAIHandlerFactory.register(getChatAIUserId(), this); + } } + + /** + * 是否启用 + * + * @return boolean + */ + protected abstract boolean isUse(); + // 获取机器人id public abstract Long getChatAIUserId(); - // 获取机器人名称 - public abstract String getChatAIName(); public void chat(Message message) { if (!supports(message)) { @@ -44,7 +52,7 @@ public abstract class AbstractChatAIHandler { threadPoolTaskExecutor.execute(() -> { String text = doChat(message); if (StringUtils.isNotBlank(text)) { - answerMsg(text, message.getRoomId(), message.getFromUid()); + answerMsg(text, message); } }); } @@ -66,30 +74,34 @@ public abstract class AbstractChatAIHandler { protected abstract String doChat(Message message); - protected void answerMsg(String text, Long roomId, Long uid) { - UserInfoResp userInfo = userService.getUserInfo(uid); + protected void answerMsg(String text, Message replyMessage) { + UserInfoResp userInfo = userService.getUserInfo(replyMessage.getFromUid()); text = "@" + userInfo.getName() + " " + text; - if (text.length() < 450) { - save(text, roomId, uid); - }else { - int maxLen = 450; + if (text.length() < 800) { + save(text, replyMessage); + } else { + int maxLen = 800; int len = text.length(); int count = (len + maxLen - 1) / maxLen; for (int i = 0; i < count; i++) { int start = i * maxLen; int end = Math.min(start + maxLen, len); - save(text.substring(start, end), roomId, uid); + save(text.substring(start, end), replyMessage); } } } - private void save(String text, Long roomId, Long uid) { + private void save(String text, Message replyMessage) { + Long roomId = replyMessage.getRoomId(); + Long uid = replyMessage.getFromUid(); + Long id = replyMessage.getId(); ChatMessageReq answerReq = new ChatMessageReq(); answerReq.setRoomId(roomId); answerReq.setMsgType(MessageTypeEnum.TEXT.getType()); TextMsgReq textMsgReq = new TextMsgReq(); textMsgReq.setContent(text); + textMsgReq.setReplyMsgId(replyMessage.getId()); textMsgReq.setAtUidList(Collections.singletonList(uid)); answerReq.setBody(textMsgReq); chatService.sendMsg(answerReq, getChatAIUserId()); diff --git a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/chatai/handler/ChatAIHandlerFactory.java b/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/chatai/handler/ChatAIHandlerFactory.java index 8d6356d..a719ecb 100644 --- a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/chatai/handler/ChatAIHandlerFactory.java +++ b/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/chatai/handler/ChatAIHandlerFactory.java @@ -1,7 +1,6 @@ package com.abin.mallchat.custom.chatai.handler; import com.baomidou.mybatisplus.core.toolkit.CollectionUtils; -import com.baomidou.mybatisplus.core.toolkit.StringUtils; import java.util.List; import java.util.Map; @@ -9,11 +8,9 @@ import java.util.concurrent.ConcurrentHashMap; public class ChatAIHandlerFactory { private static final Map CHATAI_ID_MAP = new ConcurrentHashMap<>(); - private static final Map CHATAI_NAME_MAP = new ConcurrentHashMap<>(); - public static void register(Long aIUserId, String name, AbstractChatAIHandler chatAIHandler) { + public static void register(Long aIUserId, AbstractChatAIHandler chatAIHandler) { CHATAI_ID_MAP.put(aIUserId, chatAIHandler); - CHATAI_NAME_MAP.put(name, chatAIHandler); } public static AbstractChatAIHandler getChatAIHandlerById(List userIds) { @@ -28,15 +25,4 @@ public class ChatAIHandlerFactory { } return null; } - public static AbstractChatAIHandler getChatAIHandlerByName(String text) { - if (StringUtils.isBlank(text)) { - return null; - } - for (Map.Entry entry : CHATAI_NAME_MAP.entrySet()) { - if (text.contains("@"+entry.getKey())) { - return entry.getValue(); - } - } - return null; - } } diff --git a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/chatai/handler/ChatGLM2Handler.java b/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/chatai/handler/ChatGLM2Handler.java index 11350ca..0f7ff1b 100644 --- a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/chatai/handler/ChatGLM2Handler.java +++ b/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/chatai/handler/ChatGLM2Handler.java @@ -7,6 +7,7 @@ import com.abin.mallchat.common.common.constant.RedisKey; import com.abin.mallchat.common.common.utils.RedisUtils; import com.abin.mallchat.custom.chatai.properties.ChatGLM2Properties; import com.abin.mallchat.custom.chatai.utils.ChatGLM2Utils; +import com.abin.mallchat.custom.user.domain.vo.response.user.UserInfoResp; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -36,27 +37,42 @@ public class ChatGLM2Handler extends AbstractChatAIHandler { private static final Random RANDOM = new Random(); + private static String AI_NAME; + @Autowired private ChatGLM2Properties glm2Properties; + @Override + protected void init() { + super.init(); + if (isUse()) { + UserInfoResp userInfo = userService.getUserInfo(glm2Properties.getAIUserId()); + if (userInfo == null) { + log.error("根据AIUserId:{} 找不到用户信息", glm2Properties.getAIUserId()); + throw new RuntimeException("根据AIUserId找不到用户信息"); + } + if (StringUtils.isBlank(userInfo.getName())) { + log.warn("根据AIUserId:{} 找到的用户信息没有name", glm2Properties.getAIUserId()); + throw new RuntimeException("根据AIUserId: " + glm2Properties.getAIUserId() + " 找到的用户没有名字"); + } + AI_NAME = userInfo.getName(); + } + } + + @Override + protected boolean isUse() { + return glm2Properties.isUse(); + } + @Override public Long getChatAIUserId() { return glm2Properties.getAIUserId(); } - @Override - public String getChatAIName() { - if (StringUtils.isNotBlank(glm2Properties.getAIUserName())) { - return glm2Properties.getAIUserName(); - } - String name = userService.getUserInfo(glm2Properties.getAIUserId()).getName(); - glm2Properties.setAIUserName(name); - return name; - } @Override protected String doChat(Message message) { - String content = message.getContent().replace("@" +glm2Properties.getAIUserName(), "").trim(); + String content = message.getContent().replace("@" + AI_NAME, "").trim(); Long uid = message.getFromUid(); Long minute; String text; @@ -73,7 +89,7 @@ public class ChatGLM2Handler extends AbstractChatAIHandler { .send(); text = ChatGLM2Utils.parseText(response); } catch (Exception e) { - e.printStackTrace(); + log.warn("glm2 doChat warn:", e); return getErrorText(); } if (StringUtils.isNotBlank(text)) { @@ -132,7 +148,7 @@ public class ChatGLM2Handler extends AbstractChatAIHandler { if (StringUtils.isBlank(message.getContent())) { return false; } - return StringUtils.contains(message.getContent(), "@" + glm2Properties.getAIUserName()) - && StringUtils.isNotBlank(message.getContent().replace(glm2Properties.getAIUserName(), "").trim()); + return StringUtils.contains(message.getContent(), "@" + AI_NAME) + && StringUtils.isNotBlank(message.getContent().replace(AI_NAME, "").trim()); } } diff --git a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/chatai/handler/GPTChatAIHandler.java b/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/chatai/handler/GPTChatAIHandler.java index f814713..440c1d9 100644 --- a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/chatai/handler/GPTChatAIHandler.java +++ b/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/chatai/handler/GPTChatAIHandler.java @@ -2,41 +2,59 @@ package com.abin.mallchat.custom.chatai.handler; import cn.hutool.http.HttpResponse; import com.abin.mallchat.common.chat.domain.entity.Message; +import com.abin.mallchat.common.chat.domain.entity.msg.MessageExtra; import com.abin.mallchat.common.common.constant.RedisKey; import com.abin.mallchat.common.common.utils.DateUtils; import com.abin.mallchat.common.common.utils.RedisUtils; import com.abin.mallchat.custom.chatai.properties.ChatGPTProperties; import com.abin.mallchat.custom.chatai.utils.ChatGPTUtils; +import com.abin.mallchat.custom.user.domain.vo.response.user.UserInfoResp; +import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; +import org.springframework.util.CollectionUtils; import java.util.concurrent.TimeUnit; +@Slf4j @Component public class GPTChatAIHandler extends AbstractChatAIHandler { @Autowired private ChatGPTProperties chatGPTProperties; + private static String AI_NAME; + + @Override + protected void init() { + super.init(); + UserInfoResp userInfo = userService.getUserInfo(chatGPTProperties.getAIUserId()); + if (userInfo == null) { + log.error("根据AIUserId:{} 找不到用户信息", chatGPTProperties.getAIUserId()); + throw new RuntimeException("根据AIUserId: " + chatGPTProperties.getAIUserId() + " 找不到用户信息"); + } + if (StringUtils.isBlank(userInfo.getName())) { + log.warn("根据AIUserId:{} 找到的用户信息没有name", chatGPTProperties.getAIUserId()); + throw new RuntimeException("根据AIUserId: " + chatGPTProperties.getAIUserId() + " 找到的用户没有名字"); + } + AI_NAME = userInfo.getName(); + } + + @Override + protected boolean isUse() { + return chatGPTProperties.isUse(); + } + @Override public Long getChatAIUserId() { return chatGPTProperties.getAIUserId(); } - @Override - public String getChatAIName() { - if (StringUtils.isNotBlank(chatGPTProperties.getAIUserName())) { - return chatGPTProperties.getAIUserName(); - } - String name = userService.getUserInfo(chatGPTProperties.getAIUserId()).getName(); - chatGPTProperties.setAIUserName(name); - return name; - } @Override protected String doChat(Message message) { - String content = message.getContent().replace("@" + chatGPTProperties.getAIUserName(), "").trim(); + String content = message.getContent().replace("@" + AI_NAME, "").trim(); Long uid = message.getFromUid(); Long chatNum; String text; @@ -48,12 +66,13 @@ public class GPTChatAIHandler extends AbstractChatAIHandler { response = ChatGPTUtils.create(chatGPTProperties.getKey()) .proxyUrl(chatGPTProperties.getProxyUrl()) .model(chatGPTProperties.getModelName()) + .timeout(chatGPTProperties.getTimeout()) .prompt(content) .send(); text = ChatGPTUtils.parseText(response); userChatNumInrc(uid); } catch (Exception e) { - e.printStackTrace(); + log.warn("gpt doChat warn:", e); text = "我累了，明天再聊吧"; } } @@ -78,21 +97,21 @@ public class GPTChatAIHandler extends AbstractChatAIHandler { } /* 前端传@信息后取消注释 */ -// MessageExtra extra = message.getExtra(); -// if (extra == null) { -// return false; -// } -// if (CollectionUtils.isEmpty(extra.getAtUidList())) { -// return false; -// } -// if (!extra.getAtUidList().contains(chatGPTProperties.getAIUserId())) { -// return false; -// } + MessageExtra extra = message.getExtra(); + if (extra == null) { + return false; + } + if (CollectionUtils.isEmpty(extra.getAtUidList())) { + return false; + } + if (!extra.getAtUidList().contains(chatGPTProperties.getAIUserId())) { + return false; + } if (StringUtils.isBlank(message.getContent())) { return false; } - return StringUtils.contains(message.getContent(), "@" + chatGPTProperties.getAIUserName()) - && StringUtils.isNotBlank(message.getContent().replace(chatGPTProperties.getAIUserName(), "").trim()); + return StringUtils.contains(message.getContent(), "@" + AI_NAME) + && StringUtils.isNotBlank(message.getContent().replace(AI_NAME, "").trim()); } } diff --git a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/chatai/properties/ChatGLM2Properties.java b/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/chatai/properties/ChatGLM2Properties.java index 2ccc99b..7c050b4 100644 --- a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/chatai/properties/ChatGLM2Properties.java +++ b/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/chatai/properties/ChatGLM2Properties.java @@ -30,11 +30,6 @@ public class ChatGLM2Properties { */ private Long AIUserId; - /** - * 机器人名称 - */ - private String AIUserName; - /** * 每个用户每?分钟可以请求一次 */ diff --git a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/chatai/properties/ChatGPTProperties.java b/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/chatai/properties/ChatGPTProperties.java index b7a5c56..86fd564 100644 --- a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/chatai/properties/ChatGPTProperties.java +++ b/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/chatai/properties/ChatGPTProperties.java @@ -18,11 +18,6 @@ public class ChatGPTProperties { * 机器人 id */ private Long AIUserId; - - /** - * 机器人名称 - */ - private String AIUserName; /** * 模型名称 */ @@ -36,6 +31,11 @@ public class ChatGPTProperties { */ private String proxyUrl; + /** + * 超时 + */ + private Integer timeout = 60*1000; + /** * 用户每天条数限制 */ diff --git a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/common/intecepter/TokenInterceptor.java b/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/common/intecepter/TokenInterceptor.java index 719fb0d..814297b 100644 --- a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/common/intecepter/TokenInterceptor.java +++ b/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/common/intecepter/TokenInterceptor.java @@ -45,6 +45,11 @@ public class TokenInterceptor implements HandlerInterceptor { return true; } + @Override + public void afterCompletion(HttpServletRequest request, HttpServletResponse response, Object handler, Exception ex) throws Exception { + MDC.remove(MDCKey.UID); + } + /** * 判断是不是公共方法，可以未登录访问的 * 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 03cda4d..04efa6d 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 @@ -33,8 +33,10 @@ import org.springframework.context.ApplicationEventPublisher; import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor; import org.springframework.stereotype.Component; + import java.time.Duration; import java.util.*; + import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.CopyOnWriteArrayList; import java.util.concurrent.atomic.AtomicInteger; 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 30f6cdd..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 @@ -1,5 +1,6 @@ package com.abin.mallchat.custom.user.websocket; +import cn.hutool.core.net.url.UrlBuilder; import io.netty.channel.ChannelHandlerContext; import io.netty.channel.ChannelInboundHandlerAdapter; import io.netty.handler.codec.http.FullHttpRequest; @@ -13,7 +14,16 @@ public class HttpHeadersHandler extends ChannelInboundHandlerAdapter { @Override public void channelRead(ChannelHandlerContext ctx, Object msg) throws Exception { if (msg instanceof FullHttpRequest) { - HttpHeaders headers = ((FullHttpRequest) msg).headers(); + FullHttpRequest request = (FullHttpRequest) msg; + UrlBuilder urlBuilder = UrlBuilder.ofHttp(request.uri()); + + // 获取token参数 + String token = urlBuilder.getQuery().get("token").toString(); + NettyUtil.setAttr(ctx.channel(), NettyUtil.TOKEN, token); + + // 获取请求路径 + request.setUri(urlBuilder.getPath().toString()); + HttpHeaders headers = request.headers(); String ip = headers.get("X-Real-IP"); if (StringUtils.isEmpty(ip)) {//如果没经过nginx，就直接获取远端地址 InetSocketAddress address = (InetSocketAddress) ctx.channel().remoteAddress(); @@ -21,7 +31,10 @@ public class HttpHeadersHandler extends ChannelInboundHandlerAdapter { } NettyUtil.setAttr(ctx.channel(), NettyUtil.IP, ip); ctx.pipeline().remove(this); + ctx.fireChannelRead(request); + }else + { + ctx.fireChannelRead(msg); } - ctx.fireChannelRead(msg); } } \ No newline at end of file diff --git a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/user/websocket/NettyUtil.java b/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/user/websocket/NettyUtil.java index 79daafa..bcc5b05 100644 --- a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/user/websocket/NettyUtil.java +++ b/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/user/websocket/NettyUtil.java @@ -1,6 +1,7 @@ package com.abin.mallchat.custom.user.websocket; import io.netty.channel.Channel; +import io.netty.handler.codec.http.websocketx.WebSocketServerHandshaker; import io.netty.util.Attribute; import io.netty.util.AttributeKey; @@ -15,6 +16,7 @@ public class NettyUtil { public static AttributeKey TOKEN = AttributeKey.valueOf("token"); public static AttributeKey IP = AttributeKey.valueOf("ip"); public static AttributeKey UID = AttributeKey.valueOf("uid"); + public static AttributeKey HANDSHAKER_ATTR_KEY = AttributeKey.valueOf(WebSocketServerHandshaker.class, "HANDSHAKER"); public static void setAttr(Channel channel, AttributeKey attributeKey, T data) { Attribute attr = channel.attr(attributeKey); diff --git a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/user/websocket/NettyWebSocketServer.java b/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/user/websocket/NettyWebSocketServer.java index b70b867..4ebf470 100644 --- a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/user/websocket/NettyWebSocketServer.java +++ b/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/user/websocket/NettyWebSocketServer.java @@ -10,6 +10,7 @@ import io.netty.channel.socket.SocketChannel; import io.netty.channel.socket.nio.NioServerSocketChannel; import io.netty.handler.codec.http.HttpObjectAggregator; import io.netty.handler.codec.http.HttpServerCodec; +import io.netty.handler.codec.http.websocketx.WebSocketServerProtocolHandler; import io.netty.handler.logging.LogLevel; import io.netty.handler.logging.LoggingHandler; import io.netty.handler.stream.ChunkedWriteHandler; @@ -88,7 +89,7 @@ public class NettyWebSocketServer { * 4. WebSocketServerProtocolHandler 核心功能是把 http协议升级为 ws 协议，保持长连接； * 是通过一个状态码 101 来切换的 */ - pipeline.addLast(new WebSocketHandshakeHandler()); + pipeline.addLast(new WebSocketServerProtocolHandler("/")); // 自定义handler ，处理业务逻辑 pipeline.addLast(new NettyWebSocketServerHandler()); } 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 3d75069..dbc62f9 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 @@ -19,10 +19,12 @@ import lombok.extern.slf4j.Slf4j; @Slf4j public class NettyWebSocketServerHandler extends SimpleChannelInboundHandler { + private WebSocketService webSocketService; + // 当web客户端连接后，触发该方法 @Override public void handlerAdded(ChannelHandlerContext ctx) throws Exception { -// getService().connect(ctx.channel()); + this.webSocketService = getService(); } // 客户端离线 @@ -45,7 +47,7 @@ public class NettyWebSocketServerHandler extends SimpleChannelInboundHandler