Merge remote-tracking branch 'origin/dev' into dev

xuhy

12 小时以前 3b6789ae8cb8138533b2cc362f37ad94b605a58d

 ZuulZYTravel/src/main/java/com/sinata/zuul/ZuulApplication.java

@@ -39,10 +39,10 @@

    public static void main(String[] args) {
        SpringApplication.run(ZuulApplication.class, args);
        NettyServer nettyServer = new NettyServer();
        nettyServer.bind();
        NettyServer0 nettyServer0 = new NettyServer0();
        nettyServer0.bind();
//        NettyServer nettyServer = new NettyServer();
//        nettyServer.bind();
//        NettyServer0 nettyServer0 = new NettyServer0();
//        nettyServer0.bind();
    }