From 670bc85ba8468dbe9a427abc54f2bca9d4e71749 Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Fri, 23 Apr 2021 16:32:24 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/JfptApplication.java |   17 +++++++++++++----
 1 files changed, 13 insertions(+), 4 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 2252a4b..fe2271e 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
@@ -18,10 +18,12 @@
 
 import org.springblade.core.cloud.feign.EnableBladeFeign;
 import org.springblade.core.launch.BladeApplication;
-import org.springblade.core.launch.constant.AppConstant;
+import org.springblade.jfpt.nettyServer.Server;
+import org.springblade.jfpt.nettyTcpServer.TcpServer;
+import org.springblade.jfpt.webscoket.WebSocketServer;
+import org.springframework.boot.CommandLineRunner;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
-import org.springframework.cloud.client.SpringCloudApplication;
+import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
 
 /**
  * Desk启动器
@@ -31,11 +33,18 @@
 @EnableBladeFeign
 @SpringBootApplication
 // @SeataCloudApplication
-public class JfptApplication {
+public class JfptApplication implements CommandLineRunner {
 
 	public static void main(String[] args) {
 		BladeApplication.run("blade-jfpts", JfptApplication.class, args);
 	}
 
+	@Override
+	public void run(String... args) throws Exception {
+		Server server=new Server(8088);
+		TcpServer tcpServer = new TcpServer(8099);
+		WebSocketServer webSocketServer= new WebSocketServer(9034);
+		//UdpServer udpServer=new UdpServer(8099);
+	}
 }
 

--
Gitblit v1.9.3