Merge remote-tracking branch 'origin/master'

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

@@ -183,9 +183,6 @@ public class SysMessageServiceImpl extends BaseServiceImpl<Long, SysMessage> imp
 		if(StringUtils.isNotEmpty(url)){
 			content += url;
 		}
-		if(StringUtils.isNotEmpty(extra)){
-			content = content + " " + url;
-		}
 		ImPrivateMessage privateMessage = new ImPrivateMessage();
 		privateMessage.setObjectName("RC:TxtMsg");
 		privateMessage.setTargetId(targetIds);

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

@@ -257,6 +257,7 @@ public class RoomServiceImpl implements RoomService {
     public Boolean leaveRoom(String roomId) throws Exception {
         SysUser user = sysUserFeignService.queryUserInfo();
         String userId = user.getId().toString();
+        log.info("leaveRoom: roomId={}, userId={}", roomId,userId);
         Teacher teacher = teacherDao.get(user.getId());
         CourseSchedule courseSchedule = courseScheduleDao.get(Long.parseLong(roomId.substring(1)));
         try {