From 2673fbb0bf7af6405c544cc8a56f17d03018c59a Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期四, 12 十月 2023 17:08:59 +0800
Subject: [PATCH] Merge branch 'wvp-28181-2.0' into main-dev
---
src/main/java/com/genersoft/iot/vmp/conf/UserSetting.java | 30 +++++-------------------------
1 files changed, 5 insertions(+), 25 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 eae96b9..aadbf47 100644
--- a/src/main/java/com/genersoft/iot/vmp/conf/UserSetting.java
+++ b/src/main/java/com/genersoft/iot/vmp/conf/UserSetting.java
@@ -31,7 +31,7 @@
private Boolean recordSip = Boolean.TRUE;
- private Boolean logInDatebase = Boolean.TRUE;
+ private Boolean logInDatabase = Boolean.TRUE;
private Boolean usePushingAsStatus = Boolean.FALSE;
@@ -43,11 +43,7 @@
private Boolean pushAuthority = Boolean.TRUE;
- private Boolean gbSendStreamStrict = Boolean.FALSE;
-
private Boolean syncChannelOnDeviceOnline = Boolean.FALSE;
-
- private Boolean pushStreamAfterAck = Boolean.FALSE;
private Boolean sipLog = Boolean.FALSE;
private Boolean sqlLog = Boolean.FALSE;
@@ -138,12 +134,12 @@
this.interfaceAuthenticationExcludes = interfaceAuthenticationExcludes;
}
- public Boolean getLogInDatebase() {
- return logInDatebase;
+ public Boolean getLogInDatabase() {
+ return logInDatabase;
}
- public void setLogInDatebase(Boolean logInDatebase) {
- this.logInDatebase = logInDatebase;
+ public void setLogInDatabase(Boolean logInDatabase) {
+ this.logInDatabase = logInDatabase;
}
public String getServerId() {
@@ -210,14 +206,6 @@
this.pushAuthority = pushAuthority;
}
- public Boolean getGbSendStreamStrict() {
- return gbSendStreamStrict;
- }
-
- public void setGbSendStreamStrict(Boolean gbSendStreamStrict) {
- this.gbSendStreamStrict = gbSendStreamStrict;
- }
-
public Boolean getSyncChannelOnDeviceOnline() {
return syncChannelOnDeviceOnline;
}
@@ -232,14 +220,6 @@
public void setBroadcastForPlatform(String broadcastForPlatform) {
this.broadcastForPlatform = broadcastForPlatform;
- }
-
- public Boolean getPushStreamAfterAck() {
- return pushStreamAfterAck;
- }
-
- public void setPushStreamAfterAck(Boolean pushStreamAfterAck) {
- this.pushStreamAfterAck = pushStreamAfterAck;
}
public Boolean getSipUseSourceIpAsRemoteAddress() {
--
Gitblit v1.8.0