mirrors2/eiblog
1
0
Fork 0
mirror of https://github.com/eiblog/eiblog.git synced 2026-02-10 08:32:26 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: 1. template read panic

Browse Source 
2. optimization variable naming
This commit is contained in:
henry.chen
2023-01-05 09:17:31 +08:00
parent 4690d5123b
commit f6d8656c83
5 changed files with 46 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
pkg/internal/es.go
View File

@@ -49,7 +49,7 @@ func checkESConfig() error {
}
// ElasticSearch 搜索文章
func ElasticSearch(query string, size, from int) (*searchIndexResult, error) {
func ElasticSearch(query string, size, from int) (*SearchIndexResult, error) {
if err := checkESConfig(); err != nil {
return nil, err
}
@@ -114,7 +114,7 @@ func ElasticAddIndex(article *model.Article) error {
img := tools.PickFirstImage(article.Content)
mapping := map[string]interface{}{
"title": article.Title,
"content": tools.IgnoreHtmlTag(article.Content),
"content": tools.IgnoreHTMLTag(article.Content),
"slug": article.Slug,
"tag": article.Tags,
"img": img,
@@ -241,8 +241,8 @@ func deleteIndexDocument(index, typ string, ids []string) error {
return nil
}
// searchIndexResult 查询结果
type searchIndexResult struct {
// SearchIndexResult 查询结果
type SearchIndexResult struct {
Took float32 `json:"took"`
Hits struct {
Total int `json:"total"`
@@ -264,7 +264,7 @@ type searchIndexResult struct {
}
// indexQueryDSL 语句查询文档
func indexQueryDSL(index, typ string, size, from int, dsl []byte) (*searchIndexResult, error) {
func indexQueryDSL(index, typ string, size, from int, dsl []byte) (*SearchIndexResult, error) {
rawurl := fmt.Sprintf("%s/%s/%s/_search?size=%d&from=%d", config.Conf.ESHost,
index, typ, size, from)
resp, err := httpPost(rawurl, dsl)
@@ -276,7 +276,7 @@ func indexQueryDSL(index, typ string, size, from int, dsl []byte) (*searchIndexR
if err != nil {
return nil, err
}
result := &searchIndexResult{}
result := &SearchIndexResult{}
err = json.Unmarshal(data, result)
if err != nil {
return nil, err