合并主线

src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java

@@ -318,8 +318,7 @@ public class ZLMHttpHookListener {
                     result.setEnable_audio(true);
                 }
             }
-        }
+        } else if (param.getApp().equals("broadcast")) {
-        else if (param.getApp().equals("broadcast")) {
             result.setEnable_audio(true);
         } else if (param.getApp().equals("talk")) {
             result.setEnable_audio(true);
@@ -352,13 +351,10 @@ public class ZLMHttpHookListener {
             logger.info("[ZLM HOOK] 流注销, {}->{}->{}/{}", param.getMediaServerId(), param.getSchema(), param.getApp(), param.getStream());
         }
 
-        JSONObject ret = new JSONObject();
-        ret.put("code", 0);
-        ret.put("msg", "success");
-        MediaServerItem mediaInfo = mediaServerService.getOne(param.getMediaServerId());
         JSONObject json = (JSONObject) JSON.toJSON(param);
         taskExecutor.execute(() -> {
             ZlmHttpHookSubscribe.Event subscribe = this.subscribe.sendNotify(HookType.on_stream_changed, json);
+            MediaServerItem mediaInfo = mediaServerService.getOne(param.getMediaServerId());
             if (mediaInfo == null) {
                 logger.info("[ZLM HOOK] 流变化未找到ZLM, {}", param.getMediaServerId());
                 return;
@@ -555,8 +551,6 @@ public class ZLMHttpHookListener {
                     }
                 }
             }
-
-            }
         });
         return HookResult.SUCCESS();
     }

src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java

@@ -107,12 +107,6 @@ public class PlayServiceImpl implements IPlayService {
     @Autowired
     private ZLMRESTfulUtils zlmresTfulUtils;
 
-    @Autowired
-    private ZLMServerFactory zlmServerFactory;
-
-    @Autowired
-    private AssistRESTfulUtils assistRESTfulUtils;
-
     @Autowired
     private IMediaService mediaService;