|
@@ -34,7 +34,7 @@ public class MsgHandler extends SimpleChannelInboundHandler<NettyMessage<JSONObj
|
|
|
*/
|
|
|
private Logger logger = LoggerFactory.getLogger(this.getClass());
|
|
|
public static ChannelGroup channelGroup = new DefaultChannelGroup(GlobalEventExecutor.INSTANCE);
|
|
|
- private SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss:SSS");
|
|
|
+ private SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss:SSS");
|
|
|
BlockingQueue<String> messageQueue = new LinkedBlockingQueue<>(1024 * 1024);
|
|
|
|
|
|
|
|
@@ -80,16 +80,15 @@ public class MsgHandler extends SimpleChannelInboundHandler<NettyMessage<JSONObj
|
|
|
@Override
|
|
|
protected void channelRead0(ChannelHandlerContext ctx, NettyMessage<JSONObject> msg) throws Exception {
|
|
|
log.info(location+">>>收到[{}]消息:{}", ctx.channel().remoteAddress(), msg);
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
InetSocketAddress inteSocket = (InetSocketAddress) ctx.channel().localAddress();
|
|
|
String localip = inteSocket.getAddress().getHostAddress();
|
|
|
String localport = String.valueOf(inteSocket.getPort());
|
|
|
System.out.println(
|
|
|
"server ip: " + localip + " Server port "+ localport
|
|
|
);
|
|
|
-
|
|
|
+ if (msg.getOpCode()==200){
|
|
|
+ NettyServer.addChannel(msg.getProjectId(), ctx);
|
|
|
+ }
|
|
|
|
|
|
String time = sdf.format(new Date());
|
|
|
|
|
@@ -107,12 +106,11 @@ public class MsgHandler extends SimpleChannelInboundHandler<NettyMessage<JSONObj
|
|
|
|
|
|
obj.put("userid",chattingUser.getUserId());
|
|
|
obj.put("targetAddress",chattingUser.getIp());
|
|
|
- obj.put("channelID",localport+"_"+chattingUser.getUserId());
|
|
|
+ obj.put("projectid",msg.getProjectId());
|
|
|
|
|
|
|
|
|
|
|
|
System.out.println(">>>>"+obj.toString());
|
|
|
- NettyServer.addChannel(localport+"_"+chattingUser.getUserId(), ctx);
|
|
|
NettyMessageQueue.getNettyMessageQueue().produce(obj.toString());
|
|
|
|
|
|
|