Merge remote-tracking branch 'upstream/master'

Lawrence

2020-12-16 b2fa4608a2e0abb3d744f4f91bd423380e45f9c4

 src/main/java/com/genersoft/iot/vmp/vmanager/play/PlayController.java

@@ -74,7 +74,7 @@
      resultHolder.put(DeferredResultHolder.CALLBACK_CMD_PlAY + uuid, result);

      if (streamInfo == null) {
         // TODO playStreamCmd 超时处理
         // 发送点播消息
         cmder.playStreamCmd(device, channelId, (JSONObject response) -> {
            logger.info("收到订阅消息： " + response.toJSONString());
            playService.onPublishHandlerForPlay(response, deviceId, channelId, uuid.toString());