From e99753f188982a4190a45d7a4c1648bbae1253a1 Mon Sep 17 00:00:00 2001 From: Gordon <1432970085@qq.com> Date: Thu, 16 Mar 2023 12:07:21 +0800 Subject: [PATCH 1/5] user update --- internal/rpc/user/user.go | 2 +- pkg/common/db/controller/user.go | 6 +++--- pkg/common/db/relation/user_model.go | 4 ++-- pkg/common/db/table/relation/user.go | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/internal/rpc/user/user.go b/internal/rpc/user/user.go index bf28d1f2d..7f340665b 100644 --- a/internal/rpc/user/user.go +++ b/internal/rpc/user/user.go @@ -79,7 +79,7 @@ func (s *userServer) UpdateUserInfo(ctx context.Context, req *pbuser.UpdateUserI if err != nil { return nil, err } - err = s.Update(ctx, []*tablerelation.UserModel{user}) + err = s.Update(ctx, user) if err != nil { return nil, err } diff --git a/pkg/common/db/controller/user.go b/pkg/common/db/controller/user.go index f27af4296..9a3944467 100644 --- a/pkg/common/db/controller/user.go +++ b/pkg/common/db/controller/user.go @@ -15,7 +15,7 @@ type UserDatabase interface { //插入多条 外部保证userID 不重复 且在db中不存在 Create(ctx context.Context, users []*relation.UserModel) (err error) //更新（非零值） 外部保证userID存在 - Update(ctx context.Context, users []*relation.UserModel) (err error) + Update(ctx context.Context, user *relation.UserModel) (err error) //更新（零值） 外部保证userID存在 UpdateByMap(ctx context.Context, userID string, args map[string]interface{}) (err error) //如果没找到，不返回错误 @@ -75,8 +75,8 @@ func (u *userDatabase) Create(ctx context.Context, users []*relation.UserModel) } // 更新（非零值） 外部保证userID存在 -func (u *userDatabase) Update(ctx context.Context, users []*relation.UserModel) (err error) { - return u.userDB.Update(ctx, users) +func (u *userDatabase) Update(ctx context.Context, user *relation.UserModel) (err error) { + return u.userDB.Update(ctx, user) } // 更新（零值） 外部保证userID存在 diff --git a/pkg/common/db/relation/user_model.go b/pkg/common/db/relation/user_model.go index 4f34288d7..734e22a50 100644 --- a/pkg/common/db/relation/user_model.go +++ b/pkg/common/db/relation/user_model.go @@ -26,8 +26,8 @@ func (u *UserGorm) UpdateByMap(ctx context.Context, userID string, args map[stri } // 更新多个用户信息 非零值 -func (u *UserGorm) Update(ctx context.Context, users []*relation.UserModel) (err error) { - return utils.Wrap(u.db(ctx).Updates(&users).Error, "") +func (u *UserGorm) Update(ctx context.Context, user *relation.UserModel) (err error) { + return utils.Wrap(u.db(ctx).Updates(&user).Error, "") } // 获取指定用户信息 不存在，也不返回错误 diff --git a/pkg/common/db/table/relation/user.go b/pkg/common/db/table/relation/user.go index 047046a02..6773b8412 100644 --- a/pkg/common/db/table/relation/user.go +++ b/pkg/common/db/table/relation/user.go @@ -31,7 +31,7 @@ func (UserModel) TableName() string { type UserModelInterface interface { Create(ctx context.Context, users []*UserModel) (err error) UpdateByMap(ctx context.Context, userID string, args map[string]interface{}) (err error) - Update(ctx context.Context, users []*UserModel) (err error) + Update(ctx context.Context, user *UserModel) (err error) // 获取指定用户信息 不存在，也不返回错误 Find(ctx context.Context, userIDs []string) (users []*UserModel, err error) // 获取某个用户信息 不存在，则返回错误 From 9a0f9c2270c1dcb34492263601079fef568fda9e Mon Sep 17 00:00:00 2001 From: Gordon <1432970085@qq.com> Date: Thu, 16 Mar 2023 12:32:25 +0800 Subject: [PATCH 2/5] user update --- pkg/common/db/relation/user_model.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/common/db/relation/user_model.go b/pkg/common/db/relation/user_model.go index 734e22a50..83d75f713 100644 --- a/pkg/common/db/relation/user_model.go +++ b/pkg/common/db/relation/user_model.go @@ -27,7 +27,7 @@ func (u *UserGorm) UpdateByMap(ctx context.Context, userID string, args map[stri // 更新多个用户信息 非零值 func (u *UserGorm) Update(ctx context.Context, user *relation.UserModel) (err error) { - return utils.Wrap(u.db(ctx).Updates(&user).Error, "") + return utils.Wrap(u.db(ctx).Model(user).Updates(user).Error, "") } // 获取指定用户信息 不存在，也不返回错误 From 6ce1c6c0482b08dde7c0b2715117d020d78d2c8c Mon Sep 17 00:00:00 2001 From: Gordon <1432970085@qq.com> Date: Thu, 16 Mar 2023 12:42:34 +0800 Subject: [PATCH 3/5] user update --- pkg/common/mw/rpc_server_interceptor.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkg/common/mw/rpc_server_interceptor.go b/pkg/common/mw/rpc_server_interceptor.go index e288b077f..fd3ec1129 100644 --- a/pkg/common/mw/rpc_server_interceptor.go +++ b/pkg/common/mw/rpc_server_interceptor.go @@ -29,7 +29,8 @@ func rpcServerInterceptor(ctx context.Context, req interface{}, info *grpc.Unary var operationID string defer func() { if r := recover(); r != nil { - log.ZError(ctx, "rpc panic", nil, "FullMethod", info.FullMethod, "type:", fmt.Sprintf("%T", r), "panic:", r, string(debug.Stack())) + log.ZError(ctx, "rpc panic", nil, "FullMethod", info.FullMethod, "type:", fmt.Sprintf("%T", r), "panic:", r, "stack", string(debug.Stack())) + err = errs.ErrInternalServer } }() funcName := info.FullMethod From 1f03ebdbe728805bb2976bc3a8ef8f00d07ce992 Mon Sep 17 00:00:00 2001 From: Gordon <1432970085@qq.com> Date: Thu, 16 Mar 2023 12:53:29 +0800 Subject: [PATCH 4/5] user update --- pkg/common/mw/rpc_server_interceptor.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkg/common/mw/rpc_server_interceptor.go b/pkg/common/mw/rpc_server_interceptor.go index fd3ec1129..09645d08e 100644 --- a/pkg/common/mw/rpc_server_interceptor.go +++ b/pkg/common/mw/rpc_server_interceptor.go @@ -29,7 +29,8 @@ func rpcServerInterceptor(ctx context.Context, req interface{}, info *grpc.Unary var operationID string defer func() { if r := recover(); r != nil { - log.ZError(ctx, "rpc panic", nil, "FullMethod", info.FullMethod, "type:", fmt.Sprintf("%T", r), "panic:", r, "stack", string(debug.Stack())) + log.ZError(ctx, "rpc panic", nil, "FullMethod", info.FullMethod, "type:", fmt.Sprintf("%T", r), "panic:", r) + fmt.Println("stack info:", string(debug.Stack())) err = errs.ErrInternalServer } }() From 38d3c5d94dc879b97e649605c3bfdc7938d1cb4a Mon Sep 17 00:00:00 2001 From: Gordon <1432970085@qq.com> Date: Thu, 16 Mar 2023 13:01:42 +0800 Subject: [PATCH 5/5] user update --- internal/rpc/user/user.go | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/internal/rpc/user/user.go b/internal/rpc/user/user.go index 7f340665b..b7d231b22 100644 --- a/internal/rpc/user/user.go +++ b/internal/rpc/user/user.go @@ -24,7 +24,7 @@ type userServer struct { controller.UserDatabase notification *notification.Check userCheck *check.UserCheck - ConversationChecker *check.ConversationChecker + conversationChecker *check.ConversationChecker RegisterCenter registry.SvcDiscoveryRegistry friendCheck *check.FriendChecker } @@ -45,10 +45,12 @@ func Start(client registry.SvcDiscoveryRegistry, server *grpc.Server) error { users = append(users, &tablerelation.UserModel{UserID: v, Nickname: config.Config.Manager.Nickname[k]}) } u := &userServer{ - UserDatabase: controller.NewUserDatabase(relation.NewUserGorm(db)), - notification: notification.NewCheck(client), - userCheck: check.NewUserCheck(client), - RegisterCenter: client, + UserDatabase: controller.NewUserDatabase(relation.NewUserGorm(db)), + notification: notification.NewCheck(client), + userCheck: check.NewUserCheck(client), + friendCheck: check.NewFriendChecker(client), + conversationChecker: check.NewConversationChecker(client), + RegisterCenter: client, } pbuser.RegisterUserServer(server, u) return u.UserDatabase.InitOnce(context.Background(), users)