blackteay/open-im-server
1
0
Fork 0
mirror of https://github.com/openimsdk/open-im-server.git synced 2025-04-06 04:15:46 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix bug

Browse Source
This commit is contained in:
wangchuxiao 2022-08-01 17:44:40 +08:00
parent e2e5ab656f
commit f202d5f54a
4 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
internal/api/group/group.go
View File

@ -12,6 +12,7 @@ import (
"Open_IM/pkg/utils" "Open_IM/pkg/utils"
"context" "context"
"github.com/golang/protobuf/ptypes/wrappers" "github.com/golang/protobuf/ptypes/wrappers"
"google.golang.org/grpc"
"github.com/gin-gonic/gin" "github.com/gin-gonic/gin"
@ -227,8 +228,9 @@ func GetGroupAllMemberList(c *gin.Context) {
c.JSON(http.StatusInternalServerError, gin.H{"errCode": 500, "errMsg": errMsg}) c.JSON(http.StatusInternalServerError, gin.H{"errCode": 500, "errMsg": errMsg})
return return
} }
maxSizeOption := grpc.MaxCallRecvMsgSize(1024 * 1024 * constant.GroupRPCRecvSize)
client := rpc.NewGroupClient(etcdConn) client := rpc.NewGroupClient(etcdConn)
RpcResp, err := client.GetGroupAllMember(context.Background(), req) RpcResp, err := client.GetGroupAllMember(context.Background(), req, maxSizeOption)
if err != nil { if err != nil {
log.NewError(req.OperationID, "GetGroupAllMember failed err", err.Error(), req.String()) log.NewError(req.OperationID, "GetGroupAllMember failed err", err.Error(), req.String())
c.JSON(http.StatusInternalServerError, gin.H{"errCode": 500, "errMsg": err.Error()}) c.JSON(http.StatusInternalServerError, gin.H{"errCode": 500, "errMsg": err.Error()})

4
internal/rpc/group/group.go
View File

@ -61,8 +61,8 @@ func (s *groupServer) Run() {
log.NewInfo("", "listen network success, ", address, listener) log.NewInfo("", "listen network success, ", address, listener)
defer listener.Close() defer listener.Close()
//grpc server //grpc server
recvSize := 1024 * 1024 * 30 recvSize := 1024 * 1024 * constant.GroupRPCRecvSize
sendSize := 1024 * 1024 * 30 sendSize := 1024 * 1024 * constant.GroupRPCSendSize
var options = []grpc.ServerOption{ var options = []grpc.ServerOption{
grpc.MaxRecvMsgSize(recvSize), grpc.MaxRecvMsgSize(recvSize),
grpc.MaxSendMsgSize(sendSize), grpc.MaxSendMsgSize(sendSize),

5
pkg/common/constant/constant.go
View File

@ -287,6 +287,11 @@ const (
Directly = 2 //直接进群 Directly = 2 //直接进群
) )
const (
GroupRPCRecvSize = 30
GroupRPCSendSize = 30
)
const FriendAcceptTip = "You have successfully become friends, so start chatting" const FriendAcceptTip = "You have successfully become friends, so start chatting"
func GroupIsBanChat(status int32) bool { func GroupIsBanChat(status int32) bool {

3
pkg/common/db/mongoModel.go
View File

@ -1074,7 +1074,8 @@ func (d *DataBases) GetSuperGroupByUserID(userID string) (UserToSuperGroup, erro
ctx, _ := context.WithTimeout(context.Background(), time.Duration(config.Config.Mongo.DBTimeout)*time.Second) ctx, _ := context.WithTimeout(context.Background(), time.Duration(config.Config.Mongo.DBTimeout)*time.Second)
c := d.mongoClient.Database(config.Config.Mongo.DBDatabase).Collection(cUserToSuperGroup) c := d.mongoClient.Database(config.Config.Mongo.DBDatabase).Collection(cUserToSuperGroup)
var user UserToSuperGroup var user UserToSuperGroup
return user, c.FindOne(ctx, bson.M{"user_id": userID}).Decode(&user) _ = c.FindOne(ctx, bson.M{"user_id": userID}).Decode(&user)
return user, nil
} }
func (d *DataBases) DeleteSuperGroup(groupID string) error { func (d *DataBases) DeleteSuperGroup(groupID string) error {