diff --git a/internal/grpc_server/server.go b/internal/grpc_server/server.go index a5110f9..bd6c729 100644 --- a/internal/grpc_server/server.go +++ b/internal/grpc_server/server.go @@ -22,12 +22,12 @@ func (s *Server) PhoneLogin(ctx context.Context, req *grpc_pb.PhoneLoginReq) (*g if user, err = userDao.Create(&model.User{ Phone: req.Phone, }); err != nil { - return nil, err + return nil, utils.ErrorsWrap(err) } user.Name = fmt.Sprintf("user_%v", user.Sn) _ = userDao.Updates(user) } else { - return nil, err + return nil, utils.ErrorsWrap(err) } } @@ -40,7 +40,7 @@ func (s *Server) PhoneLogin(ctx context.Context, req *grpc_pb.PhoneLoginReq) (*g func (s *Server) WxMiniLogin(ctx context.Context, req *grpc_pb.WxMiniLoginReq) (*grpc_pb.WxMiniLoginResp, error) { session, err := wechat.MiniCode2Session(req.Code) if err != nil { - return nil, err + return nil, utils.ErrorsWrap(err) } userDao := repository.NewUserDao(ctx, redis.GetCacheClient()) user, err := userDao.FindByWxUnionIDOrOpenID(session.UnionID, session.OpenID) @@ -50,12 +50,12 @@ func (s *Server) WxMiniLogin(ctx context.Context, req *grpc_pb.WxMiniLoginReq) ( WxUnionID: session.UnionID, WxMiniOpenID: session.OpenID, }); err != nil { - return nil, err + return nil, utils.ErrorsWrap(err) } user.Name = fmt.Sprintf("user_%v", user.Sn) _ = userDao.Updates(user) } else { - return nil, err + return nil, utils.ErrorsWrap(err) } } @@ -67,12 +67,12 @@ func (s *Server) WxMiniLogin(ctx context.Context, req *grpc_pb.WxMiniLoginReq) ( func (s *Server) GetUserInfo(ctx context.Context, req *grpc_pb.GetUserInfoReq) (*grpc_pb.GetUserInfoResp, error) { if !utils.ShouldBindUsn(ctx, &req.USN) { - return nil, http_resp.ParamError + return nil, utils.ErrorsWrap(http_resp.ParamError) } userDao := repository.NewUserDao(ctx, redis.GetCacheClient()) user, err := userDao.FindBySn(req.USN) if err != nil { - return nil, err + return nil, utils.ErrorsWrap(err) } return &grpc_pb.GetUserInfoResp{ diff --git a/internal/grpc_server/server_init.go b/internal/grpc_server/server_init.go index 54258a2..77e936d 100644 --- a/internal/grpc_server/server_init.go +++ b/internal/grpc_server/server_init.go @@ -15,8 +15,9 @@ type Server struct { func NewServer(ttl int64) *Server { s := &Server{ Base: service.Base{ - Target: common.KeyDiscoverUser, - EtcdTTL: ttl, + Target: common.KeyDiscoverUser, + ServiceName: common.KeyDiscoverServiceNameUser, + EtcdTTL: ttl, }, } s.Base.OnInit = s.OnInit