From 420dbce900967aeb5006266126256f8ce8aa8b5b Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期三, 22 二月 2023 18:14:53 +0800
Subject: [PATCH] Merge branch 'main' into 级联
---
src/main/java/com/genersoft/iot/vmp/conf/UserSetting.java | 34 +++++++++++++++++++++++++++++++++-
1 files changed, 33 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 72f5d14..811f7e9 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,7 +33,7 @@
private Boolean logInDatebase = Boolean.TRUE;
- private Boolean usePushingAsStatus = Boolean.TRUE;
+ private Boolean usePushingAsStatus = Boolean.FALSE;
private Boolean useSourceIpAsStreamIp = Boolean.FALSE;
@@ -45,9 +47,15 @@
private Boolean syncChannelOnDeviceOnline = Boolean.FALSE;
+ private Boolean pushStreamAfterAck = Boolean.FALSE;
+
+ private Boolean sipLog = Boolean.FALSE;
+
private String serverId = "000000";
private String thirdPartyGBIdReg = "[\\s\\S]*";
+
+ private String broadcastForPlatform = "UDP";
private List<String> interfaceAuthenticationExcludes = new ArrayList<>();
@@ -199,6 +207,22 @@
this.syncChannelOnDeviceOnline = syncChannelOnDeviceOnline;
}
+ public String getBroadcastForPlatform() {
+ return broadcastForPlatform;
+ }
+
+ public void setBroadcastForPlatform(String broadcastForPlatform) {
+ this.broadcastForPlatform = broadcastForPlatform;
+ }
+
+ public Boolean getPushStreamAfterAck() {
+ return pushStreamAfterAck;
+ }
+
+ public void setPushStreamAfterAck(Boolean pushStreamAfterAck) {
+ this.pushStreamAfterAck = pushStreamAfterAck;
+ }
+
public Boolean getSipUseSourceIpAsRemoteAddress() {
return sipUseSourceIpAsRemoteAddress;
}
@@ -206,4 +230,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