Skip to content

H
hilo-group
Commit a4e25095 authored by hujiebin's avatar hujiebin
Browse files
Options

Merge branch 'feature/trtc_del_2023-5-22' into 'master' 

trtc导量

See merge request !38
parents e9da5280 7fd4e7d2
Hide whitespace changes
Inline Side-by-side
Showing with 30 additions and 30 deletions
domain/service/group_s/group_op.go
View file @ a4e25095
......@@ -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
})
}
......
route/group_r/group_op.go
View file @ a4e25095
......@@ -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以下)，提示升级
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment