From a5b6b004f1737bf06aaaeb8d06e40b9702de25e5 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Fri, 12 Mar 2021 14:18:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/JfptApplication.java | 5 ++---
1 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/JfptApplication.java b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/JfptApplication.java
index 9aa3a84..1a6344c 100644
--- a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/JfptApplication.java
+++ b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/JfptApplication.java
@@ -20,7 +20,6 @@
import org.springblade.core.launch.BladeApplication;
import org.springblade.jfpt.nettyServer.Server;
import org.springblade.jfpt.nettyTcpServer.TcpServer;
-import org.springblade.jfpt.nettyUdpServer.server.UdpServer;
import org.springframework.boot.CommandLineRunner;
import org.springframework.boot.autoconfigure.SpringBootApplication;
@@ -40,8 +39,8 @@
@Override
public void run(String... args) throws Exception {
- //Server server=new Server(8088);
- TcpServer server=new TcpServer(8088);
+ Server server=new Server(8088);
+ TcpServer tcpServer = new TcpServer(8099);
//UdpServer udpServer=new UdpServer(8099);
}
--
Gitblit v1.9.3