From 26bdf2e7768ee5dfc400c3970a5aa129fed49453 Mon Sep 17 00:00:00 2001 From: 648540858 <648540858@qq.com> Date: 星期一, 20 三月 2023 15:31:43 +0800 Subject: [PATCH] Merge branch '级联' into main-dev --- src/main/java/com/genersoft/iot/vmp/conf/UserSetting.java | 22 +++++++++++++++++++++- 1 files changed, 21 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 1e7fd36..811f7e9 100644 --- a/src/main/java/com/genersoft/iot/vmp/conf/UserSetting.java +++ b/src/main/java/com/genersoft/iot/vmp/conf/UserSetting.java @@ -33,7 +33,7 @@ private Boolean logInDatebase = Boolean.TRUE; - private Boolean usePushingAsStatus = Boolean.TRUE; + private Boolean usePushingAsStatus = Boolean.FALSE; private Boolean useSourceIpAsStreamIp = Boolean.FALSE; @@ -47,11 +47,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<>(); @@ -203,6 +207,22 @@ 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; } -- Gitblit v1.8.0