From 6e8071d820aa55173e64fd25609caa3b6b9af98a Mon Sep 17 00:00:00 2001 From: bradyx <xushanbin@zdjtcm.com> Date: 星期三, 15 五月 2024 13:52:16 +0800 Subject: [PATCH] fix: 系统启动时,停止已启动国标推流抛出异常被系统捕获,启动服务失败。 --- src/main/java/com/genersoft/iot/vmp/vmanager/server/ServerController.java | 16 +--------------- 1 files changed, 1 insertions(+), 15 deletions(-) diff --git a/src/main/java/com/genersoft/iot/vmp/vmanager/server/ServerController.java b/src/main/java/com/genersoft/iot/vmp/vmanager/server/ServerController.java index 7451ccc..a7d6041 100755 --- a/src/main/java/com/genersoft/iot/vmp/vmanager/server/ServerController.java +++ b/src/main/java/com/genersoft/iot/vmp/vmanager/server/ServerController.java @@ -10,10 +10,7 @@ import com.genersoft.iot.vmp.conf.exception.ControllerException; import com.genersoft.iot.vmp.conf.security.JwtUtils; import com.genersoft.iot.vmp.media.service.IMediaServerService; -import com.genersoft.iot.vmp.media.zlm.SendRtpPortManager; -import com.genersoft.iot.vmp.media.event.HookSubscribe; -import com.genersoft.iot.vmp.media.zlm.dto.IHookSubscribe; -import com.genersoft.iot.vmp.media.zlm.dto.MediaServer; +import com.genersoft.iot.vmp.media.bean.MediaServer; import com.genersoft.iot.vmp.service.*; import com.genersoft.iot.vmp.service.bean.MediaServerLoad; import com.genersoft.iot.vmp.storager.IRedisCatchStorage; @@ -40,8 +37,6 @@ @RequestMapping("/api/server") public class ServerController { - @Autowired - private HookSubscribe zlmHttpHookSubscribe; @Autowired private IMediaServerService mediaServerService; @@ -76,8 +71,6 @@ @Autowired private IRedisCatchStorage redisCatchStorage; - @Autowired - private SendRtpPortManager sendRtpPortManager; @GetMapping(value = "/media_server/list") @@ -215,13 +208,6 @@ } } return jsonObject; - } - - @GetMapping(value = "/hooks") - @ResponseBody - @Operation(summary = "鑾峰彇褰撳墠鎵�鏈塰ook") - public List<IHookSubscribe> getHooks() { - return zlmHttpHookSubscribe.getAll(); } @GetMapping(value = "/system/info") -- Gitblit v1.8.0