Merge branch 'online1' of http://git.dayaedu.com/yonge/mec into online1

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

@@ -259,8 +259,12 @@ public class RoomServiceImpl implements RoomService {
         Room room = roomDao.findByRid(roomId);
         if (room == null) {
             //如果房间不存在，删除除了自己之外的其他用户
-            roomMemberDao.deleteRoomMember(roomId,userId);
-            saveRoom(roomId, roomId, curTime, display);
+//            roomMemberDao.deleteRoomMember(roomId,userId);
+            try {
+                saveRoom(roomId, roomId, curTime, display);
+            }catch (Exception e){
+                log.error("joinRoomSuccess saveRoom error: {}", e.getMessage());
+            }
             IMApiResultInfo resultInfo = imHelper.createGroup(new String[]{userId}, roomId, roomId);
             if (!resultInfo.isSuccess()) {
                 log.error("joinRoomSuccess createGroup error: roomId={}, {}", roomId, resultInfo.getErrorMessage());