From dd4e0d0d9c75b5216b08644bfe1333a79f794b58 Mon Sep 17 00:00:00 2001
From: hexq <hexiaoqu@visioninsight.com>
Date: 星期六, 20 一月 2024 10:22:34 +0800
Subject: [PATCH] BUGFIX：向下级目录关联通道时，出现“未查询到目录xxx的信息"
---
src/main/java/com/genersoft/iot/vmp/conf/UserSetting.java | 65 ++++++++++++++++----------------
1 files changed, 33 insertions(+), 32 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..63fdcda 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;
@@ -43,8 +42,6 @@
private Boolean streamOnDemand = Boolean.TRUE;
private Boolean pushAuthority = Boolean.TRUE;
-
- private Boolean gbSendStreamStrict = Boolean.FALSE;
private Boolean syncChannelOnDeviceOnline = Boolean.FALSE;
@@ -59,17 +56,19 @@
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