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

Refactor code

Browse Source
This commit is contained in:
wenxu12345 2021-12-30 10:56:17 +08:00
parent 6692867db5
commit 88aaa38676
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -9,6 +9,7 @@ import (
imdb "Open_IM/pkg/common/db/mysql_model/im_mysql_model" imdb "Open_IM/pkg/common/db/mysql_model/im_mysql_model"
"Open_IM/pkg/common/log" "Open_IM/pkg/common/log"
"Open_IM/pkg/common/token_verify" "Open_IM/pkg/common/token_verify"
cp "Open_IM/pkg/common/utils"
"Open_IM/pkg/grpc-etcdv3/getcdv3" "Open_IM/pkg/grpc-etcdv3/getcdv3"
pbGroup "Open_IM/pkg/proto/group" pbGroup "Open_IM/pkg/proto/group"
open_im_sdk "Open_IM/pkg/proto/sdk_ws" open_im_sdk "Open_IM/pkg/proto/sdk_ws"
@ -396,10 +397,11 @@ func (s *groupServer) GetGroupApplicationList(_ context.Context, req *pbGroup.Ge
return &pbGroup.GetGroupApplicationListResp{ErrCode: 701, ErrMsg: "GetGroupApplicationList failed"}, nil return &pbGroup.GetGroupApplicationListResp{ErrCode: 701, ErrMsg: "GetGroupApplicationList failed"}, nil
} }
log.NewDebug(req.OperationID, "GetGroupApplicationList reply ", reply)
resp := pbGroup.GetGroupApplicationListResp{} resp := pbGroup.GetGroupApplicationListResp{}
for _, v := range reply { for _, v := range reply {
var node open_im_sdk.GroupRequest var node open_im_sdk.GroupRequest
utils.CopyStructFields(&node, v) cp.GroupRequestDBCopyOpenIM(&node, &v)
log.NewDebug(req.OperationID, "node ", node, "v ", v) log.NewDebug(req.OperationID, "node ", node, "v ", v)
} }
log.NewInfo(req.OperationID, "GetGroupMembersInfo rpc return ", resp) log.NewInfo(req.OperationID, "GetGroupMembersInfo rpc return ", resp)

6
pkg/common/db/mysql_model/im_mysql_model/group_request_model.go
View File

@ -105,12 +105,12 @@ func GetGroupApplicationList(userID string) ([]GroupRequest, error) {
if v.RoleLevel > constant.GroupOrdinaryUsers { if v.RoleLevel > constant.GroupOrdinaryUsers {
list, err := GetGroupRequestByGroupID(v.GroupID) list, err := GetGroupRequestByGroupID(v.GroupID)
if err != nil { if err != nil {
fmt.Println("111 GetGroupRequestByGroupID failed ", err.Error()) // fmt.Println("111 GetGroupRequestByGroupID failed ", err.Error())
continue continue
} }
fmt.Println("222 GetGroupRequestByGroupID ok ", list) // fmt.Println("222 GetGroupRequestByGroupID ok ", list)
groupRequestList = append(groupRequestList, list...) groupRequestList = append(groupRequestList, list...)
fmt.Println("333 GetGroupRequestByGroupID ok ", groupRequestList) // fmt.Println("333 GetGroupRequestByGroupID ok ", groupRequestList)
} }
} }
return groupRequestList, nil return groupRequestList, nil