Merge branch 'feature/0414-trtc' into master_saas

mec-im/src/main/java/com/ym/dao/RoomDao.java

@@ -18,7 +18,7 @@ import java.util.List;
 public interface RoomDao extends JpaRepository<Room, Long> {
     Room findByRid(String rid);
 
-    @Query(value = "select * from rongyun_room where rid=?1 FOR UPDATE", nativeQuery = true)
+    @Query(value = "select * from rongyun_room where rid=?1", nativeQuery = true)
     Room findByLockRid(String rid);
 
     @Modifying

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

@@ -562,6 +562,7 @@ public class RoomServiceImpl implements RoomService {
         }
         Date curTime = DateTimeUtils.currentUTC();
         Room room = roomDao.findByRid(roomId);
+        log.info("joinRoomSuccess: roomId={}, userId={}, roleEnum={}, room={}", roomId, userId, roleEnum.name(), Objects.isNull(room));
         if (room == null) {
             saveRoom(roomId, roomId, curTime, display);
             this.joinImGroup(roomId, schedule.getActualTeacherId(), schedule);
@@ -2438,8 +2439,8 @@ public class RoomServiceImpl implements RoomService {
 
         RoomMember roomMember = roomMemberDao.findByRidAndUid(roomId, senderId);
 
-        String roomServiceProviter = getRoomServiceProvider(roomId);
-        if (TencentCloudRTCPlugin.PLUGIN_NAME.equals(roomServiceProviter)) {
+        String roomServiceProvider = getRoomServiceProvider(roomId);
+        if (TencentCloudRTCPlugin.PLUGIN_NAME.equals(roomServiceProvider)) {
 
             sendDisplayMessage(display, roomMember);
         } else {

mec-im/src/test/resources/application.yml

@@ -0,0 +1,5 @@
+
+# JPA配置
+spring:
+  jpa:
+    show-sql: true