From ed08c7ef77b3466e8f388fe3ea3f6a94f324fa4e Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期三, 22 三月 2023 09:27:17 +0800
Subject: [PATCH] Merge pull request #785 from xiaoQQya/wvp-28181-2.0
---
src/main/java/com/genersoft/iot/vmp/conf/UserSetting.java | 34 +++++++++++++++++++++++++++++-----
1 files changed, 29 insertions(+), 5 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 be7d5af..d72d255 100644
--- a/src/main/java/com/genersoft/iot/vmp/conf/UserSetting.java
+++ b/src/main/java/com/genersoft/iot/vmp/conf/UserSetting.java
@@ -1,5 +1,6 @@
package com.genersoft.iot.vmp.conf;
+import org.junit.jupiter.api.Order;
import org.springframework.boot.context.properties.ConfigurationProperties;
import org.springframework.stereotype.Component;
@@ -11,6 +12,7 @@
*/
@Component
@ConfigurationProperties(prefix = "user-settings", ignoreInvalidFields = true)
+@Order(0)
public class UserSetting {
private Boolean savePositionHistory = Boolean.FALSE;
@@ -46,13 +48,17 @@
private Boolean syncChannelOnDeviceOnline = Boolean.FALSE;
private Boolean sipLog = Boolean.FALSE;
- private Boolean syncDb = Boolean.TRUE;
+ private Boolean sendToPlatformsWhenIdLost = Boolean.FALSE;
+
+ private Boolean refuseChannelStatusChannelFormNotify = Boolean.FALSE;
private String serverId = "000000";
private String thirdPartyGBIdReg = "[\\s\\S]*";
private List<String> interfaceAuthenticationExcludes = new ArrayList<>();
+
+ private List<String> allowedOrigins = new ArrayList<>();
public Boolean getSavePositionHistory() {
return savePositionHistory;
@@ -218,11 +224,29 @@
this.sipLog = sipLog;
}
- public Boolean getSyncDb() {
- return syncDb;
+ public List<String> getAllowedOrigins() {
+ return allowedOrigins;
}
- public void setSyncDb(Boolean syncDb) {
- this.syncDb = syncDb;
+ public void setAllowedOrigins(List<String> allowedOrigins) {
+ this.allowedOrigins = allowedOrigins;
}
+
+ public Boolean getSendToPlatformsWhenIdLost() {
+ return sendToPlatformsWhenIdLost;
+ }
+
+ public void setSendToPlatformsWhenIdLost(Boolean sendToPlatformsWhenIdLost) {
+ this.sendToPlatformsWhenIdLost = sendToPlatformsWhenIdLost;
+ }
+
+ public Boolean getRefuseChannelStatusChannelFormNotify() {
+ return refuseChannelStatusChannelFormNotify;
+ }
+
+ public void setRefuseChannelStatusChannelFormNotify(Boolean refuseChannelStatusChannelFormNotify) {
+ this.refuseChannelStatusChannelFormNotify = refuseChannelStatusChannelFormNotify;
+ }
+
+
}
--
Gitblit v1.8.0