From 38980826f9789745c7288e2e9c800873315a9228 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期一, 04 三月 2024 14:32:57 +0800
Subject: [PATCH] 修复平台删除时未移除心跳超时重新注册任务的问题 #1329
---
src/main/java/com/genersoft/iot/vmp/conf/UserSetting.java | 67 +++++++++++++++++----------------
1 files changed, 34 insertions(+), 33 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 f508de7..5d4af3d 100644
--- a/src/main/java/com/genersoft/iot/vmp/conf/UserSetting.java
+++ b/src/main/java/com/genersoft/iot/vmp/conf/UserSetting.java
@@ -1,8 +1,7 @@
package com.genersoft.iot.vmp.conf;
-import io.swagger.v3.oas.annotations.media.Schema;
-import org.springframework.core.annotation.Order;
import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.core.annotation.Order;
import org.springframework.stereotype.Component;
import java.util.ArrayList;
@@ -24,15 +23,15 @@
private Integer playTimeout = 18000;
- private int platformPlayTimeout = 60000;
+ private int platformPlayTimeout = 20000;
- private Boolean interfaceAuthentication = Boolean.FALSE;
+ private Boolean interfaceAuthentication = Boolean.TRUE;
- private Boolean recordPushLive = Boolean.FALSE;
+ private Boolean recordPushLive = Boolean.TRUE;
- private Boolean recordSip = Boolean.FALSE;
+ private Boolean recordSip = Boolean.TRUE;
- private Boolean logInDatebase = Boolean.TRUE;
+ private Boolean logInDatabase = Boolean.TRUE;
private Boolean usePushingAsStatus = Boolean.TRUE;
@@ -44,8 +43,6 @@
private Boolean pushAuthority = Boolean.TRUE;
- private Boolean gbSendStreamStrict = Boolean.FALSE;
-
private Boolean syncChannelOnDeviceOnline = Boolean.FALSE;
private Boolean sipLog = Boolean.FALSE;
@@ -54,22 +51,24 @@
private Boolean refuseChannelStatusChannelFormNotify = Boolean.FALSE;
- private Boolean deviceStatusNotify = Boolean.FALSE;
+ private Boolean deviceStatusNotify = Boolean.TRUE;
private Boolean useCustomSsrcForParentInvite = Boolean.TRUE;
private String serverId = "000000";
- private String recordPath = null;
-
private String thirdPartyGBIdReg = "[\\s\\S]*";
-
+ 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;
@@ -131,12 +130,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() {
@@ -203,14 +202,6 @@
this.pushAuthority = pushAuthority;
}
- public Boolean getGbSendStreamStrict() {
- return gbSendStreamStrict;
- }
-
- public void setGbSendStreamStrict(Boolean gbSendStreamStrict) {
- this.gbSendStreamStrict = gbSendStreamStrict;
- }
-
public Boolean getSyncChannelOnDeviceOnline() {
return syncChannelOnDeviceOnline;
}
@@ -259,14 +250,6 @@
this.refuseChannelStatusChannelFormNotify = refuseChannelStatusChannelFormNotify;
}
- public String getRecordPath() {
- return recordPath;
- }
-
- public void setRecordPath(String recordPath) {
- this.recordPath = recordPath;
- }
-
public int getMaxNotifyCountQueue() {
return maxNotifyCountQueue;
}
@@ -299,9 +282,27 @@
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