Merge branch '648540858:wvp-28181-2.0' into wvp-28181-2.0

mrjackwang

2022-08-06 28df05e261c0d63050d0bd938b7a6a2c2938b8e9

 src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMServerConfig.java

@@ -65,6 +65,9 @@
    @JSONField(name = "hook.admin_params")
    private String hookAdminParams;

    @JSONField(name = "hook.alive_interval")
    private int hookAliveInterval;

    @JSONField(name = "hook.enable")
    private String hookEnable;

@@ -190,6 +193,9 @@

    @JSONField(name = "rtp_proxy.port")
    private int rtpProxyPort;

    @JSONField(name = "rtp_proxy.port_range")
    private String portRange;

    @JSONField(name = "rtp_proxy.timeoutSec")
    private String rtpProxyTimeoutSec;
@@ -791,4 +797,20 @@
    public void setShellPhell(String shellPhell) {
        this.shellPhell = shellPhell;
    }

    public int getHookAliveInterval() {
        return hookAliveInterval;
    }

    public void setHookAliveInterval(int hookAliveInterval) {
        this.hookAliveInterval = hookAliveInterval;
    }

    public String getPortRange() {
        return portRange;
    }

    public void setPortRange(String portRange) {
        this.portRange = portRange;
    }
}