From 87acd73efcde49cb5630c266db4ebd3f6b1b9dfd Mon Sep 17 00:00:00 2001 From: panlinlin <648540858@qq.com> Date: 星期二, 06 四月 2021 15:13:40 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/wvp-28181-2.0' into wvp-28181-2.0 --- src/main/java/com/genersoft/iot/vmp/conf/MediaServerConfig.java | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/src/main/java/com/genersoft/iot/vmp/conf/MediaServerConfig.java b/src/main/java/com/genersoft/iot/vmp/conf/MediaServerConfig.java index 76390e4..eba9a5e 100644 --- a/src/main/java/com/genersoft/iot/vmp/conf/MediaServerConfig.java +++ b/src/main/java/com/genersoft/iot/vmp/conf/MediaServerConfig.java @@ -35,6 +35,8 @@ private String wanIp; + private long updateTime; + @JSONField(name = "hls.fileBufSize") private String hlsFileBufSize; @@ -728,4 +730,12 @@ public void setWanIp(String wanIp) { this.wanIp = wanIp; } + + public long getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(long updateTime) { + this.updateTime = updateTime; + } } -- Gitblit v1.8.0