From 6e4268a670a796a884261ab77d70b59dc95cb909 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: Thu, 20 Jun 2024 18:12:35 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E6=8E=A8=E6=B5=81=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E5=86=99=E5=85=A5redis?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../vmp/media/zlm/ZLMHttpHookListener.java    | 21 ++++++++++++-------
 1 file changed, 13 insertions(+), 8 deletions(-)

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 63239b78..73f20bf4 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
@@ -375,8 +375,20 @@ public class ZLMHttpHookListener {
                         streamAuthorityInfo.setOriginTypeStr(param.getOriginTypeStr());
                     }
                     redisCatchStorage.updateStreamAuthorityInfo(param.getApp(), param.getStream(), streamAuthorityInfo);
+
+                    Map<String, String> params = MediaServerUtils.urlParamToMap(param.getParams());
+                    param.setParamMap(params);
+                    StreamInfo streamInfoByAppAndStream = mediaService.getStreamInfoByAppAndStream(mediaInfo,
+                            param.getApp(), param.getStream(), tracks, params.get("callId"));
+                    param.setStreamInfo(new StreamContent(streamInfoByAppAndStream));
+
+                    param.setSeverId(userSetting.getServerId());
+                    streamPushService.updatePush(param);
+                    // 冗余数据，自己系统中自用
+                    redisCatchStorage.addPushListItem(param.getApp(), param.getStream(), param);
                 }
             }
+            // TODO 修改为第一个为准 后续不再处理
             if ("rtsp".equals(param.getSchema())) {
                 logger.info("流变化：注册->{}, app->{}, stream->{}", param.isRegist(), param.getApp(), param.getStream());
                 if (param.isRegist()) {
@@ -464,14 +476,7 @@ public class ZLMHttpHookListener {
                             param.setStreamInfo(new StreamContent(streamInfoByAppAndStream));
 
                             redisCatchStorage.addStream(mediaInfo, type, param.getApp(), param.getStream(), param);
-                            if (param.getOriginType() == OriginType.RTSP_PUSH.ordinal()
-                                    || param.getOriginType() == OriginType.RTMP_PUSH.ordinal()
-                                    || param.getOriginType() == OriginType.RTC_PUSH.ordinal()) {
-                                param.setSeverId(userSetting.getServerId());
-                                streamPushService.updatePush(param);
-                                // 冗余数据，自己系统中自用
-                                redisCatchStorage.addPushListItem(param.getApp(), param.getStream(), param);
-                            }
+
                         } else {
                             // 兼容流注销时类型从redis记录获取
                             OnStreamChangedHookParam onStreamChangedHookParam = redisCatchStorage.getStreamInfo(