最新标讯高亮处理

jyBXBase/rpc/bxbase.proto

@@ -209,7 +209,7 @@ message newestList {
   int64 bidamount = 3;//中标金额
   int64 budget = 4;//预算
   string buyerclass = 5;//采购单位类型
-  string matchkeys = 6;//订阅匹配信息
+  repeated string matchkeys = 6;//订阅匹配信息
   int64 publishTime = 7;//发布时间
   string industry = 8;//行业
   string  title = 9;//标题

jyBXBase/rpc/model/newestBidding.go

@@ -73,7 +73,7 @@ func (n *NewestInfo) GetPushHistory() (res []*bxbase.NewestList) {
 			//
 			infos[infoId] = &bxbase.NewestList{
 				Id:         ME.EncodeArticleId2ByCheck(MC.ObjToString(v["infoid"])),
-				Matchkeys:  MC.ObjToString(v["matchkeys"]),
+				Matchkeys:  strings.Split(MC.ObjToString(v["matchkeys"])," "),
 				Budget:     MC.Int64All(v["budget"]),
 				Bidamount:  MC.Int64All(v["bidamount"]),
 				FileExists: MC.Int64All(v["attachment_count"]) > 0,

jyBXBase/rpc/type/bxbase/bxbase.pb.go

@@ -2083,22 +2083,22 @@ type NewestList struct {
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	Area        string `protobuf:"bytes,1,opt,name=area,proto3" json:"area,omitempty"`                //省份
-	City        string `protobuf:"bytes,2,opt,name=city,proto3" json:"city,omitempty"`                //城市
-	Bidamount   int64  `protobuf:"varint,3,opt,name=bidamount,proto3" json:"bidamount,omitempty"`     //中标金额
-	Budget      int64  `protobuf:"varint,4,opt,name=budget,proto3" json:"budget,omitempty"`           //预算
-	Buyerclass  string `protobuf:"bytes,5,opt,name=buyerclass,proto3" json:"buyerclass,omitempty"`    //采购单位类型
-	Matchkeys   string `protobuf:"bytes,6,opt,name=matchkeys,proto3" json:"matchkeys,omitempty"`      //订阅匹配信息
-	PublishTime int64  `protobuf:"varint,7,opt,name=publishTime,proto3" json:"publishTime,omitempty"` //发布时间
-	Industry    string `protobuf:"bytes,8,opt,name=industry,proto3" json:"industry,omitempty"`        //行业
-	Title       string `protobuf:"bytes,9,opt,name=title,proto3" json:"title,omitempty"`              //标题
-	Subtype     string `protobuf:"bytes,10,opt,name=subtype,proto3" json:"subtype,omitempty"`         //
-	AppId       string `protobuf:"bytes,11,opt,name=appId,proto3" json:"appId,omitempty"`
-	Id          string `protobuf:"bytes,12,opt,name=id,proto3" json:"id,omitempty"`                  //招标信息id
-	FileExists  bool   `protobuf:"varint,13,opt,name=fileExists,proto3" json:"fileExists,omitempty"` //是否有附件
-	IsCol       bool   `protobuf:"varint,14,opt,name=isCol,proto3" json:"isCol,omitempty"`           //是否收藏
-	Site        string `protobuf:"bytes,15,opt,name=site,proto3" json:"site,omitempty"`              //网站名称
-	SpiderCode  string `protobuf:"bytes,16,opt,name=spiderCode,proto3" json:"spiderCode,omitempty"`  //网站代码
+	Area        string   `protobuf:"bytes,1,opt,name=area,proto3" json:"area,omitempty"`                //省份
+	City        string   `protobuf:"bytes,2,opt,name=city,proto3" json:"city,omitempty"`                //城市
+	Bidamount   int64    `protobuf:"varint,3,opt,name=bidamount,proto3" json:"bidamount,omitempty"`     //中标金额
+	Budget      int64    `protobuf:"varint,4,opt,name=budget,proto3" json:"budget,omitempty"`           //预算
+	Buyerclass  string   `protobuf:"bytes,5,opt,name=buyerclass,proto3" json:"buyerclass,omitempty"`    //采购单位类型
+	Matchkeys   []string `protobuf:"bytes,6,rep,name=matchkeys,proto3" json:"matchkeys,omitempty"`      //订阅匹配信息
+	PublishTime int64    `protobuf:"varint,7,opt,name=publishTime,proto3" json:"publishTime,omitempty"` //发布时间
+	Industry    string   `protobuf:"bytes,8,opt,name=industry,proto3" json:"industry,omitempty"`        //行业
+	Title       string   `protobuf:"bytes,9,opt,name=title,proto3" json:"title,omitempty"`              //标题
+	Subtype     string   `protobuf:"bytes,10,opt,name=subtype,proto3" json:"subtype,omitempty"`         //
+	AppId       string   `protobuf:"bytes,11,opt,name=appId,proto3" json:"appId,omitempty"`
+	Id          string   `protobuf:"bytes,12,opt,name=id,proto3" json:"id,omitempty"`                  //招标信息id
+	FileExists  bool     `protobuf:"varint,13,opt,name=fileExists,proto3" json:"fileExists,omitempty"` //是否有附件
+	IsCol       bool     `protobuf:"varint,14,opt,name=isCol,proto3" json:"isCol,omitempty"`           //是否收藏
+	Site        string   `protobuf:"bytes,15,opt,name=site,proto3" json:"site,omitempty"`              //网站名称
+	SpiderCode  string   `protobuf:"bytes,16,opt,name=spiderCode,proto3" json:"spiderCode,omitempty"`  //网站代码
 }
 
 func (x *NewestList) Reset() {
@@ -2168,11 +2168,11 @@ func (x *NewestList) GetBuyerclass() string {
 	return ""
 }
 
-func (x *NewestList) GetMatchkeys() string {
+func (x *NewestList) GetMatchkeys() []string {
 	if x != nil {
 		return x.Matchkeys
 	}
-	return ""
+	return nil
 }
 
 func (x *NewestList) GetPublishTime() int64 {
@@ -3141,7 +3141,7 @@ var file_bxbase_proto_rawDesc = []byte{
 	0x62, 0x75, 0x64, 0x67, 0x65, 0x74, 0x12, 0x1e, 0x0a, 0x0a, 0x62, 0x75, 0x79, 0x65, 0x72, 0x63,
 	0x6c, 0x61, 0x73, 0x73, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x62, 0x75, 0x79, 0x65,
 	0x72, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x12, 0x1c, 0x0a, 0x09, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x6b,
-	0x65, 0x79, 0x73, 0x18, 0x06, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x6d, 0x61, 0x74, 0x63, 0x68,
+	0x65, 0x79, 0x73, 0x18, 0x06, 0x20, 0x03, 0x28, 0x09, 0x52, 0x09, 0x6d, 0x61, 0x74, 0x63, 0x68,
 	0x6b, 0x65, 0x79, 0x73, 0x12, 0x20, 0x0a, 0x0b, 0x70, 0x75, 0x62, 0x6c, 0x69, 0x73, 0x68, 0x54,
 	0x69, 0x6d, 0x65, 0x18, 0x07, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0b, 0x70, 0x75, 0x62, 0x6c, 0x69,
 	0x73, 0x68, 0x54, 0x69, 0x6d, 0x65, 0x12, 0x1a, 0x0a, 0x08, 0x69, 0x6e, 0x64, 0x75, 0x73, 0x74,