优化代码，合并WebsocketServer类代码到ServerEndpointExporter类

Author: pengyongjianpyj

README_zh.md

@@ -6,6 +6,8 @@ netty-websocket-http-spring-boot-starter [![License](http://img.shields.io/:lice
 ### 简介
 本项目帮助你在spring-boot中使用Netty来开发WebSocket服务器，并像spring-websocket的注解开发一样简单，还可以帮助你在spring-boot中使用Netty来开发简单的Http服务器
 
+项目启动及其迅捷，经测试启动时间在1s左右。
+
 WebSocket和Http使用统一端口（默认8080），方便网络方面的管理，另外本项目可用作微服务，只需添加注册发现相关依赖即可
 
 ### 要求

demo/src/main/java/org/pyj/demo/WebSocket.java

@@ -33,5 +33,6 @@ public void onError(Session session, Throwable throwable) {
 
     @OnMessage
     public void OnMessage(Session session, String message) {
+        System.out.println(message);
     }
 }

src/main/java/org/pyj/ServerEndpointExporter.java

@@ -1,29 +1,43 @@
 package org.pyj;
 
-import org.pyj.http.annotation.NettyHttpHandler;
+import io.netty.bootstrap.ServerBootstrap;
+import io.netty.channel.ChannelFuture;
+import io.netty.channel.ChannelInitializer;
+import io.netty.channel.ChannelOption;
+import io.netty.channel.ChannelPipeline;
+import io.netty.channel.EventLoopGroup;
+import io.netty.channel.WriteBufferWaterMark;
+import io.netty.channel.nio.NioEventLoopGroup;
+import io.netty.channel.socket.nio.NioServerSocketChannel;
+import io.netty.channel.socket.nio.NioSocketChannel;
+import io.netty.handler.codec.http.HttpObjectAggregator;
+import io.netty.handler.codec.http.HttpServerCodec;
+import io.netty.handler.logging.LogLevel;
+import io.netty.handler.logging.LoggingHandler;
+import java.net.InetAddress;
+import java.net.InetSocketAddress;
+import java.net.UnknownHostException;
+import java.util.HashMap;
+import java.util.Map;
+import lombok.extern.slf4j.Slf4j;
 import org.pyj.exception.IllegalPathDuplicatedException;
+import org.pyj.http.annotation.NettyHttpHandler;
 import org.pyj.http.handler.IFunctionHandler;
 import org.pyj.http.path.Path;
-import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.TypeConverter;
 import org.springframework.beans.TypeMismatchException;
 import org.springframework.beans.factory.BeanFactory;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.config.BeanExpressionContext;
 import org.springframework.beans.factory.config.BeanExpressionResolver;
 import org.springframework.beans.factory.support.AbstractBeanFactory;
 import org.springframework.context.ApplicationContext;
 import org.springframework.core.annotation.AnnotatedElementUtils;
-import org.springframework.core.env.Environment;
 import org.yeauty.annotation.ServerEndpoint;
 import org.yeauty.exception.DeploymentException;
 import org.yeauty.pojo.PojoEndpointServer;
 import org.yeauty.pojo.PojoMethodMapping;
 import org.yeauty.standard.ServerEndpointConfig;
 
-import java.util.HashMap;
-import java.util.Map;
-
 /**
  * @author pengyongjian
  * @Description:
@@ -32,14 +46,8 @@
 @Slf4j
 public class ServerEndpointExporter extends org.yeauty.standard.ServerEndpointExporter {
 
-    @Autowired
-    Environment environment;
-
     private AbstractBeanFactory beanFactory;
 
-    @Autowired
-    private WebsocketServer websocketServer;
-
     @Override
     public void afterSingletonsInstantiated() {
         registerEndpoint();
@@ -89,15 +97,67 @@ private void registerEndpoint() {
         // 创建http处理业务类对象
         HttpServerHandler httpServerHandler = new HttpServerHandler(pojoEndpointServer, serverEndpointConfig,
                 functionHandlerMap, webSocketServerHandler);
-        // 将http处理业务类对象注入到netty的web容器中
-        websocketServer.setHttpServerHandler(httpServerHandler);
         // netty的web容器的启动
-        init(serverEndpointConfig.getPort());
+        init(serverEndpointConfig.getPort(), httpServerHandler);
     }
 
-    private void init(int port) {
+    private void init(int port, HttpServerHandler httpServerHandler) {
         try {
-            websocketServer.init();
+            ServerEndpointConfig config = httpServerHandler.getConfig();
+            EventLoopGroup boss = new NioEventLoopGroup(config.getBossLoopGroupThreads());
+            EventLoopGroup worker = new NioEventLoopGroup(config.getWorkerLoopGroupThreads());
+            ServerBootstrap bootstrap = new ServerBootstrap();
+            bootstrap.group(boss, worker)
+                .channel(NioServerSocketChannel.class)
+                .option(ChannelOption.CONNECT_TIMEOUT_MILLIS, config.getConnectTimeoutMillis())
+                .option(ChannelOption.SO_BACKLOG, config.getSoBacklog())
+                .childOption(ChannelOption.WRITE_SPIN_COUNT, config.getWriteSpinCount())
+                .childOption(ChannelOption.WRITE_BUFFER_WATER_MARK, new WriteBufferWaterMark(config.getWriteBufferLowWaterMark(), config.getWriteBufferHighWaterMark()))
+                .childOption(ChannelOption.TCP_NODELAY, config.isTcpNodelay())
+                .childOption(ChannelOption.SO_KEEPALIVE, config.isSoKeepalive())
+                .childOption(ChannelOption.SO_LINGER, config.getSoLinger())
+                .childOption(ChannelOption.ALLOW_HALF_CLOSURE, config.isAllowHalfClosure())
+                .handler(new LoggingHandler(LogLevel.DEBUG))
+                .childHandler(new ChannelInitializer<NioSocketChannel>() {
+                    @Override
+                    protected void initChannel(NioSocketChannel ch) throws Exception {
+                        ChannelPipeline pipeline = ch.pipeline();
+                        pipeline.addLast(new HttpServerCodec());
+                        pipeline.addLast(new HttpObjectAggregator(65536));
+                        pipeline.addLast(httpServerHandler);
+                    }
+                });
+
+            if (config.getSoRcvbuf() != -1) {
+                bootstrap.childOption(ChannelOption.SO_RCVBUF, config.getSoRcvbuf());
+            }
+
+            if (config.getSoSndbuf() != -1) {
+                bootstrap.childOption(ChannelOption.SO_SNDBUF, config.getSoSndbuf());
+            }
+
+            ChannelFuture channelFuture;
+            if ("0.0.0.0".equals(config.getHost())) {
+                channelFuture = bootstrap.bind(config.getPort());
+            } else {
+                try {
+                    channelFuture = bootstrap.bind(new InetSocketAddress(InetAddress.getByName(config.getHost()), config.getPort()));
+                } catch (UnknownHostException e) {
+                    channelFuture = bootstrap.bind(config.getHost(), config.getPort());
+                    e.printStackTrace();
+                }
+            }
+
+            channelFuture.addListener(future -> {
+                if (!future.isSuccess()){
+                    future.cause().printStackTrace();
+                }
+            });
+
+            Runtime.getRuntime().addShutdownHook(new Thread(() -> {
+                boss.shutdownGracefully().syncUninterruptibly();
+                worker.shutdownGracefully().syncUninterruptibly();
+            }));
             logger.info("=====Netty WebSocket started on port:" + port + " =====");
         } catch (Exception e) {
             logger.error("websocket init fail", e);

src/main/java/org/pyj/WebsocketServer.java

@@ -1,7 +1,6 @@
 package org.pyj.config;
 
 import org.pyj.ServerEndpointExporter;
-import org.pyj.WebsocketServer;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
@@ -16,9 +15,4 @@ public class WebSocketNettyConfig {
     public ServerEndpointExporter serverEndpointExporter() {
         return new ServerEndpointExporter();
     }
-
-    @Bean
-    public WebsocketServer websocketServer() {
-        return new WebsocketServer();
-    }
 }