From ef6693aabbbf12e83d09ad8749f6e60faacc012d Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期二, 29 十一月 2022 15:18:56 +0800
Subject: [PATCH] Merge branch 'wvp-28181-2.0' into Zafu-Dev-1127
---
src/main/java/com/genersoft/iot/vmp/conf/UserSetting.java | 20 ++++++++++++++++++++
1 files changed, 20 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 9f5fbae..eeee438 100644
--- a/src/main/java/com/genersoft/iot/vmp/conf/UserSetting.java
+++ b/src/main/java/com/genersoft/iot/vmp/conf/UserSetting.java
@@ -33,11 +33,15 @@
private Boolean usePushingAsStatus = Boolean.TRUE;
+ private Boolean useSourceIpAsStreamIp = Boolean.FALSE;
+
private Boolean streamOnDemand = Boolean.TRUE;
private Boolean pushAuthority = Boolean.TRUE;
private Boolean gbSendStreamStrict = Boolean.FALSE;
+
+ private Boolean syncChannelOnDeviceOnline = Boolean.FALSE;
private String serverId = "000000";
@@ -161,6 +165,14 @@
this.streamOnDemand = streamOnDemand;
}
+ public Boolean getUseSourceIpAsStreamIp() {
+ return useSourceIpAsStreamIp;
+ }
+
+ public void setUseSourceIpAsStreamIp(Boolean useSourceIpAsStreamIp) {
+ this.useSourceIpAsStreamIp = useSourceIpAsStreamIp;
+ }
+
public Boolean getPushAuthority() {
return pushAuthority;
}
@@ -176,4 +188,12 @@
public void setGbSendStreamStrict(Boolean gbSendStreamStrict) {
this.gbSendStreamStrict = gbSendStreamStrict;
}
+
+ public Boolean getSyncChannelOnDeviceOnline() {
+ return syncChannelOnDeviceOnline;
+ }
+
+ public void setSyncChannelOnDeviceOnline(Boolean syncChannelOnDeviceOnline) {
+ this.syncChannelOnDeviceOnline = syncChannelOnDeviceOnline;
+ }
}
--
Gitblit v1.8.0