From 039fbf7e243d4bf0f46b44e7dae2a5d36e978056 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期一, 20 三月 2023 14:32:53 +0800
Subject: [PATCH] Merge branch 'talk' into main-dev
---
src/main/java/com/genersoft/iot/vmp/conf/UserSetting.java | 26 ++++++++++++++++++++++++--
1 files changed, 24 insertions(+), 2 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 92528a3..251edf1 100644
--- a/src/main/java/com/genersoft/iot/vmp/conf/UserSetting.java
+++ b/src/main/java/com/genersoft/iot/vmp/conf/UserSetting.java
@@ -1,5 +1,6 @@
package com.genersoft.iot.vmp.conf;
+import org.junit.jupiter.api.Order;
import org.springframework.boot.context.properties.ConfigurationProperties;
import org.springframework.stereotype.Component;
@@ -11,6 +12,7 @@
*/
@Component
@ConfigurationProperties(prefix = "user-settings", ignoreInvalidFields = true)
+@Order(0)
public class UserSetting {
private Boolean savePositionHistory = Boolean.FALSE;
@@ -31,11 +33,11 @@
private Boolean logInDatebase = Boolean.TRUE;
- private Boolean usePushingAsStatus = Boolean.TRUE;
+ private Boolean usePushingAsStatus = Boolean.FALSE;
private Boolean useSourceIpAsStreamIp = Boolean.FALSE;
- private Boolean sipUseSourceIpAsRemoteAddress = Boolean.TRUE;
+ private Boolean sipUseSourceIpAsRemoteAddress = Boolean.FALSE;
private Boolean streamOnDemand = Boolean.TRUE;
@@ -44,6 +46,10 @@
private Boolean gbSendStreamStrict = Boolean.FALSE;
private Boolean syncChannelOnDeviceOnline = Boolean.FALSE;
+
+ private Boolean pushStreamAfterAck = Boolean.FALSE;
+
+ private Boolean sipLog = Boolean.FALSE;
private String serverId = "000000";
@@ -199,6 +205,14 @@
this.syncChannelOnDeviceOnline = syncChannelOnDeviceOnline;
}
+ public Boolean getPushStreamAfterAck() {
+ return pushStreamAfterAck;
+ }
+
+ public void setPushStreamAfterAck(Boolean pushStreamAfterAck) {
+ this.pushStreamAfterAck = pushStreamAfterAck;
+ }
+
public Boolean getSipUseSourceIpAsRemoteAddress() {
return sipUseSourceIpAsRemoteAddress;
}
@@ -206,4 +220,12 @@
public void setSipUseSourceIpAsRemoteAddress(Boolean sipUseSourceIpAsRemoteAddress) {
this.sipUseSourceIpAsRemoteAddress = sipUseSourceIpAsRemoteAddress;
}
+
+ public Boolean getSipLog() {
+ return sipLog;
+ }
+
+ public void setSipLog(Boolean sipLog) {
+ this.sipLog = sipLog;
+ }
}
--
Gitblit v1.8.0