From 5cae58c69129631c80c611d1870c3a20721cebf4 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期二, 14 二月 2023 10:04:48 +0800
Subject: [PATCH] Merge branch 'wvp-28181-2.0' into main2
---
src/main/java/com/genersoft/iot/vmp/conf/UserSetting.java | 52 +++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 51 insertions(+), 1 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 ca204d9..81fbf74 100644
--- a/src/main/java/com/genersoft/iot/vmp/conf/UserSetting.java
+++ b/src/main/java/com/genersoft/iot/vmp/conf/UserSetting.java
@@ -31,9 +31,11 @@
private Boolean logInDatebase = Boolean.TRUE;
- private Boolean usePushingAsStatus = Boolean.TRUE;
+ private Boolean usePushingAsStatus = Boolean.FALSE;
private Boolean useSourceIpAsStreamIp = Boolean.FALSE;
+
+ private Boolean sipUseSourceIpAsRemoteAddress = Boolean.FALSE;
private Boolean streamOnDemand = Boolean.TRUE;
@@ -41,9 +43,17 @@
private Boolean gbSendStreamStrict = Boolean.FALSE;
+ private Boolean syncChannelOnDeviceOnline = Boolean.FALSE;
+
+ private Boolean pushStreamAfterAck = Boolean.FALSE;
+
+ private Boolean sipLog = Boolean.FALSE;
+
private String serverId = "000000";
private String thirdPartyGBIdReg = "[\\s\\S]*";
+
+ private String broadcastForPlatform = "UDP";
private List<String> interfaceAuthenticationExcludes = new ArrayList<>();
@@ -186,4 +196,44 @@
public void setGbSendStreamStrict(Boolean gbSendStreamStrict) {
this.gbSendStreamStrict = gbSendStreamStrict;
}
+
+ public Boolean getSyncChannelOnDeviceOnline() {
+ return syncChannelOnDeviceOnline;
+ }
+
+ public void setSyncChannelOnDeviceOnline(Boolean syncChannelOnDeviceOnline) {
+ this.syncChannelOnDeviceOnline = syncChannelOnDeviceOnline;
+ }
+
+ public String getBroadcastForPlatform() {
+ return broadcastForPlatform;
+ }
+
+ public void setBroadcastForPlatform(String broadcastForPlatform) {
+ this.broadcastForPlatform = broadcastForPlatform;
+ }
+
+ public Boolean getPushStreamAfterAck() {
+ return pushStreamAfterAck;
+ }
+
+ public void setPushStreamAfterAck(Boolean pushStreamAfterAck) {
+ this.pushStreamAfterAck = pushStreamAfterAck;
+ }
+
+ public Boolean getSipUseSourceIpAsRemoteAddress() {
+ return sipUseSourceIpAsRemoteAddress;
+ }
+
+ public void setSipUseSourceIpAsRemoteAddress(Boolean sipUseSourceIpAsRemoteAddress) {
+ this.sipUseSourceIpAsRemoteAddress = sipUseSourceIpAsRemoteAddress;
+ }
+
+ public Boolean getSipLog() {
+ return sipLog;
+ }
+
+ public void setSipLog(Boolean sipLog) {
+ this.sipLog = sipLog;
+ }
}
--
Gitblit v1.8.0