fix：常量配置全部到配置项中

services/elastic/elastic.go

@@ -3,19 +3,10 @@ package elastic
 import (
 	"context"
 	"fmt"
-	"github.com/olivere/elastic/v7"
 	"hongze/hongze_edb_lib/models"
 	"hongze/hongze_edb_lib/utils"
 )
 
-func NewClient() (client *elastic.Client, err error) {
-	client, err = elastic.NewClient(
-		elastic.SetURL(ES_URL),
-		elastic.SetBasicAuth(ES_USERNAME, ES_PASSWORD),
-		elastic.SetSniff(false))
-	return
-}
-
 // EsAddOrEditEdbInfoData 新增/修改es中的指标数据
 func EsAddOrEditEdbInfoData(indexName, docId string, item *models.EdbInfoList) (err error) {
 	defer func() {

services/elastic/elasticsearch.go

@@ -1,20 +0,0 @@
-package elastic
-
-import (
-	"fmt"
-)
-
-const (
-	ES_URL      = "http://es-cn-nif227b580019rgw6.public.elasticsearch.aliyuncs.com:9200" //<1>
-	ES_USERNAME = "elastic"                                                               //<2>
-	ES_PASSWORD = "hongze@2021"                                                           //<3>
-	//Grafana pwd-> 20521bb9
-	//Grafana username-> emon
-)
-
-type tracelog struct{}
-
-//实现输出
-func (tracelog) Printf(format string, v ...interface{}) {
-	fmt.Printf(format, v...)
-}

utils/config.go

@@ -68,6 +68,13 @@ type WindUrlMap struct {
 	Num int
 }
 
+// ES配置
+var (
+	ES_URL      string // ES服务器地址
+	ES_USERNAME string // ES账号
+	ES_PASSWORD string // ES密码
+)
+
 func init() {
 	tmpRunMode, err := web.AppConfig.String("run_mode")
 	if err != nil {
@@ -167,6 +174,13 @@ func init() {
 		ThsRefreshToken = config["ths_refresh_token"] //同花顺的刷新token
 	}
 
+	// ES配置
+	{
+		ES_URL = config["es_url"]
+		ES_USERNAME = config["es_username"]
+		ES_PASSWORD = config["es_password"]
+	}
+
 	// 数据指标库ES索引名称
 	DATA_INDEX_NAME = config["data_index_name"]
 

utils/elastic.go

@@ -6,12 +6,6 @@ import (
 
 var EsClient *elastic.Client
 
-const (
-	ES_URL      = "http://es-cn-nif227b580019rgw6.public.elasticsearch.aliyuncs.com:9200" //<1>
-	ES_USERNAME = "elastic"                                                               //<2>
-	ES_PASSWORD = "hongze@2021"                                                           //<3>
-)
-
 func init() {
 	client, err := elastic.NewClient(
 		elastic.SetURL(ES_URL),