From d4fdd975cc760432b11f931a003174d435e5b5b0 Mon Sep 17 00:00:00 2001 From: 648540858 <648540858@qq.com> Date: 星期三, 16 八月 2023 17:20:45 +0800 Subject: [PATCH] 优化对讲释放流程 --- src/main/java/com/genersoft/iot/vmp/conf/UserSetting.java | 53 +++++++++++++++++++++++++++++++++++++---------------- 1 files changed, 37 insertions(+), 16 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..0993d74 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,15 +25,15 @@ 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 usePushingAsStatus = Boolean.TRUE; + private Boolean usePushingAsStatus = Boolean.FALSE; private Boolean useSourceIpAsStreamIp = Boolean.FALSE; @@ -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,19 @@ private String thirdPartyGBIdReg = "[\\s\\S]*"; + private String broadcastForPlatform = "UDP"; + 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; @@ -203,20 +206,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() { @@ -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