From 1fc2916c2b4b28fbf722c4401e559805f9578573 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期日, 28 四月 2024 22:25:58 +0800
Subject: [PATCH] Merge pull request #1432 from AlphaWu/Zafu-Dev-20240428
---
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 c6c024e..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.zlm.ZlmHttpHookSubscribe;
-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 ZlmHttpHookSubscribe 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