瀏覽代碼

PersonLookScrip返回下一个小纸条是否需要解锁

wfz 2 年之前
父節點
當前提交
b269d94311
共有 6 個文件被更改,包括 173 次插入118 次删除
  1. 153 106
      api/user/user.pb.go
  2. 5 1
      api/user/user.proto
  3. 5 5
      api/user/user_grpc.pb.go
  4. 4 4
      api/user/user_http.pb.go
  5. 2 2
      js/api/user/user_http_pb.ts
  6. 4 0
      js/api/user/user_pb.ts

File diff suppressed because it is too large
+ 153 - 106
api/user/user.pb.go


+ 5 - 1
api/user/user.proto

@@ -260,7 +260,7 @@ service User {
     };
   };
   // 36、用户查看纸条
-  rpc PersonLookScrip (PersonLookScripRequest) returns (google.protobuf.Empty){
+  rpc PersonLookScrip (PersonLookScripRequest) returns (PersonLookScripReply){
     option (google.api.http) = {
       post: "/api/user/scrip/look",
       body:"*"
@@ -621,6 +621,10 @@ service User {
   rpc CronRemoveExpirationVip (google.protobuf.Empty) returns (google.protobuf.Empty){};
 }
 
+message PersonLookScripReply{
+  bool isNextLock = 1;// 下一个小纸条是否需要解锁
+}
+
 message UpdateTodayRequest{
   string userId = 1;
   int64 todaySendUnreadReminderNum = 2;

+ 5 - 5
api/user/user_grpc.pb.go

@@ -92,7 +92,7 @@ type UserClient interface {
 	// 35、查询随机纸条列表
 	FindRecommendScrip(ctx context.Context, in *UserFindScripRequest, opts ...grpc.CallOption) (*common.ScripReply, error)
 	// 36、用户查看纸条
-	PersonLookScrip(ctx context.Context, in *PersonLookScripRequest, opts ...grpc.CallOption) (*emptypb.Empty, error)
+	PersonLookScrip(ctx context.Context, in *PersonLookScripRequest, opts ...grpc.CallOption) (*PersonLookScripReply, error)
 	// 37、用户点击回看
 	PersonClickLookBack(ctx context.Context, in *emptypb.Empty, opts ...grpc.CallOption) (*common.ScripInfo, error)
 	// 38、用户回复小纸条
@@ -555,8 +555,8 @@ func (c *userClient) FindRecommendScrip(ctx context.Context, in *UserFindScripRe
 	return out, nil
 }
 
-func (c *userClient) PersonLookScrip(ctx context.Context, in *PersonLookScripRequest, opts ...grpc.CallOption) (*emptypb.Empty, error) {
-	out := new(emptypb.Empty)
+func (c *userClient) PersonLookScrip(ctx context.Context, in *PersonLookScripRequest, opts ...grpc.CallOption) (*PersonLookScripReply, error) {
+	out := new(PersonLookScripReply)
 	err := c.cc.Invoke(ctx, "/api.user.User/PersonLookScrip", in, out, opts...)
 	if err != nil {
 		return nil, err
@@ -1250,7 +1250,7 @@ type UserServer interface {
 	// 35、查询随机纸条列表
 	FindRecommendScrip(context.Context, *UserFindScripRequest) (*common.ScripReply, error)
 	// 36、用户查看纸条
-	PersonLookScrip(context.Context, *PersonLookScripRequest) (*emptypb.Empty, error)
+	PersonLookScrip(context.Context, *PersonLookScripRequest) (*PersonLookScripReply, error)
 	// 37、用户点击回看
 	PersonClickLookBack(context.Context, *emptypb.Empty) (*common.ScripInfo, error)
 	// 38、用户回复小纸条
@@ -1500,7 +1500,7 @@ func (UnimplementedUserServer) FindOtherScrip(context.Context, *common.FindScrip
 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) {
+func (UnimplementedUserServer) PersonLookScrip(context.Context, *PersonLookScripRequest) (*PersonLookScripReply, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method PersonLookScrip not implemented")
 }
 func (UnimplementedUserServer) PersonClickLookBack(context.Context, *emptypb.Empty) (*common.ScripInfo, error) {

+ 4 - 4
api/user/user_http.pb.go

@@ -78,7 +78,7 @@ type UserHTTPServer interface {
 	GetWindowInfo(context.Context, *emptypb.Empty) (*chat.WindowInfo, error)
 	IsCanGetReturnReword(context.Context, *emptypb.Empty) (*IsCanGetReturnRewordReply, error)
 	PersonClickLookBack(context.Context, *emptypb.Empty) (*common.ScripInfo, error)
-	PersonLookScrip(context.Context, *PersonLookScripRequest) (*emptypb.Empty, error)
+	PersonLookScrip(context.Context, *PersonLookScripRequest) (*PersonLookScripReply, error)
 	PersonReplyScrip(context.Context, *ReplyScripRequest) (*common.ChatRecordInfo, error)
 	PersonStarScrip(context.Context, *common.ScripIdRequest) (*common.ChatRecordInfo, error)
 	RandomMeme(context.Context, *common.RandomNum) (*common.CommonTextList, error)
@@ -2376,7 +2376,7 @@ type UserHTTPClient interface {
 	GetWindowInfo(ctx context.Context, req *emptypb.Empty, opts ...http.CallOption) (rsp *chat.WindowInfo, err error)
 	IsCanGetReturnReword(ctx context.Context, req *emptypb.Empty, opts ...http.CallOption) (rsp *IsCanGetReturnRewordReply, err error)
 	PersonClickLookBack(ctx context.Context, req *emptypb.Empty, opts ...http.CallOption) (rsp *common.ScripInfo, err error)
-	PersonLookScrip(ctx context.Context, req *PersonLookScripRequest, opts ...http.CallOption) (rsp *emptypb.Empty, err error)
+	PersonLookScrip(ctx context.Context, req *PersonLookScripRequest, opts ...http.CallOption) (rsp *PersonLookScripReply, err error)
 	PersonReplyScrip(ctx context.Context, req *ReplyScripRequest, opts ...http.CallOption) (rsp *common.ChatRecordInfo, err error)
 	PersonStarScrip(ctx context.Context, req *common.ScripIdRequest, opts ...http.CallOption) (rsp *common.ChatRecordInfo, err error)
 	RandomMeme(ctx context.Context, req *common.RandomNum, opts ...http.CallOption) (rsp *common.CommonTextList, err error)
@@ -3041,8 +3041,8 @@ func (c *UserHTTPClientImpl) PersonClickLookBack(ctx context.Context, in *emptyp
 	return &out, err
 }
 
-func (c *UserHTTPClientImpl) PersonLookScrip(ctx context.Context, in *PersonLookScripRequest, opts ...http.CallOption) (*emptypb.Empty, error) {
-	var out emptypb.Empty
+func (c *UserHTTPClientImpl) PersonLookScrip(ctx context.Context, in *PersonLookScripRequest, opts ...http.CallOption) (*PersonLookScripReply, error) {
+	var out PersonLookScripReply
 	pattern := "/api/user/scrip/look"
 	path := binding.EncodeURL(pattern, in, false)
 	opts = append(opts, http.Operation("/api.user.User/PersonLookScrip"))

+ 2 - 2
js/api/user/user_http_pb.ts

@@ -1,6 +1,6 @@
 // @ts-ignore
 import request from '@/libs/request';
-import {UserInfo,UserBalance,UserFindChatListReply,CreateScripRequest,DeleteScripRequest,UserFindScripRequest,PersonLookScripRequest,ReplyScripRequest,KeyRequest,InformationStatus,UserRechargeRequest,PayInfo,RechargeList,VipRechargeList,FindPayOrderListRequest,PayOrderList,FindMatchingAvatarAndNumReply,UserFreeNum,GetRandomMatchingRequest,SendMessageRequest,VipInfo,GetUserLookHandPickNumReply,IsCanGetReturnRewordReply,UserPrivacyStatusInfo,FindRecommendHighQualityUserRequest,FindRecommendHighQualityUserReply,GetUserDBMsgFromWebsocketReply,SendMsgReduceCreditRequest,UpdateUserMatchedNumRequest,UpdateUserMatchedNumAndReturnUserMsgReply,GetRecommendUserDBRequest,ReportUserBlackRequest,AddUserCreditRequest,UserGetInformationAwardByActivityRequest,UserGetInformationAwardByActivityReply,FindUserVipListDBReply,FindUserCertificationDBReply,MatchUserDBWithoutMapRequest,UpdateTodayRequest,UpdateLastSendTemplateTimeRequest} from "./user_pb";
+import {UserInfo,UserBalance,UserFindChatListReply,CreateScripRequest,DeleteScripRequest,UserFindScripRequest,PersonLookScripRequest,PersonLookScripReply,ReplyScripRequest,KeyRequest,InformationStatus,UserRechargeRequest,PayInfo,RechargeList,VipRechargeList,FindPayOrderListRequest,PayOrderList,FindMatchingAvatarAndNumReply,UserFreeNum,GetRandomMatchingRequest,SendMessageRequest,VipInfo,GetUserLookHandPickNumReply,IsCanGetReturnRewordReply,UserPrivacyStatusInfo,FindRecommendHighQualityUserRequest,FindRecommendHighQualityUserReply,GetUserDBMsgFromWebsocketReply,SendMsgReduceCreditRequest,UpdateUserMatchedNumRequest,UpdateUserMatchedNumAndReturnUserMsgReply,GetRecommendUserDBRequest,ReportUserBlackRequest,AddUserCreditRequest,UserGetInformationAwardByActivityRequest,UserGetInformationAwardByActivityReply,FindUserVipListDBReply,FindUserCertificationDBReply,MatchUserDBWithoutMapRequest,UpdateTodayRequest,UpdateLastSendTemplateTimeRequest} from "./user_pb";
 import {SendPhoneCodeRequest,CheckPhoneCodeRequest,UpdateInformationRequest,CreateChatRoomParam,PersonParam,HomeInfo,LookedAndLikedNum,ListPageRequest,SexReq,TagListReply,ListPage2Request,RecommendPersonListReply,FindChatRecordListRequest,ChatRecordListReply,FindChatRoomMsgRequest,ChatRoomMsg,IsLike,MemeRequest,MemeList,FindChatTopicRequest,ChatTopicList,RandomNum,CommonTextList,RandomNumAndSex,MemeTitleList,ChatCardInfo,ReportChatRequest,FindOverSevenDayAvatarReply,UpdateLastScripIDRequest,ScripID,ScripReply,FindScripRequest,ScripInfo,ChatRecordInfo,RoomIDRequest,PartnerIDParam,AddFriendMessageInfo,SendMessageReply,HandpickPersonListReply,PersonIDParam,ScripIdRequest,CheckIdentifyRequest,CheckIdentifyReply,PersonMsg,PersonIDList,PersonDBReply,UpdateLastScripIDDBRequest,IDParam,PersonDB,GetUserDBAndInitReq,PersonDBDetails} from "../common/common_pb";
 import {RoomReply,UnreadNumReply,UserRoomInfo,CheckUserPartnerIsRelationshipReply,WindowInfo,GetRandomMatchingReply} from "../chat/chat_pb";
 import {LookAndLikeListReply,LookAndLikeMessageReply,LookMessageReply} from "../statistics/statistics_pb";
@@ -182,7 +182,7 @@ const UserService = {
   },
   /**  36、用户查看纸条 */
   PersonLookScrip: async (req?: PersonLookScripRequest) => {
-	const res = await request.post('/api/user/scrip/look', req);
+	const res = await request.post<{ data: PersonLookScripReply, code: string, message: string }>('/api/user/scrip/look', req);
     return res.data.data;
   },
   /**  37、用户点击回看 */

+ 4 - 0
js/api/user/user_pb.ts

@@ -1,5 +1,9 @@
 import {Message} from "../common/common_pb";
 
+export interface PersonLookScripReply{
+    /**  下一个小纸条是否需要解锁 */
+    isNextLock?:boolean;
+}
 export interface UpdateTodayRequest{
     userId?:string;
     todaySendUnreadReminderNum?:number;

Some files were not shown because too many files changed in this diff