From 74ad4235f1738ea8ca954bd396a35ddf90a6e37b Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期六, 01 七月 2023 13:01:56 +0800
Subject: [PATCH] 修复tcp主动的推流
---
src/main/java/com/genersoft/iot/vmp/conf/UserSetting.java | 42 ++++++++++++++++++++++++++++++++++++++++--
1 files changed, 40 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 b3ccf77..eae96b9 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;
@@ -33,7 +33,7 @@
private Boolean logInDatebase = Boolean.TRUE;
- private Boolean usePushingAsStatus = Boolean.TRUE;
+ private Boolean usePushingAsStatus = Boolean.FALSE;
private Boolean useSourceIpAsStreamIp = Boolean.FALSE;
@@ -47,18 +47,24 @@
private Boolean syncChannelOnDeviceOnline = Boolean.FALSE;
+ private Boolean pushStreamAfterAck = 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";
private String recordPath = null;
private String thirdPartyGBIdReg = "[\\s\\S]*";
+
+ private String broadcastForPlatform = "UDP";
private String civilCodeFile = "classpath:civilCode.csv";
@@ -220,6 +226,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;
}
@@ -284,6 +306,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