合并

go.mod

@@ -9,4 +9,5 @@ require (
 	bp.jydev.jianyu360.cn/BaseService/resourceCenter v0.0.4
 	github.com/zeromicro/go-zero v1.4.3
 	google.golang.org/grpc v1.51.0
+	google.golang.org/protobuf v1.28.1
 )

rpc/pb/userCenter_grpc.pb.go

@@ -1,11 +1,7 @@
 // Code generated by protoc-gen-go-grpc. DO NOT EDIT.
 // versions:
 // - protoc-gen-go-grpc v1.2.0
-<<<<<<< HEAD
 // - protoc             v3.20.0--rc2
-=======
-// - protoc             v3.15.1
->>>>>>> master
 // source: userCenter.proto
 
 package pb
@@ -64,13 +60,10 @@ type UserCenterClient interface {
 	GetEntUserList(ctx context.Context, in *EntUserListReq, opts ...grpc.CallOption) (*EntUserListResp, error)
 	//查看员工是否是企业管理员
 	CheckIsEntAdmin(ctx context.Context, in *EntUserReq, opts ...grpc.CallOption) (*CheckIsEntAdminResp, error)
-<<<<<<< HEAD
 	//获取用户可切换的身份列表
 	IdentityList(ctx context.Context, in *IdentityReq, opts ...grpc.CallOption) (*IdentityResp, error)
-=======
 	//获取用户身份相关参数
 	UserIdentity(ctx context.Context, in *UserIdentityReq, opts ...grpc.CallOption) (*UserIdentityResp, error)
->>>>>>> master
 }
 
 type userCenterClient struct {
@@ -252,15 +245,18 @@ func (c *userCenterClient) CheckIsEntAdmin(ctx context.Context, in *EntUserReq,
 	return out, nil
 }
 
-<<<<<<< HEAD
 func (c *userCenterClient) IdentityList(ctx context.Context, in *IdentityReq, opts ...grpc.CallOption) (*IdentityResp, error) {
 	out := new(IdentityResp)
 	err := c.cc.Invoke(ctx, "/UserCenter/IdentityList", in, out, opts...)
-=======
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
 func (c *userCenterClient) UserIdentity(ctx context.Context, in *UserIdentityReq, opts ...grpc.CallOption) (*UserIdentityResp, error) {
 	out := new(UserIdentityResp)
 	err := c.cc.Invoke(ctx, "/UserCenter/UserIdentity", in, out, opts...)
->>>>>>> master
 	if err != nil {
 		return nil, err
 	}
@@ -309,13 +305,10 @@ type UserCenterServer interface {
 	GetEntUserList(context.Context, *EntUserListReq) (*EntUserListResp, error)
 	//查看员工是否是企业管理员
 	CheckIsEntAdmin(context.Context, *EntUserReq) (*CheckIsEntAdminResp, error)
-<<<<<<< HEAD
 	//获取用户可切换的身份列表
 	IdentityList(context.Context, *IdentityReq) (*IdentityResp, error)
-=======
 	//获取用户身份相关参数
 	UserIdentity(context.Context, *UserIdentityReq) (*UserIdentityResp, error)
->>>>>>> master
 	mustEmbedUnimplementedUserCenterServer()
 }
 
@@ -380,13 +373,11 @@ func (UnimplementedUserCenterServer) GetEntUserList(context.Context, *EntUserLis
 func (UnimplementedUserCenterServer) CheckIsEntAdmin(context.Context, *EntUserReq) (*CheckIsEntAdminResp, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method CheckIsEntAdmin not implemented")
 }
-<<<<<<< HEAD
 func (UnimplementedUserCenterServer) IdentityList(context.Context, *IdentityReq) (*IdentityResp, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method IdentityList not implemented")
-=======
+}
 func (UnimplementedUserCenterServer) UserIdentity(context.Context, *UserIdentityReq) (*UserIdentityResp, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method UserIdentity not implemented")
->>>>>>> master
 }
 func (UnimplementedUserCenterServer) mustEmbedUnimplementedUserCenterServer() {}
 
@@ -743,18 +734,12 @@ func _UserCenter_CheckIsEntAdmin_Handler(srv interface{}, ctx context.Context, d
 	return interceptor(ctx, in, info, handler)
 }
 
-<<<<<<< HEAD
 func _UserCenter_IdentityList_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
 	in := new(IdentityReq)
-=======
-func _UserCenter_UserIdentity_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(UserIdentityReq)
->>>>>>> master
 	if err := dec(in); err != nil {
 		return nil, err
 	}
 	if interceptor == nil {
-<<<<<<< HEAD
 		return srv.(UserCenterServer).IdentityList(ctx, in)
 	}
 	info := &grpc.UnaryServerInfo{
@@ -763,7 +748,16 @@ func _UserCenter_UserIdentity_Handler(srv interface{}, ctx context.Context, dec
 	}
 	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
 		return srv.(UserCenterServer).IdentityList(ctx, req.(*IdentityReq))
-=======
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _UserCenter_UserIdentity_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(UserIdentityReq)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
 		return srv.(UserCenterServer).UserIdentity(ctx, in)
 	}
 	info := &grpc.UnaryServerInfo{
@@ -772,7 +766,6 @@ func _UserCenter_UserIdentity_Handler(srv interface{}, ctx context.Context, dec
 	}
 	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
 		return srv.(UserCenterServer).UserIdentity(ctx, req.(*UserIdentityReq))
->>>>>>> master
 	}
 	return interceptor(ctx, in, info, handler)
 }
@@ -861,13 +854,12 @@ var UserCenter_ServiceDesc = grpc.ServiceDesc{
 			Handler:    _UserCenter_CheckIsEntAdmin_Handler,
 		},
 		{
-<<<<<<< HEAD
 			MethodName: "IdentityList",
 			Handler:    _UserCenter_IdentityList_Handler,
-=======
+		},
+		{
 			MethodName: "UserIdentity",
 			Handler:    _UserCenter_UserIdentity_Handler,
->>>>>>> master
 		},
 	},
 	Streams:  []grpc.StreamDesc{},