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

mec-im/src/main/java/com/ym/job/ScheduleManager.java

@@ -86,8 +86,8 @@ public class ScheduleManager implements SchedulingConfigurer {
             @Override
             public void run() {
                 ScheduledTask task = roomCacheTasks.remove(roomId);
-                task.cancel();
                 roomService.destroyRoom(roomId);
+                task.cancel();
             }
         }, roomProperties.getRoomTtl() * 10, roomProperties.getRoomTtl(), null));
         roomCacheTasks.put(roomId, task);

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

@@ -118,8 +118,8 @@ public class RoomServiceImpl implements RoomService {
                 log.error("joinRoom IM error: roomId={}, {}", roomId, resultInfo.getErrorMessage());
                 throw new ApiException(ErrorEnum.ERR_CREATE_ROOM_ERROR, resultInfo.getErrorMessage());
             } else {
-                destroyRoom(roomId);
-//                scheduleManager.addExpiredTask(this, roomId);
+//                destroyRoom(roomId);
+                scheduleManager.addExpiredTask(this, roomId);
             }
         } else {
             display = roomList.get(0).getDisplay();