From 6de0c329ea9aceaee398356fb4aab99b37508d07 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: Tue, 26 Mar 2024 23:38:49 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A7=BB=E9=99=A4=E5=A4=9A=E4=BD=99=E7=9A=84?=
 =?UTF-8?q?=E8=8A=82=E7=82=B9=E5=90=AF=E5=8A=A8=E4=BA=8B=E4=BB=B6=E5=88=86?=
 =?UTF-8?q?=E5=8F=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../vmp/media/zlm/ZLMHttpHookListener.java    |  8 ----
 .../media/zlm/dto/HookSubscribeFactory.java   |  8 ----
 .../dto/HookSubscribeForServerStarted.java    | 44 -------------------
 3 files changed, 60 deletions(-)
 delete mode 100755 src/main/java/com/genersoft/iot/vmp/media/zlm/dto/HookSubscribeForServerStarted.java

diff --git a/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java b/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java
index 71ceb2e3..42f5e28a 100755
--- a/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java
+++ b/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java
@@ -277,14 +277,6 @@ public class ZLMHttpHookListener {
         ZLMServerConfig zlmServerConfig = JSON.to(ZLMServerConfig.class, jsonObject);
         zlmServerConfig.setIp(request.getRemoteAddr());
         logger.info("[ZLM HOOK] zlm 启动 " + zlmServerConfig.getGeneralMediaServerId());
-        taskExecutor.execute(() -> {
-            List<ZlmHttpHookSubscribe.Event> subscribes = this.subscribe.getSubscribes(HookType.on_server_started);
-            if (subscribes != null && !subscribes.isEmpty()) {
-                for (ZlmHttpHookSubscribe.Event subscribe : subscribes) {
-                    subscribe.response(null, zlmServerConfig);
-                }
-            }
-        });
         try {
             HookZlmServerStartEvent event = new HookZlmServerStartEvent(this);
             MediaServer mediaServerItem = mediaServerService.getOne(zlmServerConfig.getMediaServerId());
diff --git a/src/main/java/com/genersoft/iot/vmp/media/zlm/dto/HookSubscribeFactory.java b/src/main/java/com/genersoft/iot/vmp/media/zlm/dto/HookSubscribeFactory.java
index f828bdd8..417251f0 100755
--- a/src/main/java/com/genersoft/iot/vmp/media/zlm/dto/HookSubscribeFactory.java
+++ b/src/main/java/com/genersoft/iot/vmp/media/zlm/dto/HookSubscribeFactory.java
@@ -49,14 +49,6 @@ public class HookSubscribeFactory {
         return hookSubscribe;
     }
 
-
-    public static HookSubscribeForServerStarted on_server_started() {
-        HookSubscribeForServerStarted hookSubscribe = new HookSubscribeForServerStarted();
-        hookSubscribe.setContent(new JSONObject());
-
-        return hookSubscribe;
-    }
-
     public static HookSubscribeForRecordMp4 on_record_mp4(String mediaServerId, String app, String stream) {
         HookSubscribeForRecordMp4 hookSubscribe = new HookSubscribeForRecordMp4();
         JSONObject subscribeKey = new com.alibaba.fastjson2.JSONObject();
diff --git a/src/main/java/com/genersoft/iot/vmp/media/zlm/dto/HookSubscribeForServerStarted.java b/src/main/java/com/genersoft/iot/vmp/media/zlm/dto/HookSubscribeForServerStarted.java
deleted file mode 100755
index 8bcde0a0..00000000
--- a/src/main/java/com/genersoft/iot/vmp/media/zlm/dto/HookSubscribeForServerStarted.java
+++ /dev/null
@@ -1,44 +0,0 @@
-package com.genersoft.iot.vmp.media.zlm.dto;
-
-import com.alibaba.fastjson2.JSONObject;
-import com.alibaba.fastjson2.annotation.JSONField;
-
-import java.time.Instant;
-
-/**
- * hook订阅-流变化
- * @author lin
- */
-public class HookSubscribeForServerStarted implements IHookSubscribe{
-
-    private HookType hookType = HookType.on_server_started;
-
-    private JSONObject content;
-
-    @JSONField(format="yyyy-MM-dd HH:mm:ss")
-    private Instant expires;
-
-    @Override
-    public HookType getHookType() {
-        return hookType;
-    }
-
-    @Override
-    public JSONObject getContent() {
-        return content;
-    }
-
-    public void setContent(JSONObject content) {
-        this.content = content;
-    }
-
-    @Override
-    public Instant getExpires() {
-        return expires;
-    }
-
-    @Override
-    public void setExpires(Instant expires) {
-        this.expires = expires;
-    }
-}