Merge branch 'feature/create_trtc' into 'master'

trtc房间

See merge request !26

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"
@@ -1757,20 +1756,21 @@ func GroupIn(c *gin.Context) (*mycontext.MyContext, error) {
 	if group_m.IsUseTRTC(model, groupId) {
 		provider = group_e.GroupProvider_TRTC
 	} else {
-		dayMaxCovertNum := int64(20)
-		numKey := rediskey.GetConvertToTRTCNum()
-		covertNum, err := redisCli.GetCacheInt64(numKey)
-		if time.Now().Unix() > 1682499704 && err == nil && covertNum <= dayMaxCovertNum {
+		//dayMaxCovertNum := int64(20)
+		//numKey := rediskey.GetConvertToTRTCNum()
+		//covertNum, err := redisCli.GetCacheInt64(numKey)
+		//if time.Now().Unix() > 1682499704 && err == nil && covertNum <= dayMaxCovertNum {
+		if 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)
+				//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)
+				//}
 			}
 		}
 	}