wangshan 3 anos atrás
pai
commit
a4c383910e

+ 1 - 2
jyBXCore/rpc/internal/logic/getsearchlistlogic.go

@@ -8,7 +8,6 @@ import (
 	"fmt"
 	IC "jyBXCore/rpc/init"
 	"jyBXCore/rpc/util"
-	"log"
 	"strings"
 	"time"
 
@@ -98,8 +97,8 @@ func (l *GetSearchListLogic) GetSearchList(in *bxcore.SearchReq) (*bxcore.Search
 			//付费用户搜索优化
 			publishTime := in.PublishTime
 			if b := util.IsOptimize(IC.C, in); b {
-				log.Println(in.PublishTime, "----b:", b)
 				count, list = util.GetBidSearchData(in)
+				count += 1 //避免刚好50条 无法加载下一页数据
 			}
 			//分词后 第二页数据请求 先获取全部数据 再切割
 			if in.SplitKeywords != "" && strings.Contains(in.SplitKeywords, "+&&&") && in.PageNum == 2 {

+ 1 - 3
jyBXCore/rpc/model/es/es.go

@@ -3,13 +3,12 @@ package es
 import (
 	elastic "app.yhyue.com/moapp/jybase/esv1"
 	"fmt"
-	"github.com/zeromicro/go-zero/core/logx"
 	"strconv"
 	"strings"
 )
 
 const (
-	highlightStr = `%s: {"fragment_size": %d,"number_of_fragments": 1}`
+	highlightStr = `"%s": {"fragment_size": %d,"number_of_fragments": 1}`
 	HL           = `"highlight": {"pre_tags": [""],"post_tags": [""],"fields": {%s}}`
 )
 
@@ -48,7 +47,6 @@ func (e *EsSearch) GetAllByNgramWithCount() (int64, *[]map[string]interface{}) {
 		if e.Start > -1 {
 			qstr = qstr[:len(qstr)-1] + `,"from":` + strconv.Itoa(e.Start) + `,"size":` + strconv.Itoa(e.Limit) + "}"
 		}
-		logx.Info("qstr:", qstr)
 		return elastic.GetWithCount(e.Index, e.Itype, qstr)
 	} else {
 		return 0, nil

+ 2 - 2
jyBXCore/rpc/util/search.go

@@ -191,7 +191,7 @@ func GetBidSearchData(in *bxcore.SearchReq) (count int64, list []*bxcore.SearchL
 			Index:      INDEX,
 			Itype:      TYPE,
 			Query:      qstr,
-			FindFields: `"detail"`,
+			FindFields: "detail",
 			Order:      bidSearch_sort,
 			Fields:     field,
 			Start:      start,
@@ -202,7 +202,7 @@ func GetBidSearchData(in *bxcore.SearchReq) (count int64, list []*bxcore.SearchL
 		var repl *[]map[string]interface{}
 		if hightlightContent {
 			biddingSearch.Count = 115
-			biddingSearch.HighLight = true
+			biddingSearch.HighLight = hightlightContent
 		}
 		//repl = elastic.GetAllByNgram(INDEX, TYPE, qstr, ``, bidSearch_sort, field, start, int(in.PageSize), 0, false)
 		count, repl = biddingSearch.GetAllByNgramWithCount()