Merge remote-tracking branch 'origin/wvp-28181-2.0' into wvp-28181-2.0

648540858

2022-09-16 1ee56d50d871ed0adb2d3b39600653945e34bb23

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

@@ -104,7 +104,7 @@
        }, 60 * 1000 );
    }

    @Async
    @Async("taskExecutor")
    public void connectZlmServer(MediaServerItem mediaServerItem){
        String connectZlmServerTaskKey = "connect-zlm-" + mediaServerItem.getId();
        ZLMServerConfig zlmServerConfigFirst = getMediaServerConfig(mediaServerItem);