后台保活和注册

rc-service/rc-inner-api/other-inner/other-inner-model/src/main/java/com/red/circle/other/inner/model/cmd/user/account/CreateAccountCmd.java

@@ -3,9 +3,9 @@ package com.red.circle.other.inner.model.cmd.user.account;
 import com.red.circle.common.business.dto.cmd.AppExtCommand;
 import com.red.circle.framework.core.asserts.ResponseAssert;
 import com.red.circle.framework.core.response.ResponseErrorCode;
-import com.red.circle.tool.core.text.StringUtils;
+import com.red.circle.other.inner.enums.user.AuthTypeEnum;
 import com.red.circle.other.inner.model.cmd.user.UserProfileCmd;
-import jakarta.validation.constraints.NotBlank;
+import com.red.circle.tool.core.text.StringUtils;
 import jakarta.validation.constraints.NotNull;
 import java.util.Objects;
 import lombok.Data;
@@ -33,8 +33,7 @@ public class CreateAccountCmd extends AppExtCommand {
   /**
    * 注册类型:MOBILE、FACEBOOK、GOOGLE、APPLE、Snapchat.
    */
-  @NotBlank(message = "type required.")
+  private String type = AuthTypeEnum.GOOGLE.name();
-  private String type;
 
   /**
    * 开放id.
@@ -74,8 +73,16 @@ public class CreateAccountCmd extends AppExtCommand {
     return profile.getUserAvatar();
   }
 
+  public String getType() {
+    return StringUtils.isBlank(type) ? AuthTypeEnum.GOOGLE.name() : type;
+  }
+
+  public void setType(String type) {
+    this.type = StringUtils.isBlank(type) ? AuthTypeEnum.GOOGLE.name() : type;
+  }
+
   public boolean checkTypeMobile() {
-    return Objects.equals(type, "MOBILE");
+    return Objects.equals(getType(), AuthTypeEnum.MOBILE.name());
   }
 
   public boolean checkChina() {

rc-service/rc-service-live/live-domain/src/main/java/com/red/circle/live/domain/constant/ActiveSecondConstant.java

@@ -6,8 +6,13 @@ package com.red.circle.live.domain.constant;
 public interface ActiveSecondConstant {
 
   /**
-   * 心跳60s一次， 预留30s异常等待.
+   * 房间在线用户保活时间.
    */
-  int EXPIRATION_SECOND = 120;
+  int ROOM_USER_EXPIRATION_SECOND = 5 * 60;
+
+  /**
+   * 麦位活跃保活时间.
+   */
+  int MIC_EXPIRATION_SECOND = 120;
 
 }

rc-service/rc-service-live/live-domain/src/main/java/com/red/circle/live/domain/live/LiveMicrophone.java

@@ -51,7 +51,7 @@ public class LiveMicrophone implements Serializable {
    */
   public boolean checkInactiveExpire() {
     long intervalTime = (System.currentTimeMillis() - this.refreshTime) / 1000;
-    return intervalTime >= ActiveSecondConstant.EXPIRATION_SECOND;
+    return intervalTime >= ActiveSecondConstant.MIC_EXPIRATION_SECOND;
   }
 
 }

rc-service/rc-service-live/live-domain/src/main/java/com/red/circle/live/domain/online/LiveRoomUser.java

@@ -50,7 +50,7 @@ public class LiveRoomUser implements Serializable {
    */
   public boolean checkInactiveExpire() {
     long intervalTime = (System.currentTimeMillis() - this.refreshTime) / 1000;
-    return intervalTime > ActiveSecondConstant.EXPIRATION_SECOND;
+    return intervalTime > ActiveSecondConstant.ROOM_USER_EXPIRATION_SECOND;
   }
 
 }

rc-service/rc-service-live/live-infrastructure/src/main/java/com/red/circle/live/infra/database/cache/service/impl/LiveMicUserCacheServiceImpl.java

@@ -1,6 +1,7 @@
 package com.red.circle.live.infra.database.cache.service.impl;
 
 import com.red.circle.component.redis.service.RedisService;
+import com.red.circle.live.domain.constant.ActiveSecondConstant;
 import com.red.circle.live.domain.online.LiveRoomUser;
 import com.red.circle.live.domain.online.LiveRoomUserRefresh;
 import com.red.circle.live.infra.database.cache.key.LiveMicUserKey;
@@ -47,8 +48,8 @@ public class LiveMicUserCacheServiceImpl implements LiveMicUserCacheService {
         if (Objects.nonNull(user)) {
             redisService.hashPut(LiveMicUserKey.ROOM.getKey(roomId), Objects.toString(user.getUserId()),
                     user);
-            //放入redis  key IN_ROOM:userId  v 是roomId 是 放1分钟30秒每次来了都刷新过期时间
+            redisService.setString("IN_ROOM:" + user.getUserId(), roomId,
-            redisService.setString("IN_ROOM:" + user.getUserId(), roomId, 90, TimeUnit.SECONDS);
+                ActiveSecondConstant.ROOM_USER_EXPIRATION_SECOND, TimeUnit.SECONDS);
         }
 
         return new LiveRoomUserRefresh()
@@ -95,7 +96,8 @@ public class LiveMicUserCacheServiceImpl implements LiveMicUserCacheService {
     }
 
     private void setExpire(Long roomId) {
-        redisService.expire(LiveMicUserKey.ROOM.getKey(roomId), 90, TimeUnit.SECONDS);
+        redisService.expire(LiveMicUserKey.ROOM.getKey(roomId),
+            ActiveSecondConstant.ROOM_USER_EXPIRATION_SECOND, TimeUnit.SECONDS);
     }
 
 }

rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/listener/user/OnlineStatusUploadListener.java

@@ -42,6 +42,8 @@ import org.apache.commons.lang3.StringUtils;
 @RequiredArgsConstructor
 public class OnlineStatusUploadListener implements MessageListener {
 
+  private static final int ONLINE_EXPIRE_SECONDS = 5 * 60;
+
   private final ExpandService expandService;
   private final UserSVipGateway userSVipGateway;
   private final WalletGoldClient walletGoldClient;
@@ -138,7 +140,7 @@ public class OnlineStatusUploadListener implements MessageListener {
             ? UserOnlineStatusEnum.valueOf(event.getStatus())
             : UserOnlineStatusEnum.IDLE)
         .setWeights(onlineStatusCommon.getWeights(userProfile.getId()))
-        .setExpiredTime(TimestampUtils.nowPlusSeconds(90))
+        .setExpiredTime(TimestampUtils.nowPlusSeconds(ONLINE_EXPIRE_SECONDS))
         .setCreateTime(TimestampUtils.now())
         .setSessionId(DataTypeUtils.toLong(event.getSessionId()))
         .setSvipLevel(userSVipGateway.checkSVipIdentity(userProfile.getId())));

rc-service/rc-service-other/other-infrastructure/src/main/java/com/red/circle/other/infra/database/mongo/service/user/status/impl/OnlineUserServiceImpl.java

@@ -42,12 +42,17 @@ public class OnlineUserServiceImpl implements OnlineUserService {
   @Override
   public boolean exists(Long sessionId, Long userId) {
     return mongoTemplate.exists(Query.query(Criteria.where("sessionId").is(sessionId)
-        .and("id").is(userId)), OnlineUser.class);
+        .and("id").is(userId)
+        .and("status").is(UserOnlineStatusEnum.LANGUAGE_HALL)
+        .and("expiredTime").gte(TimestampUtils.now())), OnlineUser.class);
   }
 
   @Override
   public String getSessionId(Long userId) {
-    Criteria criteria = Criteria.where("id").is(userId);
+    Criteria criteria = Criteria.where("id").is(userId)
+        .and("status").is(UserOnlineStatusEnum.LANGUAGE_HALL)
+        .and("sessionId").gt(0)
+        .and("expiredTime").gte(TimestampUtils.now());
     return Optional.ofNullable(mongoTemplate.findOne(Query.query(criteria), OnlineUser.class))
         .map(OnlineUser::getSessionId)
         .map(Objects::toString)
@@ -205,7 +210,8 @@ public class OnlineUserServiceImpl implements OnlineUserService {
   public List<OnlineUser> flowSessionOnlineUser(String sessionId, UserOnlineStatusEnum status,
       Long lastTimingId) {
     Criteria criteria = Criteria.where("sessionId").is(Long.parseLong(sessionId))
-        .and("status").is(status);
+        .and("status").is(status)
+        .and("expiredTime").gte(TimestampUtils.now());
 
     if (Objects.nonNull(lastTimingId)) {
       criteria.and("timingId").gt(lastTimingId);
@@ -228,7 +234,9 @@ public class OnlineUserServiceImpl implements OnlineUserService {
 
   @Override
   public Long countSessionId(Long sessionId) {
-    return mongoTemplate.count(Query.query(Criteria.where("sessionId").is(sessionId)),
+    return mongoTemplate.count(Query.query(Criteria.where("sessionId").is(sessionId)
+            .and("status").is(UserOnlineStatusEnum.LANGUAGE_HALL)
+            .and("expiredTime").gte(TimestampUtils.now())),
         OnlineUser.class);
   }
 
@@ -274,7 +282,8 @@ public class OnlineUserServiceImpl implements OnlineUserService {
   @Override
   public List<OnlineUser> flowLanguageHallTop200(Long roomId, Long lastTimingId) {
     Criteria criteria = Criteria.where("sessionId").is(roomId)
-        .and("status").is(UserOnlineStatusEnum.LANGUAGE_HALL);
+        .and("status").is(UserOnlineStatusEnum.LANGUAGE_HALL)
+        .and("expiredTime").gte(TimestampUtils.now());
 
     if (Objects.nonNull(lastTimingId)) {
       criteria.and("timingId").gt(lastTimingId);
@@ -349,7 +358,8 @@ public class OnlineUserServiceImpl implements OnlineUserService {
   @Override
   public List<OnlineUser> flowLanguageHallByRoomId(Long roomId) {
     Criteria criteria = Criteria.where("sessionId").is(roomId)
-        .and("status").is(UserOnlineStatusEnum.LANGUAGE_HALL);
+        .and("status").is(UserOnlineStatusEnum.LANGUAGE_HALL)
+        .and("expiredTime").gte(TimestampUtils.now());
     return mongoTemplate.find(Query.query(criteria)
         .with(Sort.by(Sort.Order.asc("timingId")))
         .limit(5), OnlineUser.class);