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

mec-im/src/main/java/com/ym/service/Impl/LiveRoomServiceImpl.java

@@ -342,7 +342,8 @@ public class LiveRoomServiceImpl implements LiveRoomService {
         ImLiveRoomVideo imLiveRoomVideo = initImLiveRoomVideo(roomId, event.getTaskId(), DateTime.now().toDate());
         imLiveRoomVideo.setStartTime(new DateTime(startTime).toDate());
         imLiveRoomVideo.setEndTime(new DateTime(event.getEndTime() * 1000L).toDate());
-        imLiveRoomVideo.setUrl(event.getVideoUrl());
+        // 强制替换http为https
+        imLiveRoomVideo.setUrl(event.getVideoUrl().replace("http://", "https://"));
         imLiveRoomVideo.setType(2);
 
         // 回放记录已存在，直接忽略