From e46f1ae9150028b794a9519dda7d66bf77a486c2 Mon Sep 17 00:00:00 2001
From: xu-bin-bin <34916924+xu-bin-bin@users.noreply.github.com>
Date: 星期四, 31 八月 2023 16:51:06 +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 | 30 ++++++++++++++++++++++++------
1 files changed, 24 insertions(+), 6 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 aa98d58..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.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;
@@ -31,7 +31,7 @@
private Boolean recordSip = Boolean.TRUE;
- private Boolean logInDatebase = Boolean.TRUE;
+ private Boolean logInDatabase = Boolean.TRUE;
private Boolean usePushingAsStatus = Boolean.TRUE;
@@ -46,11 +46,13 @@
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";
@@ -130,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() {
@@ -274,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