Merge branch 'ljc_20220706_mergeVideo' into master_saas

mec-biz/src/main/java/com/ym/mec/biz/service/impl/ImLiveBroadcastRoomServiceImpl.java

@@ -985,7 +985,7 @@ public class ImLiveBroadcastRoomServiceImpl extends ServiceImpl<ImLiveBroadcastR
         if (whetherVideoFlag && stateFlag) {
             try {
                 //停止录制视频
-                // imFeignService.stopRecord(roomSpeakerInfo.getRoomUid());
+                imFeignService.stopRecord(roomSpeakerInfo.getRoomUid());
             } catch (Exception e) {
                 log.error("stopRecord error: {}", e.getMessage());
             }

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

@@ -295,7 +295,7 @@ public class LiveRoomServiceImpl implements LiveRoomService {
     public String getRoomSessionId(String roomId) {
         RBucket<String> bucket = redissonClient.getBucket("sessionId:" + roomId);
         if (bucket.isExists()) {
-            // return bucket.get();
+            return bucket.get();
         }
         HttpURLConnection conn;
         JSONObject resultObject;