From 38a85d432ae9bb861dbcbf090d68fb3dca0d85f6 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期二, 29 十一月 2022 17:51:45 +0800
Subject: [PATCH] 修复合并的bug
---
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 9f5fbae..a2d3054 100644
--- a/src/main/java/com/genersoft/iot/vmp/conf/UserSetting.java
+++ b/src/main/java/com/genersoft/iot/vmp/conf/UserSetting.java
@@ -31,13 +31,17 @@
private Boolean logInDatebase = Boolean.TRUE;
- private Boolean usePushingAsStatus = Boolean.TRUE;
+ private Boolean usePushingAsStatus = Boolean.FALSE;
+
+ 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