Skip to content

Commit 6429860

Browse files
committed
fix: fix the point`s func and change the protobuf about the mustEmbedUnimplementedUserServer
1 parent 4cd43b1 commit 6429860

File tree

9 files changed

+19
-19
lines changed

9 files changed

+19
-19
lines changed

api/user/v1/user.proto

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ syntax = "proto3";
22
import "google/protobuf/empty.proto";
33
option go_package = "./;v1";
44

5-
// protoc --proto_path=. --go_out=. --go-grpc_out=. user.proto
5+
// protoc --proto_path=. --go_out=. --go-grpc_out=require_unimplemented_servers=false:. user.proto
66
service User{
77
rpc GetUserList(PageInfo) returns (UserListResponse); // 用户列表
88
rpc GetUserByMobile(MobileRequest) returns (UserInfoResponse); //通过mobile查询用户

api/user/v1/user_grpc.pb.go

+2-4
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

app/shop/custom/internal/data/rpc/user.go

+5-5
Original file line numberDiff line numberDiff line change
@@ -40,27 +40,27 @@ type users struct {
4040

4141
var _ data.UserData = &users{}
4242

43-
func (u users) Create(ctx context.Context, user *data.User) error {
43+
func (u *users) Create(ctx context.Context, user *data.User) error {
4444
//TODO implement me
4545
panic("implement me")
4646
}
4747

48-
func (u users) Update(ctx context.Context, user *data.User) error {
48+
func (u *users) Update(ctx context.Context, user *data.User) error {
4949
//TODO implement me
5050
panic("implement me")
5151
}
5252

53-
func (u users) Get(ctx context.Context, userID uint64) (data.User, error) {
53+
func (u *users) Get(ctx context.Context, userID uint64) (data.User, error) {
5454
//TODO implement me
5555
panic("implement me")
5656
}
5757

58-
func (u users) GetByMobile(ctx context.Context, mobile string) (data.User, error) {
58+
func (u *users) GetByMobile(ctx context.Context, mobile string) (data.User, error) {
5959
//TODO implement me
6060
panic("implement me")
6161
}
6262

63-
func (u users) CheckPassWord(ctx context.Context, password, encryptedPwd string) error {
63+
func (u *users) CheckPassWord(ctx context.Context, password, encryptedPwd string) error {
6464
//TODO implement me
6565
panic("implement me")
6666
}

app/user/srv/controller/user/by_id.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ import (
88
"github.com/coderi421/gframework/pkg/log"
99
)
1010

11-
func (u *userServer) GetUserById(ctx context.Context, request *upbv1.IdRequest) (*upbv1.UserInfoResponse, error) {
12-
user, err := u.srv.GetByID(ctx, uint64(request.Id))
11+
func (us *userServer) GetUserById(ctx context.Context, request *upbv1.IdRequest) (*upbv1.UserInfoResponse, error) {
12+
user, err := us.srv.GetByID(ctx, uint64(request.Id))
1313
if err != nil {
1414
log.Errorf("get user by id: %s,error: %v", request.Id, err)
1515
}

app/user/srv/controller/user/by_mobile.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@ import (
88
"github.com/coderi421/gframework/pkg/log"
99
)
1010

11-
func (u *userServer) GetUserByMobile(ctx context.Context, request *upbv1.MobileRequest) (*upbv1.UserInfoResponse, error) {
11+
func (us *userServer) GetUserByMobile(ctx context.Context, request *upbv1.MobileRequest) (*upbv1.UserInfoResponse, error) {
1212
log.Info("get user by mobile function called.")
13-
user, err := u.srv.GetByMobile(ctx, request.Mobile)
13+
user, err := us.srv.GetByMobile(ctx, request.Mobile)
1414
if err != nil {
1515
log.Errorf("get user by mobile: %s,error: %v", request.Mobile, err)
1616
}

app/user/srv/controller/user/create.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,15 @@ import (
1010
)
1111

1212
// CreateUser controller层应该是很薄的一层,参数校验,日志打印,错误处理,调用service层
13-
func (u *userServer) CreateUser(ctx context.Context, request *upbv1.CreateUserInfo) (*upbv1.UserInfoResponse, error) {
13+
func (us *userServer) CreateUser(ctx context.Context, request *upbv1.CreateUserInfo) (*upbv1.UserInfoResponse, error) {
1414
userDO := v12.UserDO{
1515
Mobile: request.Mobile,
1616
NickName: request.NickName,
1717
Password: request.PassWord,
1818
}
1919
userDTO := v1.UserDTO{userDO}
2020

21-
err := u.srv.Create(ctx, &userDTO)
21+
err := us.srv.Create(ctx, &userDTO)
2222
if err != nil {
2323
log.Errorf("get user by mobile: %s,error: %v", request.Mobile, err)
2424
}

app/user/srv/controller/user/list.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ contoller依赖service层,并不是直接依赖了具体的struct 而是依赖
1414
但是底层是绝对不能依赖父层的!
1515
*/
1616

17-
func (us userServer) GetUserList(ctx context.Context, info *upbv1.PageInfo) (*upbv1.UserListResponse, error) {
17+
func (us *userServer) GetUserList(ctx context.Context, info *upbv1.PageInfo) (*upbv1.UserListResponse, error) {
1818
srvOpts := metav1.ListMeta{
1919
Page: int(info.Pn),
2020
PageSize: int(info.PSize),

app/user/srv/controller/user/update.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import (
1313
)
1414

1515
// controller层应该是很薄的一层,参数校验,日志打印,错误处理,调用service层
16-
func (u *userServer) UpdateUser(ctx context.Context, request *upbv1.UpdateUserInfo) (*emptypb.Empty, error) {
16+
func (us *userServer) UpdateUser(ctx context.Context, request *upbv1.UpdateUserInfo) (*emptypb.Empty, error) {
1717
birthDay := time.Unix(int64(request.BirthDay), 0)
1818
userDO := v1.UserDO{
1919
BaseModel: v1.BaseModel{
@@ -24,7 +24,7 @@ func (u *userServer) UpdateUser(ctx context.Context, request *upbv1.UpdateUserIn
2424
Birthday: &birthDay,
2525
}
2626
userDTO := v12.UserDTO{userDO}
27-
err := u.srv.Update(ctx, &userDTO)
27+
err := us.srv.Update(ctx, &userDTO)
2828
if err != nil {
2929
log.Errorf("update user: %v,error: %v", userDTO, err)
3030
return nil, err

app/user/srv/controller/user/user.go

+2
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@ type userServer struct {
99
srv srv1.UserSrv
1010
}
1111

12+
var _ v1.UserServer = &userServer{}
13+
1214
func NewUserServer(srv srv1.UserSrv) *userServer {
1315
return &userServer{srv: srv}
1416
}

0 commit comments

Comments
 (0)