From 1efabbe4cc672fcf2ce589bdad1bce66c897a225 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: Fri, 24 May 2024 10:50:29 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=AF=E6=8C=81=E6=8A=8A=E6=8E=A8=E6=B5=81?=
 =?UTF-8?q?=E7=9A=84=E9=A2=9D=E5=A4=96=E5=8F=82=E6=95=B0=E5=8A=A0=E5=85=A5?=
 =?UTF-8?q?redis=E7=BC=93=E5=AD=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../vmp/media/zlm/ZLMHttpHookListener.java    | 11 +++-----
 .../dto/hook/OnStreamChangedHookParam.java    | 28 +++++++++++++++++++
 2 files changed, 32 insertions(+), 7 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 b6390488..63239b78 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
@@ -457,15 +457,12 @@ public class ZLMHttpHookListener {
                     if (!"rtp".equals(param.getApp())) {
                         String type = OriginType.values()[param.getOriginType()].getType();
                         if (param.isRegist()) {
-                            StreamAuthorityInfo streamAuthorityInfo = redisCatchStorage.getStreamAuthorityInfo(
-                                    param.getApp(), param.getStream());
-                            String callId = null;
-                            if (streamAuthorityInfo != null) {
-                                callId = streamAuthorityInfo.getCallId();
-                            }
+                            Map<String, String> params = MediaServerUtils.urlParamToMap(param.getParams());
+                            param.setParamMap(params);
                             StreamInfo streamInfoByAppAndStream = mediaService.getStreamInfoByAppAndStream(mediaInfo,
-                                    param.getApp(), param.getStream(), tracks, callId);
+                                    param.getApp(), param.getStream(), tracks, params.get("callId"));
                             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()
diff --git a/src/main/java/com/genersoft/iot/vmp/media/zlm/dto/hook/OnStreamChangedHookParam.java b/src/main/java/com/genersoft/iot/vmp/media/zlm/dto/hook/OnStreamChangedHookParam.java
index ffca0d5a..84d2f4b0 100755
--- a/src/main/java/com/genersoft/iot/vmp/media/zlm/dto/hook/OnStreamChangedHookParam.java
+++ b/src/main/java/com/genersoft/iot/vmp/media/zlm/dto/hook/OnStreamChangedHookParam.java
@@ -3,6 +3,7 @@ package com.genersoft.iot.vmp.media.zlm.dto.hook;
 import com.genersoft.iot.vmp.vmanager.bean.StreamContent;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * @author lin
@@ -98,6 +99,16 @@ public class OnStreamChangedHookParam extends HookParam{
      */
     private String vhost;
 
+    /**
+     * 额外的参数字符串
+     */
+    private String params;
+
+    /**
+     * 额外的参数
+     */
+    private Map<String, String> paramMap;
+
     public boolean isRegist() {
         return regist;
     }
@@ -496,6 +507,23 @@ public class OnStreamChangedHookParam extends HookParam{
         this.callId = callId;
     }
 
+
+    public Map<String, String> getParamMap() {
+        return paramMap;
+    }
+
+    public void setParamMap(Map<String, String> paramMap) {
+        this.paramMap = paramMap;
+    }
+
+    public String getParams() {
+        return params;
+    }
+
+    public void setParams(String params) {
+        this.params = params;
+    }
+
     @Override
     public String toString() {
         return "OnStreamChangedHookParam{" +