diff --git a/domain/service/group_s/group_op.go b/domain/service/group_s/group_op.go index fb13ab9dcdd5fbfa3a9ce1fa43c3a4541e391d63..92569631df487444aef533a7efc7d293a0ab72fe 100644 --- a/domain/service/group_s/group_op.go +++ b/domain/service/group_s/group_op.go @@ -44,10 +44,10 @@ func (s *GroupService) CreateGroup(userId uint64, g *group_m.GroupInfo) error { if err := group_m.CreateGroupRole(model, g.ImGroupId, userId, group_e.GROUP_OWNER); err != nil { return err } - // 新房间标记成trtc房间 - if err := group_m.InitTRTC(model, g.ImGroupId); err != nil { - model.Log.Errorf("CreateGroup g:%+v, err:%v", g, err) - } + //// 新房间标记成trtc房间 + //if err := group_m.InitTRTC(model, g.ImGroupId); err != nil { + // model.Log.Errorf("CreateGroup g:%+v, err:%v", g, err) + //} return nil }) } diff --git a/route/group_r/group_op.go b/route/group_r/group_op.go index 50659f86334a2e405c8e004b084436735f431c9a..ca6b4893139c98e4ab350a42a232bd97968d376b 100644 --- a/route/group_r/group_op.go +++ b/route/group_r/group_op.go @@ -2,7 +2,6 @@ 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" @@ -1763,36 +1762,37 @@ func GroupIn(c *gin.Context) (*mycontext.MyContext, error) { provider := group_e.GroupProvider_SW if group_m.IsUseTRTC(model, groupId) { provider = group_e.GroupProvider_TRTC - //total := int64(2000) - //if !config.AppIsRelease() { - // total = 0 - //} - //if group_m.CountTRTC(model) > total { - // roomUser, err := group_m.GetRoomOnlineUser(myContext, groupId) - // if err == nil && roomUser.Total == 0 { - // if err := group_m.DeleteTRTC(model, groupId); err == nil { - // provider = group_e.GroupProvider_SW - // } - // } - //} - } else { - 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 { + total := int64(11000) + if !config.AppIsRelease() { + total = 30 + } + if group_m.CountTRTC(model) > total { 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 err := group_m.DeleteTRTC(model, groupId); err == nil { + provider = group_e.GroupProvider_SW } } } + } else { + // 增加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) + // } + // } + //} } if provider == group_e.GroupProvider_TRTC { // 版本升级提示,旧版本(3.6.0以下),提示升级