diff --git a/internal/rpc/user/user.go b/internal/rpc/user/user.go index 66bd1d682..f889214ad 100644 --- a/internal/rpc/user/user.go +++ b/internal/rpc/user/user.go @@ -598,6 +598,8 @@ func (s *userServer) UserRegister(ctx context.Context, req *pbuser.UserRegisterR CreateTime: now, AppMangerLevel: user.AppMangerLevel, GlobalRecvMsgOpt: user.GlobalRecvMsgOpt, + FirstName: user.FirstName, + LastName: user.LastName, }) } if err := s.db.Create(ctx, users); err != nil { diff --git a/pkg/common/convert/user.go b/pkg/common/convert/user.go index 1130d81e2..a85e025d1 100644 --- a/pkg/common/convert/user.go +++ b/pkg/common/convert/user.go @@ -31,8 +31,10 @@ func UserDB2Pb(user *relationtb.User) *sdkws.UserInfo { CreateTime: user.CreateTime.UnixMilli(), AppMangerLevel: user.AppMangerLevel, GlobalRecvMsgOpt: user.GlobalRecvMsgOpt, - Phone: user.Phone, - PhoneVisibility: user.PhoneVisibility, + FirstName: user.FirstName, + LastName: user.LastName, + Phone: user.Phone, + PhoneVisibility: user.PhoneVisibility, CallAcceptSetting: user.CallAcceptSetting, MsgReceiveSetting: user.MsgReceiveSetting, } @@ -51,6 +53,8 @@ func UserPb2DB(user *sdkws.UserInfo) *relationtb.User { CreateTime: time.UnixMilli(user.CreateTime), AppMangerLevel: user.AppMangerLevel, GlobalRecvMsgOpt: user.GlobalRecvMsgOpt, + FirstName: user.FirstName, + LastName: user.LastName, } } @@ -63,6 +67,8 @@ func UserPb2DBMap(user *sdkws.UserInfo) map[string]any { "nickname": user.Nickname, "face_url": user.FaceURL, "ex": user.Ex, + "first_name": user.FirstName, + "last_name": user.LastName, "app_manager_level": user.AppMangerLevel, "global_recv_msg_opt": user.GlobalRecvMsgOpt, } @@ -106,6 +112,7 @@ func UserPb2DBMapEx(user *sdkws.UserInfoWithEx) map[string]any { if user.MsgReceiveSetting != nil { val["msg_receive_setting"] = user.MsgReceiveSetting.Value } + // TODO: Add FirstName/LastName support to UserInfoWithEx proto when regenerated return val } diff --git a/pkg/common/storage/model/user.go b/pkg/common/storage/model/user.go index 3903316e0..f1dcd6c99 100644 --- a/pkg/common/storage/model/user.go +++ b/pkg/common/storage/model/user.go @@ -50,6 +50,8 @@ type User struct { AppMangerLevel int32 `bson:"app_manger_level"` GlobalRecvMsgOpt int32 `bson:"global_recv_msg_opt"` CreateTime time.Time `bson:"create_time"` + FirstName string `bson:"first_name"` + LastName string `bson:"last_name"` // Phone 用户手机号(明文,仅服务端留存,下发时按 PhoneVisibility 过滤) Phone string `bson:"phone"` // PhoneVisibility 0=所有人可见 1=仅好友可见 2=隐藏 diff --git a/protocol b/protocol index 90aae1d57..a186c4a07 160000 --- a/protocol +++ b/protocol @@ -1 +1 @@ -Subproject commit 90aae1d576466a1fa55eba386d1f7a38ca6062d0 +Subproject commit a186c4a0722d8ea983dacd34b6664f23e23dc18e