Merge branch 'feature/v1.1.12' of http://192.168.3.207:8080/BaseService/jyMicroservices into feature/v1.1.12

jyBXBase/api/bxbase.api

@@ -87,9 +87,9 @@ type (
 		FileExists      string `json:"fileExists,optional"` //附件
 		Notkey          string `json:"notkey,optional"`     //排除词 关键词：排除词（副：五组，每组最多15个字符）
 		InKey           string `json:"inkey,optional"`
-		SearchGroup     int    `json:"searchGroup,optional"`     // 搜索分组：默认0：全部；1：招标采购公告；2：超前项目
-		SearchMode      int    `json:"searchMode,optional"`      // 搜索模式：0：精准搜索；1：模糊搜索
-		WordsMode       int    `json:"wordsMode,optional"`       // 搜索关键词模式；默认0：包含所有，1：包含任意
+		SearchGroup     string `json:"searchGroup,optional"`     // 搜索分组：默认0：全部；1：招标采购公告；2：超前项目
+		SearchMode      string `json:"searchMode,optional"`      // 搜索模式：0：精准搜索；1：模糊搜索
+		WordsMode       string `json:"wordsMode,optional"`       // 搜索关键词模式；默认0：包含所有，1：包含任意
 		AdditionalWords string `json:"additionalWords,optional"` // 关键词：附加关键词（副：五组，每组最多15个字符）
 	}
 	//首页最新招标信息

jyBXBase/api/internal/logic/addSearchScreenLogic.go

@@ -48,9 +48,9 @@ func (l *AddSearchScreenLogic) AddSearchScreen(req *types.AddSearchScreen) (resp
 		NotKey:          req.Notkey,
 		InKey:           req.InKey,
 		AppId:           req.AppId,
-		SearchGroup:     int64(req.SearchGroup),
-		SearchMode:      int64(req.SearchMode),
-		WordsMode:       int64(req.WordsMode),
+		SearchGroup:     req.SearchGroup,
+		SearchMode:      req.SearchMode,
+		WordsMode:       req.WordsMode,
 		AdditionalWords: req.AdditionalWords,
 	})
 	if err0 != nil {

jyBXBase/api/internal/logic/checkSearchScreenLogic.go

@@ -47,9 +47,9 @@ func (l *CheckSearchScreenLogic) CheckSearchScreen(req *types.AddSearchScreen) (
 		FileExists:      req.FileExists,
 		NotKey:          req.Notkey,
 		AppId:           req.AppId,
-		SearchGroup:     int64(req.SearchGroup),
-		SearchMode:      int64(req.SearchMode),
-		WordsMode:       int64(req.WordsMode),
+		SearchGroup:     req.SearchGroup,
+		SearchMode:      req.SearchMode,
+		WordsMode:       req.WordsMode,
 		AdditionalWords: req.AdditionalWords,
 	})
 	if err0 != nil {

jyBXBase/api/internal/types/types.go

@@ -78,9 +78,9 @@ type AddSearchScreen struct {
 	FileExists      string `json:"fileExists,optional"` //附件
 	Notkey          string `json:"notkey,optional"`     //排除词 关键词：排除词（副：五组，每组最多15个字符）
 	InKey           string `json:"inkey,optional"`
-	SearchGroup     int    `json:"searchGroup,optional"`     // 搜索分组：默认0：全部；1：招标采购公告；2：超前项目
-	SearchMode      int    `json:"searchMode,optional"`      // 搜索模式：0：精准搜索；1：模糊搜索
-	WordsMode       int    `json:"wordsMode,optional"`       // 搜索关键词模式；默认0：包含所有，1：包含任意
+	SearchGroup     string `json:"searchGroup,optional"`     // 搜索分组：默认0：全部；1：招标采购公告；2：超前项目
+	SearchMode      string `json:"searchMode,optional"`      // 搜索模式：0：精准搜索；1：模糊搜索
+	WordsMode       string `json:"wordsMode,optional"`       // 搜索关键词模式；默认0：包含所有，1：包含任意
 	AdditionalWords string `json:"additionalWords,optional"` // 关键词：附加关键词（副：五组，每组最多15个字符）
 }
 

jyBXBase/api/test/apitest.http

@@ -1,23 +1,23 @@
 // 接口测试用例
 
 ### 搜索/订阅 列表模式保存
-POST http://localhost:8006/jybx/base/subscribe/saveListMode
+POST http://{{addr}}/jybx/base/subscribe/saveListMode
 Content-Type: application/json
 UserId:test20130110
 
 {
-  "mode": 0
+  "mode": 1
 }
 
 ### 搜索/订阅 列表模式获取
-POST http://localhost:8006/jybx/base/subscribe/showListMode
+POST http://{{ addr }}/jybx/base/subscribe/showListMode
 Content-Type: application/json
-UserId:test201301102
+UserId:test20130110
 
 
 
 ### 校验筛选条件是否重复保存
-POST http://localhost:8006/jybx/base/checkSearchScreen
+POST http://{{addr}}/jybx/base/checkSearchScreen
 Content-Type: application/json
 UserId:test20130110
 appId:10000
@@ -37,16 +37,15 @@ appId:10000
   "fileExists": "0",
   "area": "北京",
   "city": "",
-  "searchGroup": 0,
-  "searchMode": 1,
-  "wordsMode": 1,
+  "searchGroup": "0",
+  "searchMode": "1",
+  "wordsMode": "1",
   "additionalWords": "九龙山 医院 "
 }
 ### 筛选条件保存
-POST http://localhost:8006/jybx/base/addSearchScreen
+POST http://{{addr}}/jybx/base/addSearchScreen
 Content-Type: application/json
-UserId:test20130110
-appId:10000
+Cookie: SESSIONID=4b0dfa144d8cfa0c899e7281ff00656291d621db
 
 {
   "searchvalue": "景山公园 天坛 地坛 陶然亭 颐和园",
@@ -64,23 +63,23 @@ appId:10000
   "area": "北京",
   "city": "",
   "inkey": "742c4bce4303dffdaa8ce3c0b99ee814",
-  "searchGroup": 0,
-  "searchMode": 1,
-  "wordsMode": 1,
+  "searchGroup": "0",
+  "searchMode": "0",
+  "wordsMode": "1",
   "additionalWords": "九龙山 医院"
 }
 
 
 
 ### 查看已保存的筛选条件
-POST http://localhost:8006/jybx/base/showSearchScreen
+POST http://{{addr}}/jybx/base/showSearchScreen
 Content-Type: application/json
-UserId:test20130110
-appId:10000
+Cookie: SESSIONID=4b0dfa144d8cfa0c899e7281ff00656291d621db
+
 
 
 ### 删除已保存的筛选条件
-POST http://localhost:8006/jybx/base/delSearchScreen
+POST http://{{addr}}/jybx/base/delSearchScreen
 Content-Type: application/json
 UserId:test20130110
 appId:10000

jyBXBase/api/test/http-client.env.json

@@ -0,0 +1,11 @@
+{
+  "240dev": {
+    "addr": "192.168.3.240:8006"
+  },
+  "frontProxy240": {
+    "addr": "192.168.3.240:8077"
+  },
+  "local": {
+    "addr": "127.0.0.1:8006"
+  }
+}

jyBXBase/rpc/bxbase.proto

@@ -136,9 +136,9 @@ message ListSearchRes{
   string id = 17;
   bool isPay = 18;
   string tabularflag = 19;
-  int64  searchGroup = 20;//搜索分组：默认0：全部；1：招标采购公告；2：超前项目
-  int64  searchMode = 21;//搜索模式：0：精准搜索；1：模糊搜索
-  int64  wordsMode = 22;// 搜索关键词模式；默认0：包含所有，1：包含任意
+  string  searchGroup = 20;//搜索分组：默认0：全部；1：招标采购公告；2：超前项目
+  string  searchMode = 21;//搜索模式：0：精准搜索；1：模糊搜索
+  string  wordsMode = 22;// 搜索关键词模式；默认0：包含所有，1：包含任意
   string additionalWords = 23;//关键词：附加关键词（副：五组，每组最多15个字符）
 }
 
@@ -161,9 +161,9 @@ message AddSearchReq{
   string city = 16;
   string inKey = 17;
   string appId = 18;
-  int64  searchGroup = 19;//搜索分组：默认0：全部；1：招标采购公告；2：超前项目
-  int64  searchMode = 20;//搜索模式：0：精准搜索；1：模糊搜索
-  int64  wordsMode = 21;// 搜索关键词模式；默认0：包含所有，1：包含任意
+  string  searchGroup = 19;//搜索分组：默认0：全部；1：招标采购公告；2：超前项目
+  string  searchMode = 20;//搜索模式：0：精准搜索；1：模糊搜索
+  string  wordsMode = 21;// 搜索关键词模式；默认0：包含所有，1：包含任意
   string additionalWords = 22;//关键词：附加关键词（副：五组，每组最多15个字符）
 }
 

jyBXBase/rpc/internal/logic/addsearchlogic.go

@@ -63,9 +63,9 @@ func (l *AddSearchLogic) AddSearch(in *bxbase.AddSearchReq) (res *bxbase.CommonR
 	newData["creation_time"] = time.Now().Unix()
 	newData["user_id"] = in.UserId
 	newData["in_key"] = in.InKey
-	newData["searchGroup"] = int(in.SearchGroup)
-	newData["searchMode"] = int(in.SearchMode)
-	newData["wordsMode"] = int(in.WordsMode)
+	newData["searchGroup"] = in.SearchGroup
+	newData["searchMode"] = in.SearchMode
+	newData["wordsMode"] = in.WordsMode
 	newData["additionalWords"] = in.AdditionalWords
 	IC.Mgo.Save("search_condition", newData)
 	return

jyBXBase/rpc/internal/logic/showsearchlogic.go

@@ -27,7 +27,6 @@ func NewShowSearchLogic(ctx context.Context, svcCtx *svc.ServiceContext) *ShowSe
 
 // 获取收藏列表
 func (l *ShowSearchLogic) ShowSearch(in *bxbase.ShowSearchReq) (res *bxbase.ShowSearchRes, err error) {
-	// todo 待测试
 	var (
 		data  []*bxbase.ListSearchRes
 		isOld bool
@@ -77,9 +76,9 @@ func (l *ShowSearchLogic) ShowSearch(in *bxbase.ShowSearchReq) (res *bxbase.Show
 			listSearch.FileExists = common.InterfaceToStr(vlu["file_exists"])
 			listSearch.Notkey = common.InterfaceToStr(vlu["not_key"])
 			listSearch.Tabularflag = common.InterfaceToStr(vlu["tabular_flag"])
-			listSearch.SearchGroup = common.Int64All(vlu["searchGroup"])
-			listSearch.SearchMode = common.Int64All(vlu["searchMode"])
-			listSearch.WordsMode = common.Int64All(vlu["wordsMode"])
+			listSearch.SearchGroup = common.InterfaceToStr(vlu["searchGroup"])
+			listSearch.SearchMode = common.InterfaceToStr(vlu["searchMode"])
+			listSearch.WordsMode = common.InterfaceToStr(vlu["wordsMode"])
 			listSearch.AdditionalWords = common.InterfaceToStr(vlu["additionalWords"])
 			//ppa,buyer,winner,agency
 			if SelectCheck(listSearch.SelectType, isOld) || listSearch.City != "" || listSearch.Notkey != "" ||

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

@@ -1338,9 +1338,9 @@ type ListSearchRes struct {
 	Id              string `protobuf:"bytes,17,opt,name=id,proto3" json:"id,omitempty"`
 	IsPay           bool   `protobuf:"varint,18,opt,name=isPay,proto3" json:"isPay,omitempty"`
 	Tabularflag     string `protobuf:"bytes,19,opt,name=tabularflag,proto3" json:"tabularflag,omitempty"`
-	SearchGroup     int64  `protobuf:"varint,20,opt,name=searchGroup,proto3" json:"searchGroup,omitempty"`        //搜索分组：默认0：全部；1：招标采购公告；2：超前项目
-	SearchMode      int64  `protobuf:"varint,21,opt,name=searchMode,proto3" json:"searchMode,omitempty"`          //搜索模式：0：精准搜索；1：模糊搜索
-	WordsMode       int64  `protobuf:"varint,22,opt,name=wordsMode,proto3" json:"wordsMode,omitempty"`            // 搜索关键词模式；默认0：包含所有，1：包含任意
+	SearchGroup     string `protobuf:"bytes,20,opt,name=searchGroup,proto3" json:"searchGroup,omitempty"`         //搜索分组：默认0：全部；1：招标采购公告；2：超前项目
+	SearchMode      string `protobuf:"bytes,21,opt,name=searchMode,proto3" json:"searchMode,omitempty"`           //搜索模式：0：精准搜索；1：模糊搜索
+	WordsMode       string `protobuf:"bytes,22,opt,name=wordsMode,proto3" json:"wordsMode,omitempty"`             // 搜索关键词模式；默认0：包含所有，1：包含任意
 	AdditionalWords string `protobuf:"bytes,23,opt,name=additionalWords,proto3" json:"additionalWords,omitempty"` //关键词：附加关键词（副：五组，每组最多15个字符）
 }
 
@@ -1509,25 +1509,25 @@ func (x *ListSearchRes) GetTabularflag() string {
 	return ""
 }
 
-func (x *ListSearchRes) GetSearchGroup() int64 {
+func (x *ListSearchRes) GetSearchGroup() string {
 	if x != nil {
 		return x.SearchGroup
 	}
-	return 0
+	return ""
 }
 
-func (x *ListSearchRes) GetSearchMode() int64 {
+func (x *ListSearchRes) GetSearchMode() string {
 	if x != nil {
 		return x.SearchMode
 	}
-	return 0
+	return ""
 }
 
-func (x *ListSearchRes) GetWordsMode() int64 {
+func (x *ListSearchRes) GetWordsMode() string {
 	if x != nil {
 		return x.WordsMode
 	}
-	return 0
+	return ""
 }
 
 func (x *ListSearchRes) GetAdditionalWords() string {
@@ -1560,9 +1560,9 @@ type AddSearchReq struct {
 	City            string `protobuf:"bytes,16,opt,name=city,proto3" json:"city,omitempty"`
 	InKey           string `protobuf:"bytes,17,opt,name=inKey,proto3" json:"inKey,omitempty"`
 	AppId           string `protobuf:"bytes,18,opt,name=appId,proto3" json:"appId,omitempty"`
-	SearchGroup     int64  `protobuf:"varint,19,opt,name=searchGroup,proto3" json:"searchGroup,omitempty"`        //搜索分组：默认0：全部；1：招标采购公告；2：超前项目
-	SearchMode      int64  `protobuf:"varint,20,opt,name=searchMode,proto3" json:"searchMode,omitempty"`          //搜索模式：0：精准搜索；1：模糊搜索
-	WordsMode       int64  `protobuf:"varint,21,opt,name=wordsMode,proto3" json:"wordsMode,omitempty"`            // 搜索关键词模式；默认0：包含所有，1：包含任意
+	SearchGroup     string `protobuf:"bytes,19,opt,name=searchGroup,proto3" json:"searchGroup,omitempty"`         //搜索分组：默认0：全部；1：招标采购公告；2：超前项目
+	SearchMode      string `protobuf:"bytes,20,opt,name=searchMode,proto3" json:"searchMode,omitempty"`           //搜索模式：0：精准搜索；1：模糊搜索
+	WordsMode       string `protobuf:"bytes,21,opt,name=wordsMode,proto3" json:"wordsMode,omitempty"`             // 搜索关键词模式；默认0：包含所有，1：包含任意
 	AdditionalWords string `protobuf:"bytes,22,opt,name=additionalWords,proto3" json:"additionalWords,omitempty"` //关键词：附加关键词（副：五组，每组最多15个字符）
 }
 
@@ -1724,25 +1724,25 @@ func (x *AddSearchReq) GetAppId() string {
 	return ""
 }
 
-func (x *AddSearchReq) GetSearchGroup() int64 {
+func (x *AddSearchReq) GetSearchGroup() string {
 	if x != nil {
 		return x.SearchGroup
 	}
-	return 0
+	return ""
 }
 
-func (x *AddSearchReq) GetSearchMode() int64 {
+func (x *AddSearchReq) GetSearchMode() string {
 	if x != nil {
 		return x.SearchMode
 	}
-	return 0
+	return ""
 }
 
-func (x *AddSearchReq) GetWordsMode() int64 {
+func (x *AddSearchReq) GetWordsMode() string {
 	if x != nil {
 		return x.WordsMode
 	}
-	return 0
+	return ""
 }
 
 func (x *AddSearchReq) GetAdditionalWords() string {
@@ -3035,11 +3035,11 @@ var file_bxbase_proto_rawDesc = []byte{
 	0x52, 0x05, 0x69, 0x73, 0x50, 0x61, 0x79, 0x12, 0x20, 0x0a, 0x0b, 0x74, 0x61, 0x62, 0x75, 0x6c,
 	0x61, 0x72, 0x66, 0x6c, 0x61, 0x67, 0x18, 0x13, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, 0x74, 0x61,
 	0x62, 0x75, 0x6c, 0x61, 0x72, 0x66, 0x6c, 0x61, 0x67, 0x12, 0x20, 0x0a, 0x0b, 0x73, 0x65, 0x61,
-	0x72, 0x63, 0x68, 0x47, 0x72, 0x6f, 0x75, 0x70, 0x18, 0x14, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0b,
+	0x72, 0x63, 0x68, 0x47, 0x72, 0x6f, 0x75, 0x70, 0x18, 0x14, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b,
 	0x73, 0x65, 0x61, 0x72, 0x63, 0x68, 0x47, 0x72, 0x6f, 0x75, 0x70, 0x12, 0x1e, 0x0a, 0x0a, 0x73,
-	0x65, 0x61, 0x72, 0x63, 0x68, 0x4d, 0x6f, 0x64, 0x65, 0x18, 0x15, 0x20, 0x01, 0x28, 0x03, 0x52,
+	0x65, 0x61, 0x72, 0x63, 0x68, 0x4d, 0x6f, 0x64, 0x65, 0x18, 0x15, 0x20, 0x01, 0x28, 0x09, 0x52,
 	0x0a, 0x73, 0x65, 0x61, 0x72, 0x63, 0x68, 0x4d, 0x6f, 0x64, 0x65, 0x12, 0x1c, 0x0a, 0x09, 0x77,
-	0x6f, 0x72, 0x64, 0x73, 0x4d, 0x6f, 0x64, 0x65, 0x18, 0x16, 0x20, 0x01, 0x28, 0x03, 0x52, 0x09,
+	0x6f, 0x72, 0x64, 0x73, 0x4d, 0x6f, 0x64, 0x65, 0x18, 0x16, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09,
 	0x77, 0x6f, 0x72, 0x64, 0x73, 0x4d, 0x6f, 0x64, 0x65, 0x12, 0x28, 0x0a, 0x0f, 0x61, 0x64, 0x64,
 	0x69, 0x74, 0x69, 0x6f, 0x6e, 0x61, 0x6c, 0x57, 0x6f, 0x72, 0x64, 0x73, 0x18, 0x17, 0x20, 0x01,
 	0x28, 0x09, 0x52, 0x0f, 0x61, 0x64, 0x64, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x61, 0x6c, 0x57, 0x6f,
@@ -3076,11 +3076,11 @@ var file_bxbase_proto_rawDesc = []byte{
 	0x09, 0x52, 0x05, 0x69, 0x6e, 0x4b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x61, 0x70, 0x70, 0x49,
 	0x64, 0x18, 0x12, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x61, 0x70, 0x70, 0x49, 0x64, 0x12, 0x20,
 	0x0a, 0x0b, 0x73, 0x65, 0x61, 0x72, 0x63, 0x68, 0x47, 0x72, 0x6f, 0x75, 0x70, 0x18, 0x13, 0x20,
-	0x01, 0x28, 0x03, 0x52, 0x0b, 0x73, 0x65, 0x61, 0x72, 0x63, 0x68, 0x47, 0x72, 0x6f, 0x75, 0x70,
+	0x01, 0x28, 0x09, 0x52, 0x0b, 0x73, 0x65, 0x61, 0x72, 0x63, 0x68, 0x47, 0x72, 0x6f, 0x75, 0x70,
 	0x12, 0x1e, 0x0a, 0x0a, 0x73, 0x65, 0x61, 0x72, 0x63, 0x68, 0x4d, 0x6f, 0x64, 0x65, 0x18, 0x14,
-	0x20, 0x01, 0x28, 0x03, 0x52, 0x0a, 0x73, 0x65, 0x61, 0x72, 0x63, 0x68, 0x4d, 0x6f, 0x64, 0x65,
+	0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x73, 0x65, 0x61, 0x72, 0x63, 0x68, 0x4d, 0x6f, 0x64, 0x65,
 	0x12, 0x1c, 0x0a, 0x09, 0x77, 0x6f, 0x72, 0x64, 0x73, 0x4d, 0x6f, 0x64, 0x65, 0x18, 0x15, 0x20,
-	0x01, 0x28, 0x03, 0x52, 0x09, 0x77, 0x6f, 0x72, 0x64, 0x73, 0x4d, 0x6f, 0x64, 0x65, 0x12, 0x28,
+	0x01, 0x28, 0x09, 0x52, 0x09, 0x77, 0x6f, 0x72, 0x64, 0x73, 0x4d, 0x6f, 0x64, 0x65, 0x12, 0x28,
 	0x0a, 0x0f, 0x61, 0x64, 0x64, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x61, 0x6c, 0x57, 0x6f, 0x72, 0x64,
 	0x73, 0x18, 0x16, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0f, 0x61, 0x64, 0x64, 0x69, 0x74, 0x69, 0x6f,
 	0x6e, 0x61, 0x6c, 0x57, 0x6f, 0x72, 0x64, 0x73, 0x22, 0x4c, 0x0a, 0x0c, 0x44, 0x65, 0x6c, 0x53,

jyBXSubscribe/rpc/model/push.go

@@ -28,8 +28,8 @@ import (
 const (
 	pageSize            = 100
 	AllSubPushCacheSize = 200
-	query               = `{"query":{"terms":{"_id":["%s"]}},"_source":["_id","area", "publishtime", "s_subscopeclass", "subtype", "title", "toptype", "type", "buyerclass","bidamount","budget","projectname","buyer","bidopentime","s_winner","filetext","buyertel","buyerperson","agency","agencyperson","agencytel","winnerperson","winnertel","signendTime","bidendtime"],"from":0,"size":%d}`
-	mongodb_fields      = `{"_id":1,"area":1,"publishtime":1,"s_subscopeclass":1,"subtype":1,"title":1,"toptype":1,"type":1, "buyerclass":1,"budget":1,"bidamount":1,"s_winner":1,"bidopentime":1,"buyer":1,"projectname":1,"filetext":1,"buyertel":1,"buyerperson":1,"agency":1,"agencyperson":1,"agencytel":1,"winnerperson":1,"winnertel":1,"signendTime":1,"bidendtime":1}`
+	query               = `{"query":{"terms":{"_id":["%s"]}},"_source":["_id","area", "publishtime", "s_subscopeclass", "subtype", "title", "toptype", "type", "buyerclass","bidamount","budget","projectname","buyer","bidopentime","s_winner","filetext","buyertel","buyerperson","agency","agencyperson","agencytel","winnerperson","winnertel","signendtime","bidendtime"],"from":0,"size":%d}`
+	mongodb_fields      = `{"_id":1,"area":1,"publishtime":1,"s_subscopeclass":1,"subtype":1,"title":1,"toptype":1,"type":1, "buyerclass":1,"budget":1,"bidamount":1,"s_winner":1,"bidopentime":1,"buyer":1,"projectname":1,"filetext":1,"buyertel":1,"buyerperson":1,"agency":1,"agencyperson":1,"agencytel":1,"winnerperson":1,"winnertel":1,"signendtime":1,"bidendtime":1}`
 
 	SubFreeFlag  = "fType"
 	SubVipFlag   = "vType"
@@ -1002,7 +1002,7 @@ func GetKeySet(t string, u *map[string]interface{}, data []string) (bool, []stri
 const (
 	INDEX      = "bidding"
 	TYPE       = "bidding"
-	bidField   = `"_id","title","publishtime","toptype","subtype","type","area","city","s_subscopeclass","buyerclass","budget","bidamount","filetext","spidercode","site","buyer","bidopentime","buyertel","buyerperson","agency","agencyperson","agencytel","s_winner",winnerperson","winnertel","signendTime","bidendtime"`
+	bidField   = `"_id","title","publishtime","toptype","subtype","type","area","city","s_subscopeclass","buyerclass","budget","bidamount","filetext","spidercode","site","buyer","bidopentime","buyertel","buyerperson","agency","agencyperson","agencytel","s_winner",winnerperson","winnertel","signendtime","bidendtime"`
 	bidTime    = `{"range":{"publishtime":{"gt":%d}}}`
 	bidSort    = `{"publishtime":"desc"}`
 	findfields = `"title"`