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

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

@@ -209,10 +209,10 @@ public class StudentRegistrationServiceImpl extends BaseServiceImpl<Long, Studen
     @Override
     @Transactional(rollbackFor = Exception.class)
     public Integer batchUpdateSubject(Integer userId, Integer subId, String musicGroupId) throws Exception {
-        SysUser sysUser = sysUserFeignService.queryUserInfo();
-        if (sysUser == null) {
-            throw new BizException("获取用户信息失败");
-        }
+//        SysUser sysUser = sysUserFeignService.queryUserInfo();
+//        if (sysUser == null) {
+//            throw new BizException("获取用户信息失败");
+//        }
         //获取当前学员的当前声部
         StudentRegistration studentRegistration = studentRegistrationDao.queryByUserIdAndMusicGroupId(userId, musicGroupId);
         if (studentRegistration == null) {

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

@@ -172,6 +172,7 @@ public class LiveRoomServiceImpl implements LiveRoomService {
                         //保存切片
                         ImLiveRoomVideo imLiveRoomVideo = initImLiveRoomVideo(roomId, recordNotify.getRecordId(), now);
                         imLiveRoomVideo.setStartTime(video.getEndTime());
+                        imLiveRoomVideo.setEndTime(now);
                         imLiveRoomVideo.setUrl(fileUrl);
                         imLiveRoomVideo.setType(2);
                         imLiveRoomVideoService.save(imLiveRoomVideo);

mec-student/src/main/resources/logback-spring.xml

@@ -43,7 +43,7 @@
 		</encoder>
 	</appender>
 
-	<logger name="com.ym.mec" level="INFO" />
+	<logger name="com.ym.mec" level="WARN" />
 
 	<logger name="com.ym.mec.thirdparty" level="INFO"
 			additivity="false">