From 1de344674afd6bb35b51b165bbad76dbe6299b7e Mon Sep 17 00:00:00 2001 From: 648540858 <648540858@qq.com> Date: 星期四, 28 三月 2024 18:08:33 +0800 Subject: [PATCH] 使用冒号分隔redis的key --- src/main/java/com/genersoft/iot/vmp/conf/UserSetting.java | 48 +++++++++++++++++++----------------------------- 1 files changed, 19 insertions(+), 29 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 515f3e7..a9f5c88 100644 --- a/src/main/java/com/genersoft/iot/vmp/conf/UserSetting.java +++ b/src/main/java/com/genersoft/iot/vmp/conf/UserSetting.java @@ -1,7 +1,7 @@ package com.genersoft.iot.vmp.conf; -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; @@ -23,7 +23,7 @@ private Integer playTimeout = 18000; - private int platformPlayTimeout = 60000; + private int platformPlayTimeout = 20000; private Boolean interfaceAuthentication = Boolean.TRUE; @@ -31,9 +31,9 @@ private Boolean recordSip = Boolean.TRUE; - private Boolean logInDatebase = Boolean.TRUE; + private Boolean logInDatabase = Boolean.TRUE; - private Boolean usePushingAsStatus = Boolean.TRUE; + private Boolean usePushingAsStatus = Boolean.FALSE; private Boolean useSourceIpAsStreamIp = Boolean.FALSE; @@ -43,8 +43,6 @@ private Boolean pushAuthority = Boolean.TRUE; - private Boolean gbSendStreamStrict = Boolean.FALSE; - private Boolean syncChannelOnDeviceOnline = Boolean.FALSE; private Boolean sipLog = Boolean.FALSE; @@ -53,14 +51,14 @@ private Boolean refuseChannelStatusChannelFormNotify = Boolean.FALSE; - private Boolean deviceStatusNotify = Boolean.FALSE; + private Boolean deviceStatusNotify = Boolean.TRUE; private Boolean useCustomSsrcForParentInvite = Boolean.TRUE; private String serverId = "000000"; - private String recordPath = null; - private String thirdPartyGBIdReg = "[\\s\\S]*"; + + private String broadcastForPlatform = "UDP"; private String civilCodeFile = "classpath:civilCode.csv"; @@ -134,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() { @@ -206,20 +204,20 @@ this.pushAuthority = pushAuthority; } - public Boolean getGbSendStreamStrict() { - return gbSendStreamStrict; - } - - public void setGbSendStreamStrict(Boolean gbSendStreamStrict) { - this.gbSendStreamStrict = gbSendStreamStrict; - } - public Boolean getSyncChannelOnDeviceOnline() { return syncChannelOnDeviceOnline; } public void setSyncChannelOnDeviceOnline(Boolean syncChannelOnDeviceOnline) { this.syncChannelOnDeviceOnline = syncChannelOnDeviceOnline; + } + + public String getBroadcastForPlatform() { + return broadcastForPlatform; + } + + public void setBroadcastForPlatform(String broadcastForPlatform) { + this.broadcastForPlatform = broadcastForPlatform; } public Boolean getSipUseSourceIpAsRemoteAddress() { @@ -260,14 +258,6 @@ public void setRefuseChannelStatusChannelFormNotify(Boolean refuseChannelStatusChannelFormNotify) { this.refuseChannelStatusChannelFormNotify = refuseChannelStatusChannelFormNotify; - } - - public String getRecordPath() { - return recordPath; - } - - public void setRecordPath(String recordPath) { - this.recordPath = recordPath; } public int getMaxNotifyCountQueue() { -- Gitblit v1.8.0