Merge branch 'wvp-28181-2.0' into wvp-pro-record

648540858

2022-03-03 14174ff40022a1f7662759d478d06b7b350ccd98

 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;

@@ -791,4 +794,12 @@
    public void setShellPhell(String shellPhell) {
        this.shellPhell = shellPhell;
    }

    public int getHookAliveInterval() {
        return hookAliveInterval;
    }

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