Merge branch 'v1'

services/elastic/elastic.go

@@ -13,21 +13,11 @@ import (
 	"strings"
 )
 
-func NewClient() (client *elastic.Client, err error) {
-	client, err = elastic.NewClient(
-		elastic.SetURL(utils.ES_URL),
-		elastic.SetBasicAuth(utils.ES_USERNAME, utils.ES_PASSWORD),
-		elastic.SetSniff(false))
-	return
-}
-
 // indexName:索引名称
 // mappingJson:表结构
 func EsCreateIndex(indexName, mappingJson string) (err error) {
-	client, err := NewClient()
-	if err != nil {
-		return
-	}
+	client := utils.EsClient
+
 	//定义表结构
 	exists, err := client.IndexExists(indexName).Do(context.Background()) //<5>
 	if err != nil {
@@ -49,10 +39,8 @@ func EsCreateIndex(indexName, mappingJson string) (err error) {
 
 // 删除数据
 func EsDeleteData(indexName, docId string) (err error) {
-	client, err := NewClient()
-	if err != nil {
-		return
-	}
+	client := utils.EsClient
+
 	resp, err := client.Delete().Index(indexName).Id(docId).Do(context.Background())
 	fmt.Println(resp)
 	if err != nil {
@@ -67,10 +55,7 @@ func EsDeleteData(indexName, docId string) (err error) {
 }
 
 func MappingModify(indexName, mappingJson string) {
-	client, err := NewClient()
-	if err != nil {
-		return
-	}
+	client := utils.EsClient
 	result, err := client.PutMapping().Index(indexName).BodyString(mappingJson).Do(context.Background())
 	fmt.Println(err)
 	fmt.Println(result)
@@ -84,10 +69,7 @@ func EsAddOrEditEdbInfoData(indexName, docId string, item *data_manage.EdbInfoLi
 			fmt.Println("EsAddOrEditData Err:", err.Error())
 		}
 	}()
-	client, err := NewClient()
-	if err != nil {
-		return
-	}
+	client := utils.EsClient
 
 	resp, err := client.Index().Index(indexName).Id(docId).BodyJson(item).Do(context.Background())
 	if err != nil {
@@ -320,10 +302,7 @@ func SearchEdbInfoDataBak(indexName, keywordStr string, from, size, filterSource
 			fmt.Println("EsAddOrEditData Err:", err.Error())
 		}
 	}()
-	client, err := NewClient()
-	if err != nil {
-		return
-	}
+	client := utils.EsClient
 
 	//queryString := elastic.NewQueryStringQuery(keywordStr)
 	//boolQueryJson, err := json.Marshal(queryString)
@@ -696,10 +675,7 @@ func searchEdbInfoData(indexName string, mustMap, mustNotMap []interface{}, shou
 			fmt.Println("EsAddOrEditData Err:", err.Error())
 		}
 	}()
-	client, err := NewClient()
-	if err != nil {
-		return
-	}
+	client := utils.EsClient
 
 	//queryString := elastic.NewQueryStringQuery(keywordStr)
 	//boolQueryJson, err := json.Marshal(queryString)
@@ -814,10 +790,7 @@ func EsDeleteEdbInfoData(indexName, docId string) (err error) {
 			fmt.Println("EsDeleteEdbInfoData Err:", err.Error())
 		}
 	}()
-	client, err := NewClient()
-	if err != nil {
-		return
-	}
+	client := utils.EsClient
 
 	resp, err := client.Delete().Index(indexName).Id(docId).Do(context.Background())
 	fmt.Println(resp)
@@ -839,10 +812,8 @@ func EsAddOrEditReport(indexName, docId string, item *models.ElasticReportDetail
 			fmt.Println("EsAddOrEditReport Err:", err.Error())
 		}
 	}()
-	client, err := NewClient()
-	if err != nil {
-		return
-	}
+	client := utils.EsClient
+
 	// docId为报告ID+章节ID
 	searchById, err := client.Get().Index(indexName).Id(docId).Do(context.Background())
 	if err != nil && !strings.Contains(err.Error(), "404") {
@@ -910,10 +881,8 @@ func Analyze(content string) (contentList []string, err error) {
 			fmt.Println("Analyze Err:", err.Error())
 		}
 	}()
-	client, err := NewClient()
-	if err != nil {
-		return
-	}
+	client := utils.EsClient
+
 	queryMap := map[string]string{
 		"text":     content,
 		"analyzer": "ik_max_word",
@@ -950,10 +919,7 @@ func EsAddOrEditChartInfoData(indexName, docId string, item *data_manage.ChartIn
 			fmt.Println("EsAddOrEditData Err:", err.Error())
 		}
 	}()
-	client, err := NewClient()
-	if err != nil {
-		return
-	}
+	client := utils.EsClient
 
 	resp, err := client.Index().Index(indexName).Id(docId).BodyJson(item).Do(context.Background())
 	if err != nil {
@@ -977,10 +943,7 @@ func EsDeleteDataV2(indexName, docId string) (err error) {
 			fmt.Println("EsDeleteEdbInfoData Err:", err.Error())
 		}
 	}()
-	client, err := NewClient()
-	if err != nil {
-		return
-	}
+	client := utils.EsClient
 
 	resp, err := client.Delete().Index(indexName).Id(docId).Do(context.Background())
 	fmt.Println(resp)
@@ -1003,10 +966,7 @@ func SearchChartInfoData(indexName, keywordStr string, showSysId int, sourceList
 			fmt.Println("EsAddOrEditData Err:", err.Error())
 		}
 	}()
-	client, err := NewClient()
-	if err != nil {
-		return
-	}
+	client := utils.EsClient
 
 	//queryString := elastic.NewQueryStringQuery(keywordStr)
 	//boolQueryJson, err := json.Marshal(queryString)
@@ -1169,10 +1129,7 @@ func EsAddOrEditDataInterface(indexName, docId string, item interface{}) (err er
 			fmt.Println("EsAddOrEditData Err:", err.Error())
 		}
 	}()
-	client, err := NewClient()
-	if err != nil {
-		return
-	}
+	client := utils.EsClient
 
 	resp, err := client.Index().Index(indexName).Id(docId).BodyJson(item).Do(context.Background())
 	if err != nil {
@@ -1197,10 +1154,7 @@ func SearchMyChartInfoData(indexName, keywordStr string, adminId int, noPermissi
 			fmt.Println("EsAddOrEditData Err:", err.Error())
 		}
 	}()
-	client, err := NewClient()
-	if err != nil {
-		return
-	}
+	client := utils.EsClient
 
 	//queryString := elastic.NewQueryStringQuery(keywordStr)
 	//boolQueryJson, err := json.Marshal(queryString)

utils/config.go

@@ -375,5 +375,9 @@ func init() {
 
 	CrmEtaServerUrl = config["crm_eta_server_url"]
 	LibreOfficePath = config["libre_office_path"]
+
+	// 初始化ES
+	initEs()
+
 	return
 }

utils/elastic.go

@@ -0,0 +1,21 @@
+package utils
+
+import (
+	"github.com/olivere/elastic/v7"
+)
+
+// EsClient es客户端
+var EsClient *elastic.Client
+
+func initEs() {
+	client, err := elastic.NewClient(
+		elastic.SetURL(ES_URL),
+		elastic.SetBasicAuth(ES_USERNAME, ES_PASSWORD),
+		elastic.SetSniff(false))
+	EsClient = client
+	if err != nil {
+		panic("ElasticSearch连接失败,err:" + err.Error())
+		//go alarm_msg.SendAlarmMsg("ElasticSearch连接失败", 2)
+	}
+	return
+}