Commit cbc275bf authored by AfirSraftGarrier's avatar AfirSraftGarrier

格式并加些打印

parent 30fc1001
...@@ -38,13 +38,14 @@ public class DeviceServerHandler extends SimpleChannelInboundHandler<Object> { ...@@ -38,13 +38,14 @@ public class DeviceServerHandler extends SimpleChannelInboundHandler<Object> {
@Override @Override
protected void channelRead0(ChannelHandlerContext ctx, Object msg) { protected void channelRead0(ChannelHandlerContext ctx, Object msg) {
log.info("read...");
SocketChannel channel = (SocketChannel) ctx.channel(); SocketChannel channel = (SocketChannel) ctx.channel();
InetSocketAddress socketAddr = (InetSocketAddress) ctx.channel().remoteAddress(); InetSocketAddress socketAddr = (InetSocketAddress) ctx.channel().remoteAddress();
String remoteIp = socketAddr.getHostString(); String remoteIp = socketAddr.getHostString();
int remotePort = socketAddr.getPort(); int remotePort = socketAddr.getPort();
DeviceProtocol protocol = (DeviceProtocol) msg; DeviceProtocol protocol = (DeviceProtocol) msg;
String channelId = channel.id().asLongText(); String channelId = channel.id().asLongText();
log.debug("设备服务器,channelRead0:{},{}", channelId, HexUtil.bytes2hex(protocol.getContent())); log.info("设备服务器,channelRead0:{},{}", channelId, HexUtil.bytes2hex(protocol.getContent()));
/* 1.透传前先进行鉴权 2.鉴权通过后,创建桥接客户端,非鉴权消息全部放行 3.未鉴权的不能进行透传,强制下线 */ /* 1.透传前先进行鉴权 2.鉴权通过后,创建桥接客户端,非鉴权消息全部放行 3.未鉴权的不能进行透传,强制下线 */
byte cmd = protocol.getCmd(); byte cmd = protocol.getCmd();
int cmdInt = cmd & 0xFF; int cmdInt = cmd & 0xFF;
...@@ -55,12 +56,14 @@ public class DeviceServerHandler extends SimpleChannelInboundHandler<Object> { ...@@ -55,12 +56,14 @@ public class DeviceServerHandler extends SimpleChannelInboundHandler<Object> {
} else { } else {
auth = handlerCheckAuthStatus(channel, remoteIp, remotePort, protocol); auth = handlerCheckAuthStatus(channel, remoteIp, remotePort, protocol);
if (auth) { if (auth) {
log.info("auth valid...");
handlerForward(channel, remoteIp, remotePort, protocol); handlerForward(channel, remoteIp, remotePort, protocol);
} }
} }
// 以下为正式代码 // 以下为正式代码
if (auth == false) { if (auth == false) {
log.info("close");
channel.close(); channel.close();
} }
} }
...@@ -68,13 +71,13 @@ public class DeviceServerHandler extends SimpleChannelInboundHandler<Object> { ...@@ -68,13 +71,13 @@ public class DeviceServerHandler extends SimpleChannelInboundHandler<Object> {
@Override @Override
public void channelRegistered(ChannelHandlerContext ctx) throws Exception { public void channelRegistered(ChannelHandlerContext ctx) throws Exception {
super.channelRegistered(ctx); super.channelRegistered(ctx);
log.debug("设备服务器,channelRegistered:{}", ctx.channel().id().asLongText()); log.info("设备服务器,channelRegistered:{}", ctx.channel().id().asLongText());
} }
@Override @Override
public synchronized void channelActive(ChannelHandlerContext ctx) throws Exception { public synchronized void channelActive(ChannelHandlerContext ctx) throws Exception {
super.channelActive(ctx); super.channelActive(ctx);
log.debug("设备服务器,channelActive:{}", ctx.channel().id().asLongText()); log.info("设备服务器,channelActive:{}", ctx.channel().id().asLongText());
} }
@Override @Override
...@@ -82,7 +85,7 @@ public class DeviceServerHandler extends SimpleChannelInboundHandler<Object> { ...@@ -82,7 +85,7 @@ public class DeviceServerHandler extends SimpleChannelInboundHandler<Object> {
super.channelInactive(ctx); super.channelInactive(ctx);
SocketChannel channel = (SocketChannel) ctx.channel(); SocketChannel channel = (SocketChannel) ctx.channel();
String channelId = channel.id().asLongText(); String channelId = channel.id().asLongText();
log.debug("设备服务器,channelInactive:{}", channelId); log.info("设备服务器,channelInactive:{}", channelId);
DeviceClientInactiveEvent deviceClientInactiveEvent = new DeviceClientInactiveEvent(); DeviceClientInactiveEvent deviceClientInactiveEvent = new DeviceClientInactiveEvent();
deviceClientInactiveEvent.setChannelId(channelId); deviceClientInactiveEvent.setChannelId(channelId);
...@@ -93,18 +96,18 @@ public class DeviceServerHandler extends SimpleChannelInboundHandler<Object> { ...@@ -93,18 +96,18 @@ public class DeviceServerHandler extends SimpleChannelInboundHandler<Object> {
@Override @Override
public void channelReadComplete(ChannelHandlerContext ctx) throws Exception { public void channelReadComplete(ChannelHandlerContext ctx) throws Exception {
super.channelReadComplete(ctx); super.channelReadComplete(ctx);
log.debug("设备服务器,channelReadComplete:{}", ctx.channel().id().asLongText()); log.info("设备服务器,channelReadComplete:{}", ctx.channel().id().asLongText());
} }
@Override @Override
public void exceptionCaught(ChannelHandlerContext ctx, Throwable cause) throws Exception { public void exceptionCaught(ChannelHandlerContext ctx, Throwable cause) throws Exception {
super.exceptionCaught(ctx, cause); super.exceptionCaught(ctx, cause);
log.debug("设备服务器,exceptionCaught:{}", ctx.channel().id().asLongText()); log.info("设备服务器,exceptionCaught:{}", ctx.channel().id().asLongText());
ctx.close(); ctx.close();
} }
private boolean handlerCheckAuth(SocketChannel channel, String remoteIp, int remotePort, DeviceProtocol protocol) { private boolean handlerCheckAuth(SocketChannel channel, String remoteIp, int remotePort, DeviceProtocol protocol) {
// TODO 正式代码要放开 // 正式代码要放开
byte[] bytes = safety.decodeExtendedPayload(protocol.getContent(), 0, protocol.getContent().length); byte[] bytes = safety.decodeExtendedPayload(protocol.getContent(), 0, protocol.getContent().length);
if (bytes == null) { if (bytes == null) {
return false; return false;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment