From 509d9b3cbba7ba8fdc7466c34e46db70d41517a8 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期二, 27 二月 2024 10:22:13 +0800
Subject: [PATCH] Merge branch 'wvp-28181-2.0' into main-dev
---
src/main/java/com/genersoft/iot/vmp/conf/MediaConfig.java | 29 +++++++++++++++++++++++++++--
1 files changed, 27 insertions(+), 2 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 20ed8cb..884036a 100644
--- a/src/main/java/com/genersoft/iot/vmp/conf/MediaConfig.java
+++ b/src/main/java/com/genersoft/iot/vmp/conf/MediaConfig.java
@@ -81,6 +81,12 @@
@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;
+
public String getId() {
return id;
}
@@ -91,7 +97,7 @@
public String getHookIp() {
if (ObjectUtils.isEmpty(hookIp)){
- return sipIp.split(",")[0];
+ return sipIp;
}else {
return hookIp;
}
@@ -212,13 +218,32 @@
mediaServerItem.setSendRtpPortRange(rtpSendPortRange);
mediaServerItem.setRecordAssistPort(recordAssistPort);
mediaServerItem.setHookAliveInterval(30.00f);
-
+ mediaServerItem.setRecordDay(recordDay);
+ 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