去除调试日志日志

648540858

2024-06-13 4ad711f61a1a760a0f8f7f8475b75ec93e31d8ae

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

@@ -29,6 +29,7 @@
import com.genersoft.iot.vmp.storager.IRedisCatchStorage;

import com.genersoft.iot.vmp.storager.IVideoManagerStorage;

import com.genersoft.iot.vmp.utils.DateUtil;

import com.genersoft.iot.vmp.utils.MediaServerUtils;

import com.genersoft.iot.vmp.vmanager.bean.ErrorCode;

import com.genersoft.iot.vmp.vmanager.bean.OtherPsSendInfo;

import com.genersoft.iot.vmp.vmanager.bean.OtherRtpSendInfo;

@@ -47,7 +48,6 @@
import javax.sip.InvalidArgumentException;

import javax.sip.SipException;

import java.text.ParseException;

import java.util.HashMap;

import java.util.List;

import java.util.Map;

import java.util.UUID;

@@ -179,7 +179,7 @@
            }

        });

        if (!"rtp".equals(param.getApp())) {

            Map<String, String> paramMap = urlParamToMap(param.getParams());

            Map<String, String> paramMap = MediaServerUtils.urlParamToMap(param.getParams());

            StreamAuthorityInfo streamAuthorityInfo = redisCatchStorage.getStreamAuthorityInfo(param.getApp(), param.getStream());

            if (streamAuthorityInfo != null && streamAuthorityInfo.getCallId() != null && !streamAuthorityInfo.getCallId().equals(paramMap.get("callId"))) {

                return new HookResult(401, "Unauthorized");

@@ -220,7 +220,7 @@
                    logger.info("推流鉴权失败： 缺少必要参数：sign=md5(user表的pushKey)");

                    return new HookResultForOnPublish(401, "Unauthorized");

                }

                Map<String, String> paramMap = urlParamToMap(param.getParams());

                Map<String, String> paramMap = MediaServerUtils.urlParamToMap(param.getParams());

                String sign = paramMap.get("sign");

                if (sign == null) {

                    logger.info("推流鉴权失败： 缺少必要参数：sign=md5(user表的pushKey)");

@@ -351,6 +351,11 @@
                logger.info("[ZLM HOOK] 流变化未找到ZLM, {}", param.getMediaServerId());

                return;

            }

            if (!ObjectUtils.isEmpty(mediaInfo.getTranscodeSuffix())

                    && !"null".equalsIgnoreCase(mediaInfo.getTranscodeSuffix())

                    && param.getStream().endsWith(mediaInfo.getTranscodeSuffix())  ) {

                return;

            }

            if (subscribe != null) {

                subscribe.response(mediaInfo, param);

            }

@@ -452,15 +457,12 @@
                    if (!"rtp".equals(param.getApp())) {

                        String type = OriginType.values()[param.getOriginType()].getType();

                        if (param.isRegist()) {

                            StreamAuthorityInfo streamAuthorityInfo = redisCatchStorage.getStreamAuthorityInfo(

                                    param.getApp(), param.getStream());

                            String callId = null;

                            if (streamAuthorityInfo != null) {

                                callId = streamAuthorityInfo.getCallId();

                            }

                            Map<String, String> params = MediaServerUtils.urlParamToMap(param.getParams());

                            param.setParamMap(params);

                            StreamInfo streamInfoByAppAndStream = mediaService.getStreamInfoByAppAndStream(mediaInfo,

                                    param.getApp(), param.getStream(), tracks, callId);

                                    param.getApp(), param.getStream(), tracks, params.get("callId"));

                            param.setStreamInfo(new StreamContent(streamInfoByAppAndStream));



                            redisCatchStorage.addStream(mediaInfo, type, param.getApp(), param.getStream(), param);

                            if (param.getOriginType() == OriginType.RTSP_PUSH.ordinal()

                                    || param.getOriginType() == OriginType.RTMP_PUSH.ordinal()

@@ -563,6 +565,19 @@


        logger.info("[ZLM HOOK]流无人观看：{}->{}->{}/{}", param.getMediaServerId(), param.getSchema(),

                param.getApp(), param.getStream());



        MediaServerItem mediaInfo = mediaServerService.getOne(param.getMediaServerId());

        if (mediaInfo == null) {

            JSONObject ret = new JSONObject();

            ret.put("code", 0);

            return ret;

        }

        if (!ObjectUtils.isEmpty(mediaInfo.getTranscodeSuffix())

                && !"null".equalsIgnoreCase(mediaInfo.getTranscodeSuffix())

                && param.getStream().endsWith(mediaInfo.getTranscodeSuffix())  ) {

            param.setStream(param.getStream().substring(0, param.getStream().lastIndexOf(mediaInfo.getTranscodeSuffix()) -1 ));

        }



        JSONObject ret = new JSONObject();

        ret.put("code", 0);

        // 国标类型的流

@@ -880,23 +895,5 @@
        });



        return HookResult.SUCCESS();

    }



    private Map<String, String> urlParamToMap(String params) {

        HashMap<String, String> map = new HashMap<>();

        if (ObjectUtils.isEmpty(params)) {

            return map;

        }

        String[] paramsArray = params.split("&");

        if (paramsArray.length == 0) {

            return map;

        }

        for (String param : paramsArray) {

            String[] paramArray = param.split("=");

            if (paramArray.length == 2) {

                map.put(paramArray[0], paramArray[1]);

            }

        }

        return map;

    }

}