diff --git a/internal/business/domain/user/model/user.go b/internal/business/domain/user/model/user.go index 7bf5dfc..751e3fc 100644 --- a/internal/business/domain/user/model/user.go +++ b/internal/business/domain/user/model/user.go @@ -25,14 +25,13 @@ func (u *User) ToProto() *pb.User { } return &pb.User{ - UserId: u.Id, - Nickname: u.Nickname, - Sex: u.Sex, - AvatarUrl: u.AvatarUrl, - Extra: u.Extra, - CreateTime: u.CreateTime.Unix(), - UpdateTime: u.UpdateTime.Unix(), - MasterId: u.MasterId, - IsAutoAddedFriends: u.IsAutoAddedFriends, + UserId: u.Id, + Nickname: u.Nickname, + Sex: u.Sex, + AvatarUrl: u.AvatarUrl, + Extra: u.Extra, + CreateTime: u.CreateTime.Unix(), + UpdateTime: u.UpdateTime.Unix(), + MasterId: u.MasterId, } } diff --git a/pkg/pb/business.ext.pb.go b/pkg/pb/business.ext.pb.go index b5a04a8..ed64aca 100644 --- a/pkg/pb/business.ext.pb.go +++ b/pkg/pb/business.ext.pb.go @@ -431,15 +431,14 @@ type User struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - UserId int64 `protobuf:"varint,1,opt,name=user_id,json=userId,proto3" json:"user_id,omitempty"` // 用户id - Nickname string `protobuf:"bytes,2,opt,name=nickname,proto3" json:"nickname,omitempty"` // 昵称 - Sex int32 `protobuf:"varint,3,opt,name=sex,proto3" json:"sex,omitempty"` // 性别 - AvatarUrl string `protobuf:"bytes,4,opt,name=avatar_url,json=avatarUrl,proto3" json:"avatar_url,omitempty"` // 头像地址 - Extra string `protobuf:"bytes,5,opt,name=extra,proto3" json:"extra,omitempty"` // 附加字段 - CreateTime int64 `protobuf:"varint,6,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"` // 创建时间 - UpdateTime int64 `protobuf:"varint,7,opt,name=update_time,json=updateTime,proto3" json:"update_time,omitempty"` // 更新时间 - MasterId int64 `protobuf:"varint,8,opt,name=master_id,json=masterId,proto3" json:"master_id,omitempty"` // 站长id - IsAutoAddedFriends int `protobuf:"varint,8,opt,name=is_auto_added_friends,json=isAutoAddedFriends,proto3" json:"is_auto_added_friends,omitempty"` // 是否自动被添加好友 + UserId int64 `protobuf:"varint,1,opt,name=user_id,json=userId,proto3" json:"user_id,omitempty"` // 用户id + Nickname string `protobuf:"bytes,2,opt,name=nickname,proto3" json:"nickname,omitempty"` // 昵称 + Sex int32 `protobuf:"varint,3,opt,name=sex,proto3" json:"sex,omitempty"` // 性别 + AvatarUrl string `protobuf:"bytes,4,opt,name=avatar_url,json=avatarUrl,proto3" json:"avatar_url,omitempty"` // 头像地址 + Extra string `protobuf:"bytes,5,opt,name=extra,proto3" json:"extra,omitempty"` // 附加字段 + CreateTime int64 `protobuf:"varint,6,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"` // 创建时间 + UpdateTime int64 `protobuf:"varint,7,opt,name=update_time,json=updateTime,proto3" json:"update_time,omitempty"` // 更新时间 + MasterId int64 `protobuf:"varint,8,opt,name=master_id,json=masterId,proto3" json:"master_id,omitempty"` // 站长id } func (x *User) Reset() { diff --git a/pkg/proto/business.ext.proto b/pkg/proto/business.ext.proto index 7408740..93b0ece 100644 --- a/pkg/proto/business.ext.proto +++ b/pkg/proto/business.ext.proto @@ -62,7 +62,6 @@ message User { int64 create_time = 6; // 创建时间 int64 update_time = 7; // 更新时间 int64 master_id = 8; // 站长id - int64 is_auto_added_friends = 9; // 是否自动被添加好友 } message GetUserReq {