From cc793d16f5114122304573e452bcef9dd23d32c2 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期四, 28 三月 2024 18:35:28 +0800
Subject: [PATCH] 调整hook订阅通知的位置
---
src/main/java/com/genersoft/iot/vmp/media/abl/ABLHttpHookListener.java | 24 ++++++++++++------------
1 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/media/abl/ABLHttpHookListener.java b/src/main/java/com/genersoft/iot/vmp/media/abl/ABLHttpHookListener.java
index 026134a..aa49ac1 100755
--- a/src/main/java/com/genersoft/iot/vmp/media/abl/ABLHttpHookListener.java
+++ b/src/main/java/com/genersoft/iot/vmp/media/abl/ABLHttpHookListener.java
@@ -22,7 +22,7 @@
import com.genersoft.iot.vmp.media.bean.MediaInfo;
import com.genersoft.iot.vmp.media.service.IMediaServerService;
import com.genersoft.iot.vmp.media.zlm.ZLMMediaListManager;
-import com.genersoft.iot.vmp.media.zlm.ZlmHttpHookSubscribe;
+import com.genersoft.iot.vmp.media.event.HookSubscribe;
import com.genersoft.iot.vmp.media.zlm.dto.*;
import com.genersoft.iot.vmp.media.zlm.dto.hook.*;
import com.genersoft.iot.vmp.media.zlm.event.HookZlmServerStartEvent;
@@ -60,7 +60,7 @@
* ABL鏈嶅姟Hook浜嬩欢
*/
@RestController
-@RequestMapping("/index/hook")
+@RequestMapping("/index/hook/abl")
public class ABLHttpHookListener {
private final static Logger logger = LoggerFactory.getLogger(ABLHttpHookListener.class);
@@ -108,7 +108,7 @@
private ZLMMediaListManager zlmMediaListManager;
@Autowired
- private ZlmHttpHookSubscribe subscribe;
+ private HookSubscribe subscribe;
@Autowired
private UserSetting userSetting;
@@ -168,7 +168,7 @@
taskExecutor.execute(() -> {
JSONObject json = (JSONObject) JSON.toJSON(param);
- ZlmHttpHookSubscribe.Event subscribe = this.subscribe.sendNotify(HookType.on_play, json);
+ HookSubscribe.Event subscribe = this.subscribe.sendNotify(HookType.on_play, json);
if (subscribe != null) {
MediaServer mediaInfo = mediaServerService.getOne(mediaServerId);
if (mediaInfo != null) {
@@ -247,7 +247,7 @@
HookResultForOnPublish result = HookResultForOnPublish.SUCCESS();
result.setEnable_audio(true);
taskExecutor.execute(() -> {
- ZlmHttpHookSubscribe.Event subscribe = this.subscribe.sendNotify(HookType.on_publish, json);
+ HookSubscribe.Event subscribe = this.subscribe.sendNotify(HookType.on_publish, json);
if (subscribe != null) {
subscribe.response(mediaInfo, param);
}
@@ -346,7 +346,7 @@
JSONObject json = (JSONObject) JSON.toJSON(param);
taskExecutor.execute(() -> {
- ZlmHttpHookSubscribe.Event subscribe = this.subscribe.sendNotify(HookType.on_stream_changed, json);
+ HookSubscribe.Event subscribe = this.subscribe.sendNotify(HookType.on_stream_changed, json);
MediaServer mediaInfo = mediaServerService.getOne(param.getMediaServerId());
if (mediaInfo == null) {
logger.info("[ABL HOOK] 娴佸彉鍖栨湭鎵惧埌ABL, {}", param.getMediaServerId());
@@ -789,9 +789,9 @@
zlmServerConfig.setIp(request.getRemoteAddr());
logger.info("[ABL HOOK] ABL 鍚姩 " + zlmServerConfig.getGeneralMediaServerId());
taskExecutor.execute(() -> {
- List<ZlmHttpHookSubscribe.Event> subscribes = this.subscribe.getSubscribes(HookType.on_server_started);
+ List<HookSubscribe.Event> subscribes = this.subscribe.getSubscribes(HookType.on_server_started);
if (subscribes != null && !subscribes.isEmpty()) {
- for (ZlmHttpHookSubscribe.Event subscribe : subscribes) {
+ for (HookSubscribe.Event subscribe : subscribes) {
subscribe.response(null, zlmServerConfig);
}
}
@@ -853,9 +853,9 @@
logger.info("[ABL HOOK] rtpServer鏀舵祦瓒呮椂锛歿}->{}({})", param.getMediaServerId(), param.getStream_id(), param.getSsrc());
taskExecutor.execute(() -> {
- List<ZlmHttpHookSubscribe.Event> subscribes = this.subscribe.getSubscribes(HookType.on_rtp_server_timeout);
+ List<HookSubscribe.Event> subscribes = this.subscribe.getSubscribes(HookType.on_rtp_server_timeout);
if (subscribes != null && !subscribes.isEmpty()) {
- for (ZlmHttpHookSubscribe.Event subscribe : subscribes) {
+ for (HookSubscribe.Event subscribe : subscribes) {
subscribe.response(null, param);
}
}
@@ -873,9 +873,9 @@
logger.info("[AB HOOK] 褰曞儚瀹屾垚浜嬩欢锛歿}->{}", param.getMediaServerId(), param.getFile_path());
taskExecutor.execute(() -> {
- List<ZlmHttpHookSubscribe.Event> subscribes = this.subscribe.getSubscribes(HookType.on_record_mp4);
+ List<HookSubscribe.Event> subscribes = this.subscribe.getSubscribes(HookType.on_record_mp4);
if (subscribes != null && !subscribes.isEmpty()) {
- for (ZlmHttpHookSubscribe.Event subscribe : subscribes) {
+ for (HookSubscribe.Event subscribe : subscribes) {
subscribe.response(null, param);
}
}
--
Gitblit v1.8.0