重名

api/user/user.proto

@@ -360,7 +360,7 @@ service User {
     };
   };
   // 查询自己的小纸条
-  rpc FindMyScrip (FindScripRequest) returns (common.ScripReply){
+  rpc FindMyScrip (UserFindScripRequest) returns (common.ScripReply){
     option (google.api.http) = {
       post: "/api/user/scrip/find/self",
       body:"*"
@@ -374,7 +374,7 @@ service User {
     };
   };
   // 查询随机纸条列表
-  rpc FindRecommendScrip (FindScripRequest) returns (common.ScripReply){
+  rpc FindRecommendScrip (UserFindScripRequest) returns (common.ScripReply){
     option (google.api.http) = {
       post: "/api/user/scrip/find/recommend",
       body:"*"
@@ -422,7 +422,7 @@ message PersonLookScripRequest{
   int64 scripId = 3;// 纸条id
 }
 
-message FindScripRequest {
+message UserFindScripRequest {
   int64 nextId = 3;
   int64 offset = 4;
 }

api/user/user_grpc.pb.go

@@ -131,11 +131,11 @@ type UserClient interface {
 	// 删除纸条
 	DeleteScrip(ctx context.Context, in *DeleteScripRequest, opts ...grpc.CallOption) (*emptypb.Empty, error)
 	// 查询自己的小纸条
-	FindMyScrip(ctx context.Context, in *FindScripRequest, opts ...grpc.CallOption) (*common.ScripReply, error)
+	FindMyScrip(ctx context.Context, in *UserFindScripRequest, opts ...grpc.CallOption) (*common.ScripReply, error)
 	// 查询别人的小纸条
 	FindUserScrip(ctx context.Context, in *common.FindScripRequest, opts ...grpc.CallOption) (*common.ScripReply, error)
 	// 查询随机纸条列表
-	FindRecommendScrip(ctx context.Context, in *FindScripRequest, opts ...grpc.CallOption) (*common.ScripReply, error)
+	FindRecommendScrip(ctx context.Context, in *UserFindScripRequest, opts ...grpc.CallOption) (*common.ScripReply, error)
 	// 用户查看纸条
 	PersonLookScrip(ctx context.Context, in *PersonLookScripRequest, opts ...grpc.CallOption) (*emptypb.Empty, error)
 	// 用户点击回看
@@ -642,7 +642,7 @@ func (c *userClient) DeleteScrip(ctx context.Context, in *DeleteScripRequest, op
 	return out, nil
 }
 
-func (c *userClient) FindMyScrip(ctx context.Context, in *FindScripRequest, opts ...grpc.CallOption) (*common.ScripReply, error) {
+func (c *userClient) FindMyScrip(ctx context.Context, in *UserFindScripRequest, opts ...grpc.CallOption) (*common.ScripReply, error) {
 	out := new(common.ScripReply)
 	err := c.cc.Invoke(ctx, "/api.user.User/FindMyScrip", in, out, opts...)
 	if err != nil {
@@ -660,7 +660,7 @@ func (c *userClient) FindUserScrip(ctx context.Context, in *common.FindScripRequ
 	return out, nil
 }
 
-func (c *userClient) FindRecommendScrip(ctx context.Context, in *FindScripRequest, opts ...grpc.CallOption) (*common.ScripReply, error) {
+func (c *userClient) FindRecommendScrip(ctx context.Context, in *UserFindScripRequest, opts ...grpc.CallOption) (*common.ScripReply, error) {
 	out := new(common.ScripReply)
 	err := c.cc.Invoke(ctx, "/api.user.User/FindRecommendScrip", in, out, opts...)
 	if err != nil {
@@ -827,11 +827,11 @@ type UserServer interface {
 	// 删除纸条
 	DeleteScrip(context.Context, *DeleteScripRequest) (*emptypb.Empty, error)
 	// 查询自己的小纸条
-	FindMyScrip(context.Context, *FindScripRequest) (*common.ScripReply, error)
+	FindMyScrip(context.Context, *UserFindScripRequest) (*common.ScripReply, error)
 	// 查询别人的小纸条
 	FindUserScrip(context.Context, *common.FindScripRequest) (*common.ScripReply, error)
 	// 查询随机纸条列表
-	FindRecommendScrip(context.Context, *FindScripRequest) (*common.ScripReply, error)
+	FindRecommendScrip(context.Context, *UserFindScripRequest) (*common.ScripReply, error)
 	// 用户查看纸条
 	PersonLookScrip(context.Context, *PersonLookScripRequest) (*emptypb.Empty, error)
 	// 用户点击回看
@@ -1011,13 +1011,13 @@ func (UnimplementedUserServer) CreateScrip(context.Context, *CreateScripRequest)
 func (UnimplementedUserServer) DeleteScrip(context.Context, *DeleteScripRequest) (*emptypb.Empty, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method DeleteScrip not implemented")
 }
-func (UnimplementedUserServer) FindMyScrip(context.Context, *FindScripRequest) (*common.ScripReply, error) {
+func (UnimplementedUserServer) FindMyScrip(context.Context, *UserFindScripRequest) (*common.ScripReply, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method FindMyScrip not implemented")
 }
 func (UnimplementedUserServer) FindUserScrip(context.Context, *common.FindScripRequest) (*common.ScripReply, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method FindUserScrip not implemented")
 }
-func (UnimplementedUserServer) FindRecommendScrip(context.Context, *FindScripRequest) (*common.ScripReply, error) {
+func (UnimplementedUserServer) FindRecommendScrip(context.Context, *UserFindScripRequest) (*common.ScripReply, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method FindRecommendScrip not implemented")
 }
 func (UnimplementedUserServer) PersonLookScrip(context.Context, *PersonLookScripRequest) (*emptypb.Empty, error) {
@@ -2021,7 +2021,7 @@ func _User_DeleteScrip_Handler(srv interface{}, ctx context.Context, dec func(in
 }
 
 func _User_FindMyScrip_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(FindScripRequest)
+	in := new(UserFindScripRequest)
 	if err := dec(in); err != nil {
 		return nil, err
 	}
@@ -2033,7 +2033,7 @@ func _User_FindMyScrip_Handler(srv interface{}, ctx context.Context, dec func(in
 		FullMethod: "/api.user.User/FindMyScrip",
 	}
 	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(UserServer).FindMyScrip(ctx, req.(*FindScripRequest))
+		return srv.(UserServer).FindMyScrip(ctx, req.(*UserFindScripRequest))
 	}
 	return interceptor(ctx, in, info, handler)
 }
@@ -2057,7 +2057,7 @@ func _User_FindUserScrip_Handler(srv interface{}, ctx context.Context, dec func(
 }
 
 func _User_FindRecommendScrip_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(FindScripRequest)
+	in := new(UserFindScripRequest)
 	if err := dec(in); err != nil {
 		return nil, err
 	}
@@ -2069,7 +2069,7 @@ func _User_FindRecommendScrip_Handler(srv interface{}, ctx context.Context, dec
 		FullMethod: "/api.user.User/FindRecommendScrip",
 	}
 	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(UserServer).FindRecommendScrip(ctx, req.(*FindScripRequest))
+		return srv.(UserServer).FindRecommendScrip(ctx, req.(*UserFindScripRequest))
 	}
 	return interceptor(ctx, in, info, handler)
 }

api/user/user_http.pb.go

@@ -45,14 +45,14 @@ type UserHTTPServer interface {
 	FindMatchingAvatarAndNum(context.Context, *emptypb.Empty) (*FindMatchingAvatarAndNumReply, error)
 	FindMemeByType(context.Context, *common.MemeRequest) (*common.MemeList, error)
 	FindMemeTitle(context.Context, *emptypb.Empty) (*common.MemeTitleList, error)
-	FindMyScrip(context.Context, *FindScripRequest) (*common.ScripReply, error)
+	FindMyScrip(context.Context, *UserFindScripRequest) (*common.ScripReply, error)
 	FindOnlineList(context.Context, *common.ListPage2Request) (*common.RecommendPersonListReply, error)
 	FindOverSevenDayAvatar(context.Context, *emptypb.Empty) (*common.FindOverSevenDayAvatarReply, error)
 	FindOverSevenDayRoomList(context.Context, *common.ListPageRequest) (*UserFindChatListReply, error)
 	FindPayList(context.Context, *FindPayOrderListRequest) (*PayOrderList, error)
 	FindRechargeList(context.Context, *emptypb.Empty) (*RechargeList, error)
 	FindRecommendPersonList(context.Context, *FindRecommendPersonListRequest) (*common.RecommendPersonListReply, error)
-	FindRecommendScrip(context.Context, *FindScripRequest) (*common.ScripReply, error)
+	FindRecommendScrip(context.Context, *UserFindScripRequest) (*common.ScripReply, error)
 	FindTagListBySex(context.Context, *common.SexReq) (*common.TagListReply, error)
 	FindUserScrip(context.Context, *common.FindScripRequest) (*common.ScripReply, error)
 	FindWithinSevenDayRoomList(context.Context, *common.ListPageRequest) (*UserFindChatListReply, error)
@@ -1415,7 +1415,7 @@ func _User_DeleteScrip0_HTTP_Handler(srv UserHTTPServer) func(ctx http.Context)
 
 func _User_FindMyScrip0_HTTP_Handler(srv UserHTTPServer) func(ctx http.Context) error {
 	return func(ctx http.Context) error {
-		var in FindScripRequest
+		var in UserFindScripRequest
 		if err := ctx.Bind(&in); err != nil {
 			return err
 		}
@@ -1424,7 +1424,7 @@ func _User_FindMyScrip0_HTTP_Handler(srv UserHTTPServer) func(ctx http.Context)
 		}
 		http.SetOperation(ctx, "/api.user.User/FindMyScrip")
 		h := ctx.Middleware(func(ctx context.Context, req interface{}) (interface{}, error) {
-			return srv.FindMyScrip(ctx, req.(*FindScripRequest))
+			return srv.FindMyScrip(ctx, req.(*UserFindScripRequest))
 		})
 		out, err := h(ctx, &in)
 		if err != nil {
@@ -1469,7 +1469,7 @@ func _User_FindUserScrip0_HTTP_Handler(srv UserHTTPServer) func(ctx http.Context
 
 func _User_FindRecommendScrip0_HTTP_Handler(srv UserHTTPServer) func(ctx http.Context) error {
 	return func(ctx http.Context) error {
-		var in FindScripRequest
+		var in UserFindScripRequest
 		if err := ctx.Bind(&in); err != nil {
 			return err
 		}
@@ -1478,7 +1478,7 @@ func _User_FindRecommendScrip0_HTTP_Handler(srv UserHTTPServer) func(ctx http.Co
 		}
 		http.SetOperation(ctx, "/api.user.User/FindRecommendScrip")
 		h := ctx.Middleware(func(ctx context.Context, req interface{}) (interface{}, error) {
-			return srv.FindRecommendScrip(ctx, req.(*FindScripRequest))
+			return srv.FindRecommendScrip(ctx, req.(*UserFindScripRequest))
 		})
 		out, err := h(ctx, &in)
 		if err != nil {
@@ -1618,14 +1618,14 @@ type UserHTTPClient interface {
 	FindMatchingAvatarAndNum(ctx context.Context, req *emptypb.Empty, opts ...http.CallOption) (rsp *FindMatchingAvatarAndNumReply, err error)
 	FindMemeByType(ctx context.Context, req *common.MemeRequest, opts ...http.CallOption) (rsp *common.MemeList, err error)
 	FindMemeTitle(ctx context.Context, req *emptypb.Empty, opts ...http.CallOption) (rsp *common.MemeTitleList, err error)
-	FindMyScrip(ctx context.Context, req *FindScripRequest, opts ...http.CallOption) (rsp *common.ScripReply, err error)
+	FindMyScrip(ctx context.Context, req *UserFindScripRequest, opts ...http.CallOption) (rsp *common.ScripReply, err error)
 	FindOnlineList(ctx context.Context, req *common.ListPage2Request, opts ...http.CallOption) (rsp *common.RecommendPersonListReply, err error)
 	FindOverSevenDayAvatar(ctx context.Context, req *emptypb.Empty, opts ...http.CallOption) (rsp *common.FindOverSevenDayAvatarReply, err error)
 	FindOverSevenDayRoomList(ctx context.Context, req *common.ListPageRequest, opts ...http.CallOption) (rsp *UserFindChatListReply, err error)
 	FindPayList(ctx context.Context, req *FindPayOrderListRequest, opts ...http.CallOption) (rsp *PayOrderList, err error)
 	FindRechargeList(ctx context.Context, req *emptypb.Empty, opts ...http.CallOption) (rsp *RechargeList, err error)
 	FindRecommendPersonList(ctx context.Context, req *FindRecommendPersonListRequest, opts ...http.CallOption) (rsp *common.RecommendPersonListReply, err error)
-	FindRecommendScrip(ctx context.Context, req *FindScripRequest, opts ...http.CallOption) (rsp *common.ScripReply, err error)
+	FindRecommendScrip(ctx context.Context, req *UserFindScripRequest, opts ...http.CallOption) (rsp *common.ScripReply, err error)
 	FindTagListBySex(ctx context.Context, req *common.SexReq, opts ...http.CallOption) (rsp *common.TagListReply, err error)
 	FindUserScrip(ctx context.Context, req *common.FindScripRequest, opts ...http.CallOption) (rsp *common.ScripReply, err error)
 	FindWithinSevenDayRoomList(ctx context.Context, req *common.ListPageRequest, opts ...http.CallOption) (rsp *UserFindChatListReply, err error)
@@ -1862,7 +1862,7 @@ func (c *UserHTTPClientImpl) FindMemeTitle(ctx context.Context, in *emptypb.Empt
 	return &out, err
 }
 
-func (c *UserHTTPClientImpl) FindMyScrip(ctx context.Context, in *FindScripRequest, opts ...http.CallOption) (*common.ScripReply, error) {
+func (c *UserHTTPClientImpl) FindMyScrip(ctx context.Context, in *UserFindScripRequest, opts ...http.CallOption) (*common.ScripReply, error) {
 	var out common.ScripReply
 	pattern := "/api/user/scrip/find/self"
 	path := binding.EncodeURL(pattern, in, false)
@@ -1953,7 +1953,7 @@ func (c *UserHTTPClientImpl) FindRecommendPersonList(ctx context.Context, in *Fi
 	return &out, err
 }
 
-func (c *UserHTTPClientImpl) FindRecommendScrip(ctx context.Context, in *FindScripRequest, opts ...http.CallOption) (*common.ScripReply, error) {
+func (c *UserHTTPClientImpl) FindRecommendScrip(ctx context.Context, in *UserFindScripRequest, opts ...http.CallOption) (*common.ScripReply, error) {
 	var out common.ScripReply
 	pattern := "/api/user/scrip/find/recommend"
 	path := binding.EncodeURL(pattern, in, false)

js/api/user/user_http_pb.ts

@@ -1,7 +1,7 @@
 // @ts-ignore
 import request from '@/libs/request';
 import {UpdateInformationRequest,PersonIDParam,PersonMsg,SendPhoneCodeRequest,CheckPhoneCodeRequest,PartnerIDParam,CreateChatRoomParam,AddFriendMessageInfo,PersonParam,HomeInfo,PersonIDList,PersonDBReply,ListPageRequest,WxConfReq,WxConfResponse,SexReq,TagListReply,ListPage2Request,RecommendPersonListReply,LookedAndLikedNum,FindChatRecordListRequest,ChatRecordListReply,FindChatRoomMsgRequest,ChatRoomMsg,IsLike,ChatCardInfo,MemeRequest,MemeList,FindChatTopicRequest,ChatTopicList,RandomNum,CommonTextList,RandomNumAndSex,MemeTitleList,RoomIDRequest,ReportChatRequest,FindRecommendRequest,FindOverSevenDayAvatarReply,ScripID,ScripReply,FindScripRequest,ScripInfo,ChatRecordInfo,UpdateLastScripIDRequest} from "../common/common_pb";
-import {UserInfo,KeyRequest,UserFindChatListReply,UserBalance,InformationStatus,UserRechargeRequest,PayInfo,RechargeList,FindPayOrderListRequest,PayOrderList,FindRecommendPersonListRequest,FindMatchingAvatarAndNumReply,CreateScripRequest,DeleteScripRequest,FindScripRequest,PersonLookScripRequest,ReplyScripRequest} from "./user_pb";
+import {UserInfo,KeyRequest,UserFindChatListReply,UserBalance,InformationStatus,UserRechargeRequest,PayInfo,RechargeList,FindPayOrderListRequest,PayOrderList,FindRecommendPersonListRequest,FindMatchingAvatarAndNumReply,CreateScripRequest,DeleteScripRequest,UserFindScripRequest,PersonLookScripRequest,ReplyScripRequest} from "./user_pb";
 import {CheckUserPartnerIsRelationshipReply,RoomReply,WindowInfo} from "../chat/chat_pb";
 import {LookAndLikeListReply,LookAndLikeMessageReply,LookMessageReply} from "../statistics/statistics_pb";
 
@@ -242,7 +242,7 @@ const UserService = {
     return res.data.data;
   },
   /**  查询自己的小纸条 */
-  FindMyScrip: async (req?: FindScripRequest) => {
+  FindMyScrip: async (req?: UserFindScripRequest) => {
 	const res = await request.post<{ data: ScripReply, code: string, message: string }>('/api/user/scrip/find/self', req);
     return res.data.data;
   },
@@ -252,7 +252,7 @@ const UserService = {
     return res.data.data;
   },
   /**  查询随机纸条列表 */
-  FindRecommendScrip: async (req?: FindScripRequest) => {
+  FindRecommendScrip: async (req?: UserFindScripRequest) => {
 	const res = await request.post<{ data: ScripReply, code: string, message: string }>('/api/user/scrip/find/recommend', req);
     return res.data.data;
   },

js/api/user/user_pb.ts

@@ -9,7 +9,7 @@ export interface PersonLookScripRequest{
     /**  纸条id */
     scripId?:number;
 }
-export interface FindScripRequest{
+export interface UserFindScripRequest{
     nextId?:number;
     offset?:number;
 }