Thirdparty
/
netmc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

移除报文日志，编码接口增加session

master
剑器近 2021-06-29 14:00:12 +08:00
parent c756450c5c
commit 244ca3483f
3 changed files with 5 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/main/java/io/github/yezhihao/netmc/codec/MessageDecoderWrapper.java
View File

@ -2,13 +2,10 @@ package io.github.yezhihao.netmc.codec;
import io.github.yezhihao.netmc.session.Session; import io.github.yezhihao.netmc.session.Session;
import io.netty.buffer.ByteBuf; import io.netty.buffer.ByteBuf;
import io.netty.buffer.ByteBufUtil;
import io.netty.channel.ChannelHandler; import io.netty.channel.ChannelHandler;
import io.netty.channel.ChannelHandlerContext; import io.netty.channel.ChannelHandlerContext;
import io.netty.channel.ChannelInboundHandlerAdapter; import io.netty.channel.ChannelInboundHandlerAdapter;
import io.netty.handler.codec.DecoderException; import io.netty.handler.codec.DecoderException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
/** /**
* 基础消息解码 * 基础消息解码
@ -18,8 +15,6 @@ import org.slf4j.LoggerFactory;
@ChannelHandler.Sharable @ChannelHandler.Sharable
public class MessageDecoderWrapper extends ChannelInboundHandlerAdapter { public class MessageDecoderWrapper extends ChannelInboundHandlerAdapter {
private static final Logger log = LoggerFactory.getLogger(MessageDecoderWrapper.class.getSimpleName());
private MessageDecoder decoder; private MessageDecoder decoder;
public MessageDecoderWrapper(MessageDecoder decoder) { public MessageDecoderWrapper(MessageDecoder decoder) {
@ -31,14 +26,6 @@ public class MessageDecoderWrapper extends ChannelInboundHandlerAdapter {
if (msg instanceof ByteBuf) { if (msg instanceof ByteBuf) {
ByteBuf buf = (ByteBuf) msg; ByteBuf buf = (ByteBuf) msg;
try { try {
if (log.isInfoEnabled()) {
String hex;
if (buf.readableBytes() < 1048)
hex = ByteBufUtil.hexDump(buf);
else
hex = ByteBufUtil.hexDump(buf.slice(0, 32)) + "..." + ByteBufUtil.hexDump(buf.slice(buf.readableBytes() - 32, 32));
log.info("<<<<<[ip={}],payload={}", ctx.channel().remoteAddress(), hex);
}
Object message = decoder.decode(buf, ctx.channel().attr(Session.KEY).get()); Object message = decoder.decode(buf, ctx.channel().attr(Session.KEY).get());
if (message != null) if (message != null)
ctx.fireChannelRead(message); ctx.fireChannelRead(message);

3
src/main/java/io/github/yezhihao/netmc/codec/MessageEncoder.java
View File

@ -1,5 +1,6 @@
package io.github.yezhihao.netmc.codec; package io.github.yezhihao.netmc.codec;
import io.github.yezhihao.netmc.session.Session;
import io.netty.buffer.ByteBuf; import io.netty.buffer.ByteBuf;
/** /**
@ -11,4 +12,6 @@ public interface MessageEncoder<T> {
ByteBuf encode(T message); ByteBuf encode(T message);
ByteBuf encode(T message, Session session);
} }

10
src/main/java/io/github/yezhihao/netmc/codec/MessageEncoderWrapper.java
View File

@ -1,15 +1,13 @@
package io.github.yezhihao.netmc.codec; package io.github.yezhihao.netmc.codec;
import io.github.yezhihao.netmc.session.Session;
import io.netty.buffer.ByteBuf; import io.netty.buffer.ByteBuf;
import io.netty.buffer.ByteBufUtil;
import io.netty.buffer.Unpooled; import io.netty.buffer.Unpooled;
import io.netty.channel.ChannelHandler; import io.netty.channel.ChannelHandler;
import io.netty.channel.ChannelHandlerContext; import io.netty.channel.ChannelHandlerContext;
import io.netty.channel.ChannelOutboundHandlerAdapter; import io.netty.channel.ChannelOutboundHandlerAdapter;
import io.netty.channel.ChannelPromise; import io.netty.channel.ChannelPromise;
import io.netty.handler.codec.EncoderException; import io.netty.handler.codec.EncoderException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
/** /**
* 基础消息编码 * 基础消息编码
@ -19,8 +17,6 @@ import org.slf4j.LoggerFactory;
@ChannelHandler.Sharable @ChannelHandler.Sharable
public class MessageEncoderWrapper extends ChannelOutboundHandlerAdapter { public class MessageEncoderWrapper extends ChannelOutboundHandlerAdapter {
private static final Logger log = LoggerFactory.getLogger(MessageEncoderWrapper.class.getSimpleName());
private MessageEncoder encoder; private MessageEncoder encoder;
public MessageEncoderWrapper(MessageEncoder encoder) { public MessageEncoderWrapper(MessageEncoder encoder) {
@ -34,9 +30,7 @@ public class MessageEncoderWrapper extends ChannelOutboundHandlerAdapter {
if (msg instanceof ByteBuf) if (msg instanceof ByteBuf)
buf = (ByteBuf) msg; buf = (ByteBuf) msg;
else else
buf = encoder.encode(msg); buf = encoder.encode(msg, ctx.channel().attr(Session.KEY).get());
if (log.isInfoEnabled())
log.info(">>>>>[ip={}],payload={}", ctx.channel().remoteAddress(), ByteBufUtil.hexDump(buf));
if (buf.isReadable()) { if (buf.isReadable()) {
ctx.write(buf, promise); ctx.write(buf, promise);