Merge remote-tracking branch 'origin/debug' into debug

services/knowledge/es.go

@@ -194,6 +194,8 @@ func EsAddOrEditKnowledgeResource(item *knowledge.KnowledgeResource) (err error)
 		contentRunes := []rune(content)
 		if len(contentRunes) > 60 {
 			item.Content = string(contentRunes[:60])
+		} else {
+			item.Content = content
 		}
 	}
 	request := client.Index().Index(indexName).Id(strconv.Itoa(item.KnowledgeResourceId)).BodyJson(item)
@@ -204,7 +206,6 @@ func EsAddOrEditKnowledgeResource(item *knowledge.KnowledgeResource) (err error)
 		return
 	}
 	if response.Status == 0 {
-		err = fmt.Errorf("add knowledge resource to es failed, response result is %s", response.Result)
 		err = nil
 	} else {
 		fmt.Println("EsAddOrEditKnowledgeResource:", response.Status, response.Result)