Merge remote-tracking branch 'origin/master'

Administrator

2023-08-18 fc45913412a310d2855dcd80dfc560acf965559d

Merge remote-tracking branch 'origin/master'

 ard-work/src/main/java/com/ruoyi/media/service/impl/MediaService.java

@@ -264,7 +264,7 @@
            String rtspUrl = "rtsp://" + mediamtxHost + ":7554/" + name;
            info.setRtspUrl(rtspUrl);
            Source source = item.getSource();
            if (source.getId().equals("")) {
            if (source==null||source.getId().equals("")) {
                //会话ID
                info.setId("0");
                //上行流量