From f1d079f9c0b3d384090477ca54e0548373d62b57 Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Thu, 16 Jan 2025 11:56:39 +0800
Subject: [PATCH] 配置修改
---
src/main/java/com/genersoft/iot/vmp/media/zlm/dto/MediaServerItem.java | 47 +++++++++++++++++++++++++++++++++--------------
1 files changed, 33 insertions(+), 14 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/media/zlm/dto/MediaServerItem.java b/src/main/java/com/genersoft/iot/vmp/media/zlm/dto/MediaServerItem.java
index 181fc5b..bf58187 100644
--- a/src/main/java/com/genersoft/iot/vmp/media/zlm/dto/MediaServerItem.java
+++ b/src/main/java/com/genersoft/iot/vmp/media/zlm/dto/MediaServerItem.java
@@ -3,64 +3,91 @@
import com.genersoft.iot.vmp.gb28181.session.SsrcConfig;
import com.genersoft.iot.vmp.media.zlm.ZLMServerConfig;
+import io.swagger.v3.oas.annotations.media.Schema;
+import org.springframework.util.ObjectUtils;
import org.springframework.util.StringUtils;
import java.util.HashMap;
+@Schema(description = "流媒体服务信息")
public class MediaServerItem{
+ @Schema(description = "ID")
private String id;
+ @Schema(description = "IP")
private String ip;
+ @Schema(description = "hook使用的IP（zlm访问WVP使用的IP）")
private String hookIp;
+ @Schema(description = "SDP IP")
private String sdpIp;
+ @Schema(description = "流IP")
private String streamIp;
+ @Schema(description = "HTTP端口")
private int httpPort;
+ @Schema(description = "HTTPS端口")
private int httpSSlPort;
+ @Schema(description = "RTMP端口")
private int rtmpPort;
+ @Schema(description = "RTMPS端口")
private int rtmpSSlPort;
+ @Schema(description = "RTP收流端口（单端口模式有用）")
private int rtpProxyPort;
+ @Schema(description = "RTSP端口")
private int rtspPort;
+ @Schema(description = "RTSPS端口")
private int rtspSSLPort;
+ @Schema(description = "是否开启自动配置ZLM")
private boolean autoConfig;
+ @Schema(description = "ZLM鉴权参数")
private String secret;
- private int streamNoneReaderDelayMS;
-
+ @Schema(description = "keepalive hook触发间隔,单位秒")
private int hookAliveInterval;
+ @Schema(description = "是否使用多端口模式")
private boolean rtpEnable;
+ @Schema(description = "状态")
private boolean status;
+ @Schema(description = "多端口RTP收流端口范围")
private String rtpPortRange;
+ @Schema(description = "RTP发流端口范围")
private String sendRtpPortRange;
+ @Schema(description = "assist服务端口")
private int recordAssistPort;
+ @Schema(description = "创建时间")
private String createTime;
+ @Schema(description = "更新时间")
private String updateTime;
+ @Schema(description = "上次心跳时间")
private String lastKeepaliveTime;
+ @Schema(description = "是否是默认ZLM")
private boolean defaultServer;
+ @Schema(description = "SSRC信息")
private SsrcConfig ssrcConfig;
+ @Schema(description = "当前使用到的端口")
private int currentPort;
@@ -68,6 +95,7 @@
* 每一台ZLM都有一套独立的SSRC列表
* 在ApplicationCheckRunner里对mediaServerSsrcMap进行初始化
*/
+ @Schema(description = "ID")
private HashMap<String, SsrcConfig> mediaServerSsrcMap;
public MediaServerItem() {
@@ -76,9 +104,9 @@
public MediaServerItem(ZLMServerConfig zlmServerConfig, String sipIp) {
id = zlmServerConfig.getGeneralMediaServerId();
ip = zlmServerConfig.getIp();
- hookIp = StringUtils.isEmpty(zlmServerConfig.getHookIp())? sipIp: zlmServerConfig.getHookIp();
- sdpIp = StringUtils.isEmpty(zlmServerConfig.getSdpIp())? zlmServerConfig.getIp(): zlmServerConfig.getSdpIp();
- streamIp = StringUtils.isEmpty(zlmServerConfig.getStreamIp())? zlmServerConfig.getIp(): zlmServerConfig.getStreamIp();
+ hookIp = ObjectUtils.isEmpty(zlmServerConfig.getHookIp())? sipIp: zlmServerConfig.getHookIp();
+ sdpIp = ObjectUtils.isEmpty(zlmServerConfig.getSdpIp())? zlmServerConfig.getIp(): zlmServerConfig.getSdpIp();
+ streamIp = ObjectUtils.isEmpty(zlmServerConfig.getStreamIp())? zlmServerConfig.getIp(): zlmServerConfig.getStreamIp();
httpPort = zlmServerConfig.getHttpPort();
httpSSlPort = zlmServerConfig.getHttpSSLport();
rtmpPort = zlmServerConfig.getRtmpPort();
@@ -88,7 +116,6 @@
rtspSSLPort = zlmServerConfig.getRtspSSlport();
autoConfig = true; // 默认值true;
secret = zlmServerConfig.getApiSecret();
- streamNoneReaderDelayMS = zlmServerConfig.getGeneralStreamNoneReaderDelayMS();
hookAliveInterval = zlmServerConfig.getHookAliveInterval();
rtpEnable = false; // 默认使用单端口;直到用户自己设置开启多端口
rtpPortRange = zlmServerConfig.getPortRange().replace("_",","); // 默认使用30000,30500作为级联时发送流的端口号
@@ -207,14 +234,6 @@
public void setSecret(String secret) {
this.secret = secret;
- }
-
- public int getStreamNoneReaderDelayMS() {
- return streamNoneReaderDelayMS;
- }
-
- public void setStreamNoneReaderDelayMS(int streamNoneReaderDelayMS) {
- this.streamNoneReaderDelayMS = streamNoneReaderDelayMS;
}
public boolean isRtpEnable() {
--
Gitblit v1.9.3