From 284a9a6b482347a9fe65223a3280421d6a65e2e4 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Sat, 08 May 2021 11:37:17 +0800
Subject: [PATCH] 1.处警队伍列表接口修改 2.近一周警情接口修改,返回一键求助 3.报警设备报警时bug修复,新增判断接警员的在线状态和工作状态是否为空

---
 blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/JfptApplication.java |   19 +++++++++++++++----
 1 files changed, 15 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..05dd031 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,13 @@
 
 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.nettyUdpServer.server.UdpServer;
+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 +34,19 @@
 @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(9534);
+//		Server serverTwo = new Server(9534);
+	}
 }
 

--
Gitblit v1.9.3