From 7d792fb35a28fb85e5d6c3d2a98ea338e6977034 Mon Sep 17 00:00:00 2001 From: cqasen Date: Sat, 25 Sep 2021 18:17:33 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E8=BF=9E=E6=8E=A5elasticsearch=E7=9A=84?= =?UTF-8?q?=E5=AF=86=E7=A0=81=E5=8F=96=E7=9A=84=E9=85=8D=E7=BD=AE=E5=AD=97?= =?UTF-8?q?=E6=AE=B5=E9=94=99=E8=AF=AF=EF=BC=8C=E5=90=8C=E6=97=B6=E5=BA=94?= =?UTF-8?q?=E8=AF=A5=E6=96=B0=E5=A2=9ESetSniff=E8=AE=BE=E7=BD=AE=E4=B8=BAf?= =?UTF-8?q?alse?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app.yml | 4 ++-- service/endpoint/elastic6.go | 3 ++- service/endpoint/elastic7.go | 3 ++- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/app.yml b/app.yml index 033c61a..22285df 100644 --- a/app.yml +++ b/app.yml @@ -50,8 +50,8 @@ redis_addrs: 127.0.0.1:6379 #redis地址，多个用逗号分隔 #elasticsearch连接配置 #es_addrs: 127.0.0.1:9200 #连接地址，多个用逗号分隔 #es_version: 7 # Elasticsearch版本，支持6和7、默认为7 -#es_password: # 用户名 -#es_version: # 密码 +#es_user: # 用户名 +#es_password: # 密码 #rocketmq连接配置 #rocketmq_name_servers: 127.0.0.1:9876 #rocketmq命名服务地址，多个用逗号分隔 diff --git a/service/endpoint/elastic6.go b/service/endpoint/elastic6.go index 5b0d75b..5b27ead 100644 --- a/service/endpoint/elastic6.go +++ b/service/endpoint/elastic6.go @@ -56,8 +56,9 @@ func (s *Elastic6Endpoint) Connect() error { var options []elastic.ClientOptionFunc options = append(options, elastic.SetErrorLog(logagent.NewElsLoggerAgent())) options = append(options, elastic.SetURL(s.hosts...)) + options = append(options, elastic.SetSniff(false)) if global.Cfg().ElsUser != "" && global.Cfg().ElsPassword != "" { - options = append(options, elastic.SetBasicAuth(global.Cfg().ElsUser, global.Cfg().Password)) + options = append(options, elastic.SetBasicAuth(global.Cfg().ElsUser, global.Cfg().ElsPassword)) } client, err := elastic.NewClient(options...) diff --git a/service/endpoint/elastic7.go b/service/endpoint/elastic7.go index 3164b6d..9621eea 100644 --- a/service/endpoint/elastic7.go +++ b/service/endpoint/elastic7.go @@ -56,8 +56,9 @@ func (s *Elastic7Endpoint) Connect() error { var options []elastic.ClientOptionFunc options = append(options, elastic.SetErrorLog(logagent.NewElsLoggerAgent())) options = append(options, elastic.SetURL(s.hosts...)) + options = append(options, elastic.SetSniff(false)) if global.Cfg().ElsUser != "" && global.Cfg().ElsPassword != "" { - options = append(options, elastic.SetBasicAuth(global.Cfg().ElsUser, global.Cfg().Password)) + options = append(options, elastic.SetBasicAuth(global.Cfg().ElsUser, global.Cfg().ElsPassword)) } client, err := elastic.NewClient(options...) -- Gitee From b6f5b165df16dca16864bf7135eb0619409200ca Mon Sep 17 00:00:00 2001 From: cqasen Date: Sat, 25 Sep 2021 18:21:04 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E8=BF=9E=E6=8E=A5elasticsearch=E7=9A=84?= =?UTF-8?q?=E5=AF=86=E7=A0=81=E5=8F=96=E7=9A=84=E9=85=8D=E7=BD=AE=E5=AD=97?= =?UTF-8?q?=E6=AE=B5=E9=94=99=E8=AF=AF=EF=BC=8C=E5=90=8C=E6=97=B6=E5=BA=94?= =?UTF-8?q?=E8=AF=A5=E6=96=B0=E5=A2=9ESetSniff=E8=AE=BE=E7=BD=AE=E4=B8=BAf?= =?UTF-8?q?alse?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app.yml | 4 ++-- service/endpoint/elastic6.go | 2 +- service/endpoint/elastic7.go | 3 +-- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/app.yml b/app.yml index 22285df..a02ec8c 100644 --- a/app.yml +++ b/app.yml @@ -50,8 +50,8 @@ redis_addrs: 127.0.0.1:6379 #redis地址，多个用逗号分隔 #elasticsearch连接配置 #es_addrs: 127.0.0.1:9200 #连接地址，多个用逗号分隔 #es_version: 7 # Elasticsearch版本，支持6和7、默认为7 -#es_user: # 用户名 -#es_password: # 密码 +#es_user: # 用户名 +#es_password: # 密码 #rocketmq连接配置 #rocketmq_name_servers: 127.0.0.1:9876 #rocketmq命名服务地址，多个用逗号分隔 diff --git a/service/endpoint/elastic6.go b/service/endpoint/elastic6.go index 5b27ead..e3bd07b 100644 --- a/service/endpoint/elastic6.go +++ b/service/endpoint/elastic6.go @@ -56,10 +56,10 @@ func (s *Elastic6Endpoint) Connect() error { var options []elastic.ClientOptionFunc options = append(options, elastic.SetErrorLog(logagent.NewElsLoggerAgent())) options = append(options, elastic.SetURL(s.hosts...)) - options = append(options, elastic.SetSniff(false)) if global.Cfg().ElsUser != "" && global.Cfg().ElsPassword != "" { options = append(options, elastic.SetBasicAuth(global.Cfg().ElsUser, global.Cfg().ElsPassword)) } + options = append(options, elastic.SetSniff(false)) client, err := elastic.NewClient(options...) if err != nil { diff --git a/service/endpoint/elastic7.go b/service/endpoint/elastic7.go index 9621eea..8485c8b 100644 --- a/service/endpoint/elastic7.go +++ b/service/endpoint/elastic7.go @@ -23,7 +23,6 @@ import ( "sync" "github.com/juju/errors" - "github.com/olivere/elastic/v7" "github.com/siddontang/go-mysql/canal" "github.com/siddontang/go-mysql/mysql" @@ -56,10 +55,10 @@ func (s *Elastic7Endpoint) Connect() error { var options []elastic.ClientOptionFunc options = append(options, elastic.SetErrorLog(logagent.NewElsLoggerAgent())) options = append(options, elastic.SetURL(s.hosts...)) - options = append(options, elastic.SetSniff(false)) if global.Cfg().ElsUser != "" && global.Cfg().ElsPassword != "" { options = append(options, elastic.SetBasicAuth(global.Cfg().ElsUser, global.Cfg().ElsPassword)) } + options = append(options, elastic.SetSniff(false)) client, err := elastic.NewClient(options...) if err != nil { -- Gitee From 1c10dd3ca0c0efdb25f7e02bfc662a7aef2a944d Mon Sep 17 00:00:00 2001 From: cqasen Date: Sat, 25 Sep 2021 18:27:56 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E5=BC=95=E5=85=A5=E7=9A=84elastic/v7?= =?UTF-8?q?=E6=90=9E=E4=B8=A2=E4=BA=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- service/endpoint/elastic7.go | 1 + 1 file changed, 1 insertion(+) diff --git a/service/endpoint/elastic7.go b/service/endpoint/elastic7.go index 8485c8b..6807f2c 100644 --- a/service/endpoint/elastic7.go +++ b/service/endpoint/elastic7.go @@ -23,6 +23,7 @@ import ( "sync" "github.com/juju/errors" + "github.com/olivere/elastic/v7" "github.com/siddontang/go-mysql/canal" "github.com/siddontang/go-mysql/mysql" -- Gitee