From e5017fdcdb4329691fa288081c23c5392ce31eae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=A7=89?= <huan0016@gmail.com>
Date: Fri, 8 Dec 2023 23:20:11 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BD=BF=E7=94=A8=E9=85=8D=E7=BD=AE=E6=96=87?=
 =?UTF-8?q?=E4=BB=B6=E5=92=8C=E7=94=9F=E4=BA=A7=E7=B4=A2=E5=BC=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .vscode/settings.json |  2 +-
 api/graphql.go        |  2 +-
 bin/main.go           |  1 +
 models/zincsearch.go  | 40 +++++++++++++---------------------------
 4 files changed, 16 insertions(+), 29 deletions(-)

diff --git a/.vscode/settings.json b/.vscode/settings.json
index 14f6030..2b8c08a 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -1,3 +1,3 @@
 {
-    "editor.inlineSuggest.showToolbar": "onHover"
+    "editor.inlineSuggest.showToolbar": "always"
 }
\ No newline at end of file
diff --git a/api/graphql.go b/api/graphql.go
index 05b2ab9..289453c 100644
--- a/api/graphql.go
+++ b/api/graphql.go
@@ -272,7 +272,7 @@ func NewSchema(config Config) (graphql.Schema, error) {
 							"bool": map[string]interface{}{
 								"must": []map[string]interface{}{
 									{
-										"query_string": map[string]string{"query": "City:" + args.Text},
+										"query_string": map[string]string{"query": "text:" + args.Text},
 									},
 								},
 							},
diff --git a/bin/main.go b/bin/main.go
index e8319a0..746e976 100644
--- a/bin/main.go
+++ b/bin/main.go
@@ -182,6 +182,7 @@ func main() {
 	config := viper.GetViper()
 
 	models.InitConfig(config)
+	models.ZincInit()
 
 	mysqlConnection.Init()
 	milvusConnection.Init()
diff --git a/models/zincsearch.go b/models/zincsearch.go
index 566e200..c257380 100644
--- a/models/zincsearch.go
+++ b/models/zincsearch.go
@@ -11,21 +11,19 @@ import (
 	"net/url"
 )
 
-// 查询参数
-//type Query struct {
-//	Query struct {
-//		Bool struct {
-//			Must []struct {
-//				QueryString struct {
-//					Query string `json:"query"`
-//				} `json:"query_string"`
-//			} `json:"must"`
-//		} `json:"bool"`
-//	} `json:"query"`
-//	Sort []string `json:"sort"`
-//	From int      `json:"from"`
-//	Size int      `json:"size"`
-//}
+var (
+	user     string
+	password string
+	index    string
+	zincHost string
+)
+
+func ZincInit() {
+	user = config.GetString("zincsearch.user")
+	password = config.GetString("zincsearch.password")
+	index = config.GetString("zincsearch.index")
+	zincHost = config.GetString("zincsearch.host")
+}
 
 // 返回结果
 type Response struct {
@@ -111,12 +109,6 @@ func (res Response) ToIDList(first, last int, after, before string) (id_list []s
 }
 
 func ZincSearch(query map[string]interface{}) (rest Response, err error) {
-	const (
-		user     = "admin"
-		password = "Complexpass#123"
-		index    = "olympics"
-		zincHost = "https://zincsearch.gameui.net"
-	)
 	bas64encodedCreds := base64.StdEncoding.EncodeToString([]byte(user + ":" + password))
 	zincURL := zincHost + "/es/" + index + "/_search"
 	queryBytes, _ := json.Marshal(query)
@@ -159,12 +151,6 @@ func ZincSearch(query map[string]interface{}) (rest Response, err error) {
 }
 
 func ZincPut(data map[string]interface{}) (err error) {
-	const (
-		user     = "admin"
-		password = "Complexpass#123"
-		index    = "olympics"
-		zincHost = "https://zincsearch.gameui.net"
-	)
 	bas64encodedCreds := base64.StdEncoding.EncodeToString([]byte(user + ":" + password))
 	zincURL := zincHost + "/api/" + index + "/_doc"
 	queryBytes, _ := json.Marshal(data)