|  | @@ -84,7 +84,7 @@ public class RoomServiceImpl implements RoomService {
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |          log.info("joinRoom: roomId={}, userName={}, isAudience={}, isDisableCamera={}", roomId, userName, isAudience, isDisableCamera);
 | 
	
		
			
				|  |  |  //        String userId = getUser().getUserId().toString();
 | 
	
		
			
				|  |  | -        String userId = sysUserFeignService.queryUserInfo(token).getId().toString();
 | 
	
		
			
				|  |  | +        String userId = sysUserFeignService.queryUserInfo().getId().toString();
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |          String display = "";
 | 
	
		
			
				|  |  |          Date curTime = DateTimeUtils.currentUTC();
 | 
	
	
		
			
				|  | @@ -221,7 +221,7 @@ public class RoomServiceImpl implements RoomService {
 | 
	
		
			
				|  |  |      @Override
 | 
	
		
			
				|  |  |      public Boolean leaveRoom(String roomId) throws Exception {
 | 
	
		
			
				|  |  |          String token = SecurityUtils.getToken();
 | 
	
		
			
				|  |  | -        SysUser user = sysUserFeignService.queryUserInfo(token);
 | 
	
		
			
				|  |  | +        SysUser user = sysUserFeignService.queryUserInfo();
 | 
	
		
			
				|  |  |          String userId = user.getId().toString();
 | 
	
		
			
				|  |  |          
 | 
	
		
			
				|  |  |          CheckUtils.checkArgument(user != null, "user must't be null");
 | 
	
	
		
			
				|  | @@ -328,7 +328,7 @@ public class RoomServiceImpl implements RoomService {
 | 
	
		
			
				|  |  |          CheckUtils.checkArgument(roomId != null, "roomId must't be null");
 | 
	
		
			
				|  |  |          CheckUtils.checkArgument(users.size() > 0, "the changed user list must't be null");
 | 
	
		
			
				|  |  |          String token = SecurityUtils.getToken();
 | 
	
		
			
				|  |  | -        SysUser authUser = sysUserFeignService.queryUserInfo(token);
 | 
	
		
			
				|  |  | +        SysUser authUser = sysUserFeignService.queryUserInfo();
 | 
	
		
			
				|  |  |          String userId = authUser.getId().toString();
 | 
	
		
			
				|  |  |          List<Room> roomList = roomDao.findByRid(roomId);
 | 
	
		
			
				|  |  |          if (roomList.isEmpty()) {
 | 
	
	
		
			
				|  | @@ -378,7 +378,7 @@ public class RoomServiceImpl implements RoomService {
 | 
	
		
			
				|  |  |      @Override
 | 
	
		
			
				|  |  |      public Boolean kickMember(String roomId) throws ApiException, Exception {
 | 
	
		
			
				|  |  |          String token = SecurityUtils.getToken();
 | 
	
		
			
				|  |  | -        SysUser authUser = sysUserFeignService.queryUserInfo(token);
 | 
	
		
			
				|  |  | +        SysUser authUser = sysUserFeignService.queryUserInfo();
 | 
	
		
			
				|  |  |          String userId = authUser.getId().toString();
 | 
	
		
			
				|  |  |          CheckUtils.checkArgument(userId != null, "userId must't be null");
 | 
	
		
			
				|  |  |          CheckUtils.checkArgument(roomId != null, "roomId must't be null");
 | 
	
	
		
			
				|  | @@ -418,7 +418,7 @@ public class RoomServiceImpl implements RoomService {
 | 
	
		
			
				|  |  |      @Override
 | 
	
		
			
				|  |  |      public Boolean display(String roomId, int type, String uri) throws ApiException, Exception {
 | 
	
		
			
				|  |  |          String token = SecurityUtils.getToken();
 | 
	
		
			
				|  |  | -        SysUser authUser = sysUserFeignService.queryUserInfo(token);
 | 
	
		
			
				|  |  | +        SysUser authUser = sysUserFeignService.queryUserInfo();
 | 
	
		
			
				|  |  |          String userId = authUser.getId().toString();
 | 
	
		
			
				|  |  |          log.info("display in room: {}, type = {}, uri = {}", roomId, type, uri);
 | 
	
		
			
				|  |  |          CheckUtils.checkArgument(roomId != null, "roomId must't be null");
 | 
	
	
		
			
				|  | @@ -483,7 +483,7 @@ public class RoomServiceImpl implements RoomService {
 | 
	
		
			
				|  |  |          CheckUtils.checkArgument(roomId != null, "roomId must't be null");
 | 
	
		
			
				|  |  |          CheckUtils.checkArgument(roomDao.existsByRid(roomId), "room not exist");
 | 
	
		
			
				|  |  |          String token = SecurityUtils.getToken();
 | 
	
		
			
				|  |  | -        SysUser authUser = sysUserFeignService.queryUserInfo(token);
 | 
	
		
			
				|  |  | +        SysUser authUser = sysUserFeignService.queryUserInfo();
 | 
	
		
			
				|  |  |          String userId = authUser.getId().toString();
 | 
	
		
			
				|  |  |          CheckUtils.checkArgument(roomMemberDao.existsByRidAndUid(roomId, userId), "room member not exist");
 | 
	
		
			
				|  |  |  
 | 
	
	
		
			
				|  | @@ -527,7 +527,7 @@ public class RoomServiceImpl implements RoomService {
 | 
	
		
			
				|  |  |          CheckUtils.checkArgument(roomId != null, "roomId must't be null");
 | 
	
		
			
				|  |  |          CheckUtils.checkArgument(whiteBoardId != null, "whiteBoardId must't be null");
 | 
	
		
			
				|  |  |          String token = SecurityUtils.getToken();
 | 
	
		
			
				|  |  | -        SysUser authUser = sysUserFeignService.queryUserInfo(token);
 | 
	
		
			
				|  |  | +        SysUser authUser = sysUserFeignService.queryUserInfo();
 | 
	
		
			
				|  |  |          String userId = authUser.getId().toString();
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |          List<Whiteboard> whiteboardList = whiteboardDao.findByRidAndWbid(roomId, whiteBoardId);
 | 
	
	
		
			
				|  | @@ -584,7 +584,7 @@ public class RoomServiceImpl implements RoomService {
 | 
	
		
			
				|  |  |          CheckUtils.checkArgument(roomId != null, "roomId must't be null");
 | 
	
		
			
				|  |  |          CheckUtils.checkArgument(whiteBoardId != null, "whiteBoardId must't be null");
 | 
	
		
			
				|  |  |          String token = SecurityUtils.getToken();
 | 
	
		
			
				|  |  | -        SysUser authUser = sysUserFeignService.queryUserInfo(token);
 | 
	
		
			
				|  |  | +        SysUser authUser = sysUserFeignService.queryUserInfo();
 | 
	
		
			
				|  |  |          String userId = authUser.getId().toString();
 | 
	
		
			
				|  |  |          List<Room> roomList = roomDao.findByRid(roomId);
 | 
	
		
			
				|  |  |          CheckUtils.checkArgument(!roomList.isEmpty(), "room not exist");
 | 
	
	
		
			
				|  | @@ -604,7 +604,7 @@ public class RoomServiceImpl implements RoomService {
 | 
	
		
			
				|  |  |          CheckUtils.checkArgument(roomDao.existsByRid(roomId), "room not exist");
 | 
	
		
			
				|  |  |          CheckUtils.checkArgument(roomMemberDao.existsByRidAndUid(roomId, userId), "room member not exist");
 | 
	
		
			
				|  |  |          String token = SecurityUtils.getToken();
 | 
	
		
			
				|  |  | -        SysUser authUser = sysUserFeignService.queryUserInfo(token);
 | 
	
		
			
				|  |  | +        SysUser authUser = sysUserFeignService.queryUserInfo();
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |          log.info("controlDevice: userId={}, typeEnum={}, onOff={}", userId, typeEnum, enable);
 | 
	
		
			
				|  |  |  
 | 
	
	
		
			
				|  | @@ -645,7 +645,7 @@ public class RoomServiceImpl implements RoomService {
 | 
	
		
			
				|  |  |      public Boolean approveControlDevice(String roomId, String ticket) throws ApiException, Exception {
 | 
	
		
			
				|  |  |          CheckUtils.checkArgument(ticket != null, "ticket must't be null");
 | 
	
		
			
				|  |  |          String token = SecurityUtils.getToken();
 | 
	
		
			
				|  |  | -        SysUser authUser = sysUserFeignService.queryUserInfo(token);
 | 
	
		
			
				|  |  | +        SysUser authUser = sysUserFeignService.queryUserInfo();
 | 
	
		
			
				|  |  |          String userId = authUser.getId().toString();
 | 
	
		
			
				|  |  |          log.info("approveControlDevice: ticket={}", ticket);
 | 
	
		
			
				|  |  |          ControlDeviceTaskInfo taskInfo = (ControlDeviceTaskInfo) scheduleManager.executeTask(ticket);
 | 
	
	
		
			
				|  | @@ -670,7 +670,7 @@ public class RoomServiceImpl implements RoomService {
 | 
	
		
			
				|  |  |      public Boolean rejectControlDevice(String roomId, String ticket) throws ApiException, Exception {
 | 
	
		
			
				|  |  |          CheckUtils.checkArgument(ticket != null, "ticket must't be null");
 | 
	
		
			
				|  |  |          String token = SecurityUtils.getToken();
 | 
	
		
			
				|  |  | -        SysUser authUser = sysUserFeignService.queryUserInfo(token);
 | 
	
		
			
				|  |  | +        SysUser authUser = sysUserFeignService.queryUserInfo();
 | 
	
		
			
				|  |  |          String userId = authUser.getId().toString();
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |          log.info("rejectControlDevice: ticket={}", ticket);
 | 
	
	
		
			
				|  | @@ -688,7 +688,7 @@ public class RoomServiceImpl implements RoomService {
 | 
	
		
			
				|  |  |          CheckUtils.checkArgument(roomId != null, "roomId must't be null");
 | 
	
		
			
				|  |  |          CheckUtils.checkArgument(roomDao.existsByRid(roomId), "room not exist");
 | 
	
		
			
				|  |  |          String token = SecurityUtils.getToken();
 | 
	
		
			
				|  |  | -        SysUser authUser = sysUserFeignService.queryUserInfo(token);
 | 
	
		
			
				|  |  | +        SysUser authUser = sysUserFeignService.queryUserInfo();
 | 
	
		
			
				|  |  |          String userId = authUser.getId().toString();
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |          int result;
 | 
	
	
		
			
				|  | @@ -721,7 +721,7 @@ public class RoomServiceImpl implements RoomService {
 | 
	
		
			
				|  |  |          CheckUtils.checkArgument(roomId != null, "roomId must't be null");
 | 
	
		
			
				|  |  |          CheckUtils.checkArgument(roomDao.existsByRid(roomId), "room not exist");
 | 
	
		
			
				|  |  |          String token = SecurityUtils.getToken();
 | 
	
		
			
				|  |  | -        SysUser authUser = sysUserFeignService.queryUserInfo(token);
 | 
	
		
			
				|  |  | +        SysUser authUser = sysUserFeignService.queryUserInfo();
 | 
	
		
			
				|  |  |          String userId = authUser.getId().toString();
 | 
	
		
			
				|  |  |          List<RoomMember> assistants = roomMemberDao.findByRidAndRole(roomId, RoleEnum.RoleAssistant.getValue());
 | 
	
		
			
				|  |  |          if (assistants.isEmpty()) {
 | 
	
	
		
			
				|  | @@ -756,7 +756,7 @@ public class RoomServiceImpl implements RoomService {
 | 
	
		
			
				|  |  |          CheckUtils.checkArgument(roomId != null, "roomId must't be null");
 | 
	
		
			
				|  |  |          CheckUtils.checkArgument(roomDao.existsByRid(roomId), "room not exist");
 | 
	
		
			
				|  |  |          String token = SecurityUtils.getToken();
 | 
	
		
			
				|  |  | -        SysUser authUser = sysUserFeignService.queryUserInfo(token);
 | 
	
		
			
				|  |  | +        SysUser authUser = sysUserFeignService.queryUserInfo();
 | 
	
		
			
				|  |  |          String userId = authUser.getId().toString();
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |          int count = roomMemberDao.countByRidAndExcludeRole(roomId, RoleEnum.RoleAudience.getValue());
 | 
	
	
		
			
				|  | @@ -801,7 +801,7 @@ public class RoomServiceImpl implements RoomService {
 | 
	
		
			
				|  |  |          CheckUtils.checkArgument(roomId != null, "roomId must't be null");
 | 
	
		
			
				|  |  |          CheckUtils.checkArgument(roomDao.existsByRid(roomId), "room not exist");
 | 
	
		
			
				|  |  |          String token = SecurityUtils.getToken();
 | 
	
		
			
				|  |  | -        SysUser authUser = sysUserFeignService.queryUserInfo(token);
 | 
	
		
			
				|  |  | +        SysUser authUser = sysUserFeignService.queryUserInfo();
 | 
	
		
			
				|  |  |          String userId = authUser.getId().toString();
 | 
	
		
			
				|  |  |          ScheduledTaskInfo taskInfo = scheduleManager.executeTask(ticket);
 | 
	
		
			
				|  |  |  
 | 
	
	
		
			
				|  | @@ -875,7 +875,7 @@ public class RoomServiceImpl implements RoomService {
 | 
	
		
			
				|  |  |          CheckUtils.checkArgument(targetUserId != null, "userId must't be null");
 | 
	
		
			
				|  |  |          CheckUtils.checkArgument(roomMemberDao.existsByRidAndUid(roomId, targetUserId), "room member not exist");
 | 
	
		
			
				|  |  |          String token = SecurityUtils.getToken();
 | 
	
		
			
				|  |  | -        SysUser authUser = sysUserFeignService.queryUserInfo(token);
 | 
	
		
			
				|  |  | +        SysUser authUser = sysUserFeignService.queryUserInfo();
 | 
	
		
			
				|  |  |          String userId = authUser.getId().toString();
 | 
	
		
			
				|  |  |          log.info("inviteUpgradeRole roomId = {}, targetUserId = {}, targetRole = {}", roomId, targetUserId, targetRole);
 | 
	
		
			
				|  |  |  
 | 
	
	
		
			
				|  | @@ -915,7 +915,7 @@ public class RoomServiceImpl implements RoomService {
 | 
	
		
			
				|  |  |          CheckUtils.checkArgument(ticket != null, "ticket must't be null");
 | 
	
		
			
				|  |  |          CheckUtils.checkArgument(roomDao.existsByRid(roomId), "room not exist");
 | 
	
		
			
				|  |  |          String token = SecurityUtils.getToken();
 | 
	
		
			
				|  |  | -        SysUser authUser = sysUserFeignService.queryUserInfo(token);
 | 
	
		
			
				|  |  | +        SysUser authUser = sysUserFeignService.queryUserInfo();
 | 
	
		
			
				|  |  |          String userId = authUser.getId().toString();
 | 
	
		
			
				|  |  |          UpgradeRoleTaskInfo taskInfo = (UpgradeRoleTaskInfo) scheduleManager.executeTask(ticket);
 | 
	
		
			
				|  |  |          log.info("approveUpgradeRole roomId = {}, task={}", roomId, taskInfo);
 | 
	
	
		
			
				|  | @@ -958,7 +958,7 @@ public class RoomServiceImpl implements RoomService {
 | 
	
		
			
				|  |  |          CheckUtils.checkArgument(ticket != null, "ticket must't be null");
 | 
	
		
			
				|  |  |          CheckUtils.checkArgument(roomDao.existsByRid(roomId), "room not exist");
 | 
	
		
			
				|  |  |          String token = SecurityUtils.getToken();
 | 
	
		
			
				|  |  | -        SysUser authUser = sysUserFeignService.queryUserInfo(token);
 | 
	
		
			
				|  |  | +        SysUser authUser = sysUserFeignService.queryUserInfo();
 | 
	
		
			
				|  |  |          String userId = authUser.getId().toString();
 | 
	
		
			
				|  |  |          UpgradeRoleTaskInfo taskInfo = (UpgradeRoleTaskInfo) scheduleManager.executeTask(ticket);
 | 
	
		
			
				|  |  |          UpgradeRoleMessage msg = new UpgradeRoleMessage(ActionEnum.Reject.ordinal());
 | 
	
	
		
			
				|  | @@ -982,7 +982,7 @@ public class RoomServiceImpl implements RoomService {
 | 
	
		
			
				|  |  |          CheckUtils.checkArgument(RoleEnum.getEnumByValue(targetRole).equals(RoleEnum.RoleTeacher), "only set to teacher");
 | 
	
		
			
				|  |  |          CheckUtils.checkArgument(roomMemberDao.existsByRidAndUid(roomId, targetUserId), "room member not exist");
 | 
	
		
			
				|  |  |          String token = SecurityUtils.getToken();
 | 
	
		
			
				|  |  | -        SysUser authUser = sysUserFeignService.queryUserInfo(token);
 | 
	
		
			
				|  |  | +        SysUser authUser = sysUserFeignService.queryUserInfo();
 | 
	
		
			
				|  |  |          String userId = authUser.getId().toString();
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |          List<RoomMember> targetUser = roomMemberDao.findByRidAndUid(roomId, targetUserId);
 |