From ecf84bb0f1952c4a044ff6c8aa18226b31593f3f Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期五, 18 十一月 2022 21:52:02 +0800
Subject: [PATCH] 合并主线
---
src/main/java/com/genersoft/iot/vmp/media/zlm/dto/MediaServerItemLite.java | 17 -----------------
1 files changed, 0 insertions(+), 17 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/media/zlm/dto/MediaServerItemLite.java b/src/main/java/com/genersoft/iot/vmp/media/zlm/dto/MediaServerItemLite.java
index 01ac5c4..4e0ffe9 100644
--- a/src/main/java/com/genersoft/iot/vmp/media/zlm/dto/MediaServerItemLite.java
+++ b/src/main/java/com/genersoft/iot/vmp/media/zlm/dto/MediaServerItemLite.java
@@ -1,12 +1,6 @@
package com.genersoft.iot.vmp.media.zlm.dto;
-import com.genersoft.iot.vmp.gb28181.session.SsrcConfig;
-import com.genersoft.iot.vmp.media.zlm.ZLMServerConfig;
-import org.springframework.util.StringUtils;
-
-import java.util.HashMap;
-
/**
* 绮剧畝鐨凪ediaServerItem淇℃伅锛屾柟渚跨粰鍓嶇杩斿洖鏁版嵁
*/
@@ -38,8 +32,6 @@
private String secret;
- private int hookAliveInterval;
-
private int recordAssistPort;
@@ -58,7 +50,6 @@
this.rtspPort = mediaServerItem.getRtspPort();
this.rtspSSLPort = mediaServerItem.getRtspSSLPort();
this.secret = mediaServerItem.getSecret();
- this.hookAliveInterval = mediaServerItem.getHookAliveInterval();
this.recordAssistPort = mediaServerItem.getRecordAssistPort();
}
@@ -165,14 +156,6 @@
public void setSecret(String secret) {
this.secret = secret;
- }
-
- public int getHookAliveInterval() {
- return hookAliveInterval;
- }
-
- public void setHookAliveInterval(int hookAliveInterval) {
- this.hookAliveInterval = hookAliveInterval;
}
public int getRecordAssistPort() {
--
Gitblit v1.8.0