Commit 8659cd5a authored by chenweijian's avatar chenweijian

Merge branch 'feature/create_trtc' into 'master'

trtc导量,每天20个

See merge request !25
parents 2b011cd6 83f1c4db
...@@ -2,6 +2,7 @@ package group_r ...@@ -2,6 +2,7 @@ package group_r
import ( import (
"encoding/json" "encoding/json"
"git.hilo.cn/hilo-common/_const/rediskey"
"git.hilo.cn/hilo-common/domain" "git.hilo.cn/hilo-common/domain"
"git.hilo.cn/hilo-common/mycontext" "git.hilo.cn/hilo-common/mycontext"
"git.hilo.cn/hilo-common/mylogrus" "git.hilo.cn/hilo-common/mylogrus"
...@@ -1756,9 +1757,14 @@ func GroupIn(c *gin.Context) (*mycontext.MyContext, error) { ...@@ -1756,9 +1757,14 @@ func GroupIn(c *gin.Context) (*mycontext.MyContext, error) {
if group_m.IsUseTRTC(model, groupId) { if group_m.IsUseTRTC(model, groupId) {
provider = group_e.GroupProvider_TRTC provider = group_e.GroupProvider_TRTC
} else { } else {
if time.Now().Unix() > 1683820800 { // todo 1683820800=5月2号,等过审再修改 dayMaxCovertNum := int64(20)
numKey := rediskey.GetConvertToTRTCNum()
covertNum, err := redisCli.GetCacheInt64(numKey)
if time.Now().Unix() > 1682499704 && err == nil && covertNum <= dayMaxCovertNum {
roomUser, err := group_m.GetRoomOnlineUser(myContext, groupId) roomUser, err := group_m.GetRoomOnlineUser(myContext, groupId)
if err == nil && roomUser.Total == 0 { 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 { if err := group_m.InitTRTC(model, groupId); err != nil {
return myContext, err return myContext, err
} }
...@@ -1767,6 +1773,7 @@ func GroupIn(c *gin.Context) (*mycontext.MyContext, error) { ...@@ -1767,6 +1773,7 @@ func GroupIn(c *gin.Context) (*mycontext.MyContext, error) {
} }
} }
} }
}
if provider == group_e.GroupProvider_TRTC { if provider == group_e.GroupProvider_TRTC {
// 版本升级提示,旧版本(3.6.0以下),提示升级 // 版本升级提示,旧版本(3.6.0以下),提示升级
_, major, minor, _, err := req.GetAppVersion(c) _, major, minor, _, err := req.GetAppVersion(c)
......
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