Browse Source

feat:招标搜索保存

duxin 3 năm trước cách đây
mục cha
commit
bd20e248e2

+ 47 - 0
jyBXBase/api/bxcore.api

@@ -48,6 +48,37 @@ type (
 		Bids   string `json:"bids"`
 		Label  string `json:"label,optional"`
 	}
+	//获取筛选条件
+	ShowSearch {
+		UserId string `header:"userId"`
+		Type   string `json:"type,optional"`
+	}
+	//删除筛选条件
+	DelSearch {
+		Id string `header:"id"`
+	}
+
+	//保存筛选条件
+	AddSearch {
+		UserId       string `header:"userId"`
+		Type         string `header:"type,,optional"`
+		Keywords     string `json:"keywords"`             //搜索词
+		Publishtime  string `json:"publishtime,optional"` //发布时间
+		Province     string `json:"province,optional"`
+		Area         string `json:"area,optional"`         //地区
+		Subtype      string `json:"subtype,optional"`      //信息类型
+		Minprice     string `json:"minprice,optional"`     //最低价格
+		Maxprice     string `json:"maxprice,optional"`     //最高价格
+		Industry     string `json:"industry,optional"`     //选中的行业
+		SelectType   string `json:"selectType,optional"`   //标题 or 全文
+		Buyerclass   string `json:"buyerclass,optional"`   //采购单位行业
+		Hasbuyertel  string `json:"hasbuyertel,optional"`  //是否有采购电话
+		Haswinnertel string `json:"haswinnertel,optional"` //是否有中标电话
+		Attachment   string `json:"attachment,optional"`   //附件
+		Notkey       string `json:"notkey,optional"`       //排除词
+		Tabularflag  string `json:"tabularflag,optional"`
+	}
+
 	//公共接口返回
 	CommonRes {
 		Err_code int         `json:"error_code"`
@@ -75,4 +106,20 @@ service bxcore-api {
 	//添加标签
 	@handler AddLabel
 	post /bidcoll/addLabel (AddLabel) returns(CommonRes)
+	
+	//展示标签
+	@handler ShowSearch
+	post /search/ShowSearch (ShowSearch) returns(CommonRes)
+	
+	//添加筛选条件
+	@handler AddSearch
+	post /search/addSearch (AddSearch) returns(CommonRes)
+	
+	//校验筛选条件
+	@handler CheckSearch
+	post /search/checkSearch (AddSearch) returns(CommonRes)
+	
+	//删除筛选条件
+	@handler DelSearch
+	post /search/delSearch (DelSearch) returns(CommonRes)
 }

+ 20 - 0
jyBXBase/api/internal/handler/routes.go

@@ -42,6 +42,26 @@ func RegisterHandlers(server *rest.Server, serverCtx *svc.ServiceContext) {
 				Path:    "/bidcoll/addLabel",
 				Handler: AddLabelHandler(serverCtx),
 			},
+			{
+				Method:  http.MethodPost,
+				Path:    "/search/ShowSearch",
+				Handler: ShowSearchHandler(serverCtx),
+			},
+			{
+				Method:  http.MethodPost,
+				Path:    "/search/addSearch",
+				Handler: AddSearchHandler(serverCtx),
+			},
+			{
+				Method:  http.MethodPost,
+				Path:    "/search/checkSearch",
+				Handler: CheckSearchHandler(serverCtx),
+			},
+			{
+				Method:  http.MethodPost,
+				Path:    "/search/delSearch",
+				Handler: DelSearchHandler(serverCtx),
+			},
 		},
 	)
 }

+ 29 - 0
jyBXBase/api/internal/types/types.go

@@ -41,6 +41,35 @@ type IsCollAction struct {
 	Label  string `json:"label,optional"`
 }
 
+type ShowSearch struct {
+	UserId string `header:"userId"`
+	Type   string `json:"type,optional"`
+}
+
+type DelSearch struct {
+	Id string `header:"id"`
+}
+
+type AddSearch struct {
+	UserId       string `header:"userId"`
+	Type         string `header:"type,,optional"`
+	Keywords     string `json:"keywords"`             //搜索词
+	Publishtime  string `json:"publishtime,optional"` //发布时间
+	Province     string `json:"province,optional"`
+	Area         string `json:"area,optional"`         //地区
+	Subtype      string `json:"subtype,optional"`      //信息类型
+	Minprice     string `json:"minprice,optional"`     //最低价格
+	Maxprice     string `json:"maxprice,optional"`     //最高价格
+	Industry     string `json:"industry,optional"`     //选中的行业
+	SelectType   string `json:"selectType,optional"`   //标题 or 全文
+	Buyerclass   string `json:"buyerclass,optional"`   //采购单位行业
+	Hasbuyertel  string `json:"hasbuyertel,optional"`  //是否有采购电话
+	Haswinnertel string `json:"haswinnertel,optional"` //是否有中标电话
+	Attachment   string `json:"attachment,optional"`   //附件
+	Notkey       string `json:"notkey,optional"`       //排除词
+	Tabularflag  string `json:"tabularflag,optional"`
+}
+
 type CommonRes struct {
 	Err_code int         `json:"error_code"`
 	Err_msg  string      `json:"error_msg"`

+ 0 - 74
jyBXBase/rpc/bxcollection/bxcol/bxcol.go

@@ -1,74 +0,0 @@
-// Code generated by goctl. DO NOT EDIT!
-// Source: bxcollection.proto
-
-package bxcol
-
-import (
-	"context"
-
-	"github.com/zeromicro/go-zero/zrpc"
-	"google.golang.org/grpc"
-)
-
-type (
-	Bxcol interface {
-		// 新增标签
-		Addlabel(ctx context.Context, in *AddlabelReq, opts ...grpc.CallOption) (*AddlabelRes, error)
-		// 获取标签
-		GetLabelAction(ctx context.Context, in *GetLabelActionReq, opts ...grpc.CallOption) (*GetLabelActionRes, error)
-		// 标签新增或删除
-		LabelAction(ctx context.Context, in *LabelActionReq, opts ...grpc.CallOption) (*LabelActionRes, error)
-		// 招标信息收藏
-		BCAction(ctx context.Context, in *BCActionReq, opts ...grpc.CallOption) (*LabelActionRes, error)
-		// 招标信息是否被收藏
-		IsCollAction(ctx context.Context, in *IsCollActionReq, opts ...grpc.CallOption) (*IsCollActionRes, error)
-		// 获取收藏列表
-		List(ctx context.Context, in *ListReq, opts ...grpc.CallOption) (*ListRes, error)
-	}
-
-	defaultBxcol struct {
-		cli zrpc.Client
-	}
-)
-
-func NewBxcol(cli zrpc.Client) Bxcol {
-	return &defaultBxcol{
-		cli: cli,
-	}
-}
-
-// 新增标签
-func (m *defaultBxcol) Addlabel(ctx context.Context, in *AddlabelReq, opts ...grpc.CallOption) (*AddlabelRes, error) {
-	client := NewBxcolClient(m.cli.Conn())
-	return client.Addlabel(ctx, in, opts...)
-}
-
-// 获取标签
-func (m *defaultBxcol) GetLabelAction(ctx context.Context, in *GetLabelActionReq, opts ...grpc.CallOption) (*GetLabelActionRes, error) {
-	client := NewBxcolClient(m.cli.Conn())
-	return client.GetLabelAction(ctx, in, opts...)
-}
-
-// 标签新增或删除
-func (m *defaultBxcol) LabelAction(ctx context.Context, in *LabelActionReq, opts ...grpc.CallOption) (*LabelActionRes, error) {
-	client := NewBxcolClient(m.cli.Conn())
-	return client.LabelAction(ctx, in, opts...)
-}
-
-// 招标信息收藏
-func (m *defaultBxcol) BCAction(ctx context.Context, in *BCActionReq, opts ...grpc.CallOption) (*LabelActionRes, error) {
-	client := NewBxcolClient(m.cli.Conn())
-	return client.BCAction(ctx, in, opts...)
-}
-
-// 招标信息是否被收藏
-func (m *defaultBxcol) IsCollAction(ctx context.Context, in *IsCollActionReq, opts ...grpc.CallOption) (*IsCollActionRes, error) {
-	client := NewBxcolClient(m.cli.Conn())
-	return client.IsCollAction(ctx, in, opts...)
-}
-
-// 获取收藏列表
-func (m *defaultBxcol) List(ctx context.Context, in *ListReq, opts ...grpc.CallOption) (*ListRes, error) {
-	client := NewBxcolClient(m.cli.Conn())
-	return client.List(ctx, in, opts...)
-}

+ 0 - 1636
jyBXBase/rpc/bxcollection/bxcol/bxcollection.pb.go

@@ -1,1636 +0,0 @@
-// Code generated by protoc-gen-go. DO NOT EDIT.
-// versions:
-// 	protoc-gen-go v1.28.0
-// 	protoc        v3.9.0
-// source: bxcollection.proto
-
-package bxcol
-
-import (
-	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
-	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
-	reflect "reflect"
-	sync "sync"
-)
-
-const (
-	// Verify that this generated code is sufficiently up-to-date.
-	_ = protoimpl.EnforceVersion(20 - protoimpl.MinVersion)
-	// Verify that runtime/protoimpl is sufficiently up-to-date.
-	_ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20)
-)
-
-type AddlabelReq struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	UserId string `protobuf:"bytes,1,opt,name=userId,proto3" json:"userId,omitempty"`
-	Name   string `protobuf:"bytes,2,opt,name=name,proto3" json:"name,omitempty"`
-}
-
-func (x *AddlabelReq) Reset() {
-	*x = AddlabelReq{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_bxcollection_proto_msgTypes[0]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *AddlabelReq) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*AddlabelReq) ProtoMessage() {}
-
-func (x *AddlabelReq) ProtoReflect() protoreflect.Message {
-	mi := &file_bxcollection_proto_msgTypes[0]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use AddlabelReq.ProtoReflect.Descriptor instead.
-func (*AddlabelReq) Descriptor() ([]byte, []int) {
-	return file_bxcollection_proto_rawDescGZIP(), []int{0}
-}
-
-func (x *AddlabelReq) GetUserId() string {
-	if x != nil {
-		return x.UserId
-	}
-	return ""
-}
-
-func (x *AddlabelReq) GetName() string {
-	if x != nil {
-		return x.Name
-	}
-	return ""
-}
-
-type AddlabelRes struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	ErrCode int64  `protobuf:"varint,1,opt,name=err_code,json=errCode,proto3" json:"err_code,omitempty"`
-	ErrMsg  string `protobuf:"bytes,2,opt,name=err_msg,json=errMsg,proto3" json:"err_msg,omitempty"`
-	Labid   string `protobuf:"bytes,3,opt,name=labid,proto3" json:"labid,omitempty"`
-}
-
-func (x *AddlabelRes) Reset() {
-	*x = AddlabelRes{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_bxcollection_proto_msgTypes[1]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *AddlabelRes) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*AddlabelRes) ProtoMessage() {}
-
-func (x *AddlabelRes) ProtoReflect() protoreflect.Message {
-	mi := &file_bxcollection_proto_msgTypes[1]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use AddlabelRes.ProtoReflect.Descriptor instead.
-func (*AddlabelRes) Descriptor() ([]byte, []int) {
-	return file_bxcollection_proto_rawDescGZIP(), []int{1}
-}
-
-func (x *AddlabelRes) GetErrCode() int64 {
-	if x != nil {
-		return x.ErrCode
-	}
-	return 0
-}
-
-func (x *AddlabelRes) GetErrMsg() string {
-	if x != nil {
-		return x.ErrMsg
-	}
-	return ""
-}
-
-func (x *AddlabelRes) GetLabid() string {
-	if x != nil {
-		return x.Labid
-	}
-	return ""
-}
-
-type GetLabelActionReq struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	UserId string `protobuf:"bytes,1,opt,name=userId,proto3" json:"userId,omitempty"`
-}
-
-func (x *GetLabelActionReq) Reset() {
-	*x = GetLabelActionReq{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_bxcollection_proto_msgTypes[2]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *GetLabelActionReq) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*GetLabelActionReq) ProtoMessage() {}
-
-func (x *GetLabelActionReq) ProtoReflect() protoreflect.Message {
-	mi := &file_bxcollection_proto_msgTypes[2]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use GetLabelActionReq.ProtoReflect.Descriptor instead.
-func (*GetLabelActionReq) Descriptor() ([]byte, []int) {
-	return file_bxcollection_proto_rawDescGZIP(), []int{2}
-}
-
-func (x *GetLabelActionReq) GetUserId() string {
-	if x != nil {
-		return x.UserId
-	}
-	return ""
-}
-
-type GetLabelActionRes struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	ErrCode int64          `protobuf:"varint,1,opt,name=err_code,json=errCode,proto3" json:"err_code,omitempty"`
-	ErrMsg  string         `protobuf:"bytes,2,opt,name=err_msg,json=errMsg,proto3" json:"err_msg,omitempty"`
-	Labels  []*LabelByUser `protobuf:"bytes,3,rep,name=labels,proto3" json:"labels,omitempty"`
-}
-
-func (x *GetLabelActionRes) Reset() {
-	*x = GetLabelActionRes{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_bxcollection_proto_msgTypes[3]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *GetLabelActionRes) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*GetLabelActionRes) ProtoMessage() {}
-
-func (x *GetLabelActionRes) ProtoReflect() protoreflect.Message {
-	mi := &file_bxcollection_proto_msgTypes[3]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use GetLabelActionRes.ProtoReflect.Descriptor instead.
-func (*GetLabelActionRes) Descriptor() ([]byte, []int) {
-	return file_bxcollection_proto_rawDescGZIP(), []int{3}
-}
-
-func (x *GetLabelActionRes) GetErrCode() int64 {
-	if x != nil {
-		return x.ErrCode
-	}
-	return 0
-}
-
-func (x *GetLabelActionRes) GetErrMsg() string {
-	if x != nil {
-		return x.ErrMsg
-	}
-	return ""
-}
-
-func (x *GetLabelActionRes) GetLabels() []*LabelByUser {
-	if x != nil {
-		return x.Labels
-	}
-	return nil
-}
-
-type LabelByUser struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	Lid    string `protobuf:"bytes,1,opt,name=lid,proto3" json:"lid,omitempty"`
-	Lname  string `protobuf:"bytes,2,opt,name=lname,proto3" json:"lname,omitempty"`
-	Lcount int64  `protobuf:"varint,3,opt,name=lcount,proto3" json:"lcount,omitempty"`
-}
-
-func (x *LabelByUser) Reset() {
-	*x = LabelByUser{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_bxcollection_proto_msgTypes[4]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *LabelByUser) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*LabelByUser) ProtoMessage() {}
-
-func (x *LabelByUser) ProtoReflect() protoreflect.Message {
-	mi := &file_bxcollection_proto_msgTypes[4]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use LabelByUser.ProtoReflect.Descriptor instead.
-func (*LabelByUser) Descriptor() ([]byte, []int) {
-	return file_bxcollection_proto_rawDescGZIP(), []int{4}
-}
-
-func (x *LabelByUser) GetLid() string {
-	if x != nil {
-		return x.Lid
-	}
-	return ""
-}
-
-func (x *LabelByUser) GetLname() string {
-	if x != nil {
-		return x.Lname
-	}
-	return ""
-}
-
-func (x *LabelByUser) GetLcount() int64 {
-	if x != nil {
-		return x.Lcount
-	}
-	return 0
-}
-
-type LabelActionReq struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	UserId  string   `protobuf:"bytes,1,opt,name=userId,proto3" json:"userId,omitempty"`
-	Lids    string   `protobuf:"bytes,2,opt,name=lids,proto3" json:"lids,omitempty"`
-	Lname   string   `protobuf:"bytes,3,opt,name=lname,proto3" json:"lname,omitempty"`
-	Binfo   []string `protobuf:"bytes,4,rep,name=binfo,proto3" json:"binfo,omitempty"`
-	Laction string   `protobuf:"bytes,5,opt,name=laction,proto3" json:"laction,omitempty"`
-}
-
-func (x *LabelActionReq) Reset() {
-	*x = LabelActionReq{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_bxcollection_proto_msgTypes[5]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *LabelActionReq) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*LabelActionReq) ProtoMessage() {}
-
-func (x *LabelActionReq) ProtoReflect() protoreflect.Message {
-	mi := &file_bxcollection_proto_msgTypes[5]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use LabelActionReq.ProtoReflect.Descriptor instead.
-func (*LabelActionReq) Descriptor() ([]byte, []int) {
-	return file_bxcollection_proto_rawDescGZIP(), []int{5}
-}
-
-func (x *LabelActionReq) GetUserId() string {
-	if x != nil {
-		return x.UserId
-	}
-	return ""
-}
-
-func (x *LabelActionReq) GetLids() string {
-	if x != nil {
-		return x.Lids
-	}
-	return ""
-}
-
-func (x *LabelActionReq) GetLname() string {
-	if x != nil {
-		return x.Lname
-	}
-	return ""
-}
-
-func (x *LabelActionReq) GetBinfo() []string {
-	if x != nil {
-		return x.Binfo
-	}
-	return nil
-}
-
-func (x *LabelActionReq) GetLaction() string {
-	if x != nil {
-		return x.Laction
-	}
-	return ""
-}
-
-type LabelActionRes struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	ErrCode int64  `protobuf:"varint,1,opt,name=err_code,json=errCode,proto3" json:"err_code,omitempty"`
-	ErrMsg  string `protobuf:"bytes,2,opt,name=err_msg,json=errMsg,proto3" json:"err_msg,omitempty"`
-	Status  bool   `protobuf:"varint,3,opt,name=status,proto3" json:"status,omitempty"`
-}
-
-func (x *LabelActionRes) Reset() {
-	*x = LabelActionRes{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_bxcollection_proto_msgTypes[6]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *LabelActionRes) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*LabelActionRes) ProtoMessage() {}
-
-func (x *LabelActionRes) ProtoReflect() protoreflect.Message {
-	mi := &file_bxcollection_proto_msgTypes[6]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use LabelActionRes.ProtoReflect.Descriptor instead.
-func (*LabelActionRes) Descriptor() ([]byte, []int) {
-	return file_bxcollection_proto_rawDescGZIP(), []int{6}
-}
-
-func (x *LabelActionRes) GetErrCode() int64 {
-	if x != nil {
-		return x.ErrCode
-	}
-	return 0
-}
-
-func (x *LabelActionRes) GetErrMsg() string {
-	if x != nil {
-		return x.ErrMsg
-	}
-	return ""
-}
-
-func (x *LabelActionRes) GetStatus() bool {
-	if x != nil {
-		return x.Status
-	}
-	return false
-}
-
-type BCActionReq struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	UserId  string   `protobuf:"bytes,1,opt,name=userId,proto3" json:"userId,omitempty"`
-	Bids    []string `protobuf:"bytes,2,rep,name=bids,proto3" json:"bids,omitempty"`
-	Baction string   `protobuf:"bytes,3,opt,name=baction,proto3" json:"baction,omitempty"`
-}
-
-func (x *BCActionReq) Reset() {
-	*x = BCActionReq{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_bxcollection_proto_msgTypes[7]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *BCActionReq) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*BCActionReq) ProtoMessage() {}
-
-func (x *BCActionReq) ProtoReflect() protoreflect.Message {
-	mi := &file_bxcollection_proto_msgTypes[7]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use BCActionReq.ProtoReflect.Descriptor instead.
-func (*BCActionReq) Descriptor() ([]byte, []int) {
-	return file_bxcollection_proto_rawDescGZIP(), []int{7}
-}
-
-func (x *BCActionReq) GetUserId() string {
-	if x != nil {
-		return x.UserId
-	}
-	return ""
-}
-
-func (x *BCActionReq) GetBids() []string {
-	if x != nil {
-		return x.Bids
-	}
-	return nil
-}
-
-func (x *BCActionReq) GetBaction() string {
-	if x != nil {
-		return x.Baction
-	}
-	return ""
-}
-
-type IsCollActionReq struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	UserId string `protobuf:"bytes,1,opt,name=userId,proto3" json:"userId,omitempty"`
-	Bids   string `protobuf:"bytes,2,opt,name=bids,proto3" json:"bids,omitempty"`
-	Label  string `protobuf:"bytes,3,opt,name=label,proto3" json:"label,omitempty"`
-}
-
-func (x *IsCollActionReq) Reset() {
-	*x = IsCollActionReq{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_bxcollection_proto_msgTypes[8]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *IsCollActionReq) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*IsCollActionReq) ProtoMessage() {}
-
-func (x *IsCollActionReq) ProtoReflect() protoreflect.Message {
-	mi := &file_bxcollection_proto_msgTypes[8]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use IsCollActionReq.ProtoReflect.Descriptor instead.
-func (*IsCollActionReq) Descriptor() ([]byte, []int) {
-	return file_bxcollection_proto_rawDescGZIP(), []int{8}
-}
-
-func (x *IsCollActionReq) GetUserId() string {
-	if x != nil {
-		return x.UserId
-	}
-	return ""
-}
-
-func (x *IsCollActionReq) GetBids() string {
-	if x != nil {
-		return x.Bids
-	}
-	return ""
-}
-
-func (x *IsCollActionReq) GetLabel() string {
-	if x != nil {
-		return x.Label
-	}
-	return ""
-}
-
-type IsCollActionRes struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	ErrCode int64  `protobuf:"varint,1,opt,name=err_code,json=errCode,proto3" json:"err_code,omitempty"`
-	ErrMsg  string `protobuf:"bytes,2,opt,name=err_msg,json=errMsg,proto3" json:"err_msg,omitempty"`
-	Data    *IData `protobuf:"bytes,3,opt,name=data,proto3" json:"data,omitempty"`
-}
-
-func (x *IsCollActionRes) Reset() {
-	*x = IsCollActionRes{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_bxcollection_proto_msgTypes[9]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *IsCollActionRes) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*IsCollActionRes) ProtoMessage() {}
-
-func (x *IsCollActionRes) ProtoReflect() protoreflect.Message {
-	mi := &file_bxcollection_proto_msgTypes[9]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use IsCollActionRes.ProtoReflect.Descriptor instead.
-func (*IsCollActionRes) Descriptor() ([]byte, []int) {
-	return file_bxcollection_proto_rawDescGZIP(), []int{9}
-}
-
-func (x *IsCollActionRes) GetErrCode() int64 {
-	if x != nil {
-		return x.ErrCode
-	}
-	return 0
-}
-
-func (x *IsCollActionRes) GetErrMsg() string {
-	if x != nil {
-		return x.ErrMsg
-	}
-	return ""
-}
-
-func (x *IsCollActionRes) GetData() *IData {
-	if x != nil {
-		return x.Data
-	}
-	return nil
-}
-
-type IData struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	Iscoll bool      `protobuf:"varint,1,opt,name=iscoll,proto3" json:"iscoll,omitempty"`
-	Labels []*Labels `protobuf:"bytes,2,rep,name=labels,proto3" json:"labels,omitempty"`
-	Bids   []string  `protobuf:"bytes,3,rep,name=bids,proto3" json:"bids,omitempty"`
-}
-
-func (x *IData) Reset() {
-	*x = IData{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_bxcollection_proto_msgTypes[10]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *IData) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*IData) ProtoMessage() {}
-
-func (x *IData) ProtoReflect() protoreflect.Message {
-	mi := &file_bxcollection_proto_msgTypes[10]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use IData.ProtoReflect.Descriptor instead.
-func (*IData) Descriptor() ([]byte, []int) {
-	return file_bxcollection_proto_rawDescGZIP(), []int{10}
-}
-
-func (x *IData) GetIscoll() bool {
-	if x != nil {
-		return x.Iscoll
-	}
-	return false
-}
-
-func (x *IData) GetLabels() []*Labels {
-	if x != nil {
-		return x.Labels
-	}
-	return nil
-}
-
-func (x *IData) GetBids() []string {
-	if x != nil {
-		return x.Bids
-	}
-	return nil
-}
-
-type Labels struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	Id        string `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty"`
-	Labelname string `protobuf:"bytes,2,opt,name=labelname,proto3" json:"labelname,omitempty"`
-}
-
-func (x *Labels) Reset() {
-	*x = Labels{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_bxcollection_proto_msgTypes[11]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *Labels) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*Labels) ProtoMessage() {}
-
-func (x *Labels) ProtoReflect() protoreflect.Message {
-	mi := &file_bxcollection_proto_msgTypes[11]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use Labels.ProtoReflect.Descriptor instead.
-func (*Labels) Descriptor() ([]byte, []int) {
-	return file_bxcollection_proto_rawDescGZIP(), []int{11}
-}
-
-func (x *Labels) GetId() string {
-	if x != nil {
-		return x.Id
-	}
-	return ""
-}
-
-func (x *Labels) GetLabelname() string {
-	if x != nil {
-		return x.Labelname
-	}
-	return ""
-}
-
-type ListReq struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	UserId      string `protobuf:"bytes,1,opt,name=userId,proto3" json:"userId,omitempty"`
-	Bids        string `protobuf:"bytes,2,opt,name=bids,proto3" json:"bids,omitempty"`
-	SelectTime  string `protobuf:"bytes,3,opt,name=selectTime,proto3" json:"selectTime,omitempty"`
-	Buyerclass  string `protobuf:"bytes,4,opt,name=buyerclass,proto3" json:"buyerclass,omitempty"`
-	Pagenum     int64  `protobuf:"varint,5,opt,name=pagenum,proto3" json:"pagenum,omitempty"`
-	BuyerPhone  int64  `protobuf:"varint,6,opt,name=buyerPhone,proto3" json:"buyerPhone,omitempty"`
-	WinnerPhone int64  `protobuf:"varint,7,opt,name=winnerPhone,proto3" json:"winnerPhone,omitempty"`
-	Pagesize    int64  `protobuf:"varint,8,opt,name=pagesize,proto3" json:"pagesize,omitempty"`
-	Label       string `protobuf:"bytes,9,opt,name=label,proto3" json:"label,omitempty"`
-}
-
-func (x *ListReq) Reset() {
-	*x = ListReq{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_bxcollection_proto_msgTypes[12]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *ListReq) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*ListReq) ProtoMessage() {}
-
-func (x *ListReq) ProtoReflect() protoreflect.Message {
-	mi := &file_bxcollection_proto_msgTypes[12]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use ListReq.ProtoReflect.Descriptor instead.
-func (*ListReq) Descriptor() ([]byte, []int) {
-	return file_bxcollection_proto_rawDescGZIP(), []int{12}
-}
-
-func (x *ListReq) GetUserId() string {
-	if x != nil {
-		return x.UserId
-	}
-	return ""
-}
-
-func (x *ListReq) GetBids() string {
-	if x != nil {
-		return x.Bids
-	}
-	return ""
-}
-
-func (x *ListReq) GetSelectTime() string {
-	if x != nil {
-		return x.SelectTime
-	}
-	return ""
-}
-
-func (x *ListReq) GetBuyerclass() string {
-	if x != nil {
-		return x.Buyerclass
-	}
-	return ""
-}
-
-func (x *ListReq) GetPagenum() int64 {
-	if x != nil {
-		return x.Pagenum
-	}
-	return 0
-}
-
-func (x *ListReq) GetBuyerPhone() int64 {
-	if x != nil {
-		return x.BuyerPhone
-	}
-	return 0
-}
-
-func (x *ListReq) GetWinnerPhone() int64 {
-	if x != nil {
-		return x.WinnerPhone
-	}
-	return 0
-}
-
-func (x *ListReq) GetPagesize() int64 {
-	if x != nil {
-		return x.Pagesize
-	}
-	return 0
-}
-
-func (x *ListReq) GetLabel() string {
-	if x != nil {
-		return x.Label
-	}
-	return ""
-}
-
-type ListRes struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	ErrCode int64    `protobuf:"varint,1,opt,name=err_code,json=errCode,proto3" json:"err_code,omitempty"`
-	ErrMsg  string   `protobuf:"bytes,2,opt,name=err_msg,json=errMsg,proto3" json:"err_msg,omitempty"`
-	Ldata   *ColList `protobuf:"bytes,3,opt,name=ldata,proto3" json:"ldata,omitempty"`
-}
-
-func (x *ListRes) Reset() {
-	*x = ListRes{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_bxcollection_proto_msgTypes[13]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *ListRes) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*ListRes) ProtoMessage() {}
-
-func (x *ListRes) ProtoReflect() protoreflect.Message {
-	mi := &file_bxcollection_proto_msgTypes[13]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use ListRes.ProtoReflect.Descriptor instead.
-func (*ListRes) Descriptor() ([]byte, []int) {
-	return file_bxcollection_proto_rawDescGZIP(), []int{13}
-}
-
-func (x *ListRes) GetErrCode() int64 {
-	if x != nil {
-		return x.ErrCode
-	}
-	return 0
-}
-
-func (x *ListRes) GetErrMsg() string {
-	if x != nil {
-		return x.ErrMsg
-	}
-	return ""
-}
-
-func (x *ListRes) GetLdata() *ColList {
-	if x != nil {
-		return x.Ldata
-	}
-	return nil
-}
-
-type ColList struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	Count        int64      `protobuf:"varint,1,opt,name=count,proto3" json:"count,omitempty"`
-	HaveNextPage bool       `protobuf:"varint,2,opt,name=haveNextPage,proto3" json:"haveNextPage,omitempty"`
-	Res          []*ColData `protobuf:"bytes,3,rep,name=res,proto3" json:"res,omitempty"`
-	Pagesize     int64      `protobuf:"varint,4,opt,name=pagesize,proto3" json:"pagesize,omitempty"`
-}
-
-func (x *ColList) Reset() {
-	*x = ColList{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_bxcollection_proto_msgTypes[14]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *ColList) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*ColList) ProtoMessage() {}
-
-func (x *ColList) ProtoReflect() protoreflect.Message {
-	mi := &file_bxcollection_proto_msgTypes[14]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use ColList.ProtoReflect.Descriptor instead.
-func (*ColList) Descriptor() ([]byte, []int) {
-	return file_bxcollection_proto_rawDescGZIP(), []int{14}
-}
-
-func (x *ColList) GetCount() int64 {
-	if x != nil {
-		return x.Count
-	}
-	return 0
-}
-
-func (x *ColList) GetHaveNextPage() bool {
-	if x != nil {
-		return x.HaveNextPage
-	}
-	return false
-}
-
-func (x *ColList) GetRes() []*ColData {
-	if x != nil {
-		return x.Res
-	}
-	return nil
-}
-
-func (x *ColList) GetPagesize() int64 {
-	if x != nil {
-		return x.Pagesize
-	}
-	return 0
-}
-
-type ColData struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	Id             string `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty"`
-	Title          string `protobuf:"bytes,2,opt,name=title,proto3" json:"title,omitempty"`
-	Area           string `protobuf:"bytes,3,opt,name=area,proto3" json:"area,omitempty"`
-	Buyerclass     string `protobuf:"bytes,4,opt,name=buyerclass,proto3" json:"buyerclass,omitempty"`
-	Type           string `protobuf:"bytes,5,opt,name=type,proto3" json:"type,omitempty"`
-	SSubscopeclass string `protobuf:"bytes,6,opt,name=s_subscopeclass,json=sSubscopeclass,proto3" json:"s_subscopeclass,omitempty"`
-	Publishtime    int64  `protobuf:"varint,7,opt,name=publishtime,proto3" json:"publishtime,omitempty"`
-	Budget         string `protobuf:"bytes,8,opt,name=budget,proto3" json:"budget,omitempty"`
-	Bidamount      string `protobuf:"bytes,9,opt,name=bidamount,proto3" json:"bidamount,omitempty"`
-	Buyer          string `protobuf:"bytes,10,opt,name=buyer,proto3" json:"buyer,omitempty"`
-	SWinner        string `protobuf:"bytes,11,opt,name=s_winner,json=sWinner,proto3" json:"s_winner,omitempty"`
-	Bidopentime    int64  `protobuf:"varint,12,opt,name=bidopentime,proto3" json:"bidopentime,omitempty"`
-}
-
-func (x *ColData) Reset() {
-	*x = ColData{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_bxcollection_proto_msgTypes[15]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *ColData) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*ColData) ProtoMessage() {}
-
-func (x *ColData) ProtoReflect() protoreflect.Message {
-	mi := &file_bxcollection_proto_msgTypes[15]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use ColData.ProtoReflect.Descriptor instead.
-func (*ColData) Descriptor() ([]byte, []int) {
-	return file_bxcollection_proto_rawDescGZIP(), []int{15}
-}
-
-func (x *ColData) GetId() string {
-	if x != nil {
-		return x.Id
-	}
-	return ""
-}
-
-func (x *ColData) GetTitle() string {
-	if x != nil {
-		return x.Title
-	}
-	return ""
-}
-
-func (x *ColData) GetArea() string {
-	if x != nil {
-		return x.Area
-	}
-	return ""
-}
-
-func (x *ColData) GetBuyerclass() string {
-	if x != nil {
-		return x.Buyerclass
-	}
-	return ""
-}
-
-func (x *ColData) GetType() string {
-	if x != nil {
-		return x.Type
-	}
-	return ""
-}
-
-func (x *ColData) GetSSubscopeclass() string {
-	if x != nil {
-		return x.SSubscopeclass
-	}
-	return ""
-}
-
-func (x *ColData) GetPublishtime() int64 {
-	if x != nil {
-		return x.Publishtime
-	}
-	return 0
-}
-
-func (x *ColData) GetBudget() string {
-	if x != nil {
-		return x.Budget
-	}
-	return ""
-}
-
-func (x *ColData) GetBidamount() string {
-	if x != nil {
-		return x.Bidamount
-	}
-	return ""
-}
-
-func (x *ColData) GetBuyer() string {
-	if x != nil {
-		return x.Buyer
-	}
-	return ""
-}
-
-func (x *ColData) GetSWinner() string {
-	if x != nil {
-		return x.SWinner
-	}
-	return ""
-}
-
-func (x *ColData) GetBidopentime() int64 {
-	if x != nil {
-		return x.Bidopentime
-	}
-	return 0
-}
-
-//公共返回
-type CommonRes struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	ErrCode int64  `protobuf:"varint,1,opt,name=err_code,json=errCode,proto3" json:"err_code,omitempty"`
-	ErrMsg  string `protobuf:"bytes,2,opt,name=err_msg,json=errMsg,proto3" json:"err_msg,omitempty"`
-}
-
-func (x *CommonRes) Reset() {
-	*x = CommonRes{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_bxcollection_proto_msgTypes[16]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *CommonRes) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*CommonRes) ProtoMessage() {}
-
-func (x *CommonRes) ProtoReflect() protoreflect.Message {
-	mi := &file_bxcollection_proto_msgTypes[16]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use CommonRes.ProtoReflect.Descriptor instead.
-func (*CommonRes) Descriptor() ([]byte, []int) {
-	return file_bxcollection_proto_rawDescGZIP(), []int{16}
-}
-
-func (x *CommonRes) GetErrCode() int64 {
-	if x != nil {
-		return x.ErrCode
-	}
-	return 0
-}
-
-func (x *CommonRes) GetErrMsg() string {
-	if x != nil {
-		return x.ErrMsg
-	}
-	return ""
-}
-
-var File_bxcollection_proto protoreflect.FileDescriptor
-
-var file_bxcollection_proto_rawDesc = []byte{
-	0x0a, 0x12, 0x62, 0x78, 0x63, 0x6f, 0x6c, 0x6c, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x70,
-	0x72, 0x6f, 0x74, 0x6f, 0x12, 0x05, 0x62, 0x78, 0x63, 0x6f, 0x6c, 0x22, 0x39, 0x0a, 0x0b, 0x41,
-	0x64, 0x64, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x52, 0x65, 0x71, 0x12, 0x16, 0x0a, 0x06, 0x75, 0x73,
-	0x65, 0x72, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x75, 0x73, 0x65, 0x72,
-	0x49, 0x64, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09,
-	0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x22, 0x57, 0x0a, 0x0b, 0x41, 0x64, 0x64, 0x6c, 0x61, 0x62,
-	0x65, 0x6c, 0x52, 0x65, 0x73, 0x12, 0x19, 0x0a, 0x08, 0x65, 0x72, 0x72, 0x5f, 0x63, 0x6f, 0x64,
-	0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x07, 0x65, 0x72, 0x72, 0x43, 0x6f, 0x64, 0x65,
-	0x12, 0x17, 0x0a, 0x07, 0x65, 0x72, 0x72, 0x5f, 0x6d, 0x73, 0x67, 0x18, 0x02, 0x20, 0x01, 0x28,
-	0x09, 0x52, 0x06, 0x65, 0x72, 0x72, 0x4d, 0x73, 0x67, 0x12, 0x14, 0x0a, 0x05, 0x6c, 0x61, 0x62,
-	0x69, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x6c, 0x61, 0x62, 0x69, 0x64, 0x22,
-	0x2b, 0x0a, 0x11, 0x47, 0x65, 0x74, 0x4c, 0x61, 0x62, 0x65, 0x6c, 0x41, 0x63, 0x74, 0x69, 0x6f,
-	0x6e, 0x52, 0x65, 0x71, 0x12, 0x16, 0x0a, 0x06, 0x75, 0x73, 0x65, 0x72, 0x49, 0x64, 0x18, 0x01,
-	0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x75, 0x73, 0x65, 0x72, 0x49, 0x64, 0x22, 0x73, 0x0a, 0x11,
-	0x47, 0x65, 0x74, 0x4c, 0x61, 0x62, 0x65, 0x6c, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65,
-	0x73, 0x12, 0x19, 0x0a, 0x08, 0x65, 0x72, 0x72, 0x5f, 0x63, 0x6f, 0x64, 0x65, 0x18, 0x01, 0x20,
-	0x01, 0x28, 0x03, 0x52, 0x07, 0x65, 0x72, 0x72, 0x43, 0x6f, 0x64, 0x65, 0x12, 0x17, 0x0a, 0x07,
-	0x65, 0x72, 0x72, 0x5f, 0x6d, 0x73, 0x67, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x65,
-	0x72, 0x72, 0x4d, 0x73, 0x67, 0x12, 0x2a, 0x0a, 0x06, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x73, 0x18,
-	0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x12, 0x2e, 0x62, 0x78, 0x63, 0x6f, 0x6c, 0x2e, 0x4c, 0x61,
-	0x62, 0x65, 0x6c, 0x42, 0x79, 0x55, 0x73, 0x65, 0x72, 0x52, 0x06, 0x6c, 0x61, 0x62, 0x65, 0x6c,
-	0x73, 0x22, 0x4d, 0x0a, 0x0b, 0x4c, 0x61, 0x62, 0x65, 0x6c, 0x42, 0x79, 0x55, 0x73, 0x65, 0x72,
-	0x12, 0x10, 0x0a, 0x03, 0x6c, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6c,
-	0x69, 0x64, 0x12, 0x14, 0x0a, 0x05, 0x6c, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28,
-	0x09, 0x52, 0x05, 0x6c, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x16, 0x0a, 0x06, 0x6c, 0x63, 0x6f, 0x75,
-	0x6e, 0x74, 0x18, 0x03, 0x20, 0x01, 0x28, 0x03, 0x52, 0x06, 0x6c, 0x63, 0x6f, 0x75, 0x6e, 0x74,
-	0x22, 0x82, 0x01, 0x0a, 0x0e, 0x4c, 0x61, 0x62, 0x65, 0x6c, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e,
-	0x52, 0x65, 0x71, 0x12, 0x16, 0x0a, 0x06, 0x75, 0x73, 0x65, 0x72, 0x49, 0x64, 0x18, 0x01, 0x20,
-	0x01, 0x28, 0x09, 0x52, 0x06, 0x75, 0x73, 0x65, 0x72, 0x49, 0x64, 0x12, 0x12, 0x0a, 0x04, 0x6c,
-	0x69, 0x64, 0x73, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6c, 0x69, 0x64, 0x73, 0x12,
-	0x14, 0x0a, 0x05, 0x6c, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05,
-	0x6c, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x62, 0x69, 0x6e, 0x66, 0x6f, 0x18, 0x04,
-	0x20, 0x03, 0x28, 0x09, 0x52, 0x05, 0x62, 0x69, 0x6e, 0x66, 0x6f, 0x12, 0x18, 0x0a, 0x07, 0x6c,
-	0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x6c, 0x61,
-	0x63, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x5c, 0x0a, 0x0e, 0x4c, 0x61, 0x62, 0x65, 0x6c, 0x41, 0x63,
-	0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x73, 0x12, 0x19, 0x0a, 0x08, 0x65, 0x72, 0x72, 0x5f, 0x63,
-	0x6f, 0x64, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x07, 0x65, 0x72, 0x72, 0x43, 0x6f,
-	0x64, 0x65, 0x12, 0x17, 0x0a, 0x07, 0x65, 0x72, 0x72, 0x5f, 0x6d, 0x73, 0x67, 0x18, 0x02, 0x20,
-	0x01, 0x28, 0x09, 0x52, 0x06, 0x65, 0x72, 0x72, 0x4d, 0x73, 0x67, 0x12, 0x16, 0x0a, 0x06, 0x73,
-	0x74, 0x61, 0x74, 0x75, 0x73, 0x18, 0x03, 0x20, 0x01, 0x28, 0x08, 0x52, 0x06, 0x73, 0x74, 0x61,
-	0x74, 0x75, 0x73, 0x22, 0x53, 0x0a, 0x0b, 0x42, 0x43, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x52,
-	0x65, 0x71, 0x12, 0x16, 0x0a, 0x06, 0x75, 0x73, 0x65, 0x72, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01,
-	0x28, 0x09, 0x52, 0x06, 0x75, 0x73, 0x65, 0x72, 0x49, 0x64, 0x12, 0x12, 0x0a, 0x04, 0x62, 0x69,
-	0x64, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x09, 0x52, 0x04, 0x62, 0x69, 0x64, 0x73, 0x12, 0x18,
-	0x0a, 0x07, 0x62, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52,
-	0x07, 0x62, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x53, 0x0a, 0x0f, 0x49, 0x73, 0x43, 0x6f,
-	0x6c, 0x6c, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x71, 0x12, 0x16, 0x0a, 0x06, 0x75,
-	0x73, 0x65, 0x72, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x75, 0x73, 0x65,
-	0x72, 0x49, 0x64, 0x12, 0x12, 0x0a, 0x04, 0x62, 0x69, 0x64, 0x73, 0x18, 0x02, 0x20, 0x01, 0x28,
-	0x09, 0x52, 0x04, 0x62, 0x69, 0x64, 0x73, 0x12, 0x14, 0x0a, 0x05, 0x6c, 0x61, 0x62, 0x65, 0x6c,
-	0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x67, 0x0a,
-	0x0f, 0x49, 0x73, 0x43, 0x6f, 0x6c, 0x6c, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x73,
-	0x12, 0x19, 0x0a, 0x08, 0x65, 0x72, 0x72, 0x5f, 0x63, 0x6f, 0x64, 0x65, 0x18, 0x01, 0x20, 0x01,
-	0x28, 0x03, 0x52, 0x07, 0x65, 0x72, 0x72, 0x43, 0x6f, 0x64, 0x65, 0x12, 0x17, 0x0a, 0x07, 0x65,
-	0x72, 0x72, 0x5f, 0x6d, 0x73, 0x67, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x65, 0x72,
-	0x72, 0x4d, 0x73, 0x67, 0x12, 0x20, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x03, 0x20, 0x01,
-	0x28, 0x0b, 0x32, 0x0c, 0x2e, 0x62, 0x78, 0x63, 0x6f, 0x6c, 0x2e, 0x49, 0x44, 0x61, 0x74, 0x61,
-	0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x22, 0x5a, 0x0a, 0x05, 0x49, 0x44, 0x61, 0x74, 0x61, 0x12,
-	0x16, 0x0a, 0x06, 0x69, 0x73, 0x63, 0x6f, 0x6c, 0x6c, 0x18, 0x01, 0x20, 0x01, 0x28, 0x08, 0x52,
-	0x06, 0x69, 0x73, 0x63, 0x6f, 0x6c, 0x6c, 0x12, 0x25, 0x0a, 0x06, 0x6c, 0x61, 0x62, 0x65, 0x6c,
-	0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x62, 0x78, 0x63, 0x6f, 0x6c, 0x2e,
-	0x4c, 0x61, 0x62, 0x65, 0x6c, 0x73, 0x52, 0x06, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x73, 0x12, 0x12,
-	0x0a, 0x04, 0x62, 0x69, 0x64, 0x73, 0x18, 0x03, 0x20, 0x03, 0x28, 0x09, 0x52, 0x04, 0x62, 0x69,
-	0x64, 0x73, 0x22, 0x36, 0x0a, 0x06, 0x4c, 0x61, 0x62, 0x65, 0x6c, 0x73, 0x12, 0x0e, 0x0a, 0x02,
-	0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x1c, 0x0a, 0x09,
-	0x6c, 0x61, 0x62, 0x65, 0x6c, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52,
-	0x09, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x6e, 0x61, 0x6d, 0x65, 0x22, 0x83, 0x02, 0x0a, 0x07, 0x4c,
-	0x69, 0x73, 0x74, 0x52, 0x65, 0x71, 0x12, 0x16, 0x0a, 0x06, 0x75, 0x73, 0x65, 0x72, 0x49, 0x64,
-	0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x75, 0x73, 0x65, 0x72, 0x49, 0x64, 0x12, 0x12,
-	0x0a, 0x04, 0x62, 0x69, 0x64, 0x73, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x62, 0x69,
-	0x64, 0x73, 0x12, 0x1e, 0x0a, 0x0a, 0x73, 0x65, 0x6c, 0x65, 0x63, 0x74, 0x54, 0x69, 0x6d, 0x65,
-	0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x73, 0x65, 0x6c, 0x65, 0x63, 0x74, 0x54, 0x69,
-	0x6d, 0x65, 0x12, 0x1e, 0x0a, 0x0a, 0x62, 0x75, 0x79, 0x65, 0x72, 0x63, 0x6c, 0x61, 0x73, 0x73,
-	0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x62, 0x75, 0x79, 0x65, 0x72, 0x63, 0x6c, 0x61,
-	0x73, 0x73, 0x12, 0x18, 0x0a, 0x07, 0x70, 0x61, 0x67, 0x65, 0x6e, 0x75, 0x6d, 0x18, 0x05, 0x20,
-	0x01, 0x28, 0x03, 0x52, 0x07, 0x70, 0x61, 0x67, 0x65, 0x6e, 0x75, 0x6d, 0x12, 0x1e, 0x0a, 0x0a,
-	0x62, 0x75, 0x79, 0x65, 0x72, 0x50, 0x68, 0x6f, 0x6e, 0x65, 0x18, 0x06, 0x20, 0x01, 0x28, 0x03,
-	0x52, 0x0a, 0x62, 0x75, 0x79, 0x65, 0x72, 0x50, 0x68, 0x6f, 0x6e, 0x65, 0x12, 0x20, 0x0a, 0x0b,
-	0x77, 0x69, 0x6e, 0x6e, 0x65, 0x72, 0x50, 0x68, 0x6f, 0x6e, 0x65, 0x18, 0x07, 0x20, 0x01, 0x28,
-	0x03, 0x52, 0x0b, 0x77, 0x69, 0x6e, 0x6e, 0x65, 0x72, 0x50, 0x68, 0x6f, 0x6e, 0x65, 0x12, 0x1a,
-	0x0a, 0x08, 0x70, 0x61, 0x67, 0x65, 0x73, 0x69, 0x7a, 0x65, 0x18, 0x08, 0x20, 0x01, 0x28, 0x03,
-	0x52, 0x08, 0x70, 0x61, 0x67, 0x65, 0x73, 0x69, 0x7a, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x6c, 0x61,
-	0x62, 0x65, 0x6c, 0x18, 0x09, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x6c, 0x61, 0x62, 0x65, 0x6c,
-	0x22, 0x63, 0x0a, 0x07, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x73, 0x12, 0x19, 0x0a, 0x08, 0x65,
-	0x72, 0x72, 0x5f, 0x63, 0x6f, 0x64, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x07, 0x65,
-	0x72, 0x72, 0x43, 0x6f, 0x64, 0x65, 0x12, 0x17, 0x0a, 0x07, 0x65, 0x72, 0x72, 0x5f, 0x6d, 0x73,
-	0x67, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x65, 0x72, 0x72, 0x4d, 0x73, 0x67, 0x12,
-	0x24, 0x0a, 0x05, 0x6c, 0x64, 0x61, 0x74, 0x61, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0e,
-	0x2e, 0x62, 0x78, 0x63, 0x6f, 0x6c, 0x2e, 0x43, 0x6f, 0x6c, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x05,
-	0x6c, 0x64, 0x61, 0x74, 0x61, 0x22, 0x81, 0x01, 0x0a, 0x07, 0x43, 0x6f, 0x6c, 0x4c, 0x69, 0x73,
-	0x74, 0x12, 0x14, 0x0a, 0x05, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03,
-	0x52, 0x05, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x22, 0x0a, 0x0c, 0x68, 0x61, 0x76, 0x65, 0x4e,
-	0x65, 0x78, 0x74, 0x50, 0x61, 0x67, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0c, 0x68,
-	0x61, 0x76, 0x65, 0x4e, 0x65, 0x78, 0x74, 0x50, 0x61, 0x67, 0x65, 0x12, 0x20, 0x0a, 0x03, 0x72,
-	0x65, 0x73, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0e, 0x2e, 0x62, 0x78, 0x63, 0x6f, 0x6c,
-	0x2e, 0x43, 0x6f, 0x6c, 0x44, 0x61, 0x74, 0x61, 0x52, 0x03, 0x72, 0x65, 0x73, 0x12, 0x1a, 0x0a,
-	0x08, 0x70, 0x61, 0x67, 0x65, 0x73, 0x69, 0x7a, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x03, 0x52,
-	0x08, 0x70, 0x61, 0x67, 0x65, 0x73, 0x69, 0x7a, 0x65, 0x22, 0xcb, 0x02, 0x0a, 0x07, 0x43, 0x6f,
-	0x6c, 0x44, 0x61, 0x74, 0x61, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28,
-	0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x14, 0x0a, 0x05, 0x74, 0x69, 0x74, 0x6c, 0x65, 0x18, 0x02,
-	0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x74, 0x69, 0x74, 0x6c, 0x65, 0x12, 0x12, 0x0a, 0x04, 0x61,
-	0x72, 0x65, 0x61, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x61, 0x72, 0x65, 0x61, 0x12,
-	0x1e, 0x0a, 0x0a, 0x62, 0x75, 0x79, 0x65, 0x72, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x18, 0x04, 0x20,
-	0x01, 0x28, 0x09, 0x52, 0x0a, 0x62, 0x75, 0x79, 0x65, 0x72, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x12,
-	0x12, 0x0a, 0x04, 0x74, 0x79, 0x70, 0x65, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x74,
-	0x79, 0x70, 0x65, 0x12, 0x27, 0x0a, 0x0f, 0x73, 0x5f, 0x73, 0x75, 0x62, 0x73, 0x63, 0x6f, 0x70,
-	0x65, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x18, 0x06, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0e, 0x73, 0x53,
-	0x75, 0x62, 0x73, 0x63, 0x6f, 0x70, 0x65, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x12, 0x20, 0x0a, 0x0b,
-	0x70, 0x75, 0x62, 0x6c, 0x69, 0x73, 0x68, 0x74, 0x69, 0x6d, 0x65, 0x18, 0x07, 0x20, 0x01, 0x28,
-	0x03, 0x52, 0x0b, 0x70, 0x75, 0x62, 0x6c, 0x69, 0x73, 0x68, 0x74, 0x69, 0x6d, 0x65, 0x12, 0x16,
-	0x0a, 0x06, 0x62, 0x75, 0x64, 0x67, 0x65, 0x74, 0x18, 0x08, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06,
-	0x62, 0x75, 0x64, 0x67, 0x65, 0x74, 0x12, 0x1c, 0x0a, 0x09, 0x62, 0x69, 0x64, 0x61, 0x6d, 0x6f,
-	0x75, 0x6e, 0x74, 0x18, 0x09, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x62, 0x69, 0x64, 0x61, 0x6d,
-	0x6f, 0x75, 0x6e, 0x74, 0x12, 0x14, 0x0a, 0x05, 0x62, 0x75, 0x79, 0x65, 0x72, 0x18, 0x0a, 0x20,
-	0x01, 0x28, 0x09, 0x52, 0x05, 0x62, 0x75, 0x79, 0x65, 0x72, 0x12, 0x19, 0x0a, 0x08, 0x73, 0x5f,
-	0x77, 0x69, 0x6e, 0x6e, 0x65, 0x72, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x73, 0x57,
-	0x69, 0x6e, 0x6e, 0x65, 0x72, 0x12, 0x20, 0x0a, 0x0b, 0x62, 0x69, 0x64, 0x6f, 0x70, 0x65, 0x6e,
-	0x74, 0x69, 0x6d, 0x65, 0x18, 0x0c, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0b, 0x62, 0x69, 0x64, 0x6f,
-	0x70, 0x65, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x22, 0x3f, 0x0a, 0x09, 0x43, 0x6f, 0x6d, 0x6d, 0x6f,
-	0x6e, 0x52, 0x65, 0x73, 0x12, 0x19, 0x0a, 0x08, 0x65, 0x72, 0x72, 0x5f, 0x63, 0x6f, 0x64, 0x65,
-	0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x07, 0x65, 0x72, 0x72, 0x43, 0x6f, 0x64, 0x65, 0x12,
-	0x17, 0x0a, 0x07, 0x65, 0x72, 0x72, 0x5f, 0x6d, 0x73, 0x67, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09,
-	0x52, 0x06, 0x65, 0x72, 0x72, 0x4d, 0x73, 0x67, 0x32, 0xdd, 0x02, 0x0a, 0x05, 0x62, 0x78, 0x63,
-	0x6f, 0x6c, 0x12, 0x32, 0x0a, 0x08, 0x41, 0x64, 0x64, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x12, 0x12,
-	0x2e, 0x62, 0x78, 0x63, 0x6f, 0x6c, 0x2e, 0x41, 0x64, 0x64, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x52,
-	0x65, 0x71, 0x1a, 0x12, 0x2e, 0x62, 0x78, 0x63, 0x6f, 0x6c, 0x2e, 0x41, 0x64, 0x64, 0x6c, 0x61,
-	0x62, 0x65, 0x6c, 0x52, 0x65, 0x73, 0x12, 0x44, 0x0a, 0x0e, 0x47, 0x65, 0x74, 0x4c, 0x61, 0x62,
-	0x65, 0x6c, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x18, 0x2e, 0x62, 0x78, 0x63, 0x6f, 0x6c,
-	0x2e, 0x47, 0x65, 0x74, 0x4c, 0x61, 0x62, 0x65, 0x6c, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x52,
-	0x65, 0x71, 0x1a, 0x18, 0x2e, 0x62, 0x78, 0x63, 0x6f, 0x6c, 0x2e, 0x47, 0x65, 0x74, 0x4c, 0x61,
-	0x62, 0x65, 0x6c, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x73, 0x12, 0x3b, 0x0a, 0x0b,
-	0x4c, 0x61, 0x62, 0x65, 0x6c, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x15, 0x2e, 0x62, 0x78,
-	0x63, 0x6f, 0x6c, 0x2e, 0x4c, 0x61, 0x62, 0x65, 0x6c, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x52,
-	0x65, 0x71, 0x1a, 0x15, 0x2e, 0x62, 0x78, 0x63, 0x6f, 0x6c, 0x2e, 0x4c, 0x61, 0x62, 0x65, 0x6c,
-	0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x73, 0x12, 0x35, 0x0a, 0x08, 0x42, 0x43, 0x41,
-	0x63, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x12, 0x2e, 0x62, 0x78, 0x63, 0x6f, 0x6c, 0x2e, 0x42, 0x43,
-	0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x71, 0x1a, 0x15, 0x2e, 0x62, 0x78, 0x63, 0x6f,
-	0x6c, 0x2e, 0x4c, 0x61, 0x62, 0x65, 0x6c, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x73,
-	0x12, 0x3e, 0x0a, 0x0c, 0x49, 0x73, 0x43, 0x6f, 0x6c, 0x6c, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e,
-	0x12, 0x16, 0x2e, 0x62, 0x78, 0x63, 0x6f, 0x6c, 0x2e, 0x49, 0x73, 0x43, 0x6f, 0x6c, 0x6c, 0x41,
-	0x63, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x71, 0x1a, 0x16, 0x2e, 0x62, 0x78, 0x63, 0x6f, 0x6c,
-	0x2e, 0x49, 0x73, 0x43, 0x6f, 0x6c, 0x6c, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x73,
-	0x12, 0x26, 0x0a, 0x04, 0x4c, 0x69, 0x73, 0x74, 0x12, 0x0e, 0x2e, 0x62, 0x78, 0x63, 0x6f, 0x6c,
-	0x2e, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x71, 0x1a, 0x0e, 0x2e, 0x62, 0x78, 0x63, 0x6f, 0x6c,
-	0x2e, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x73, 0x42, 0x09, 0x5a, 0x07, 0x2e, 0x2f, 0x62, 0x78,
-	0x63, 0x6f, 0x6c, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
-}
-
-var (
-	file_bxcollection_proto_rawDescOnce sync.Once
-	file_bxcollection_proto_rawDescData = file_bxcollection_proto_rawDesc
-)
-
-func file_bxcollection_proto_rawDescGZIP() []byte {
-	file_bxcollection_proto_rawDescOnce.Do(func() {
-		file_bxcollection_proto_rawDescData = protoimpl.X.CompressGZIP(file_bxcollection_proto_rawDescData)
-	})
-	return file_bxcollection_proto_rawDescData
-}
-
-var file_bxcollection_proto_msgTypes = make([]protoimpl.MessageInfo, 17)
-var file_bxcollection_proto_goTypes = []interface{}{
-	(*AddlabelReq)(nil),       // 0: bxcol.AddlabelReq
-	(*AddlabelRes)(nil),       // 1: bxcol.AddlabelRes
-	(*GetLabelActionReq)(nil), // 2: bxcol.GetLabelActionReq
-	(*GetLabelActionRes)(nil), // 3: bxcol.GetLabelActionRes
-	(*LabelByUser)(nil),       // 4: bxcol.LabelByUser
-	(*LabelActionReq)(nil),    // 5: bxcol.LabelActionReq
-	(*LabelActionRes)(nil),    // 6: bxcol.LabelActionRes
-	(*BCActionReq)(nil),       // 7: bxcol.BCActionReq
-	(*IsCollActionReq)(nil),   // 8: bxcol.IsCollActionReq
-	(*IsCollActionRes)(nil),   // 9: bxcol.IsCollActionRes
-	(*IData)(nil),             // 10: bxcol.IData
-	(*Labels)(nil),            // 11: bxcol.Labels
-	(*ListReq)(nil),           // 12: bxcol.ListReq
-	(*ListRes)(nil),           // 13: bxcol.ListRes
-	(*ColList)(nil),           // 14: bxcol.ColList
-	(*ColData)(nil),           // 15: bxcol.ColData
-	(*CommonRes)(nil),         // 16: bxcol.CommonRes
-}
-var file_bxcollection_proto_depIdxs = []int32{
-	4,  // 0: bxcol.GetLabelActionRes.labels:type_name -> bxcol.LabelByUser
-	10, // 1: bxcol.IsCollActionRes.data:type_name -> bxcol.IData
-	11, // 2: bxcol.IData.labels:type_name -> bxcol.Labels
-	14, // 3: bxcol.ListRes.ldata:type_name -> bxcol.ColList
-	15, // 4: bxcol.ColList.res:type_name -> bxcol.ColData
-	0,  // 5: bxcol.bxcol.Addlabel:input_type -> bxcol.AddlabelReq
-	2,  // 6: bxcol.bxcol.GetLabelAction:input_type -> bxcol.GetLabelActionReq
-	5,  // 7: bxcol.bxcol.LabelAction:input_type -> bxcol.LabelActionReq
-	7,  // 8: bxcol.bxcol.BCAction:input_type -> bxcol.BCActionReq
-	8,  // 9: bxcol.bxcol.IsCollAction:input_type -> bxcol.IsCollActionReq
-	12, // 10: bxcol.bxcol.List:input_type -> bxcol.ListReq
-	1,  // 11: bxcol.bxcol.Addlabel:output_type -> bxcol.AddlabelRes
-	3,  // 12: bxcol.bxcol.GetLabelAction:output_type -> bxcol.GetLabelActionRes
-	6,  // 13: bxcol.bxcol.LabelAction:output_type -> bxcol.LabelActionRes
-	6,  // 14: bxcol.bxcol.BCAction:output_type -> bxcol.LabelActionRes
-	9,  // 15: bxcol.bxcol.IsCollAction:output_type -> bxcol.IsCollActionRes
-	13, // 16: bxcol.bxcol.List:output_type -> bxcol.ListRes
-	11, // [11:17] is the sub-list for method output_type
-	5,  // [5:11] is the sub-list for method input_type
-	5,  // [5:5] is the sub-list for extension type_name
-	5,  // [5:5] is the sub-list for extension extendee
-	0,  // [0:5] is the sub-list for field type_name
-}
-
-func init() { file_bxcollection_proto_init() }
-func file_bxcollection_proto_init() {
-	if File_bxcollection_proto != nil {
-		return
-	}
-	if !protoimpl.UnsafeEnabled {
-		file_bxcollection_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*AddlabelReq); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_bxcollection_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*AddlabelRes); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_bxcollection_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*GetLabelActionReq); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_bxcollection_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*GetLabelActionRes); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_bxcollection_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*LabelByUser); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_bxcollection_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*LabelActionReq); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_bxcollection_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*LabelActionRes); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_bxcollection_proto_msgTypes[7].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*BCActionReq); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_bxcollection_proto_msgTypes[8].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*IsCollActionReq); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_bxcollection_proto_msgTypes[9].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*IsCollActionRes); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_bxcollection_proto_msgTypes[10].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*IData); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_bxcollection_proto_msgTypes[11].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*Labels); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_bxcollection_proto_msgTypes[12].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*ListReq); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_bxcollection_proto_msgTypes[13].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*ListRes); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_bxcollection_proto_msgTypes[14].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*ColList); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_bxcollection_proto_msgTypes[15].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*ColData); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_bxcollection_proto_msgTypes[16].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*CommonRes); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-	}
-	type x struct{}
-	out := protoimpl.TypeBuilder{
-		File: protoimpl.DescBuilder{
-			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
-			RawDescriptor: file_bxcollection_proto_rawDesc,
-			NumEnums:      0,
-			NumMessages:   17,
-			NumExtensions: 0,
-			NumServices:   1,
-		},
-		GoTypes:           file_bxcollection_proto_goTypes,
-		DependencyIndexes: file_bxcollection_proto_depIdxs,
-		MessageInfos:      file_bxcollection_proto_msgTypes,
-	}.Build()
-	File_bxcollection_proto = out.File
-	file_bxcollection_proto_rawDesc = nil
-	file_bxcollection_proto_goTypes = nil
-	file_bxcollection_proto_depIdxs = nil
-}

+ 0 - 297
jyBXBase/rpc/bxcollection/bxcol/bxcollection_grpc.pb.go

@@ -1,297 +0,0 @@
-// Code generated by protoc-gen-go-grpc. DO NOT EDIT.
-// versions:
-// - protoc-gen-go-grpc v1.2.0
-// - protoc             v3.9.0
-// source: bxcollection.proto
-
-package bxcol
-
-import (
-	context "context"
-	grpc "google.golang.org/grpc"
-	codes "google.golang.org/grpc/codes"
-	status "google.golang.org/grpc/status"
-)
-
-// This is a compile-time assertion to ensure that this generated file
-// is compatible with the grpc package it is being compiled against.
-// Requires gRPC-Go v1.32.0 or later.
-const _ = grpc.SupportPackageIsVersion7
-
-// BxcolClient is the client API for Bxcol service.
-//
-// For semantics around ctx use and closing/ending streaming RPCs, please refer to https://pkg.go.dev/google.golang.org/grpc/?tab=doc#ClientConn.NewStream.
-type BxcolClient interface {
-	//新增标签
-	Addlabel(ctx context.Context, in *AddlabelReq, opts ...grpc.CallOption) (*AddlabelRes, error)
-	//获取标签
-	GetLabelAction(ctx context.Context, in *GetLabelActionReq, opts ...grpc.CallOption) (*GetLabelActionRes, error)
-	//标签新增或删除
-	LabelAction(ctx context.Context, in *LabelActionReq, opts ...grpc.CallOption) (*LabelActionRes, error)
-	//招标信息收藏
-	BCAction(ctx context.Context, in *BCActionReq, opts ...grpc.CallOption) (*LabelActionRes, error)
-	//招标信息是否被收藏
-	IsCollAction(ctx context.Context, in *IsCollActionReq, opts ...grpc.CallOption) (*IsCollActionRes, error)
-	//获取收藏列表
-	List(ctx context.Context, in *ListReq, opts ...grpc.CallOption) (*ListRes, error)
-}
-
-type bxcolClient struct {
-	cc grpc.ClientConnInterface
-}
-
-func NewBxcolClient(cc grpc.ClientConnInterface) BxcolClient {
-	return &bxcolClient{cc}
-}
-
-func (c *bxcolClient) Addlabel(ctx context.Context, in *AddlabelReq, opts ...grpc.CallOption) (*AddlabelRes, error) {
-	out := new(AddlabelRes)
-	err := c.cc.Invoke(ctx, "/bxcol.bxcol/Addlabel", in, out, opts...)
-	if err != nil {
-		return nil, err
-	}
-	return out, nil
-}
-
-func (c *bxcolClient) GetLabelAction(ctx context.Context, in *GetLabelActionReq, opts ...grpc.CallOption) (*GetLabelActionRes, error) {
-	out := new(GetLabelActionRes)
-	err := c.cc.Invoke(ctx, "/bxcol.bxcol/GetLabelAction", in, out, opts...)
-	if err != nil {
-		return nil, err
-	}
-	return out, nil
-}
-
-func (c *bxcolClient) LabelAction(ctx context.Context, in *LabelActionReq, opts ...grpc.CallOption) (*LabelActionRes, error) {
-	out := new(LabelActionRes)
-	err := c.cc.Invoke(ctx, "/bxcol.bxcol/LabelAction", in, out, opts...)
-	if err != nil {
-		return nil, err
-	}
-	return out, nil
-}
-
-func (c *bxcolClient) BCAction(ctx context.Context, in *BCActionReq, opts ...grpc.CallOption) (*LabelActionRes, error) {
-	out := new(LabelActionRes)
-	err := c.cc.Invoke(ctx, "/bxcol.bxcol/BCAction", in, out, opts...)
-	if err != nil {
-		return nil, err
-	}
-	return out, nil
-}
-
-func (c *bxcolClient) IsCollAction(ctx context.Context, in *IsCollActionReq, opts ...grpc.CallOption) (*IsCollActionRes, error) {
-	out := new(IsCollActionRes)
-	err := c.cc.Invoke(ctx, "/bxcol.bxcol/IsCollAction", in, out, opts...)
-	if err != nil {
-		return nil, err
-	}
-	return out, nil
-}
-
-func (c *bxcolClient) List(ctx context.Context, in *ListReq, opts ...grpc.CallOption) (*ListRes, error) {
-	out := new(ListRes)
-	err := c.cc.Invoke(ctx, "/bxcol.bxcol/List", in, out, opts...)
-	if err != nil {
-		return nil, err
-	}
-	return out, nil
-}
-
-// BxcolServer is the server API for Bxcol service.
-// All implementations must embed UnimplementedBxcolServer
-// for forward compatibility
-type BxcolServer interface {
-	//新增标签
-	Addlabel(context.Context, *AddlabelReq) (*AddlabelRes, error)
-	//获取标签
-	GetLabelAction(context.Context, *GetLabelActionReq) (*GetLabelActionRes, error)
-	//标签新增或删除
-	LabelAction(context.Context, *LabelActionReq) (*LabelActionRes, error)
-	//招标信息收藏
-	BCAction(context.Context, *BCActionReq) (*LabelActionRes, error)
-	//招标信息是否被收藏
-	IsCollAction(context.Context, *IsCollActionReq) (*IsCollActionRes, error)
-	//获取收藏列表
-	List(context.Context, *ListReq) (*ListRes, error)
-	mustEmbedUnimplementedBxcolServer()
-}
-
-// UnimplementedBxcolServer must be embedded to have forward compatible implementations.
-type UnimplementedBxcolServer struct {
-}
-
-func (UnimplementedBxcolServer) Addlabel(context.Context, *AddlabelReq) (*AddlabelRes, error) {
-	return nil, status.Errorf(codes.Unimplemented, "method Addlabel not implemented")
-}
-func (UnimplementedBxcolServer) GetLabelAction(context.Context, *GetLabelActionReq) (*GetLabelActionRes, error) {
-	return nil, status.Errorf(codes.Unimplemented, "method GetLabelAction not implemented")
-}
-func (UnimplementedBxcolServer) LabelAction(context.Context, *LabelActionReq) (*LabelActionRes, error) {
-	return nil, status.Errorf(codes.Unimplemented, "method LabelAction not implemented")
-}
-func (UnimplementedBxcolServer) BCAction(context.Context, *BCActionReq) (*LabelActionRes, error) {
-	return nil, status.Errorf(codes.Unimplemented, "method BCAction not implemented")
-}
-func (UnimplementedBxcolServer) IsCollAction(context.Context, *IsCollActionReq) (*IsCollActionRes, error) {
-	return nil, status.Errorf(codes.Unimplemented, "method IsCollAction not implemented")
-}
-func (UnimplementedBxcolServer) List(context.Context, *ListReq) (*ListRes, error) {
-	return nil, status.Errorf(codes.Unimplemented, "method List not implemented")
-}
-func (UnimplementedBxcolServer) mustEmbedUnimplementedBxcolServer() {}
-
-// UnsafeBxcolServer may be embedded to opt out of forward compatibility for this service.
-// Use of this interface is not recommended, as added methods to BxcolServer will
-// result in compilation errors.
-type UnsafeBxcolServer interface {
-	mustEmbedUnimplementedBxcolServer()
-}
-
-func RegisterBxcolServer(s grpc.ServiceRegistrar, srv BxcolServer) {
-	s.RegisterService(&Bxcol_ServiceDesc, srv)
-}
-
-func _Bxcol_Addlabel_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(AddlabelReq)
-	if err := dec(in); err != nil {
-		return nil, err
-	}
-	if interceptor == nil {
-		return srv.(BxcolServer).Addlabel(ctx, in)
-	}
-	info := &grpc.UnaryServerInfo{
-		Server:     srv,
-		FullMethod: "/bxcol.bxcol/Addlabel",
-	}
-	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(BxcolServer).Addlabel(ctx, req.(*AddlabelReq))
-	}
-	return interceptor(ctx, in, info, handler)
-}
-
-func _Bxcol_GetLabelAction_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(GetLabelActionReq)
-	if err := dec(in); err != nil {
-		return nil, err
-	}
-	if interceptor == nil {
-		return srv.(BxcolServer).GetLabelAction(ctx, in)
-	}
-	info := &grpc.UnaryServerInfo{
-		Server:     srv,
-		FullMethod: "/bxcol.bxcol/GetLabelAction",
-	}
-	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(BxcolServer).GetLabelAction(ctx, req.(*GetLabelActionReq))
-	}
-	return interceptor(ctx, in, info, handler)
-}
-
-func _Bxcol_LabelAction_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(LabelActionReq)
-	if err := dec(in); err != nil {
-		return nil, err
-	}
-	if interceptor == nil {
-		return srv.(BxcolServer).LabelAction(ctx, in)
-	}
-	info := &grpc.UnaryServerInfo{
-		Server:     srv,
-		FullMethod: "/bxcol.bxcol/LabelAction",
-	}
-	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(BxcolServer).LabelAction(ctx, req.(*LabelActionReq))
-	}
-	return interceptor(ctx, in, info, handler)
-}
-
-func _Bxcol_BCAction_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(BCActionReq)
-	if err := dec(in); err != nil {
-		return nil, err
-	}
-	if interceptor == nil {
-		return srv.(BxcolServer).BCAction(ctx, in)
-	}
-	info := &grpc.UnaryServerInfo{
-		Server:     srv,
-		FullMethod: "/bxcol.bxcol/BCAction",
-	}
-	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(BxcolServer).BCAction(ctx, req.(*BCActionReq))
-	}
-	return interceptor(ctx, in, info, handler)
-}
-
-func _Bxcol_IsCollAction_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(IsCollActionReq)
-	if err := dec(in); err != nil {
-		return nil, err
-	}
-	if interceptor == nil {
-		return srv.(BxcolServer).IsCollAction(ctx, in)
-	}
-	info := &grpc.UnaryServerInfo{
-		Server:     srv,
-		FullMethod: "/bxcol.bxcol/IsCollAction",
-	}
-	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(BxcolServer).IsCollAction(ctx, req.(*IsCollActionReq))
-	}
-	return interceptor(ctx, in, info, handler)
-}
-
-func _Bxcol_List_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(ListReq)
-	if err := dec(in); err != nil {
-		return nil, err
-	}
-	if interceptor == nil {
-		return srv.(BxcolServer).List(ctx, in)
-	}
-	info := &grpc.UnaryServerInfo{
-		Server:     srv,
-		FullMethod: "/bxcol.bxcol/List",
-	}
-	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(BxcolServer).List(ctx, req.(*ListReq))
-	}
-	return interceptor(ctx, in, info, handler)
-}
-
-// Bxcol_ServiceDesc is the grpc.ServiceDesc for Bxcol service.
-// It's only intended for direct use with grpc.RegisterService,
-// and not to be introspected or modified (even as a copy)
-var Bxcol_ServiceDesc = grpc.ServiceDesc{
-	ServiceName: "bxcol.bxcol",
-	HandlerType: (*BxcolServer)(nil),
-	Methods: []grpc.MethodDesc{
-		{
-			MethodName: "Addlabel",
-			Handler:    _Bxcol_Addlabel_Handler,
-		},
-		{
-			MethodName: "GetLabelAction",
-			Handler:    _Bxcol_GetLabelAction_Handler,
-		},
-		{
-			MethodName: "LabelAction",
-			Handler:    _Bxcol_LabelAction_Handler,
-		},
-		{
-			MethodName: "BCAction",
-			Handler:    _Bxcol_BCAction_Handler,
-		},
-		{
-			MethodName: "IsCollAction",
-			Handler:    _Bxcol_IsCollAction_Handler,
-		},
-		{
-			MethodName: "List",
-			Handler:    _Bxcol_List_Handler,
-		},
-	},
-	Streams:  []grpc.StreamDesc{},
-	Metadata: "bxcollection.proto",
-}

+ 67 - 0
jyBXBase/rpc/bxcollection/bxcollection.proto

@@ -97,6 +97,64 @@ message ColData {
   string s_winner = 11;
   int64 bidopentime = 12;
 }
+
+message ShowSearchReq{
+  string userId = 1;
+  string type = 2;
+}
+
+message ShowSearchRes{
+  int64 err_code = 1;
+  string err_msg = 2;
+  repeated ListSearchRes data = 3;
+}
+
+message ListSearchRes{
+  string userId =1;
+  string type =2;
+  string keywords =3;                   //搜索词
+  string publishTime=4;   //发布时间
+  string area =5;       //地区
+  string subtype =6;    //信息类型
+  string minPrice =7; //最低价格
+  string maxPrice =8;//最高价格
+  string industry =9;//选中的行业
+  string selectType =10;//标题 or 全文
+  string buyerClass =11;//采购单位行业
+  string hasBuyerTel =12;//是否有采购电话
+  string hasWinnerTel =13;//是否有中标电话
+  string attachment =14;//附件
+  string notKey =15;//排除词
+  string provincial=16;
+  string id =17;
+  bool isPay =18;
+  string tabularflag =19;
+}
+
+message AddSearchReq{
+  string userId =1;
+  string type =2;
+  string keywords =3;                   //搜索词
+  string publishTime=4;   //发布时间
+  string area =5;       //地区
+  string subtype =6;    //信息类型
+  string minPrice =7; //最低价格
+  string maxPrice =8;//最高价格
+  string industry =9;//选中的行业
+  string selectType =10;//标题 or 全文
+  string buyerClass =11;//采购单位行业
+  string hasBuyerTel =12;//是否有采购电话
+  string hasWinnerTel =13;//是否有中标电话
+  string attachment =14;//附件
+  string notKey =15;//排除词
+  string  provincial=16;
+  string tabularFlag =17;
+}
+
+message DelSearchReq{
+  string id =1;
+}
+
 //公共返回
 message CommonRes {
   int64 err_code = 1;
@@ -117,4 +175,13 @@ service bxcol {
   rpc IsCollAction(IsCollActionReq) returns(IsCollActionRes);
   //获取收藏列表
   rpc List(ListReq) returns(ListRes);
+
+  //获取筛选列表
+  rpc ShowSearch(ShowSearchReq) returns(ShowSearchRes);
+  //添加删选列表
+  rpc AddSearch(AddSearchReq) returns(CommonRes);
+  //修改筛选列表
+  rpc CheckSearch(AddSearchReq) returns(CommonRes);
+  //删除筛选列表
+  rpc DelSearch(DelSearchReq) returns(CommonRes);
 }

+ 24 - 0
jyBXBase/rpc/bxcollection/internal/server/bxcolserver.go

@@ -57,3 +57,27 @@ func (s *BxcolServer) List(ctx context.Context, in *bxcol.ListReq) (*bxcol.ListR
 	l := logic.NewListLogic(ctx, s.svcCtx)
 	return l.List(in)
 }
+
+// 获取筛选列表
+func (s *BxcolServer) ShowSearch(ctx context.Context, in *bxcol.ShowSearchReq) (*bxcol.ShowSearchRes, error) {
+	l := logic.NewShowSearchLogic(ctx, s.svcCtx)
+	return l.ShowSearch(in)
+}
+
+// 添加删选列表
+func (s *BxcolServer) AddSearch(ctx context.Context, in *bxcol.AddSearchReq) (*bxcol.CommonRes, error) {
+	l := logic.NewAddSearchLogic(ctx, s.svcCtx)
+	return l.AddSearch(in)
+}
+
+// 修改筛选列表
+func (s *BxcolServer) CheckSearch(ctx context.Context, in *bxcol.AddSearchReq) (*bxcol.CommonRes, error) {
+	l := logic.NewCheckSearchLogic(ctx, s.svcCtx)
+	return l.CheckSearch(in)
+}
+
+// 删除筛选列表
+func (s *BxcolServer) DelSearch(ctx context.Context, in *bxcol.DelSearchReq) (*bxcol.CommonRes, error) {
+	l := logic.NewDelSearchLogic(ctx, s.svcCtx)
+	return l.DelSearch(in)
+}