diff --git a/domain/model/group_m/groupInfo.go b/domain/model/group_m/groupInfo.go index a6b4551aeb6b7ed8a3277ce974ed2cd7edb89bdd..783777b680355f2195b154f85d4e2dff7c16774a 100644 --- a/domain/model/group_m/groupInfo.go +++ b/domain/model/group_m/groupInfo.go @@ -566,3 +566,12 @@ func GetFamilyRooms(model *domain.Model, familyId uint64, pageSize, pageIndex in return res, nextIdx, hasNext, nil } + +func IsUseTRTC(model *domain.Model, imGroupId string) bool { + var count int64 + if err := model.DB().Table("group_trtc").Where("im_group_id=?", imGroupId).Count(&count).Error; err != nil { + model.Log.Errorf("IsUseTRTC err:%v, groupId:%s", err, imGroupId) + return false + } + return count > 0 +} diff --git a/mysql/trtc.sql b/mysql/trtc.sql new file mode 100644 index 0000000000000000000000000000000000000000..fdc3fe807e5a9d78cfb9258bf597ce0f9b204cda --- /dev/null +++ b/mysql/trtc.sql @@ -0,0 +1,9 @@ +-CREATE TABLE `group_trtc` ( + `id` bigint unsigned NOT NULL AUTO_INCREMENT COMMENT 'id', + `im_group_id` char(32) COLLATE utf8mb4_unicode_ci NOT NULL, + `created_time` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP, + `updated_time` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, + PRIMARY KEY (`id`), + UNIQUE KEY `im_group_id` (`im_group_id`), + KEY `created_time` (`created_time`) USING BTREE + ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='使用trtc的群组'; \ No newline at end of file diff --git a/route/group_r/group_op.go b/route/group_r/group_op.go index 20461648c3e1f7e3a553bfee37e7be4d11f26d7b..8f2dbf0f802166be951581755ccfa370c262c29a 100644 --- a/route/group_r/group_op.go +++ b/route/group_r/group_op.go @@ -1752,8 +1752,7 @@ func GroupIn(c *gin.Context) (*mycontext.MyContext, error) { model.Log.Infof("GroupIn ip userId:%v,imGroupId:%v,ip:%v,imei:%v", userId, groupId, ip, imei) provider := group_e.GroupProvider_SW - roomImGroupIdMap := map[string]bool{"@TGS#3TMXOFJHC": true, "@TGS#3I57DMRIB": true} - if _, ok := roomImGroupIdMap[gi.ImGroupId]; ok { + if group_m.IsUseTRTC(model, groupId) { provider = group_e.GroupProvider_TRTC }