Merge branch '2.6.8' into wvp-28181-2.0

648540858

2023-07-03 43ef195543c087d88ac3eea98067b81d7e2b10c2

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

@@ -385,8 +385,10 @@
                        }

                        GbStream gbStream = storager.getGbStream(param.getApp(), param.getStream());

                        if (gbStream != null) {

                            if (userSetting.isUsePushingAsStatus()) {

                            eventPublisher.catalogEventPublishForStream(null, gbStream, param.isRegist()?CatalogEvent.ON:CatalogEvent.OFF);

                        }

                        }

                        if (type != null) {

                            // 发送流变化redis消息

                            JSONObject jsonObject = new JSONObject();