From aeeb61d141c0245232e9e1e4cc71e4f309e9d096 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期四, 23 五月 2024 17:47:43 +0800
Subject: [PATCH] 合并271分支
---
src/main/java/com/genersoft/iot/vmp/conf/UserSetting.java | 28 ++++++++++++++++++++++++----
1 files changed, 24 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/conf/UserSetting.java b/src/main/java/com/genersoft/iot/vmp/conf/UserSetting.java
index 0d11df8..96253d6 100644
--- a/src/main/java/com/genersoft/iot/vmp/conf/UserSetting.java
+++ b/src/main/java/com/genersoft/iot/vmp/conf/UserSetting.java
@@ -23,7 +23,7 @@
private Integer playTimeout = 18000;
- private int platformPlayTimeout = 60000;
+ private int platformPlayTimeout = 20000;
private Boolean interfaceAuthentication = Boolean.TRUE;
@@ -33,7 +33,7 @@
private Boolean logInDatabase = Boolean.TRUE;
- private Boolean usePushingAsStatus = Boolean.TRUE;
+ private Boolean usePushingAsStatus = Boolean.FALSE;
private Boolean useSourceIpAsStreamIp = Boolean.FALSE;
@@ -51,12 +51,16 @@
private Boolean refuseChannelStatusChannelFormNotify = Boolean.FALSE;
- private Boolean deviceStatusNotify = Boolean.FALSE;
+ private Boolean deviceStatusNotify = Boolean.TRUE;
private Boolean useCustomSsrcForParentInvite = Boolean.TRUE;
+
+ private Boolean docEnable = Boolean.TRUE;
private String serverId = "000000";
private String thirdPartyGBIdReg = "[\\s\\S]*";
+
+ private String broadcastForPlatform = "UDP";
private String civilCodeFile = "classpath:civilCode.csv";
@@ -64,7 +68,7 @@
private List<String> allowedOrigins = new ArrayList<>();
- private int maxNotifyCountQueue = 10000;
+ private int maxNotifyCountQueue = 100000;
private int registerAgainAfterTime = 60;
@@ -210,6 +214,14 @@
this.syncChannelOnDeviceOnline = syncChannelOnDeviceOnline;
}
+ public String getBroadcastForPlatform() {
+ return broadcastForPlatform;
+ }
+
+ public void setBroadcastForPlatform(String broadcastForPlatform) {
+ this.broadcastForPlatform = broadcastForPlatform;
+ }
+
public Boolean getSipUseSourceIpAsRemoteAddress() {
return sipUseSourceIpAsRemoteAddress;
}
@@ -305,4 +317,12 @@
public void setRegisterKeepIntDialog(boolean registerKeepIntDialog) {
this.registerKeepIntDialog = registerKeepIntDialog;
}
+
+ public Boolean getDocEnable() {
+ return docEnable;
+ }
+
+ public void setDocEnable(Boolean docEnable) {
+ this.docEnable = docEnable;
+ }
}
--
Gitblit v1.8.0