From 3951a95284fb60ce9f625dcd17689d38ec7852dc Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期五, 25 八月 2023 08:56:47 +0800
Subject: [PATCH] Merge branch '2.6.8' into wvp-28181-2.0
---
src/main/java/com/genersoft/iot/vmp/conf/UserSetting.java | 30 +++++++++++++++++++-----------
1 files changed, 19 insertions(+), 11 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 b3ccf77..5400729 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.junit.jupiter.api.Order;
import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.core.annotation.Order;
import org.springframework.stereotype.Component;
import java.util.ArrayList;
@@ -43,16 +43,16 @@
private Boolean pushAuthority = Boolean.TRUE;
- private Boolean gbSendStreamStrict = Boolean.FALSE;
-
private Boolean syncChannelOnDeviceOnline = Boolean.FALSE;
private Boolean sipLog = Boolean.FALSE;
+ private Boolean sqlLog = Boolean.FALSE;
private Boolean sendToPlatformsWhenIdLost = Boolean.FALSE;
private Boolean refuseChannelStatusChannelFormNotify = Boolean.FALSE;
private Boolean deviceStatusNotify = Boolean.FALSE;
+ private Boolean useCustomSsrcForParentInvite = Boolean.TRUE;
private String serverId = "000000";
@@ -204,14 +204,6 @@
this.pushAuthority = pushAuthority;
}
- public Boolean getGbSendStreamStrict() {
- return gbSendStreamStrict;
- }
-
- public void setGbSendStreamStrict(Boolean gbSendStreamStrict) {
- this.gbSendStreamStrict = gbSendStreamStrict;
- }
-
public Boolean getSyncChannelOnDeviceOnline() {
return syncChannelOnDeviceOnline;
}
@@ -284,6 +276,22 @@
this.deviceStatusNotify = deviceStatusNotify;
}
+ public Boolean getUseCustomSsrcForParentInvite() {
+ return useCustomSsrcForParentInvite;
+ }
+
+ public void setUseCustomSsrcForParentInvite(Boolean useCustomSsrcForParentInvite) {
+ this.useCustomSsrcForParentInvite = useCustomSsrcForParentInvite;
+ }
+
+ public Boolean getSqlLog() {
+ return sqlLog;
+ }
+
+ public void setSqlLog(Boolean sqlLog) {
+ this.sqlLog = sqlLog;
+ }
+
public String getCivilCodeFile() {
return civilCodeFile;
}
--
Gitblit v1.8.0