diff --git a/rc-service/rc-service-live/live-application/src/main/java/com/red/circle/live/app/listener/UserHeartbeatListener.java b/rc-service/rc-service-live/live-application/src/main/java/com/red/circle/live/app/listener/UserHeartbeatListener.java index aeba216d..eeaa9986 100644 --- a/rc-service/rc-service-live/live-application/src/main/java/com/red/circle/live/app/listener/UserHeartbeatListener.java +++ b/rc-service/rc-service-live/live-application/src/main/java/com/red/circle/live/app/listener/UserHeartbeatListener.java @@ -7,6 +7,7 @@ import com.red.circle.component.mq.service.Action; import com.red.circle.component.mq.service.ConsumerMessage; import com.red.circle.component.mq.service.MessageListener; import com.red.circle.component.redis.service.RedisService; +import com.red.circle.framework.dto.ResultResponse; import com.red.circle.live.app.dto.cmd.HeartbeatStatusEnum; import com.red.circle.live.domain.gateway.LiveMicrophoneGateway; import com.red.circle.live.domain.live.LiveMicrophone; diff --git a/rc-service/rc-service-live/live-infrastructure/src/main/java/com/red/circle/live/infra/database/cache/service/impl/LiveMicCacheServiceImpl.java b/rc-service/rc-service-live/live-infrastructure/src/main/java/com/red/circle/live/infra/database/cache/service/impl/LiveMicCacheServiceImpl.java index b6157950..eb9470fc 100644 --- a/rc-service/rc-service-live/live-infrastructure/src/main/java/com/red/circle/live/infra/database/cache/service/impl/LiveMicCacheServiceImpl.java +++ b/rc-service/rc-service-live/live-infrastructure/src/main/java/com/red/circle/live/infra/database/cache/service/impl/LiveMicCacheServiceImpl.java @@ -134,10 +134,7 @@ public class LiveMicCacheServiceImpl implements LiveMicCacheService { .map(LiveMicrophone::getMicIndex) .map(Objects::toString) .toArray(String[]::new); - - log.info("清除不活跃的用户入参 = {} ", JSON.toJSONString(index)); Long size = redisService.hashDelete(LiveMicKey.SEAT.getKey(roomId), index); - log.info("清除不活跃的用户结果 = {} ", size); return Objects.nonNull(size) && size > 0; } diff --git a/rc-service/rc-service-live/live-infrastructure/src/main/java/com/red/circle/live/infra/repository/LiveMicrophoneGatewayImpl.java b/rc-service/rc-service-live/live-infrastructure/src/main/java/com/red/circle/live/infra/repository/LiveMicrophoneGatewayImpl.java index b0655295..8a40b63e 100644 --- a/rc-service/rc-service-live/live-infrastructure/src/main/java/com/red/circle/live/infra/repository/LiveMicrophoneGatewayImpl.java +++ b/rc-service/rc-service-live/live-infrastructure/src/main/java/com/red/circle/live/infra/repository/LiveMicrophoneGatewayImpl.java @@ -214,10 +214,7 @@ public class LiveMicrophoneGatewayImpl implements LiveMicrophoneGateway { @Override public void goDown(Long roomId, Integer micIndex, Long userId) { - -// RLock lock = redissonClient.getLock(roomId.toString()+micIndex.toString()+"room"); micOpsLock(roomId, micIndex); -// lock.lock(); try { RoomProfileDTO roomProfile = roomManagerClient.getById(roomId).getBody(); // 房间是否真实存在 @@ -235,7 +232,6 @@ public class LiveMicrophoneGatewayImpl implements LiveMicrophoneGateway { }catch (Exception e){ ResponseAssert.isTrue(RoomErrorCode.ROOM_MEMBER_IS_MAX,false); } finally { -// lock.unlock(); micOpsUnlock(roomId, micIndex); } } @@ -386,8 +382,6 @@ public class LiveMicrophoneGatewayImpl implements LiveMicrophoneGateway { ResponseAssert.isTrue(LiveMicErrorCode.MIC_PERMISSIONS, roles.checkHomeownerOrAdmin()); -// ResponseAssert.isTrue(LiveMicErrorCode.MIC_PERMISSIONS, -// Objects.equals(roomProfile.getUserId(), opsUserId)); return roomProfile; } @@ -443,7 +437,6 @@ public class LiveMicrophoneGatewayImpl implements LiveMicrophoneGateway { .setTimeId(IdWorkerUtils.getIdStr()) .setMics(liveMicrophone) .cleanData(); - log.info("Mic user change notice, roomId={}, data={}", roomProfile.getId(), noticeRes); ThreadPoolManager.getInstance().execute(() ->{ imGroupClient.sendCustomMessage( roomProfile.getRoomAccount(), diff --git a/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/command/room/RoomEnterCmdExe.java b/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/command/room/RoomEnterCmdExe.java index c082a30b..2fde45bc 100644 --- a/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/command/room/RoomEnterCmdExe.java +++ b/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/command/room/RoomEnterCmdExe.java @@ -117,7 +117,6 @@ public class RoomEnterCmdExe { String token = userAgoraTokenCacheService.getUserAgoraToken(cmd.getReqUserId(), cmd.getRoomId()); if (Objects.isNull(token)) { token = trtcClient.createAgoraToken(cmd.getReqUserId(), cmd.getRoomId().toString()).getBody(); - log.warn("进房间token:{}", token); userAgoraTokenCacheService.save(token, cmd.getReqUserId(), cmd.getRoomId()); }