From 23beb4fde063b4a648c2a273f17cf5c423fa0ae6 Mon Sep 17 00:00:00 2001
From: leesam <leesam@leesam.cn>
Date: 星期一, 01 四月 2024 09:19:46 +0800
Subject: [PATCH] Merge branch 'master' into develop-add-api-key
---
src/main/java/com/genersoft/iot/vmp/conf/MediaConfig.java | 8 ++++----
1 files changed, 4 insertions(+), 4 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 3acc795..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,10 +81,10 @@
@Value("${media.record-assist-port:0}")
private Integer recordAssistPort = 0;
- @Value("${media.record-date:7}")
- private Integer recordDay = 7;
+ @Value("${media.record-day:7}")
+ private Integer recordDay;
- @Value("${media.record-path}")
+ @Value("${media.record-path:}")
private String recordPath;
public String getId() {
@@ -97,7 +97,7 @@
public String getHookIp() {
if (ObjectUtils.isEmpty(hookIp)){
- return sipIp.split(",")[0];
+ return sipIp;
}else {
return hookIp;
}
--
Gitblit v1.8.0