增加强制不查询编码信息配置

648540858

2020-11-13 33b51c40ddd9750a19b2c6a6618fb22386f87cd7

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

@@ -13,6 +13,7 @@
import org.springframework.boot.CommandLineRunner;
import org.springframework.core.annotation.Order;
import org.springframework.stereotype.Component;
import org.springframework.util.StringUtils;

import java.io.IOException;
import java.io.UnsupportedEncodingException;
@@ -32,11 +33,17 @@
    @Value("${media.ip}")
    private String mediaIp;

    @Value("${media.wanIp}")
    private String mediaWanIp;

    @Value("${media.port}")
    private int mediaPort;

    @Value("${media.secret}")
    private String mediaSecret;

    @Value("${media.streamNoneReaderDelayMS}")
    private String streamNoneReaderDelayMS;

    @Value("${sip.ip}")
    private String sipIP;
@@ -54,9 +61,10 @@
        MediaServerConfig mediaServerConfig = getMediaServerConfig();
        if (mediaServerConfig != null) {
            logger.info("zlm接入成功...");
            storager.updateMediaInfo(mediaServerConfig);
            logger.info("设置zlm...");
            saveZLMConfig();
            mediaServerConfig = getMediaServerConfig();
            storager.updateMediaInfo(mediaServerConfig);

        }
    }
@@ -71,6 +79,7 @@
            if (data != null && data.size() > 0) {
                mediaServerConfig = JSON.parseObject(JSON.toJSONString(data.get(0)), MediaServerConfig.class);
                mediaServerConfig.setLocalIP(mediaIp);
                mediaServerConfig.setWanIp(StringUtils.isEmpty(mediaWanIp)? mediaIp: mediaWanIp);
            }
        } else {
            logger.error("getMediaServerConfig失败, 1s后重试");
@@ -79,7 +88,7 @@
            } catch (InterruptedException e) {
                e.printStackTrace();
            }
            getMediaServerConfig();
            mediaServerConfig = getMediaServerConfig();
        }
        return mediaServerConfig;
    }
@@ -95,6 +104,7 @@
        param.put("secret",mediaSecret);
        param.put("hook.enable","1");
        param.put("hook.on_flow_report","");
        param.put("hook.on_play","");
        param.put("hook.on_http_access","");
        param.put("hook.on_publish",String.format("%s/on_publish", hookPrex));
        param.put("hook.on_record_mp4","");
@@ -103,9 +113,11 @@
        param.put("hook.on_rtsp_realm","");
        param.put("hook.on_server_started",String.format("%s/on_server_started", hookPrex));
        param.put("hook.on_shell_login",String.format("%s/on_shell_login", hookPrex));
        param.put("hook.on_stream_changed",String.format("%s/on_stream_changed", hookPrex));
        param.put("hook.on_stream_none_reader",String.format("%s/on_stream_none_reader", hookPrex));
        param.put("hook.on_stream_not_found",String.format("%s/on_stream_not_found", hookPrex));
        param.put("hook.timeoutSec","20");
        param.put("general.streamNoneReaderDelayMS",streamNoneReaderDelayMS);

        JSONObject responseJSON = zlmresTfulUtils.setServerConfig(param);