From 5cd2e2c41b6460ea628b158e9f22b6788e99eee1 Mon Sep 17 00:00:00 2001
From: lishuyuan <lishuyuan@inspur.com>
Date: 星期三, 01 十一月 2023 15:17:28 +0800
Subject: [PATCH] bugfix：设备地址变化会引起目录订阅任务失效，需要重新添加
---
src/main/java/com/genersoft/iot/vmp/conf/UserSetting.java | 53 ++++++++++++++++++++++++++++++++---------------------
1 files changed, 32 insertions(+), 21 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..aaeff0a 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,13 +25,13 @@
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;
+ 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;
@@ -63,13 +60,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;
@@ -131,12 +132,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() {
@@ -201,14 +202,6 @@
public void setPushAuthority(Boolean pushAuthority) {
this.pushAuthority = pushAuthority;
- }
-
- public Boolean getGbSendStreamStrict() {
- return gbSendStreamStrict;
- }
-
- public void setGbSendStreamStrict(Boolean gbSendStreamStrict) {
- this.gbSendStreamStrict = gbSendStreamStrict;
}
public Boolean getSyncChannelOnDeviceOnline() {
@@ -299,9 +292,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