diff --git a/route/group_r/group_op.go b/route/group_r/group_op.go index 47cf45c9c13f339e5ffc8c34127397d3f1f67291..c601f465ce0dcfe8366c503eedfe50a26d7470d6 100644 --- a/route/group_r/group_op.go +++ b/route/group_r/group_op.go @@ -2,6 +2,7 @@ package group_r import ( "encoding/json" + "git.hilo.cn/hilo-common/_const/rediskey" "git.hilo.cn/hilo-common/domain" "git.hilo.cn/hilo-common/mycontext" "git.hilo.cn/hilo-common/mylogrus" @@ -1774,25 +1775,25 @@ func GroupIn(c *gin.Context) (*mycontext.MyContext, error) { // } // } //} - } else { + } else if time.Now().Unix() > 1684810309 && time.Now().Unix() < 1684857600 { // 增加trtc房间 - //dayMaxCovertNum := int64(150) - //numKey := rediskey.GetConvertToTRTCNum() - //covertNum, err := redisCli.GetCacheInt64(numKey) - //if time.Now().Unix() > 1682499704 && err == nil && covertNum <= dayMaxCovertNum { - // //if false && time.Now().Unix() > 1682499704 { - // roomUser, err := group_m.GetRoomOnlineUser(myContext, groupId) - // if err == nil && roomUser.Total == 0 { - // newNum, err := redisCli.IncrNumExpire(numKey, 1, time.Hour*24) - // if err == nil && newNum <= dayMaxCovertNum { - // if err := group_m.InitTRTC(model, groupId); err != nil { - // return myContext, err - // } - // provider = group_e.GroupProvider_TRTC - // model.Log.Infof("auto shift trtc room groupId:%v,%+v-%v", groupId, roomUser, err) - // } - // } - //} + dayMaxCovertNum := int64(600) + numKey := rediskey.GetConvertToTRTCNum() + covertNum, err := redisCli.GetCacheInt64(numKey) + if err == nil && covertNum <= dayMaxCovertNum { + //if false && time.Now().Unix() > 1682499704 { + roomUser, err := group_m.GetRoomOnlineUser(myContext, groupId) + if err == nil && roomUser.Total == 0 { + newNum, err := redisCli.IncrNumExpire(numKey, 1, time.Hour*24) + if err == nil && newNum <= dayMaxCovertNum { + if err := group_m.InitTRTC(model, groupId); err != nil { + return myContext, err + } + provider = group_e.GroupProvider_TRTC + model.Log.Infof("auto shift trtc room groupId:%v,%+v-%v", groupId, roomUser, err) + } + } + } } if provider == group_e.GroupProvider_TRTC { // 版本升级提示,旧版本(3.6.0以下),提示升级