Merge remote-tracking branch 'origin/master' into master

648540858

2020-11-09 2e9b4b4e5e86c84088c45563cd61d18d8c7e5fea

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

@@ -30,11 +30,6 @@
        param.put("stream_id", streamId);
        JSONObject jsonObject = zlmresTfulUtils.openRtpServer(param);
        if (jsonObject.getInteger("code") == 0) {
            System.out.println(11111111);
            System.out.println(streamId);
            System.out.println(ssrc);
            System.out.println(newPort);
            System.out.println(jsonObject.toJSONString());
            return newPort;
        } else {
            return getNewRTPPort(ssrc);