同步主线的代码，保持一致性

‘sxh’

2023-06-15 ccc0a99d6894844d83d751b924cfebe74da7826c

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

@@ -191,13 +191,13 @@
            if (userSetting.getPushAuthority()) {

                // 推流鉴权

                if (param.getParams() == null) {

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

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

                    return new HookResultForOnPublish(401, "Unauthorized");

                }

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

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

                if (sign == null) {

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

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

                    return new HookResultForOnPublish(401, "Unauthorized");

                }

                // 推流自定义播放鉴权码

@@ -345,10 +345,19 @@
                }



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

                    InviteInfo inviteInfo = inviteStreamService.getInviteInfoByStream(null, param.getStream());

                    if (inviteInfo != null && (inviteInfo.getType() == InviteSessionType.PLAY || inviteInfo.getType() == InviteSessionType.PLAYBACK)) {

                        inviteStreamService.removeInviteInfo(inviteInfo);

                        storager.stopPlay(inviteInfo.getDeviceId(), inviteInfo.getChannelId());

                    if(param.getStream().split("_").length == 3){

                        boolean isSubStream = "sub".equals(param.getStream().split("_")[0]);

                        InviteInfo inviteInfo = inviteStreamService.getInviteInfoByStream(null, param.getStream(), isSubStream);

                        if(inviteInfo != null && (inviteInfo.getType() == InviteSessionType.PLAY )){

                            inviteStreamService.removeInviteInfo(inviteInfo.getType(),inviteInfo.getDeviceId(),

                                    inviteInfo.getChannelId(),inviteInfo.isSubStream(),inviteInfo.getStream());

                        }

                    }else {

                        InviteInfo inviteInfo = inviteStreamService.getInviteInfoByStream(null, param.getStream());

                        if (inviteInfo != null && (inviteInfo.getType() == InviteSessionType.PLAY || inviteInfo.getType() == InviteSessionType.PLAYBACK)) {

                            inviteStreamService.removeInviteInfo(inviteInfo);

                            storager.stopPlay(inviteInfo.getDeviceId(), inviteInfo.getChannelId());

                        }

                    }

                } else {

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

@@ -476,7 +485,16 @@
                Device device = deviceService.getDevice(inviteInfo.getDeviceId());

                if (device != null) {

                    try {

                        if (inviteStreamService.getInviteInfo(inviteInfo.getType(), inviteInfo.getDeviceId(), inviteInfo.getChannelId(), inviteInfo.getStream()) != null) {

                        InviteInfo info = null;

                        if(device.isSwitchPrimarySubStream()){

                            boolean isSubStream = "sub".equals(param.getStream().split("_")[0]);

                            info = inviteStreamService.getInviteInfo(inviteInfo.getType(), inviteInfo.getDeviceId(), inviteInfo.getChannelId(),isSubStream, inviteInfo.getStream());

                        }else {

                            info = inviteStreamService.getInviteInfo(inviteInfo.getType(), inviteInfo.getDeviceId(), inviteInfo.getChannelId(), inviteInfo.getStream());



                        }



                        if (info != null) {

                            cmder.streamByeCmd(device, inviteInfo.getChannelId(),

                                    inviteInfo.getStream(), null);

                        }

@@ -486,9 +504,15 @@
                    }

                }



                inviteStreamService.removeInviteInfo(inviteInfo.getType(), inviteInfo.getDeviceId(),

                        inviteInfo.getChannelId(), inviteInfo.getStream());

                storager.stopPlay(inviteInfo.getDeviceId(), inviteInfo.getChannelId());

                if(device.isSwitchPrimarySubStream()){

                    boolean isSubStream = "sub".equals(param.getStream().split("_")[0]);

                    inviteStreamService.removeInviteInfo(inviteInfo.getType(), inviteInfo.getDeviceId(),

                            inviteInfo.getChannelId(),isSubStream, inviteInfo.getStream());

                }else {

                    inviteStreamService.removeInviteInfo(inviteInfo.getType(), inviteInfo.getDeviceId(),

                            inviteInfo.getChannelId(), inviteInfo.getStream());

                    storager.stopPlay(inviteInfo.getDeviceId(), inviteInfo.getChannelId());

                }

                return ret;

            }

        } else {

@@ -496,13 +520,13 @@
            // 拉流代理

            StreamProxyItem streamProxyItem = streamProxyService.getStreamProxyByAppAndStream(param.getApp(), param.getStream());

            if (streamProxyItem != null) {

                if (streamProxyItem.isEnable_remove_none_reader()) {

                if (streamProxyItem.isEnableDisableNoneReader()) {

                    // 无人观看自动移除

                    ret.put("close", true);

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

                    String url = streamProxyItem.getUrl() != null ? streamProxyItem.getUrl() : streamProxyItem.getSrc_url();

                    String url = streamProxyItem.getUrl() != null ? streamProxyItem.getUrl() : streamProxyItem.getSrcUrl();

                    logger.info("[{}/{}]<-[{}] 拉流代理无人观看已经移除", param.getApp(), param.getStream(), url);

                } else if (streamProxyItem.isEnable_disable_none_reader()) {

                } else if (streamProxyItem.isEnableDisableNoneReader()) {

                    // 无人观看停用

                    ret.put("close", true);

                    // 修改数据

@@ -541,12 +565,26 @@


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

            String[] s = param.getStream().split("_");

            if (!mediaInfo.isRtpEnable() || s.length != 2) {

            if (!mediaInfo.isRtpEnable() ) {

                defaultResult.setResult(HookResult.SUCCESS());

                return defaultResult;

            }else if(s.length != 2 && s.length != 3 ){

                defaultResult.setResult(HookResult.SUCCESS());

                return defaultResult;

            }

            String deviceId = s[0];

            String channelId = s[1];

            String deviceId = null;

            String channelId = null;

            boolean isSubStream = false;

            if (s[0].length() < 20) {

                if ("sub".equals(s[0])) {

                    isSubStream = true;

                }

                deviceId = s[1];

                channelId = s[2];

            } else {

                deviceId = s[0];

                channelId = s[1];

            }

            Device device = redisCatchStorage.getDevice(deviceId);

            if (device == null) {

                defaultResult.setResult(new HookResult(ErrorCode.ERROR404.getCode(), ErrorCode.ERROR404.getMsg()));

@@ -560,7 +598,7 @@
            logger.info("[ZLM HOOK] 流未找到, 发起自动点播：{}->{}->{}/{}", param.getMediaServerId(), param.getSchema(), param.getApp(), param.getStream());



            RequestMessage msg = new RequestMessage();

            String key = DeferredResultHolder.CALLBACK_CMD_PLAY + deviceId + channelId;

            String key = DeferredResultHolder.getPlayKey(deviceId, channelId, device.isSwitchPrimarySubStream(), isSubStream);

            boolean exist = resultHolder.exist(key, null);

            msg.setKey(key);

            String uuid = UUID.randomUUID().toString();

@@ -578,7 +616,7 @@
            resultHolder.put(key, uuid, result);



            if (!exist) {

                playService.play(mediaInfo, deviceId, channelId, (code, message, data) -> {

                playService.play(mediaInfo, deviceId, channelId,isSubStream, (code, message, data) -> {

                    msg.setData(new HookResult(code, message));

                    resultHolder.invokeResult(msg);

                });

@@ -587,7 +625,7 @@
        } else {

            // 拉流代理

            StreamProxyItem streamProxyByAppAndStream = streamProxyService.getStreamProxyByAppAndStream(param.getApp(), param.getStream());

            if (streamProxyByAppAndStream != null && streamProxyByAppAndStream.isEnable_disable_none_reader()) {

            if (streamProxyByAppAndStream != null && streamProxyByAppAndStream.isEnableDisableNoneReader()) {

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

            }

            DeferredResult<HookResult> result = new DeferredResult<>();