From d9cfe061b9b501511f5d769f751c8ff6bbcb1bf9 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期四, 17 八月 2023 15:20:25 +0800
Subject: [PATCH] 优化对讲释放流程
---
src/main/java/com/genersoft/iot/vmp/conf/UserSetting.java | 122 ++++++++++++++++++++++++++++++++++++----
1 files changed, 110 insertions(+), 12 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 b413d88..0993d74 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;
@@ -43,18 +43,36 @@
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";
+ private String recordPath = null;
+
private String thirdPartyGBIdReg = "[\\s\\S]*";
+ private String broadcastForPlatform = "UDP";
+
+ private String civilCodeFile = "classpath:civilCode.csv";
+
private List<String> interfaceAuthenticationExcludes = new ArrayList<>();
+
+ private List<String> allowedOrigins = new ArrayList<>();
+
+ private int maxNotifyCountQueue = 10000;
+
+ private int registerAgainAfterTime = 60;
+
+ private boolean registerKeepIntDialog = false;
public Boolean getSavePositionHistory() {
return savePositionHistory;
@@ -188,20 +206,20 @@
this.pushAuthority = pushAuthority;
}
- public Boolean getGbSendStreamStrict() {
- return gbSendStreamStrict;
- }
-
- public void setGbSendStreamStrict(Boolean gbSendStreamStrict) {
- this.gbSendStreamStrict = gbSendStreamStrict;
- }
-
public Boolean getSyncChannelOnDeviceOnline() {
return syncChannelOnDeviceOnline;
}
public void setSyncChannelOnDeviceOnline(Boolean syncChannelOnDeviceOnline) {
this.syncChannelOnDeviceOnline = syncChannelOnDeviceOnline;
+ }
+
+ public String getBroadcastForPlatform() {
+ return broadcastForPlatform;
+ }
+
+ public void setBroadcastForPlatform(String broadcastForPlatform) {
+ this.broadcastForPlatform = broadcastForPlatform;
}
public Boolean getSipUseSourceIpAsRemoteAddress() {
@@ -220,6 +238,14 @@
this.sipLog = sipLog;
}
+ public List<String> getAllowedOrigins() {
+ return allowedOrigins;
+ }
+
+ public void setAllowedOrigins(List<String> allowedOrigins) {
+ this.allowedOrigins = allowedOrigins;
+ }
+
public Boolean getSendToPlatformsWhenIdLost() {
return sendToPlatformsWhenIdLost;
}
@@ -227,4 +253,76 @@
public void setSendToPlatformsWhenIdLost(Boolean sendToPlatformsWhenIdLost) {
this.sendToPlatformsWhenIdLost = sendToPlatformsWhenIdLost;
}
+
+ public Boolean getRefuseChannelStatusChannelFormNotify() {
+ return refuseChannelStatusChannelFormNotify;
+ }
+
+ public void setRefuseChannelStatusChannelFormNotify(Boolean refuseChannelStatusChannelFormNotify) {
+ this.refuseChannelStatusChannelFormNotify = refuseChannelStatusChannelFormNotify;
+ }
+
+ public String getRecordPath() {
+ return recordPath;
+ }
+
+ public void setRecordPath(String recordPath) {
+ this.recordPath = recordPath;
+ }
+
+ public int getMaxNotifyCountQueue() {
+ return maxNotifyCountQueue;
+ }
+
+ public void setMaxNotifyCountQueue(int maxNotifyCountQueue) {
+ this.maxNotifyCountQueue = maxNotifyCountQueue;
+ }
+
+ public Boolean getDeviceStatusNotify() {
+ return deviceStatusNotify;
+ }
+
+ public void setDeviceStatusNotify(Boolean deviceStatusNotify) {
+ 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;
+ }
+
+ public void setCivilCodeFile(String civilCodeFile) {
+ this.civilCodeFile = civilCodeFile;
+ }
+
+ public int getRegisterAgainAfterTime() {
+ return registerAgainAfterTime;
+ }
+
+ public void setRegisterAgainAfterTime(int registerAgainAfterTime) {
+ this.registerAgainAfterTime = registerAgainAfterTime;
+ }
+
+ public boolean isRegisterKeepIntDialog() {
+ return registerKeepIntDialog;
+ }
+
+ public void setRegisterKeepIntDialog(boolean registerKeepIntDialog) {
+ this.registerKeepIntDialog = registerKeepIntDialog;
+ }
}
--
Gitblit v1.8.0