From e6790d88fc5b1ac33d239c0d90ce6cdea666b821 Mon Sep 17 00:00:00 2001
From: mk1990 <153958232@qq.com>
Date: 星期一, 16 五月 2022 10:14:24 +0800
Subject: [PATCH] Merge branch 'wvp-28181-2.0' of https://github.com/mk1990/wvp-GB28181-pro into wvp-28181-2.0
---
src/main/java/com/genersoft/iot/vmp/conf/MediaConfig.java | 12 +++++-------
1 files changed, 5 insertions(+), 7 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 3f549e5..85f4684 100644
--- a/src/main/java/com/genersoft/iot/vmp/conf/MediaConfig.java
+++ b/src/main/java/com/genersoft/iot/vmp/conf/MediaConfig.java
@@ -1,12 +1,11 @@
package com.genersoft.iot.vmp.conf;
import com.genersoft.iot.vmp.media.zlm.dto.MediaServerItem;
+import com.genersoft.iot.vmp.utils.DateUtil;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.context.annotation.Configuration;
import org.springframework.util.StringUtils;
-import java.text.SimpleDateFormat;
-import java.util.Date;
@Configuration("mediaConfig")
public class MediaConfig{
@@ -60,8 +59,8 @@
@Value("${media.secret}")
private String secret;
- @Value("${media.stream-none-reader-delay-ms:18000}")
- private int streamNoneReaderDelayMS = 18000;
+ @Value("${media.stream-none-reader-delay-ms:10000}")
+ private int streamNoneReaderDelayMS = 10000;
@Value("${media.rtp.enable}")
private boolean rtpEnable;
@@ -206,9 +205,8 @@
mediaServerItem.setRecordAssistPort(recordAssistPort);
mediaServerItem.setHookAliveInterval(120);
- SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
- mediaServerItem.setCreateTime(format.format(System.currentTimeMillis()));
- mediaServerItem.setUpdateTime(format.format(System.currentTimeMillis()));
+ mediaServerItem.setCreateTime(DateUtil.getNow());
+ mediaServerItem.setUpdateTime(DateUtil.getNow());
return mediaServerItem;
}
--
Gitblit v1.8.0