fix: 列表二级分类高亮

go.mod

@@ -4,7 +4,6 @@ go 1.15
 
 require (
 	github.com/aliyun/aliyun-oss-go-sdk v1.9.8
-	github.com/antlr/antlr4/runtime/Go/antlr v0.0.0-20220111164937-1b144fa7b40f // indirect
 	github.com/baiyubin/aliyun-sts-go-sdk v0.0.0-20180326062324-cfa1a18b161f // indirect
 	github.com/fsnotify/fsnotify v1.5.1
 	github.com/gin-gonic/gin v1.7.4
@@ -21,15 +20,13 @@ require (
 	github.com/olivere/elastic/v7 v7.0.31
 	github.com/op/go-logging v0.0.0-20160315200505-970db520ece7
 	github.com/satori/go.uuid v1.2.0 // indirect
-	github.com/shopspring/decimal v1.2.0
 	github.com/silenceper/wechat/v2 v2.0.9
 	github.com/spf13/viper v1.9.0
 	github.com/swaggo/gin-swagger v1.3.3
 	github.com/swaggo/swag v1.7.4
-	github.com/yidane/formula v0.0.0-20210902154546-0782e1736717
 	golang.org/x/crypto v0.0.0-20210921155107-089bfa567519 // indirect
 	golang.org/x/image v0.0.0-20190802002840-cff245a6509b
-	golang.org/x/sys v0.0.0-20211107104306-e0b2ad06fe42
+	golang.org/x/sys v0.0.0-20211107104306-e0b2ad06fe42 // indirect
 	golang.org/x/text v0.3.7 // indirect
 	gopkg.in/alexcesaro/quotedprintable.v3 v3.0.0-20150716171945-2caba252f4dc // indirect
 	gopkg.in/gomail.v2 v2.0.0-20160411212932-81ebce5c23df

services/elastic/report.go

@@ -191,6 +191,14 @@ func ReportListSearch(keyWord string, classifyIdFirst int, classifyIdSeconds []i
 				},
 			},
 		},
+		map[string]interface{}{
+			"match": map[string]interface{}{
+				"ClassifyNameSecond": map[string]interface{}{
+					"query": keyWord,
+					"boost": 2,
+				},
+			},
+		},
 		map[string]interface{}{
 			"match_phrase": map[string]interface{}{
 				"Title": map[string]interface{}{
@@ -255,6 +263,7 @@ func ReportListSearch(keyWord string, classifyIdFirst int, classifyIdSeconds []i
 			"Title":map[string]interface{}{},
 			"Abstract":map[string]interface{}{},
 			"StageStr":map[string]interface{}{},
+			"ClassifyNameSecond":map[string]interface{}{},
 		},
 		"pre_tags" : "<span style=\"color:#E3B377\">",
 		"post_tags": "</span>",

services/report/report.go

@@ -682,6 +682,9 @@ func GetReportList(user user.UserInfo, keyWord string, classifyIdFirst, classify
 				temp.ClassifyNameFirst = reportItem.ClassifyNameFirst
 				temp.ClassifyIdSecond = reportItem.ClassifyIdSecond
 				temp.ClassifyNameSecond = reportItem.ClassifyNameSecond
+				if len(v.Highlight["ClassifyNameSecond"]) > 0 {
+					temp.ClassifyNameSecond = v.Highlight["ClassifyNameSecond"][0]
+				}
 				temp.Abstract = reportItem.Abstract
 				temp.StageStr = reportItem.StageStr
 				temp.Title = reportItem.Title