From b1b6fae22c5ab3013d73df1a43cd42f7fe0fa347 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期二, 09 四月 2024 10:35:11 +0800
Subject: [PATCH] Merge branch 'master' into dev/zlm
---
src/main/java/com/genersoft/iot/vmp/conf/MediaConfig.java | 58 ++++++++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 52 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/conf/MediaConfig.java b/src/main/java/com/genersoft/iot/vmp/conf/MediaConfig.java
index ead7997..0dc1ba9 100644
--- a/src/main/java/com/genersoft/iot/vmp/conf/MediaConfig.java
+++ b/src/main/java/com/genersoft/iot/vmp/conf/MediaConfig.java
@@ -1,6 +1,6 @@
package com.genersoft.iot.vmp.conf;
-import com.genersoft.iot.vmp.media.zlm.dto.MediaServerItem;
+import com.genersoft.iot.vmp.media.bean.MediaServer;
import com.genersoft.iot.vmp.utils.DateUtil;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -42,11 +42,23 @@
@Value("${media.stream-ip:${media.ip}}")
private String streamIp;
- @Value("${media.http-port}")
+ @Value("${media.http-port:0}")
private Integer httpPort;
+
+ @Value("${media.flv-port:0}")
+ private Integer flvPort = 0;
+
+ @Value("${media.ws-flv-port:0}")
+ private Integer wsFlvPort = 0;
@Value("${media.http-ssl-port:0}")
private Integer httpSSlPort = 0;
+
+ @Value("${media.flv-ssl-port:0}")
+ private Integer flvSSlPort = 0;
+
+ @Value("${media.ws-flv-ssl-port:0}")
+ private Integer wsFlvSSlPort = 0;
@Value("${media.rtmp-port:0}")
private Integer rtmpPort = 0;
@@ -80,6 +92,15 @@
@Value("${media.record-assist-port:0}")
private Integer recordAssistPort = 0;
+
+ @Value("${media.record-day:7}")
+ private Integer recordDay;
+
+ @Value("${media.record-path:}")
+ private String recordPath;
+
+ @Value("${media.type:zlm}")
+ private String type;
public String getId() {
return id;
@@ -190,8 +211,8 @@
return sipDomain;
}
- public MediaServerItem getMediaSerItem(){
- MediaServerItem mediaServerItem = new MediaServerItem();
+ public MediaServer getMediaSerItem(){
+ MediaServer mediaServerItem = new MediaServer();
mediaServerItem.setId(id);
mediaServerItem.setIp(ip);
mediaServerItem.setDefaultServer(true);
@@ -199,7 +220,11 @@
mediaServerItem.setSdpIp(getSdpIp());
mediaServerItem.setStreamIp(getStreamIp());
mediaServerItem.setHttpPort(httpPort);
+ mediaServerItem.setFlvPort(flvPort);
+ mediaServerItem.setWsFlvPort(wsFlvPort);
mediaServerItem.setHttpSSlPort(httpSSlPort);
+ mediaServerItem.setFlvSSLPort(flvSSlPort);
+ mediaServerItem.setWsFlvSSLPort(wsFlvSSlPort);
mediaServerItem.setRtmpPort(rtmpPort);
mediaServerItem.setRtmpSSlPort(rtmpSSlPort);
mediaServerItem.setRtpProxyPort(getRtpProxyPort());
@@ -211,14 +236,35 @@
mediaServerItem.setRtpPortRange(rtpPortRange);
mediaServerItem.setSendRtpPortRange(rtpSendPortRange);
mediaServerItem.setRecordAssistPort(recordAssistPort);
- mediaServerItem.setHookAliveInterval(30.00f);
-
+ mediaServerItem.setHookAliveInterval(10f);
+ mediaServerItem.setRecordDay(recordDay);
+ mediaServerItem.setStatus(false);
+ mediaServerItem.setType(type);
+ if (recordPath != null) {
+ mediaServerItem.setRecordPath(recordPath);
+ }
mediaServerItem.setCreateTime(DateUtil.getNow());
mediaServerItem.setUpdateTime(DateUtil.getNow());
return mediaServerItem;
}
+ public Integer getRecordDay() {
+ return recordDay;
+ }
+
+ public void setRecordDay(Integer recordDay) {
+ this.recordDay = recordDay;
+ }
+
+ public String getRecordPath() {
+ return recordPath;
+ }
+
+ public void setRecordPath(String recordPath) {
+ this.recordPath = recordPath;
+ }
+
public String getRtpSendPortRange() {
return rtpSendPortRange;
}
--
Gitblit v1.8.0