Merge branch 'master' of github.com:alberliu/gim

alberliu · Sep 29, 2020 · d18ec60 · d18ec60
2 parents 0fd3327 + 9dc4fdc
commit d18ec60
Show file tree

Hide file tree

Showing 7 changed files with 202 additions and 35 deletions.
diff --git a/internal/user/api/user_ext.go b/internal/user/api/user_ext.go
@@ -2,6 +2,7 @@ package api
 
 import (
 	"context"
+	"gim/internal/user/model"
 	"gim/internal/user/service"
 	"gim/pkg/grpclib"
 	"gim/pkg/pb"
@@ -41,3 +42,17 @@ func (s *UserExtServer) GetUser(ctx context.Context, in *pb.GetUserReq) (*pb.Get
 		},
 	}, nil
 }
+
+func (s *UserExtServer) UpdateUser(ctx context.Context, in *pb.UpdateUserReq) (*pb.UpdateUserResp, error) {
+	userId, _, err := grpclib.GetCtxData(ctx)
+	if err != nil {
+		return nil, err
+	}
+	return &pb.UpdateUserResp{}, service.UserService.Update(ctx, model.User{
+		Id:        userId,
+		Nickname:  in.Nickname,
+		Sex:       in.Sex,
+		AvatarUrl: in.AvatarUrl,
+		Extra:     in.Extra,
+	})
+}
diff --git a/pkg/pb/conn.int.pb.go b/pkg/pb/conn.int.pb.go
diff --git a/pkg/pb/logic.ext.pb.go b/pkg/pb/logic.ext.pb.go
diff --git a/pkg/pb/logic.int.pb.go b/pkg/pb/logic.int.pb.go
diff --git a/pkg/pb/user.ext.pb.go b/pkg/pb/user.ext.pb.go
diff --git a/pkg/pb/user.int.pb.go b/pkg/pb/user.int.pb.go