merge

jyBXSubscribe/api/bxsubscribe.api

@@ -121,15 +121,13 @@ type (
 		MessageId string `json:"messageId"`
 		Staffs    string `json:"staffs"`
 	}
-<<<<<<< HEAD
-
 	deriveReq {
 		AppId     string `header:"appId"`
 		UserId    string `header:"userId"`
 		EntId     string `header:"entId,optional"`
 		EntUserId string `header:"entUserId,optional"`
 		InfoId    string `json:"infoId,optional"`
-=======
+	}
 	GetUserReq {
 		AppId        string `header:"appId"`
 		EntId        int64  `header:"entId,optional"`
@@ -162,7 +160,6 @@ type (
 		PushType     string   `json:"pushType,optional"`
 		PushValue    int64    `json:"pushValue,optional"`
 		Interested   int64    `json:"interested,optional"`
->>>>>>> master
 	}
 )
 service bxsubscribe-api {
@@ -184,12 +181,10 @@ service bxsubscribe-api {
 	post /jybx/subscribe/:userType/viewStatus(viewStatusReq) returns (commonResp)
 	@handler msgDistributor
 	post /jybx/subscribe/msgDistributor(msgDistributor) returns (commonResp)
-<<<<<<< HEAD
 	@handler deriveShow //数据导出筛选条件回显
 	post /jybx/subscribe/deriveShow(deriveReq) returns (commonResp)
 	@handler deriveDel//数据导出筛选条件删除
 	post /jybx/subscribe/deriveDel(deriveReq) returns (commonResp)
-=======
 	@handler getUser //查询用户信息
 	post /jybx/subscribe/getUser (GetUserReq) returns (commonResp)
 	@handler setUser  //设置用户信息
@@ -198,5 +193,4 @@ service bxsubscribe-api {
 	post /jybx/subscribe/getPushSet (GetUserReq) returns (commonResp)
 	@handler setPushSet  //推送设置修改
 	post /jybx/subscribe/setPushSet (SetPushSetReq) returns (commonResp)
->>>>>>> master
 }

jyBXSubscribe/api/internal/types/types.go

@@ -119,14 +119,14 @@ type MsgDistributor struct {
 	Staffs    string `json:"staffs"`
 }
 
-<<<<<<< HEAD
 type DeriveReq struct {
 	AppId     string `header:"appId"`
 	UserId    string `header:"userId"`
 	EntId     string `header:"entId,optional"`
 	EntUserId string `header:"entUserId,optional"`
 	InfoId    string `json:"infoId,optional"`
-=======
+}
+
 type GetUserReq struct {
 	AppId        string `header:"appId"`
 	EntId        int64  `header:"entId,optional"`
@@ -161,5 +161,4 @@ type SetPushSetReq struct {
 	PushType     string   `json:"pushType,optional"`
 	PushValue    int64    `json:"pushValue,optional"`
 	Interested   int64    `json:"interested,optional"`
->>>>>>> master
 }

jyBXSubscribe/rpc/bxsubscribe.proto

@@ -403,12 +403,10 @@ service Bxsubscribe {
   rpc GetDistributor(GetDistributorReq)returns(DistributorResp);
   //查看状态
   rpc GetViewStatus(GetViewStatusReq)returns(ViewStatusResp);
-<<<<<<< HEAD
   //自动数据导出筛选条件查询
   rpc deriveShow(DeriveReq)returns(DeriveRes);
   //删除自动数据导出筛选条件
   rpc deriveDel(DeriveReq)returns(StatusResp);
-=======
   //用户推送信息查看
   rpc userInfo(GetUserInfoReq)returns(GetUserInfoResq);
   //用户邮箱保存
@@ -417,5 +415,4 @@ service Bxsubscribe {
   rpc getPushSet(GetPushSetReq)returns(GetPushSetResp);
   //用户推送设置修改
   rpc setPushSet(SetPushSetReq)returns(StatusResp);
->>>>>>> master
 }

jyBXSubscribe/rpc/bxsubscribe/bxsubscribe.go

@@ -1,7 +1,7 @@
-// Code generated by goctl. DO NOT EDIT!
+// Code generated by goctl. DO NOT EDIT.
 // Source: bxsubscribe.proto
 
-package bxsubscribe
+package bxsubscribeclient
 
 import (
 	"context"
@@ -163,6 +163,18 @@ func (m *defaultBxsubscribe) GetViewStatus(ctx context.Context, in *GetViewStatu
 	return client.GetViewStatus(ctx, in, opts...)
 }
 
+// 自动数据导出筛选条件查询
+func (m *defaultBxsubscribe) DeriveShow(ctx context.Context, in *DeriveReq, opts ...grpc.CallOption) (*DeriveRes, error) {
+	client := bxsubscribe.NewBxsubscribeClient(m.cli.Conn())
+	return client.DeriveShow(ctx, in, opts...)
+}
+
+// 删除自动数据导出筛选条件
+func (m *defaultBxsubscribe) DeriveDel(ctx context.Context, in *DeriveReq, opts ...grpc.CallOption) (*StatusResp, error) {
+	client := bxsubscribe.NewBxsubscribeClient(m.cli.Conn())
+	return client.DeriveDel(ctx, in, opts...)
+}
+
 // 用户推送信息查看
 func (m *defaultBxsubscribe) UserInfo(ctx context.Context, in *GetUserInfoReq, opts ...grpc.CallOption) (*GetUserInfoResq, error) {
 	client := bxsubscribe.NewBxsubscribeClient(m.cli.Conn())
@@ -186,15 +198,3 @@ func (m *defaultBxsubscribe) SetPushSet(ctx context.Context, in *SetPushSetReq,
 	client := bxsubscribe.NewBxsubscribeClient(m.cli.Conn())
 	return client.SetPushSet(ctx, in, opts...)
 }
-
-// 自动数据导出筛选条件查询
-func (m *defaultBxsubscribe) DeriveShow(ctx context.Context, in *DeriveReq, opts ...grpc.CallOption) (*DeriveRes, error) {
-	client := bxsubscribe.NewBxsubscribeClient(m.cli.Conn())
-	return client.DeriveShow(ctx, in, opts...)
-}
-
-// 删除自动数据导出筛选条件
-func (m *defaultBxsubscribe) DeriveDel(ctx context.Context, in *DeriveReq, opts ...grpc.CallOption) (*StatusResp, error) {
-	client := bxsubscribe.NewBxsubscribeClient(m.cli.Conn())
-	return client.DeriveDel(ctx, in, opts...)
-}

jyBXSubscribe/rpc/internal/server/bxsubscribeserver.go

@@ -82,7 +82,6 @@ func (s *BxsubscribeServer) GetViewStatus(ctx context.Context, in *bxsubscribe.G
 	return l.GetViewStatus(in)
 }
 
-<<<<<<< HEAD
 // 自动数据导出筛选条件查询
 func (s *BxsubscribeServer) DeriveShow(ctx context.Context, in *bxsubscribe.DeriveReq) (*bxsubscribe.DeriveRes, error) {
 	l := logic.NewDeriveShowLogic(ctx, s.svcCtx)
@@ -93,7 +92,8 @@ func (s *BxsubscribeServer) DeriveShow(ctx context.Context, in *bxsubscribe.Deri
 func (s *BxsubscribeServer) DeriveDel(ctx context.Context, in *bxsubscribe.DeriveReq) (*bxsubscribe.StatusResp, error) {
 	l := logic.NewDeriveDelLogic(ctx, s.svcCtx)
 	return l.DeriveDel(in)
-=======
+}
+
 // 用户推送信息查看
 func (s *BxsubscribeServer) UserInfo(ctx context.Context, in *bxsubscribe.GetUserInfoReq) (*bxsubscribe.GetUserInfoResq, error) {
 	l := logic.NewUserInfoLogic(ctx, s.svcCtx)
@@ -116,5 +116,4 @@ func (s *BxsubscribeServer) GetPushSet(ctx context.Context, in *bxsubscribe.GetP
 func (s *BxsubscribeServer) SetPushSet(ctx context.Context, in *bxsubscribe.SetPushSetReq) (*bxsubscribe.StatusResp, error) {
 	l := logic.NewSetPushSetLogic(ctx, s.svcCtx)
 	return l.SetPushSet(in)
->>>>>>> master
 }

jyBXSubscribe/rpc/type/bxsubscribe/bxsubscribe_grpc.pb.go

@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go-grpc. DO NOT EDIT.
 // versions:
 // - protoc-gen-go-grpc v1.2.0
-// - protoc             v3.15.5
+// - protoc             v3.15.1
 // source: bxsubscribe.proto
 
 package bxsubscribe
@@ -46,6 +46,14 @@ type BxsubscribeClient interface {
 	DeriveShow(ctx context.Context, in *DeriveReq, opts ...grpc.CallOption) (*DeriveRes, error)
 	//删除自动数据导出筛选条件
 	DeriveDel(ctx context.Context, in *DeriveReq, opts ...grpc.CallOption) (*StatusResp, error)
+	//用户推送信息查看
+	UserInfo(ctx context.Context, in *GetUserInfoReq, opts ...grpc.CallOption) (*GetUserInfoResq, error)
+	//用户邮箱保存
+	SetUser(ctx context.Context, in *SetUserInfoReq, opts ...grpc.CallOption) (*StatusResp, error)
+	//用户推送设置查看
+	GetPushSet(ctx context.Context, in *GetPushSetReq, opts ...grpc.CallOption) (*GetPushSetResp, error)
+	//用户推送设置修改
+	SetPushSet(ctx context.Context, in *SetPushSetReq, opts ...grpc.CallOption) (*StatusResp, error)
 }
 
 type bxsubscribeClient struct {
@@ -164,6 +172,42 @@ func (c *bxsubscribeClient) DeriveDel(ctx context.Context, in *DeriveReq, opts .
 	return out, nil
 }
 
+func (c *bxsubscribeClient) UserInfo(ctx context.Context, in *GetUserInfoReq, opts ...grpc.CallOption) (*GetUserInfoResq, error) {
+	out := new(GetUserInfoResq)
+	err := c.cc.Invoke(ctx, "/bxsubscribe.Bxsubscribe/userInfo", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *bxsubscribeClient) SetUser(ctx context.Context, in *SetUserInfoReq, opts ...grpc.CallOption) (*StatusResp, error) {
+	out := new(StatusResp)
+	err := c.cc.Invoke(ctx, "/bxsubscribe.Bxsubscribe/setUser", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *bxsubscribeClient) GetPushSet(ctx context.Context, in *GetPushSetReq, opts ...grpc.CallOption) (*GetPushSetResp, error) {
+	out := new(GetPushSetResp)
+	err := c.cc.Invoke(ctx, "/bxsubscribe.Bxsubscribe/getPushSet", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *bxsubscribeClient) SetPushSet(ctx context.Context, in *SetPushSetReq, opts ...grpc.CallOption) (*StatusResp, error) {
+	out := new(StatusResp)
+	err := c.cc.Invoke(ctx, "/bxsubscribe.Bxsubscribe/setPushSet", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
 // BxsubscribeServer is the server API for Bxsubscribe service.
 // All implementations must embed UnimplementedBxsubscribeServer
 // for forward compatibility
@@ -192,6 +236,14 @@ type BxsubscribeServer interface {
 	DeriveShow(context.Context, *DeriveReq) (*DeriveRes, error)
 	//删除自动数据导出筛选条件
 	DeriveDel(context.Context, *DeriveReq) (*StatusResp, error)
+	//用户推送信息查看
+	UserInfo(context.Context, *GetUserInfoReq) (*GetUserInfoResq, error)
+	//用户邮箱保存
+	SetUser(context.Context, *SetUserInfoReq) (*StatusResp, error)
+	//用户推送设置查看
+	GetPushSet(context.Context, *GetPushSetReq) (*GetPushSetResp, error)
+	//用户推送设置修改
+	SetPushSet(context.Context, *SetPushSetReq) (*StatusResp, error)
 	mustEmbedUnimplementedBxsubscribeServer()
 }
 
@@ -235,6 +287,18 @@ func (UnimplementedBxsubscribeServer) DeriveShow(context.Context, *DeriveReq) (*
 func (UnimplementedBxsubscribeServer) DeriveDel(context.Context, *DeriveReq) (*StatusResp, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method DeriveDel not implemented")
 }
+func (UnimplementedBxsubscribeServer) UserInfo(context.Context, *GetUserInfoReq) (*GetUserInfoResq, error) {
+	return nil, status.Errorf(codes.Unimplemented, "method UserInfo not implemented")
+}
+func (UnimplementedBxsubscribeServer) SetUser(context.Context, *SetUserInfoReq) (*StatusResp, error) {
+	return nil, status.Errorf(codes.Unimplemented, "method SetUser not implemented")
+}
+func (UnimplementedBxsubscribeServer) GetPushSet(context.Context, *GetPushSetReq) (*GetPushSetResp, error) {
+	return nil, status.Errorf(codes.Unimplemented, "method GetPushSet not implemented")
+}
+func (UnimplementedBxsubscribeServer) SetPushSet(context.Context, *SetPushSetReq) (*StatusResp, error) {
+	return nil, status.Errorf(codes.Unimplemented, "method SetPushSet not implemented")
+}
 func (UnimplementedBxsubscribeServer) mustEmbedUnimplementedBxsubscribeServer() {}
 
 // UnsafeBxsubscribeServer may be embedded to opt out of forward compatibility for this service.
@@ -464,6 +528,78 @@ func _Bxsubscribe_DeriveDel_Handler(srv interface{}, ctx context.Context, dec fu
 	return interceptor(ctx, in, info, handler)
 }
 
+func _Bxsubscribe_UserInfo_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(GetUserInfoReq)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(BxsubscribeServer).UserInfo(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/bxsubscribe.Bxsubscribe/userInfo",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(BxsubscribeServer).UserInfo(ctx, req.(*GetUserInfoReq))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _Bxsubscribe_SetUser_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(SetUserInfoReq)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(BxsubscribeServer).SetUser(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/bxsubscribe.Bxsubscribe/setUser",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(BxsubscribeServer).SetUser(ctx, req.(*SetUserInfoReq))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _Bxsubscribe_GetPushSet_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(GetPushSetReq)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(BxsubscribeServer).GetPushSet(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/bxsubscribe.Bxsubscribe/getPushSet",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(BxsubscribeServer).GetPushSet(ctx, req.(*GetPushSetReq))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _Bxsubscribe_SetPushSet_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(SetPushSetReq)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(BxsubscribeServer).SetPushSet(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/bxsubscribe.Bxsubscribe/setPushSet",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(BxsubscribeServer).SetPushSet(ctx, req.(*SetPushSetReq))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
 // Bxsubscribe_ServiceDesc is the grpc.ServiceDesc for Bxsubscribe service.
 // It's only intended for direct use with grpc.RegisterService,
 // and not to be introspected or modified (even as a copy)
@@ -519,6 +655,22 @@ var Bxsubscribe_ServiceDesc = grpc.ServiceDesc{
 			MethodName: "deriveDel",
 			Handler:    _Bxsubscribe_DeriveDel_Handler,
 		},
+		{
+			MethodName: "userInfo",
+			Handler:    _Bxsubscribe_UserInfo_Handler,
+		},
+		{
+			MethodName: "setUser",
+			Handler:    _Bxsubscribe_SetUser_Handler,
+		},
+		{
+			MethodName: "getPushSet",
+			Handler:    _Bxsubscribe_GetPushSet_Handler,
+		},
+		{
+			MethodName: "setPushSet",
+			Handler:    _Bxsubscribe_SetPushSet_Handler,
+		},
 	},
 	Streams:  []grpc.StreamDesc{},
 	Metadata: "bxsubscribe.proto",