From ec95a429859e2819772231e70dcd80cb976c81d2 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期五, 10 二月 2023 15:54:42 +0800
Subject: [PATCH] Merge branch 'main' into main2
---
src/main/java/com/genersoft/iot/vmp/conf/UserSetting.java | 40 ++++++++++++++++++++++++++++++++++++++++
1 files changed, 40 insertions(+), 0 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 a2d3054..81fbf74 100644
--- a/src/main/java/com/genersoft/iot/vmp/conf/UserSetting.java
+++ b/src/main/java/com/genersoft/iot/vmp/conf/UserSetting.java
@@ -35,6 +35,8 @@
private Boolean useSourceIpAsStreamIp = Boolean.FALSE;
+ private Boolean sipUseSourceIpAsRemoteAddress = Boolean.FALSE;
+
private Boolean streamOnDemand = Boolean.TRUE;
private Boolean pushAuthority = Boolean.TRUE;
@@ -43,9 +45,15 @@
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<>();
@@ -196,4 +204,36 @@
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