From c27e345edc6a92f485c1ef722ccaaa8ec6cbf5bf Mon Sep 17 00:00:00 2001
From: che_shuai <che_shuai@massclouds>
Date: 星期四, 13 七月 2023 10:22:42 +0800
Subject: [PATCH] 修复多级级联平台平台时，上级平台无法获取设备录像列表问题。问题详见 https://github.com/648540858/wvp-GB28181-pro/issues/914
---
src/main/java/com/genersoft/iot/vmp/conf/UserSetting.java | 33 +++++++++++++++++++++++++++------
1 files changed, 27 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 f508de7..55bf371 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;
@@ -26,11 +25,11 @@
private int platformPlayTimeout = 60000;
- 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;
@@ -63,13 +62,17 @@
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;
@@ -299,9 +302,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