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

proto modify

Browse Source
This commit is contained in:
wangchuxiao 2023-03-03 18:55:51 +08:00
parent ebe689324b
commit 3a93f60555
8 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
internal/common/check/access.go
View File

@ -6,7 +6,7 @@ import (
) )
func (u *UserCheck) Access(ctx context.Context, ownerUserID string) (err error) { func (u *UserCheck) Access(ctx context.Context, ownerUserID string) (err error) {
_, err = u.GetUsersInfo(ctx, ownerUserID) _, err = u.GetUserInfo(ctx, ownerUserID)
if err != nil { if err != nil {
return err return err
} }

2
internal/common/check/user.go
View File

@ -47,7 +47,7 @@ func (u *UserCheck) GetUsersInfos(ctx context.Context, userIDs []string, complet
return resp.UsersInfo, nil return resp.UsersInfo, nil
} }
func (u *UserCheck) GetUsersInfo(ctx context.Context, userID string) (*sdkws.UserInfo, error) { func (u *UserCheck) GetUserInfo(ctx context.Context, userID string) (*sdkws.UserInfo, error) {
users, err := u.GetUsersInfos(ctx, []string{userID}, true) users, err := u.GetUsersInfos(ctx, []string{userID}, true)
if err != nil { if err != nil {
return nil, err return nil, err

10
internal/common/convert/convert.go
View File

@ -58,7 +58,7 @@ func (db *DBFriend) DB2PB(ctx context.Context, friends []*relation.FriendModel)
func (db *DBFriend) Convert(ctx context.Context) (*sdk.FriendInfo, error) { func (db *DBFriend) Convert(ctx context.Context) (*sdk.FriendInfo, error) {
pbfriend := &sdk.FriendInfo{FriendUser: &sdk.UserInfo{}} pbfriend := &sdk.FriendInfo{FriendUser: &sdk.UserInfo{}}
utils.CopyStructFields(pbfriend, db) utils.CopyStructFields(pbfriend, db)
user, err := db.userCheck.GetUsersInfo(ctx, db.FriendUserID) user, err := db.userCheck.GetUserInfo(ctx, db.FriendUserID)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@ -139,14 +139,14 @@ func (pb *PBFriendRequest) Convert() (*relation.FriendRequestModel, error) {
func (db *DBFriendRequest) Convert(ctx context.Context) (*sdk.FriendRequest, error) { func (db *DBFriendRequest) Convert(ctx context.Context) (*sdk.FriendRequest, error) {
pbFriendRequest := &sdk.FriendRequest{} pbFriendRequest := &sdk.FriendRequest{}
utils.CopyStructFields(pbFriendRequest, db) utils.CopyStructFields(pbFriendRequest, db)
user, err := db.userCheck.GetUsersInfo(ctx, db.FromUserID) user, err := db.userCheck.GetUserInfo(ctx, db.FromUserID)
if err != nil { if err != nil {
return nil, err return nil, err
} }
pbFriendRequest.FromNickname = user.Nickname pbFriendRequest.FromNickname = user.Nickname
pbFriendRequest.FromFaceURL = user.FaceURL pbFriendRequest.FromFaceURL = user.FaceURL
pbFriendRequest.FromGender = user.Gender pbFriendRequest.FromGender = user.Gender
user, err = db.userCheck.GetUsersInfo(ctx, db.ToUserID) user, err = db.userCheck.GetUserInfo(ctx, db.ToUserID)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@ -219,7 +219,7 @@ func (db *DBBlack) Convert(ctx context.Context) (*sdk.BlackInfo, error) {
pbBlack := &sdk.BlackInfo{} pbBlack := &sdk.BlackInfo{}
utils.CopyStructFields(pbBlack, db) utils.CopyStructFields(pbBlack, db)
pbBlack.CreateTime = db.CreateTime.Unix() pbBlack.CreateTime = db.CreateTime.Unix()
user, err := db.userCheck.GetUsersInfo(ctx, db.BlockUserID) user, err := db.userCheck.GetUserInfo(ctx, db.BlockUserID)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@ -344,7 +344,7 @@ func (db *DBGroupMember) Convert(ctx context.Context) (*sdk.GroupMemberFullInfo,
dst := &sdk.GroupMemberFullInfo{} dst := &sdk.GroupMemberFullInfo{}
utils.CopyStructFields(dst, db) utils.CopyStructFields(dst, db)
user, err := db.userCheck.GetUsersInfo(ctx, db.UserID) user, err := db.userCheck.GetUserInfo(ctx, db.UserID)
if err != nil { if err != nil {
return nil, err return nil, err
} }

2
internal/rpc/auth/auth.go
View File

@ -38,7 +38,7 @@ func Start(client discoveryRegistry.SvcDiscoveryRegistry, server *grpc.Server) e
func (s *authServer) UserToken(ctx context.Context, req *pbAuth.UserTokenReq) (*pbAuth.UserTokenResp, error) { func (s *authServer) UserToken(ctx context.Context, req *pbAuth.UserTokenReq) (*pbAuth.UserTokenResp, error) {
resp := pbAuth.UserTokenResp{} resp := pbAuth.UserTokenResp{}
if _, err := s.userCheck.GetUsersInfo(ctx, req.UserID); err != nil { if _, err := s.userCheck.GetUserInfo(ctx, req.UserID); err != nil {
return nil, err return nil, err
} }
token, err := s.authDatabase.CreateToken(ctx, req.UserID, constant.PlatformIDToName(int(req.PlatformID))) token, err := s.authDatabase.CreateToken(ctx, req.UserID, constant.PlatformIDToName(int(req.PlatformID)))

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

@ -628,7 +628,7 @@ func (s *groupServer) JoinGroup(ctx context.Context, req *pbGroup.JoinGroupReq)
if group.GroupType == constant.SuperGroup { if group.GroupType == constant.SuperGroup {
return nil, constant.ErrGroupTypeNotSupport.Wrap() return nil, constant.ErrGroupTypeNotSupport.Wrap()
} }
user, err := s.UserCheck.GetUsersInfo(ctx, tracelog.GetOpUserID(ctx)) user, err := s.UserCheck.GetUserInfo(ctx, tracelog.GetOpUserID(ctx))
if err != nil { if err != nil {
return nil, err return nil, err
} }

2
pkg/proto/friend/friend.proto
View File

@ -139,7 +139,7 @@ message getFriendIDsReq {
} }
message getFriendIDsResp { message getFriendIDsResp {
repeated string = 1; repeated string friendIDs = 1;
} }
service friend{ service friend{

1
pkg/proto/msg/msg.proto
View File

@ -213,7 +213,6 @@ service msg {
rpc DelSuperGroupMsg(DelSuperGroupMsgReq) returns(DelSuperGroupMsgResp); rpc DelSuperGroupMsg(DelSuperGroupMsgReq) returns(DelSuperGroupMsgResp);
//清空某人所有消息 //清空某人所有消息
rpc ClearMsg(ClearMsgReq) returns(ClearMsgResp); rpc ClearMsg(ClearMsgReq) returns(ClearMsgResp);
//设置消息是否发送成功-针对api发送的消息 //设置消息是否发送成功-针对api发送的消息
rpc SetSendMsgStatus(SetSendMsgStatusReq) returns(SetSendMsgStatusResp); rpc SetSendMsgStatus(SetSendMsgStatusReq) returns(SetSendMsgStatusResp);
//获取消息发送状态 //获取消息发送状态

2
pkg/proto/rtc/rtc.proto
View File

@ -1,7 +1,7 @@
syntax = "proto3"; syntax = "proto3";
import "Open-IM-Server/pkg/proto/sdkws/ws.proto"; import "Open-IM-Server/pkg/proto/sdkws/ws.proto";
option go_package = "OpenIM/pkg/proto/rtc;rtc"; option go_package = "OpenIM/pkg/proto/rtc;rtc";
package proto; package rtc;
message SignalMessageAssembleReq { message SignalMessageAssembleReq {
sdkws.SignalReq signalReq = 1; sdkws.SignalReq signalReq = 1;