wip:解决冲突

jyBXSubscribe/rpc/bxsubscribe.proto

@@ -350,7 +350,6 @@ message SetPushSetReq{
   int64 interested = 12;
 }
 
-<<<<<<< HEAD
 message DeriveReq{
   string  appId = 1;
   string  entId = 2;
@@ -384,7 +383,7 @@ message keyWord{
   repeated string appended = 2;
   repeated string exclude = 3;
 }
-=======
+
 message StaffSubscribeReq {
   string appId = 1;
   int64  entId = 2;
@@ -424,8 +423,6 @@ message StaffSubscribeDetail{
 }
 
 
->>>>>>> master
-
 service Bxsubscribe {
   //获取订阅推送列表
   rpc GetSubList(SubscribeInfosReq) returns(SubscribeInfosResp);

jyBXSubscribe/rpc/bxsubscribe/bxsubscribe.go

@@ -13,53 +13,11 @@ import (
 )
 
 type (
-<<<<<<< HEAD
-	ByPushHistoryResp      = bxsubscribe.ByPushHistoryResp
-	CityList               = bxsubscribe.CityList
-	Derive                 = bxsubscribe.Derive
-	DeriveReq              = bxsubscribe.DeriveReq
-	DeriveRes              = bxsubscribe.DeriveRes
-	DistributorResp        = bxsubscribe.DistributorResp
-	GetDistributorReq      = bxsubscribe.GetDistributorReq
-	GetKeyReq              = bxsubscribe.GetKeyReq
-	GetPushSetReq          = bxsubscribe.GetPushSetReq
-	GetPushSetResp         = bxsubscribe.GetPushSetResp
-	GetUserInfo            = bxsubscribe.GetUserInfo
-	GetUserInfoReq         = bxsubscribe.GetUserInfoReq
-	GetUserInfoResq        = bxsubscribe.GetUserInfoResq
-	GetViewStatusReq       = bxsubscribe.GetViewStatusReq
-	Items                  = bxsubscribe.Items
-	Key                    = bxsubscribe.Key
-	KeyItems               = bxsubscribe.KeyItems
-	KeyResp                = bxsubscribe.KeyResp
-	KeyWord                = bxsubscribe.KeyWord
-	Keys                   = bxsubscribe.Keys
-	List                   = bxsubscribe.List
-	MsgDistributorReq      = bxsubscribe.MsgDistributorReq
-	PushSet                = bxsubscribe.PushSet
-	SetPushSetReq          = bxsubscribe.SetPushSetReq
-	SetReadReq             = bxsubscribe.SetReadReq
-	SetUserInfoReq         = bxsubscribe.SetUserInfoReq
-	SomeInfo               = bxsubscribe.SomeInfo
-	SomeInfoReq            = bxsubscribe.SomeInfoReq
-	SomeInfoResp           = bxsubscribe.SomeInfoResp
-	StatusResp             = bxsubscribe.StatusResp
-	Subscribe              = bxsubscribe.Subscribe
-	SubscribeData          = bxsubscribe.SubscribeData
-	SubscribeInfo          = bxsubscribe.SubscribeInfo
-	SubscribeInfosReq      = bxsubscribe.SubscribeInfosReq
-	SubscribeInfosResp     = bxsubscribe.SubscribeInfosResp
-	TimeJson               = bxsubscribe.TimeJson
-	UpdateSubScribeInfoReq = bxsubscribe.UpdateSubScribeInfoReq
-	UserReq                = bxsubscribe.UserReq
-	UserResp               = bxsubscribe.UserResp
-	UserResq               = bxsubscribe.UserResq
-	UserStatus             = bxsubscribe.UserStatus
-	ViewStatusResp         = bxsubscribe.ViewStatusResp
-	WinnerInfo             = bxsubscribe.WinnerInfo
-=======
 	ByPushHistoryResp       = bxsubscribe.ByPushHistoryResp
 	CityList                = bxsubscribe.CityList
+	Derive                  = bxsubscribe.Derive
+	DeriveReq               = bxsubscribe.DeriveReq
+	DeriveRes               = bxsubscribe.DeriveRes
 	DistributorResp         = bxsubscribe.DistributorResp
 	GetDistributorReq       = bxsubscribe.GetDistributorReq
 	GetKeyReq               = bxsubscribe.GetKeyReq
@@ -73,6 +31,7 @@ type (
 	Key                     = bxsubscribe.Key
 	KeyItems                = bxsubscribe.KeyItems
 	KeyResp                 = bxsubscribe.KeyResp
+	KeyWord                 = bxsubscribe.KeyWord
 	Keys                    = bxsubscribe.Keys
 	List                    = bxsubscribe.List
 	MsgDistributorReq       = bxsubscribe.MsgDistributorReq
@@ -102,7 +61,6 @@ type (
 	UserStatus              = bxsubscribe.UserStatus
 	ViewStatusResp          = bxsubscribe.ViewStatusResp
 	WinnerInfo              = bxsubscribe.WinnerInfo
->>>>>>> master
 
 	Bxsubscribe interface {
 		// 获取订阅推送列表

jyBXSubscribe/rpc/bxsubscribeclient/bxsubscribe.go

@@ -1,201 +0,0 @@
-// Code generated by goctl. DO NOT EDIT.
-// Source: bxsubscribe.proto
-
-package bxsubscribeclient
-
-import (
-	"context"
-
-	"jyBXSubscribe/rpc/type/bxsubscribe"
-
-	"github.com/zeromicro/go-zero/zrpc"
-	"google.golang.org/grpc"
-)
-
-type (
-	ByPushHistoryResp       = bxsubscribe.ByPushHistoryResp
-	CityList                = bxsubscribe.CityList
-	DistributorResp         = bxsubscribe.DistributorResp
-	GetDistributorReq       = bxsubscribe.GetDistributorReq
-	GetKeyReq               = bxsubscribe.GetKeyReq
-	GetPushSetReq           = bxsubscribe.GetPushSetReq
-	GetPushSetResp          = bxsubscribe.GetPushSetResp
-	GetUserInfo             = bxsubscribe.GetUserInfo
-	GetUserInfoReq          = bxsubscribe.GetUserInfoReq
-	GetUserInfoResq         = bxsubscribe.GetUserInfoResq
-	GetViewStatusReq        = bxsubscribe.GetViewStatusReq
-	Items                   = bxsubscribe.Items
-	Key                     = bxsubscribe.Key
-	KeyItems                = bxsubscribe.KeyItems
-	KeyResp                 = bxsubscribe.KeyResp
-	Keys                    = bxsubscribe.Keys
-	List                    = bxsubscribe.List
-	MsgDistributorReq       = bxsubscribe.MsgDistributorReq
-	PushSet                 = bxsubscribe.PushSet
-	SetPushSetReq           = bxsubscribe.SetPushSetReq
-	SetReadReq              = bxsubscribe.SetReadReq
-	SetUserInfoReq          = bxsubscribe.SetUserInfoReq
-	SomeInfo                = bxsubscribe.SomeInfo
-	SomeInfoReq             = bxsubscribe.SomeInfoReq
-	SomeInfoResp            = bxsubscribe.SomeInfoResp
-	StaffSubscribe          = bxsubscribe.StaffSubscribe
-	StaffSubscribeDetail    = bxsubscribe.StaffSubscribeDetail
-	StaffSubscribeDetailReq = bxsubscribe.StaffSubscribeDetailReq
-	StaffSubscribeListResp  = bxsubscribe.StaffSubscribeListResp
-	StaffSubscribeReq       = bxsubscribe.StaffSubscribeReq
-	StatusResp              = bxsubscribe.StatusResp
-	Subscribe               = bxsubscribe.Subscribe
-	SubscribeData           = bxsubscribe.SubscribeData
-	SubscribeInfo           = bxsubscribe.SubscribeInfo
-	SubscribeInfosReq       = bxsubscribe.SubscribeInfosReq
-	SubscribeInfosResp      = bxsubscribe.SubscribeInfosResp
-	TimeJson                = bxsubscribe.TimeJson
-	UpdateSubScribeInfoReq  = bxsubscribe.UpdateSubScribeInfoReq
-	UserReq                 = bxsubscribe.UserReq
-	UserResp                = bxsubscribe.UserResp
-	UserResq                = bxsubscribe.UserResq
-	UserStatus              = bxsubscribe.UserStatus
-	ViewStatusResp          = bxsubscribe.ViewStatusResp
-	WinnerInfo              = bxsubscribe.WinnerInfo
-
-	Bxsubscribe interface {
-		// 获取订阅推送列表
-		GetSubList(ctx context.Context, in *SubscribeInfosReq, opts ...grpc.CallOption) (*SubscribeInfosResp, error)
-		// 获取订阅推送相关信息
-		GetSubSomeInfo(ctx context.Context, in *SomeInfoReq, opts ...grpc.CallOption) (*SomeInfoResp, error)
-		// 修改订阅信息接口
-		UpdateSubScribeInfo(ctx context.Context, in *UpdateSubScribeInfoReq, opts ...grpc.CallOption) (*StatusResp, error)
-		// 推送页面筛选导出
-		ByPushHistory(ctx context.Context, in *SubscribeInfosReq, opts ...grpc.CallOption) (*ByPushHistoryResp, error)
-		// 推送数据浏览状态修改
-		SetRead(ctx context.Context, in *SetReadReq, opts ...grpc.CallOption) (*StatusResp, error)
-		// 关键词获取
-		GetKey(ctx context.Context, in *GetKeyReq, opts ...grpc.CallOption) (*KeyResp, error)
-		// 订阅设置获取
-		GetSubScribeInfo(ctx context.Context, in *UserReq, opts ...grpc.CallOption) (*UserResq, error)
-		// 信息分发
-		MsgDistributor(ctx context.Context, in *MsgDistributorReq, opts ...grpc.CallOption) (*StatusResp, error)
-		// 手动分发人员查询
-		GetDistributor(ctx context.Context, in *GetDistributorReq, opts ...grpc.CallOption) (*DistributorResp, error)
-		// 查看状态
-		GetViewStatus(ctx context.Context, in *GetViewStatusReq, opts ...grpc.CallOption) (*ViewStatusResp, 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)
-		// 查看企业员工用户订阅
-		GetStaffSubscribeList(ctx context.Context, in *StaffSubscribeReq, opts ...grpc.CallOption) (*StaffSubscribeListResp, error)
-		// 查看企业员工用户订阅详情
-		GetStaffSubscribeDetail(ctx context.Context, in *StaffSubscribeDetailReq, opts ...grpc.CallOption) (*StaffSubscribeDetail, error)
-	}
-
-	defaultBxsubscribe struct {
-		cli zrpc.Client
-	}
-)
-
-func NewBxsubscribe(cli zrpc.Client) Bxsubscribe {
-	return &defaultBxsubscribe{
-		cli: cli,
-	}
-}
-
-// 获取订阅推送列表
-func (m *defaultBxsubscribe) GetSubList(ctx context.Context, in *SubscribeInfosReq, opts ...grpc.CallOption) (*SubscribeInfosResp, error) {
-	client := bxsubscribe.NewBxsubscribeClient(m.cli.Conn())
-	return client.GetSubList(ctx, in, opts...)
-}
-
-// 获取订阅推送相关信息
-func (m *defaultBxsubscribe) GetSubSomeInfo(ctx context.Context, in *SomeInfoReq, opts ...grpc.CallOption) (*SomeInfoResp, error) {
-	client := bxsubscribe.NewBxsubscribeClient(m.cli.Conn())
-	return client.GetSubSomeInfo(ctx, in, opts...)
-}
-
-// 修改订阅信息接口
-func (m *defaultBxsubscribe) UpdateSubScribeInfo(ctx context.Context, in *UpdateSubScribeInfoReq, opts ...grpc.CallOption) (*StatusResp, error) {
-	client := bxsubscribe.NewBxsubscribeClient(m.cli.Conn())
-	return client.UpdateSubScribeInfo(ctx, in, opts...)
-}
-
-// 推送页面筛选导出
-func (m *defaultBxsubscribe) ByPushHistory(ctx context.Context, in *SubscribeInfosReq, opts ...grpc.CallOption) (*ByPushHistoryResp, error) {
-	client := bxsubscribe.NewBxsubscribeClient(m.cli.Conn())
-	return client.ByPushHistory(ctx, in, opts...)
-}
-
-// 推送数据浏览状态修改
-func (m *defaultBxsubscribe) SetRead(ctx context.Context, in *SetReadReq, opts ...grpc.CallOption) (*StatusResp, error) {
-	client := bxsubscribe.NewBxsubscribeClient(m.cli.Conn())
-	return client.SetRead(ctx, in, opts...)
-}
-
-// 关键词获取
-func (m *defaultBxsubscribe) GetKey(ctx context.Context, in *GetKeyReq, opts ...grpc.CallOption) (*KeyResp, error) {
-	client := bxsubscribe.NewBxsubscribeClient(m.cli.Conn())
-	return client.GetKey(ctx, in, opts...)
-}
-
-// 订阅设置获取
-func (m *defaultBxsubscribe) GetSubScribeInfo(ctx context.Context, in *UserReq, opts ...grpc.CallOption) (*UserResq, error) {
-	client := bxsubscribe.NewBxsubscribeClient(m.cli.Conn())
-	return client.GetSubScribeInfo(ctx, in, opts...)
-}
-
-// 信息分发
-func (m *defaultBxsubscribe) MsgDistributor(ctx context.Context, in *MsgDistributorReq, opts ...grpc.CallOption) (*StatusResp, error) {
-	client := bxsubscribe.NewBxsubscribeClient(m.cli.Conn())
-	return client.MsgDistributor(ctx, in, opts...)
-}
-
-// 手动分发人员查询
-func (m *defaultBxsubscribe) GetDistributor(ctx context.Context, in *GetDistributorReq, opts ...grpc.CallOption) (*DistributorResp, error) {
-	client := bxsubscribe.NewBxsubscribeClient(m.cli.Conn())
-	return client.GetDistributor(ctx, in, opts...)
-}
-
-// 查看状态
-func (m *defaultBxsubscribe) GetViewStatus(ctx context.Context, in *GetViewStatusReq, opts ...grpc.CallOption) (*ViewStatusResp, error) {
-	client := bxsubscribe.NewBxsubscribeClient(m.cli.Conn())
-	return client.GetViewStatus(ctx, in, opts...)
-}
-
-// 用户推送信息查看
-func (m *defaultBxsubscribe) UserInfo(ctx context.Context, in *GetUserInfoReq, opts ...grpc.CallOption) (*GetUserInfoResq, error) {
-	client := bxsubscribe.NewBxsubscribeClient(m.cli.Conn())
-	return client.UserInfo(ctx, in, opts...)
-}
-
-// 用户邮箱保存
-func (m *defaultBxsubscribe) SetUser(ctx context.Context, in *SetUserInfoReq, opts ...grpc.CallOption) (*StatusResp, error) {
-	client := bxsubscribe.NewBxsubscribeClient(m.cli.Conn())
-	return client.SetUser(ctx, in, opts...)
-}
-
-// 用户推送设置查看
-func (m *defaultBxsubscribe) GetPushSet(ctx context.Context, in *GetPushSetReq, opts ...grpc.CallOption) (*GetPushSetResp, error) {
-	client := bxsubscribe.NewBxsubscribeClient(m.cli.Conn())
-	return client.GetPushSet(ctx, in, opts...)
-}
-
-// 用户推送设置修改
-func (m *defaultBxsubscribe) SetPushSet(ctx context.Context, in *SetPushSetReq, opts ...grpc.CallOption) (*StatusResp, error) {
-	client := bxsubscribe.NewBxsubscribeClient(m.cli.Conn())
-	return client.SetPushSet(ctx, in, opts...)
-}
-
-// 查看企业员工用户订阅
-func (m *defaultBxsubscribe) GetStaffSubscribeList(ctx context.Context, in *StaffSubscribeReq, opts ...grpc.CallOption) (*StaffSubscribeListResp, error) {
-	client := bxsubscribe.NewBxsubscribeClient(m.cli.Conn())
-	return client.GetStaffSubscribeList(ctx, in, opts...)
-}
-
-// 查看企业员工用户订阅详情
-func (m *defaultBxsubscribe) GetStaffSubscribeDetail(ctx context.Context, in *StaffSubscribeDetailReq, opts ...grpc.CallOption) (*StaffSubscribeDetail, error) {
-	client := bxsubscribe.NewBxsubscribeClient(m.cli.Conn())
-	return client.GetStaffSubscribeDetail(ctx, in, opts...)
-}

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

@@ -29,6 +29,8 @@ const (
 	Bxsubscribe_MsgDistributor_FullMethodName          = "/bxsubscribe.Bxsubscribe/MsgDistributor"
 	Bxsubscribe_GetDistributor_FullMethodName          = "/bxsubscribe.Bxsubscribe/GetDistributor"
 	Bxsubscribe_GetViewStatus_FullMethodName           = "/bxsubscribe.Bxsubscribe/GetViewStatus"
+	Bxsubscribe_DeriveShow_FullMethodName              = "/bxsubscribe.Bxsubscribe/deriveShow"
+	Bxsubscribe_DeriveDel_FullMethodName               = "/bxsubscribe.Bxsubscribe/deriveDel"
 	Bxsubscribe_UserInfo_FullMethodName                = "/bxsubscribe.Bxsubscribe/userInfo"
 	Bxsubscribe_SetUser_FullMethodName                 = "/bxsubscribe.Bxsubscribe/setUser"
 	Bxsubscribe_GetPushSet_FullMethodName              = "/bxsubscribe.Bxsubscribe/getPushSet"
@@ -61,15 +63,11 @@ type BxsubscribeClient interface {
 	GetDistributor(ctx context.Context, in *GetDistributorReq, opts ...grpc.CallOption) (*DistributorResp, error)
 	// 查看状态
 	GetViewStatus(ctx context.Context, in *GetViewStatusReq, opts ...grpc.CallOption) (*ViewStatusResp, error)
-<<<<<<< HEAD
-	//自动数据导出筛选条件查询
+	// 自动数据导出筛选条件查询
 	DeriveShow(ctx context.Context, in *DeriveReq, opts ...grpc.CallOption) (*DeriveRes, error)
-	//删除自动数据导出筛选条件
+	// 删除自动数据导出筛选条件
 	DeriveDel(ctx context.Context, in *DeriveReq, opts ...grpc.CallOption) (*StatusResp, error)
-	//用户推送信息查看
-=======
 	// 用户推送信息查看
->>>>>>> master
 	UserInfo(ctx context.Context, in *GetUserInfoReq, opts ...grpc.CallOption) (*GetUserInfoResq, error)
 	// 用户邮箱保存
 	SetUser(ctx context.Context, in *SetUserInfoReq, opts ...grpc.CallOption) (*StatusResp, error)
@@ -183,7 +181,7 @@ func (c *bxsubscribeClient) GetViewStatus(ctx context.Context, in *GetViewStatus
 
 func (c *bxsubscribeClient) DeriveShow(ctx context.Context, in *DeriveReq, opts ...grpc.CallOption) (*DeriveRes, error) {
 	out := new(DeriveRes)
-	err := c.cc.Invoke(ctx, "/bxsubscribe.Bxsubscribe/deriveShow", in, out, opts...)
+	err := c.cc.Invoke(ctx, Bxsubscribe_DeriveShow_FullMethodName, in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -192,7 +190,7 @@ func (c *bxsubscribeClient) DeriveShow(ctx context.Context, in *DeriveReq, opts
 
 func (c *bxsubscribeClient) DeriveDel(ctx context.Context, in *DeriveReq, opts ...grpc.CallOption) (*StatusResp, error) {
 	out := new(StatusResp)
-	err := c.cc.Invoke(ctx, "/bxsubscribe.Bxsubscribe/deriveDel", in, out, opts...)
+	err := c.cc.Invoke(ctx, Bxsubscribe_DeriveDel_FullMethodName, in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -277,15 +275,11 @@ type BxsubscribeServer interface {
 	GetDistributor(context.Context, *GetDistributorReq) (*DistributorResp, error)
 	// 查看状态
 	GetViewStatus(context.Context, *GetViewStatusReq) (*ViewStatusResp, error)
-<<<<<<< HEAD
-	//自动数据导出筛选条件查询
+	// 自动数据导出筛选条件查询
 	DeriveShow(context.Context, *DeriveReq) (*DeriveRes, error)
-	//删除自动数据导出筛选条件
+	// 删除自动数据导出筛选条件
 	DeriveDel(context.Context, *DeriveReq) (*StatusResp, error)
-	//用户推送信息查看
-=======
 	// 用户推送信息查看
->>>>>>> master
 	UserInfo(context.Context, *GetUserInfoReq) (*GetUserInfoResq, error)
 	// 用户邮箱保存
 	SetUser(context.Context, *SetUserInfoReq) (*StatusResp, error)
@@ -561,7 +555,7 @@ func _Bxsubscribe_DeriveShow_Handler(srv interface{}, ctx context.Context, dec f
 	}
 	info := &grpc.UnaryServerInfo{
 		Server:     srv,
-		FullMethod: "/bxsubscribe.Bxsubscribe/deriveShow",
+		FullMethod: Bxsubscribe_DeriveShow_FullMethodName,
 	}
 	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
 		return srv.(BxsubscribeServer).DeriveShow(ctx, req.(*DeriveReq))
@@ -579,7 +573,7 @@ func _Bxsubscribe_DeriveDel_Handler(srv interface{}, ctx context.Context, dec fu
 	}
 	info := &grpc.UnaryServerInfo{
 		Server:     srv,
-		FullMethod: "/bxsubscribe.Bxsubscribe/deriveDel",
+		FullMethod: Bxsubscribe_DeriveDel_FullMethodName,
 	}
 	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
 		return srv.(BxsubscribeServer).DeriveDel(ctx, req.(*DeriveReq))