From b3c4636520e58c27a71409c764c2017c695682c1 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期一, 20 三月 2023 14:40:17 +0800
Subject: [PATCH] 主线合并talk模式
---
src/main/java/com/genersoft/iot/vmp/conf/UserSetting.java | 23 +++++++++++++----------
1 files changed, 13 insertions(+), 10 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 be7d5af..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,7 +33,7 @@
private Boolean logInDatebase = Boolean.TRUE;
- private Boolean usePushingAsStatus = Boolean.TRUE;
+ private Boolean usePushingAsStatus = Boolean.FALSE;
private Boolean useSourceIpAsStreamIp = Boolean.FALSE;
@@ -45,8 +47,9 @@
private Boolean syncChannelOnDeviceOnline = Boolean.FALSE;
+ private Boolean pushStreamAfterAck = Boolean.FALSE;
+
private Boolean sipLog = Boolean.FALSE;
- private Boolean syncDb = Boolean.TRUE;
private String serverId = "000000";
@@ -202,6 +205,14 @@
this.syncChannelOnDeviceOnline = syncChannelOnDeviceOnline;
}
+ public Boolean getPushStreamAfterAck() {
+ return pushStreamAfterAck;
+ }
+
+ public void setPushStreamAfterAck(Boolean pushStreamAfterAck) {
+ this.pushStreamAfterAck = pushStreamAfterAck;
+ }
+
public Boolean getSipUseSourceIpAsRemoteAddress() {
return sipUseSourceIpAsRemoteAddress;
}
@@ -216,13 +227,5 @@
public void setSipLog(Boolean sipLog) {
this.sipLog = sipLog;
- }
-
- public Boolean getSyncDb() {
- return syncDb;
- }
-
- public void setSyncDb(Boolean syncDb) {
- this.syncDb = syncDb;
}
}
--
Gitblit v1.8.0