From ae9976bb3a59cc3d9952dda6d9388bb412baa158 Mon Sep 17 00:00:00 2001
From: xu-bin-bin <34916924+xu-bin-bin@users.noreply.github.com>
Date: 星期二, 24 十月 2023 09:28:16 +0800
Subject: [PATCH] Merge branch '648540858:wvp-28181-2.0' into wvp-28181-2.0
---
src/main/java/com/genersoft/iot/vmp/conf/UserSetting.java | 22 ++++++----------------
1 files changed, 6 insertions(+), 16 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 515f3e7..aaeff0a 100644
--- a/src/main/java/com/genersoft/iot/vmp/conf/UserSetting.java
+++ b/src/main/java/com/genersoft/iot/vmp/conf/UserSetting.java
@@ -1,7 +1,7 @@
package com.genersoft.iot.vmp.conf;
-import org.springframework.core.annotation.Order;
import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.core.annotation.Order;
import org.springframework.stereotype.Component;
import java.util.ArrayList;
@@ -31,7 +31,7 @@
private Boolean recordSip = Boolean.TRUE;
- private Boolean logInDatebase = Boolean.TRUE;
+ private Boolean logInDatabase = Boolean.TRUE;
private Boolean usePushingAsStatus = Boolean.TRUE;
@@ -42,8 +42,6 @@
private Boolean streamOnDemand = Boolean.TRUE;
private Boolean pushAuthority = Boolean.TRUE;
-
- private Boolean gbSendStreamStrict = Boolean.FALSE;
private Boolean syncChannelOnDeviceOnline = Boolean.FALSE;
@@ -134,12 +132,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() {
@@ -204,14 +202,6 @@
public void setPushAuthority(Boolean pushAuthority) {
this.pushAuthority = pushAuthority;
- }
-
- public Boolean getGbSendStreamStrict() {
- return gbSendStreamStrict;
- }
-
- public void setGbSendStreamStrict(Boolean gbSendStreamStrict) {
- this.gbSendStreamStrict = gbSendStreamStrict;
}
public Boolean getSyncChannelOnDeviceOnline() {
--
Gitblit v1.8.0