Merge branch 'refs/heads/master' into develop-add-api-key

leesam

2024-04-10 16b7e4a7ef473a6af29ec78aeb2f471fa398efdd

 src/main/java/com/genersoft/iot/vmp/vmanager/ps/PsController.java

@@ -224,7 +224,7 @@
        param.put("src_port", sendInfo.getSendLocalPort());


        Boolean streamReady = zlmServerFactory.isStreamReady(mediaServerItem, app, stream);
        Boolean streamReady = mediaServerService.isStreamReady(mediaServerItem, app, stream);
        if (streamReady) {
            JSONObject jsonObject = zlmServerFactory.startSendRtpStream(mediaServerItem, param);
            if (jsonObject.getInteger("code") == 0) {