Merge remote-tracking branch 'origin/master'

tangzy

2021-03-23 3f5d52e4e78b7a6b9f8425287236c6f5ea0fb81e

 blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/JfptApplication.java

@@ -19,7 +19,8 @@
import org.springblade.core.cloud.feign.EnableBladeFeign;
import org.springblade.core.launch.BladeApplication;
import org.springblade.jfpt.nettyServer.Server;
import org.springblade.jfpt.nettyUdpServer.server.UdpServer;
import org.springblade.jfpt.nettyTcpServer.TcpServer;
import org.springblade.jfpt.webscoket.WebSocketServer;
import org.springframework.boot.CommandLineRunner;
import org.springframework.boot.autoconfigure.SpringBootApplication;

@@ -39,9 +40,10 @@

   @Override
   public void run(String... args) throws Exception {
      UdpServer udpServer=new UdpServer(8099);
      Server server=new Server(8088);
      TcpServer tcpServer = new TcpServer(8099);
      //WebSocketServer webSocketServer= new WebSocketServer(9034);
      //UdpServer udpServer=new UdpServer(8099);
   }

}