Merge remote-tracking branch 'origin/master'

Pu Zhibing

8 天以前 57b89047d2cc61243d204bbf886ca0619bf0cf07

 MessagePushTravel/src/main/java/com/sinata/push/util/echo/DiscardServerHandler.java

@@ -104,7 +104,7 @@
//         System.err.println(insocket.getAddress() + ": Disconnect connection......");
      }
      NettyChannelMap.remove(ctx);
      System.err.println("清除通道" + ctx);
//      System.err.println("清除通道" + ctx);
//      super.channelInactive(ctx);
   }