From 96bb3814f65edb36327eb02f2ea1beed30f06dfc Mon Sep 17 00:00:00 2001 From: 648540858 <648540858@qq.com> Date: 星期二, 08 十一月 2022 20:43:25 +0800 Subject: [PATCH] Merge branch 'wvp-28181-2.0' into wvp-28181-2.0-multi-network --- src/main/java/com/genersoft/iot/vmp/media/zlm/dto/hook/OnStreamChangedHookParam.java | 17 ++--------------- 1 files changed, 2 insertions(+), 15 deletions(-) diff --git a/src/main/java/com/genersoft/iot/vmp/media/zlm/dto/MediaItem.java b/src/main/java/com/genersoft/iot/vmp/media/zlm/dto/hook/OnStreamChangedHookParam.java similarity index 95% rename from src/main/java/com/genersoft/iot/vmp/media/zlm/dto/MediaItem.java rename to src/main/java/com/genersoft/iot/vmp/media/zlm/dto/hook/OnStreamChangedHookParam.java index 96cbfbd..29f91c8 100644 --- a/src/main/java/com/genersoft/iot/vmp/media/zlm/dto/MediaItem.java +++ b/src/main/java/com/genersoft/iot/vmp/media/zlm/dto/hook/OnStreamChangedHookParam.java @@ -1,4 +1,4 @@ -package com.genersoft.iot.vmp.media.zlm.dto; +package com.genersoft.iot.vmp.media.zlm.dto.hook; import com.genersoft.iot.vmp.common.StreamInfo; @@ -7,7 +7,7 @@ /** * @author lin */ -public class MediaItem { +public class OnStreamChangedHookParam extends HookParam{ /** * 娉ㄥ唽/娉ㄩ攢 @@ -67,11 +67,6 @@ * 浜х敓婧愮殑url */ private String originUrl; - - /** - * 娴佸獟浣撴湇鍔″櫒id - */ - private String mediaServerId; /** * 鏈嶅姟鍣╥d @@ -410,14 +405,6 @@ public void setDocker(boolean docker) { this.docker = docker; - } - - public String getMediaServerId() { - return mediaServerId; - } - - public void setMediaServerId(String mediaServerId) { - this.mediaServerId = mediaServerId; } public StreamInfo getStreamInfo() { -- Gitblit v1.8.0