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

Merge remote-tracking branch 'origin/tuoyun' into tuoyun

Browse Source
This commit is contained in:
Gordon 2021-12-28 21:03:31 +08:00
commit 23c5f4040e
3 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -22,6 +22,9 @@ func (rpc *rpcAuth) UserRegister(_ context.Context, req *pbAuth.UserRegisterReq)
log.NewInfo(req.OperationID, "UserRegister args ", req.String())
var user imdb.User
utils.CopyStructFields(&user, req.UserInfo)
if req.UserInfo.Birth != 0 {
user.Birth = utils.UnixSecondToTime(req.UserInfo.Birth)
}
err := imdb.UserRegister(user)
if err != nil {
log.NewError(req.OperationID, "UserRegister failed ", err.Error(), user)

3
internal/rpc/user/user.go
View File

@ -214,6 +214,9 @@ func (s *userServer) UpdateUserInfo(ctx context.Context, req *pbUser.UpdateUserI
var user imdb.User
utils.CopyStructFields(&user, req.UserInfo)
if req.UserInfo.Birth != 0 {
user.Birth = utils.UnixSecondToTime(req.UserInfo.Birth)
}
err := imdb.UpdateUserInfo(user)
if err != nil {
log.NewError(req.OperationID, "UpdateUserInfo failed ", err.Error(), user)

7
pkg/common/db/mysql_model/im_mysql_model/user_model.go
View File

@ -33,9 +33,6 @@ func UserRegister(user User) error {
return err
}
user.CreateTime = time.Now()
if user.Birth != 0 {
user.Birth = utils.UnixSecondToTime(user.Birth)
}
err = dbConn.Table("user").Create(&user).Error
if err != nil {
@ -83,9 +80,7 @@ func UpdateUserInfo(user User) error {
if err != nil {
return err
}
if user.Birth != 0 {
user.Birth = utils.UnixSecondToTime(user.Birth)
}
err = dbConn.Table("user").Where("user_id=?", user.UserID).Update(&user).Error
return err
}