fix bug

controllers/search.go

@@ -66,7 +66,8 @@ func (this *SearchController) SearchList() {
 	*/
 	//indexName := "article_list"
 	indexName := utils.IndexName
-	result, total, err := services.EsMultiMatchFunctionScoreQuery(indexName, keyWord, startSize, pageSize,user.UserId) //services.EsMatchFunctionScoreQuery(indexName, keyWord, startSize, pageSize) //services.EsMatchQuery(indexName, keyWord)
+	//result, total, err := services.EsMultiMatchFunctionScoreQuery(indexName, keyWord, startSize, pageSize,user.UserId) //services.EsMatchFunctionScoreQuery(indexName, keyWord, startSize, pageSize) //services.EsMatchQuery(indexName, keyWord)
+	result, total, err := services.SearchByKeyWordBack(indexName, keyWord, startSize, pageSize,user.UserId)
 	//result, total, err := services.EsMultiMatchFunctionScoreQueryFix(indexName, keyWord, startSize, pageSize)
 	if err != nil {
 		br.Msg = "检索失败"

services/elastic.go

@@ -18,7 +18,8 @@ func NewClient() (client *elastic.Client, err error) {
 	errorlog := log.New(os.Stdout, "APP", log.LstdFlags)
 	file := ""
 	if utils.RunMode == "release" {
-		file = `/data/rdlucklog/hongze_cygx/eslog.log`
+		//file = `/data/rdlucklog/hongze_cygx/eslog.log`
+		file = `./rdlucklog/eslog.log`
 	} else {
 		file = `./rdlucklog/eslog.log`
 	}

services/elasticsearch.go

@@ -263,8 +263,7 @@ func SearchByKeyWordBack02(keyWord string) (result []*models.SearchItem, err err
 	return
 }
 
-func SearchByKeyWordBack(keyWord string) (result []*models.SearchItem, err error) {
-	pageSize := 20
+func SearchByKeyWordBack(indexName,keyWord string,startSize, pageSize,userId int) (result []*models.SearchItem,total int, err error) {
 	keyWordArr, err := GetIndustryMapNameSlice(keyWord)
 	if err != nil {
 		go utils.SendEmail(utils.APPNAME+" "+utils.RunMode+"异常提醒:", "GetIndustryMapNameSlice："+err.Error(), utils.EmailSendToUsers)
@@ -281,7 +280,7 @@ func SearchByKeyWordBack(keyWord string) (result []*models.SearchItem, err error
 	if err != nil {
 		return
 	}
-	var esIndex = "cygx_article"
+	var esIndex = indexName
 
 	searchMap := make(map[int]int)
 	for _, v := range keyWordArr {
@@ -293,18 +292,18 @@ func SearchByKeyWordBack(keyWord string) (result []*models.SearchItem, err error
 		highlight = highlight.PreTags("<font color='red'>").PostTags("</font>")
 		searchByMatch, err := client.Search(esIndex).Highlight(highlight).Size(pageSize).Query(boolquery).Do(context.Background())
 		if err != nil {
-			return result, err
+			return result,0, err
 		}
 		if searchByMatch.Hits != nil {
 			for _, v := range searchByMatch.Hits.Hits {
 				articleJson, err := v.Source.MarshalJSON()
 				if err != nil {
-					return nil, err
+					return nil,0, err
 				}
 				article := new(models.CygxArticle)
 				err = json.Unmarshal(articleJson, &article)
 				if err != nil {
-					return nil, err
+					return nil,0, err
 				}
 				if _, ok := searchMap[article.ArticleId]; !ok {
 					searchItem := new(models.SearchItem)