From b15e559eae82db811b31f1e3c47e3be027f20e27 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期一, 08 一月 2024 16:18:28 +0800
Subject: [PATCH] Merge branch '2.6.9' into wvp-28181-2.0
---
src/main/java/com/genersoft/iot/vmp/conf/UserSetting.java | 187 +++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 173 insertions(+), 14 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 d28ddeb..0d11df8 100644
--- a/src/main/java/com/genersoft/iot/vmp/conf/UserSetting.java
+++ b/src/main/java/com/genersoft/iot/vmp/conf/UserSetting.java
@@ -1,6 +1,7 @@
package com.genersoft.iot.vmp.conf;
import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.core.annotation.Order;
import org.springframework.stereotype.Component;
import java.util.ArrayList;
@@ -11,6 +12,7 @@
*/
@Component
@ConfigurationProperties(prefix = "user-settings", ignoreInvalidFields = true)
+@Order(0)
public class UserSetting {
private Boolean savePositionHistory = Boolean.FALSE;
@@ -29,15 +31,44 @@
private Boolean recordSip = Boolean.TRUE;
- private Boolean logInDatebase = Boolean.TRUE;
+ private Boolean logInDatabase = Boolean.TRUE;
- private Boolean redisConfig = Boolean.TRUE;
+ private Boolean usePushingAsStatus = Boolean.TRUE;
+
+ private Boolean useSourceIpAsStreamIp = Boolean.FALSE;
+
+ private Boolean sipUseSourceIpAsRemoteAddress = Boolean.FALSE;
+
+ private Boolean streamOnDemand = Boolean.TRUE;
+
+ private Boolean pushAuthority = Boolean.TRUE;
+
+ private Boolean syncChannelOnDeviceOnline = Boolean.FALSE;
+
+ private Boolean sipLog = Boolean.FALSE;
+ private Boolean sqlLog = Boolean.FALSE;
+ private Boolean sendToPlatformsWhenIdLost = Boolean.FALSE;
+
+ private Boolean refuseChannelStatusChannelFormNotify = Boolean.FALSE;
+
+ private Boolean deviceStatusNotify = Boolean.FALSE;
+ private Boolean useCustomSsrcForParentInvite = Boolean.TRUE;
private String serverId = "000000";
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;
@@ -99,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() {
@@ -123,14 +154,6 @@
this.thirdPartyGBIdReg = thirdPartyGBIdReg;
}
- public Boolean getRedisConfig() {
- return redisConfig;
- }
-
- public void setRedisConfig(Boolean redisConfig) {
- this.redisConfig = redisConfig;
- }
-
public Boolean getRecordSip() {
return recordSip;
}
@@ -146,4 +169,140 @@
public void setPlatformPlayTimeout(int platformPlayTimeout) {
this.platformPlayTimeout = platformPlayTimeout;
}
+
+ public Boolean isUsePushingAsStatus() {
+ return usePushingAsStatus;
+ }
+
+ public void setUsePushingAsStatus(Boolean usePushingAsStatus) {
+ this.usePushingAsStatus = usePushingAsStatus;
+ }
+
+ public Boolean getStreamOnDemand() {
+ return streamOnDemand;
+ }
+
+ public void setStreamOnDemand(Boolean streamOnDemand) {
+ this.streamOnDemand = streamOnDemand;
+ }
+
+ public Boolean getUseSourceIpAsStreamIp() {
+ return useSourceIpAsStreamIp;
+ }
+
+ public void setUseSourceIpAsStreamIp(Boolean useSourceIpAsStreamIp) {
+ this.useSourceIpAsStreamIp = useSourceIpAsStreamIp;
+ }
+
+ public Boolean getPushAuthority() {
+ return pushAuthority;
+ }
+
+ public void setPushAuthority(Boolean pushAuthority) {
+ this.pushAuthority = pushAuthority;
+ }
+
+ public Boolean getSyncChannelOnDeviceOnline() {
+ return syncChannelOnDeviceOnline;
+ }
+
+ public void setSyncChannelOnDeviceOnline(Boolean syncChannelOnDeviceOnline) {
+ this.syncChannelOnDeviceOnline = syncChannelOnDeviceOnline;
+ }
+
+ public Boolean getSipUseSourceIpAsRemoteAddress() {
+ return sipUseSourceIpAsRemoteAddress;
+ }
+
+ public void setSipUseSourceIpAsRemoteAddress(Boolean sipUseSourceIpAsRemoteAddress) {
+ this.sipUseSourceIpAsRemoteAddress = sipUseSourceIpAsRemoteAddress;
+ }
+
+ public Boolean getSipLog() {
+ return sipLog;
+ }
+
+ public void setSipLog(Boolean sipLog) {
+ this.sipLog = sipLog;
+ }
+
+ public List<String> getAllowedOrigins() {
+ return allowedOrigins;
+ }
+
+ 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;
+ }
+
+ public int getMaxNotifyCountQueue() {
+ return maxNotifyCountQueue;
+ }
+
+ public void setMaxNotifyCountQueue(int maxNotifyCountQueue) {
+ this.maxNotifyCountQueue = maxNotifyCountQueue;
+ }
+
+ public Boolean getDeviceStatusNotify() {
+ return deviceStatusNotify;
+ }
+
+ public void setDeviceStatusNotify(Boolean deviceStatusNotify) {
+ this.deviceStatusNotify = deviceStatusNotify;
+ }
+
+ public Boolean getUseCustomSsrcForParentInvite() {
+ return useCustomSsrcForParentInvite;
+ }
+
+ public void setUseCustomSsrcForParentInvite(Boolean useCustomSsrcForParentInvite) {
+ this.useCustomSsrcForParentInvite = useCustomSsrcForParentInvite;
+ }
+
+ public Boolean getSqlLog() {
+ return sqlLog;
+ }
+
+ public void setSqlLog(Boolean sqlLog) {
+ 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