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/SipConfig.java | 16 ++++++++++++----
1 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/conf/SipConfig.java b/src/main/java/com/genersoft/iot/vmp/conf/SipConfig.java
index 709fe9c..bbc946b 100644
--- a/src/main/java/com/genersoft/iot/vmp/conf/SipConfig.java
+++ b/src/main/java/com/genersoft/iot/vmp/conf/SipConfig.java
@@ -1,9 +1,7 @@
package com.genersoft.iot.vmp.conf;
-import org.springframework.beans.factory.annotation.Value;
import org.springframework.boot.context.properties.ConfigurationProperties;
-import org.springframework.context.annotation.Configuration;
import org.springframework.stereotype.Component;
@Component
@@ -27,9 +25,11 @@
Integer ptzSpeed = 50;
- Integer keepaliveTimeOut = 180;
+ Integer keepaliveTimeOut = 255;
- Integer registerTimeInterval = 60;
+ Integer registerTimeInterval = 120;
+
+ private boolean alarm;
public void setIp(String ip) {
this.ip = ip;
@@ -106,4 +106,12 @@
public Integer getRegisterTimeInterval() {
return registerTimeInterval;
}
+
+ public boolean isAlarm() {
+ return alarm;
+ }
+
+ public void setAlarm(boolean alarm) {
+ this.alarm = alarm;
+ }
}
--
Gitblit v1.8.0