修复国标点播下级平台，ssrc更新的时单端口错误更新rtpserver的问题

648540858

2023-05-04 381c3bdc2079ece5147cf4cee004e9071edadf7a

 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;
@@ -19,7 +21,7 @@

    private Boolean seniorSdp = Boolean.FALSE;

    private Long playTimeout = 18000L;
    private Integer playTimeout = 18000;

    private int platformPlayTimeout = 60000;

@@ -31,13 +33,39 @@

    private Boolean logInDatebase = 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 gbSendStreamStrict = Boolean.FALSE;

    private Boolean syncChannelOnDeviceOnline = Boolean.FALSE;

    private Boolean sipLog = 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 recordPath = null;

    private String thirdPartyGBIdReg = "[\\s\\S]*";

    private List<String> interfaceAuthenticationExcludes = new ArrayList<>();

    private List<String> allowedOrigins = new ArrayList<>();

    private int maxNotifyCountQueue = 10000;

    public Boolean getSavePositionHistory() {
        return savePositionHistory;
@@ -55,7 +83,7 @@
        return seniorSdp;
    }

    public Long getPlayTimeout() {
    public Integer getPlayTimeout() {
        return playTimeout;
    }

@@ -83,7 +111,7 @@
        this.seniorSdp = seniorSdp;
    }

    public void setPlayTimeout(Long playTimeout) {
    public void setPlayTimeout(Integer playTimeout) {
        this.playTimeout = playTimeout;
    }

@@ -123,14 +151,6 @@
        this.thirdPartyGBIdReg = thirdPartyGBIdReg;
    }

    public Boolean getRedisConfig() {
        return redisConfig;
    }

    public void setRedisConfig(Boolean redisConfig) {
        this.redisConfig = redisConfig;
    }

    public Boolean getRecordSip() {
        return recordSip;
    }
@@ -146,4 +166,124 @@
    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 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 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 String getRecordPath() {
        return recordPath;
    }

    public void setRecordPath(String recordPath) {
        this.recordPath = recordPath;
    }

    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;
    }
}