From ae00605f22ecf3318059a0022f4cc62fb1a6d06f Mon Sep 17 00:00:00 2001 From: hawklin2017 <32898629+hawklin2017@users.noreply.github.com> Date: Wed, 6 May 2026 20:56:35 +0800 Subject: [PATCH] update area_code --- pkg/common/convert/user.go | 6 ++++++ pkg/common/storage/model/user.go | 1 + protocol | 2 +- 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/pkg/common/convert/user.go b/pkg/common/convert/user.go index b49c7b7c5..2c4063cbf 100644 --- a/pkg/common/convert/user.go +++ b/pkg/common/convert/user.go @@ -46,6 +46,7 @@ func UserDB2Pb(user *relationtb.User) *sdkws.UserInfo { FirstName: user.FirstName, LastName: user.LastName, Phone: user.Phone, + AreaCode: user.AreaCode, PhoneVisibility: user.PhoneVisibility, CallAcceptSetting: user.CallAcceptSetting, MsgReceiveSetting: user.MsgReceiveSetting, @@ -70,6 +71,7 @@ func UserPb2DB(user *sdkws.UserInfo) *relationtb.User { FirstName: user.FirstName, LastName: user.LastName, FullName: fullName, + AreaCode: user.AreaCode, CallRingtoneURL: user.CallRingtoneURL, } } @@ -85,6 +87,7 @@ func UserPb2DBMap(user *sdkws.UserInfo) map[string]any { "ex": user.Ex, "first_name": user.FirstName, "last_name": user.LastName, + "area_code": user.AreaCode, "app_manager_level": user.AppMangerLevel, "global_recv_msg_opt": user.GlobalRecvMsgOpt, "call_ringtone_url": user.CallRingtoneURL, @@ -141,6 +144,9 @@ func UserPb2DBMapEx(user *sdkws.UserInfoWithEx) map[string]any { if user.Phone != nil { val["phone"] = user.Phone.Value } + if user.AreaCode != nil { + val["area_code"] = user.AreaCode.Value + } if user.PhoneVisibility != nil { val["phone_visibility"] = user.PhoneVisibility.Value } diff --git a/pkg/common/storage/model/user.go b/pkg/common/storage/model/user.go index fa6786947..14f026fac 100644 --- a/pkg/common/storage/model/user.go +++ b/pkg/common/storage/model/user.go @@ -54,6 +54,7 @@ type User struct { LastName string `bson:"last_name"` FullName string `bson:"full_name"` Phone string `bson:"phone"` + AreaCode string `bson:"area_code"` PhoneVisibility int32 `bson:"phone_visibility"` CallAcceptSetting int32 `bson:"call_accept_setting"` MsgReceiveSetting int32 `bson:"msg_receive_setting"` diff --git a/protocol b/protocol index 8bdb641d1..3b211f91d 160000 --- a/protocol +++ b/protocol @@ -1 +1 @@ -Subproject commit 8bdb641d1356efc61620c0d37647a86f5dc94973 +Subproject commit 3b211f91d0e6b98797f91ba34fa64a7b47df5645