wfz 3 лет назад
Родитель
Сommit
8988401307
5 измененных файлов с 567 добавлено и 666 удалено
  1. 566 572
      api/user/user.pb.go
  2. 0 7
      api/user/user.proto
  3. 0 38
      api/user/user_grpc.pb.go
  4. 0 43
      api/user/user_http.pb.go
  5. 1 6
      js/api/user/user_http_pb.ts

Разница между файлами не показана из-за своего большого размера
+ 566 - 572
api/user/user.pb.go


+ 0 - 7
api/user/user.proto

@@ -84,13 +84,6 @@ service User {
       body:"*"
     };
   };
-  // 10、微信SDK初始化
-  rpc WxConf (common.WxConfReq) returns (common.WxConfResponse){
-    option (google.api.http) = {
-      post: "/api/wx/jssdk/config",
-      body:"*"
-    };
-  };
   // 11、获取标签列表
   rpc FindTagListBySex (common.SexReq) returns (common.TagListReply){
     option (google.api.http) = {

+ 0 - 38
api/user/user_grpc.pb.go

@@ -41,8 +41,6 @@ type UserClient interface {
 	UserGetPersonLikedAndLooked(ctx context.Context, in *common.PersonParam, opts ...grpc.CallOption) (*common.LookedAndLikedNum, error)
 	// 9、查看看过我的列表
 	FindLookList(ctx context.Context, in *common.ListPageRequest, opts ...grpc.CallOption) (*statistics.LookAndLikeListReply, error)
-	// 10、微信SDK初始化
-	WxConf(ctx context.Context, in *common.WxConfReq, opts ...grpc.CallOption) (*common.WxConfResponse, error)
 	// 11、获取标签列表
 	FindTagListBySex(ctx context.Context, in *common.SexReq, opts ...grpc.CallOption) (*common.TagListReply, error)
 	// 12、获取在线列表
@@ -322,15 +320,6 @@ func (c *userClient) FindLookList(ctx context.Context, in *common.ListPageReques
 	return out, nil
 }
 
-func (c *userClient) WxConf(ctx context.Context, in *common.WxConfReq, opts ...grpc.CallOption) (*common.WxConfResponse, error) {
-	out := new(common.WxConfResponse)
-	err := c.cc.Invoke(ctx, "/api.user.User/WxConf", in, out, opts...)
-	if err != nil {
-		return nil, err
-	}
-	return out, nil
-}
-
 func (c *userClient) FindTagListBySex(ctx context.Context, in *common.SexReq, opts ...grpc.CallOption) (*common.TagListReply, error) {
 	out := new(common.TagListReply)
 	err := c.cc.Invoke(ctx, "/api.user.User/FindTagListBySex", in, out, opts...)
@@ -1155,8 +1144,6 @@ type UserServer interface {
 	UserGetPersonLikedAndLooked(context.Context, *common.PersonParam) (*common.LookedAndLikedNum, error)
 	// 9、查看看过我的列表
 	FindLookList(context.Context, *common.ListPageRequest) (*statistics.LookAndLikeListReply, error)
-	// 10、微信SDK初始化
-	WxConf(context.Context, *common.WxConfReq) (*common.WxConfResponse, error)
 	// 11、获取标签列表
 	FindTagListBySex(context.Context, *common.SexReq) (*common.TagListReply, error)
 	// 12、获取在线列表
@@ -1373,9 +1360,6 @@ func (UnimplementedUserServer) UserGetPersonLikedAndLooked(context.Context, *com
 func (UnimplementedUserServer) FindLookList(context.Context, *common.ListPageRequest) (*statistics.LookAndLikeListReply, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method FindLookList not implemented")
 }
-func (UnimplementedUserServer) WxConf(context.Context, *common.WxConfReq) (*common.WxConfResponse, error) {
-	return nil, status.Errorf(codes.Unimplemented, "method WxConf not implemented")
-}
 func (UnimplementedUserServer) FindTagListBySex(context.Context, *common.SexReq) (*common.TagListReply, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method FindTagListBySex not implemented")
 }
@@ -1836,24 +1820,6 @@ func _User_FindLookList_Handler(srv interface{}, ctx context.Context, dec func(i
 	return interceptor(ctx, in, info, handler)
 }
 
-func _User_WxConf_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(common.WxConfReq)
-	if err := dec(in); err != nil {
-		return nil, err
-	}
-	if interceptor == nil {
-		return srv.(UserServer).WxConf(ctx, in)
-	}
-	info := &grpc.UnaryServerInfo{
-		Server:     srv,
-		FullMethod: "/api.user.User/WxConf",
-	}
-	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(UserServer).WxConf(ctx, req.(*common.WxConfReq))
-	}
-	return interceptor(ctx, in, info, handler)
-}
-
 func _User_FindTagListBySex_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
 	in := new(common.SexReq)
 	if err := dec(in); err != nil {
@@ -3503,10 +3469,6 @@ var User_ServiceDesc = grpc.ServiceDesc{
 			MethodName: "FindLookList",
 			Handler:    _User_FindLookList_Handler,
 		},
-		{
-			MethodName: "WxConf",
-			Handler:    _User_WxConf_Handler,
-		},
 		{
 			MethodName: "FindTagListBySex",
 			Handler:    _User_FindTagListBySex_Handler,

+ 0 - 43
api/user/user_http.pb.go

@@ -105,7 +105,6 @@ type UserHTTPServer interface {
 	UserSetBlackChat(context.Context, *common.RoomIDRequest) (*emptypb.Empty, error)
 	UserSetPrivacyStatus(context.Context, *UserPrivacyStatusInfo) (*emptypb.Empty, error)
 	UserUnLike(context.Context, *common.PersonParam) (*emptypb.Empty, error)
-	WxConf(context.Context, *common.WxConfReq) (*common.WxConfResponse, error)
 }
 
 func RegisterUserHTTPServer(s *http.Server, srv UserHTTPServer) {
@@ -120,7 +119,6 @@ func RegisterUserHTTPServer(s *http.Server, srv UserHTTPServer) {
 	r.POST("/api/user/home", _User_UserGetHomeInfo0_HTTP_Handler(srv))
 	r.POST("/api/user/num", _User_UserGetPersonLikedAndLooked0_HTTP_Handler(srv))
 	r.POST("/api/user/list/look", _User_FindLookList0_HTTP_Handler(srv))
-	r.POST("/api/wx/jssdk/config", _User_WxConf0_HTTP_Handler(srv))
 	r.POST("/api/user/list/tag", _User_FindTagListBySex0_HTTP_Handler(srv))
 	r.POST("/api/user/list/online", _User_FindOnlineList0_HTTP_Handler(srv))
 	r.POST("/api/user/list/chat/within", _User_FindWithinSevenDayRoomList0_HTTP_Handler(srv))
@@ -458,33 +456,6 @@ func _User_FindLookList0_HTTP_Handler(srv UserHTTPServer) func(ctx http.Context)
 	}
 }
 
-func _User_WxConf0_HTTP_Handler(srv UserHTTPServer) func(ctx http.Context) error {
-	return func(ctx http.Context) error {
-		var in common.WxConfReq
-		if err := ctx.Bind(&in); err != nil {
-			return err
-		}
-		if err := ctx.BindQuery(&in); err != nil {
-			return err
-		}
-		http.SetOperation(ctx, "/api.user.User/WxConf")
-		h := ctx.Middleware(func(ctx context.Context, req interface{}) (interface{}, error) {
-			return srv.WxConf(ctx, req.(*common.WxConfReq))
-		})
-		out, err := h(ctx, &in)
-		if err != nil {
-			return err
-		}
-		success := &reply.SuccessReply{
-			Code: 0,
-		}
-		if out != nil {
-			success.Data = out
-		}
-		return ctx.Result(200, success)
-	}
-}
-
 func _User_FindTagListBySex0_HTTP_Handler(srv UserHTTPServer) func(ctx http.Context) error {
 	return func(ctx http.Context) error {
 		var in common.SexReq
@@ -2316,7 +2287,6 @@ type UserHTTPClient interface {
 	UserSetBlackChat(ctx context.Context, req *common.RoomIDRequest, opts ...http.CallOption) (rsp *emptypb.Empty, err error)
 	UserSetPrivacyStatus(ctx context.Context, req *UserPrivacyStatusInfo, opts ...http.CallOption) (rsp *emptypb.Empty, err error)
 	UserUnLike(ctx context.Context, req *common.PersonParam, opts ...http.CallOption) (rsp *emptypb.Empty, err error)
-	WxConf(ctx context.Context, req *common.WxConfReq, opts ...http.CallOption) (rsp *common.WxConfResponse, err error)
 }
 
 type UserHTTPClientImpl struct {
@@ -3301,16 +3271,3 @@ func (c *UserHTTPClientImpl) UserUnLike(ctx context.Context, in *common.PersonPa
 	}
 	return &out, err
 }
-
-func (c *UserHTTPClientImpl) WxConf(ctx context.Context, in *common.WxConfReq, opts ...http.CallOption) (*common.WxConfResponse, error) {
-	var out common.WxConfResponse
-	pattern := "/api/wx/jssdk/config"
-	path := binding.EncodeURL(pattern, in, false)
-	opts = append(opts, http.Operation("/api.user.User/WxConf"))
-	opts = append(opts, http.PathTemplate(pattern))
-	err := c.cc.Invoke(ctx, "POST", path, in, &out, opts...)
-	if err != nil {
-		return nil, err
-	}
-	return &out, err
-}

+ 1 - 6
js/api/user/user_http_pb.ts

@@ -1,7 +1,7 @@
 // @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,MatchUserDBWithoutMapRequest,UpdateTodayRequest,UpdateLastSendTemplateTimeRequest} from "./user_pb";
-import {SendPhoneCodeRequest,CheckPhoneCodeRequest,UpdateInformationRequest,CreateChatRoomParam,PersonParam,HomeInfo,LookedAndLikedNum,ListPageRequest,WxConfReq,WxConfResponse,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,PersonMsg,PersonIDList,PersonDBReply,UpdateLastScripIDDBRequest,IDParam,PersonDB,GetUserDBAndInitReq,PersonDBDetails} from "../common/common_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,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";
 
@@ -55,11 +55,6 @@ const UserService = {
 	const res = await request.post<{ data: LookAndLikeListReply, code: string, message: string }>('/api/user/list/look', req);
     return res.data.data;
   },
-  /**  10、微信SDK初始化 */
-  WxConf: async (req?: WxConfReq) => {
-	const res = await request.post<{ data: WxConfResponse, code: string, message: string }>('/api/wx/jssdk/config', req);
-    return res.data.data;
-  },
   /**  11、获取标签列表 */
   FindTagListBySex: async (req?: SexReq) => {
 	const res = await request.post<{ data: TagListReply, code: string, message: string }>('/api/user/list/tag', req);

Некоторые файлы не были показаны из-за большого количества измененных файлов