rdluck 4 years ago
parent
commit
30abccb308
3 changed files with 31 additions and 6 deletions
  1. 1 1
      controllers/user.go
  2. 19 3
      services/elastic.go
  3. 11 2
      services/task.go

+ 1 - 1
controllers/user.go

@@ -89,7 +89,7 @@ func (this *UserController) Login() {
 			br.Msg = "邮箱格式错误,请重新输入"
 			return
 		}
-		item, err := models.GetMsgCode(req.Mobile, req.VCode)
+		item, err := models.GetMsgCode(req.Email, req.VCode)
 		if err != nil {
 			if err.Error() == utils.ErrNoRow() {
 				br.Msg = "验证码错误,请重新输入"

+ 19 - 3
services/elastic.go

@@ -63,6 +63,24 @@ func EsAddData(indexName, docId string, item interface{}) (err error) {
 	return
 }
 
+//删除数据
+func EsDeleteData(indexName, docId string) (err error) {
+	client, err := NewClient()
+	if err != nil {
+		return
+	}
+	resp, err := client.Delete().Index(indexName).Id(docId).Do(context.Background())
+	if err != nil {
+		return
+	}
+	if resp.Status == 0 {
+		fmt.Println("删除成功")
+	} else {
+		fmt.Println("AddData", resp.Status, resp.Result)
+	}
+	return
+}
+
 func MappingModify(indexName, mappingJson string) {
 	client, err := NewClient()
 	if err != nil {
@@ -90,7 +108,7 @@ func EsQuery(indexName, keyWord string) (result []*models.SearchItem, err error)
 
 	matchq1 := elastic.NewMatchQuery("Title", keyWord).Boost(n + 1).Analyzer("ik_smart")
 	matchq2 := elastic.NewMatchQuery("BodyText", keyWord).Boost(n + 1).Analyzer("ik_smart")
-	
+
 	matchArr = append(matchArr, matchq1)
 	matchArr = append(matchArr, matchq2)
 	for _, v := range keyWordArr {
@@ -102,9 +120,7 @@ func EsQuery(indexName, keyWord string) (result []*models.SearchItem, err error)
 		}
 		n--
 	}
-
 	boolquery.Should(matchArr...)
-
 	highlight := elastic.NewHighlight()
 	highlight = highlight.Fields(elastic.NewHighlighterField("Title"), elastic.NewHighlighterField("BodyText"))
 	highlight = highlight.PreTags("<font color='red'>").PostTags("</font>")

+ 11 - 2
services/task.go

@@ -96,8 +96,17 @@ func Task() {
 	//	return
 	//}
 	//
-	//indexName:="article"
+	//indexName := "article"
+	//
 	//for _, v := range allList {
+	//	content := html.UnescapeString(v.Body)
+	//	doc, err := goquery.NewDocumentFromReader(strings.NewReader(content))
+	//	if err != nil {
+	//		fmt.Println("create doc err:", err.Error())
+	//		return
+	//	}
+	//	bodyText := doc.Text()
+	//
 	//	item := new(ElasticArticleDetail)
 	//	item.ArticleId = v.ArticleId
 	//	item.Title = v.Title
@@ -113,7 +122,7 @@ func Task() {
 	//	item.ExpertNumber = v.ExpertNumber
 	//	item.Department = v.Department
 	//	item.ArticleIdMd5 = v.ArticleIdMd5
-	//	item.BodyText = v.BodyText
+	//	item.BodyText = bodyText
 	//	EsAddData(indexName, strconv.Itoa(v.ArticleId), item)
 	//}
 	fmt.Println("end")