From 52deb6bb7990d198ea1ba9c222e70068f79ef557 Mon Sep 17 00:00:00 2001 From: chenchun Date: Wed, 20 Apr 2022 11:10:37 +0800 Subject: [PATCH 1/2] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 62f8b366..8540480d 100644 --- a/README.md +++ b/README.md @@ -20,7 +20,7 @@ Yi框架-一套与SqlSugar一样爽的.Net6低代码开源框架。 适合.Net6学习、Sqlsugar学习 、项目二次开发。 集大成者,终究轮子 -Yi框架最新版本标签:`v1.0.3` 更新时间:2022/4/18 +Yi框架最新版本标签:`v1.0.3` (项目与Sqlsugar同步更新,但这作者老杰哥代码天天爆肝到凌晨两点,我们也尽量会跟上他的脚步。更新频繁,所以可watching持续关注。) From 8196cd597a127aa62f809ec466e39c1cc7c2f4f5 Mon Sep 17 00:00:00 2001 From: chenchun Date: Thu, 21 Apr 2022 18:03:30 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=B7=BB=E5=8A=A0es=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E5=90=8D=E4=B8=8E=E5=AF=86=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Yi.Framework.Common/IOCOptions/ElasticSearchOptions.cs | 2 ++ Yi.Framework.Net6/Yi.Framework.Core/ElasticSearchInvoker.cs | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/Yi.Framework.Net6/Yi.Framework.Common/IOCOptions/ElasticSearchOptions.cs b/Yi.Framework.Net6/Yi.Framework.Common/IOCOptions/ElasticSearchOptions.cs index 1080aaa6..de6c5301 100644 --- a/Yi.Framework.Net6/Yi.Framework.Common/IOCOptions/ElasticSearchOptions.cs +++ b/Yi.Framework.Net6/Yi.Framework.Common/IOCOptions/ElasticSearchOptions.cs @@ -10,5 +10,7 @@ namespace Yi.Framework.Common.IOCOptions { public string Url { get; set; } public string IndexName { get; set; } + public string UserName { get; set; } + public string PassWord { get; set; } } } diff --git a/Yi.Framework.Net6/Yi.Framework.Core/ElasticSearchInvoker.cs b/Yi.Framework.Net6/Yi.Framework.Core/ElasticSearchInvoker.cs index 4b4556cc..da72e72f 100644 --- a/Yi.Framework.Net6/Yi.Framework.Core/ElasticSearchInvoker.cs +++ b/Yi.Framework.Net6/Yi.Framework.Core/ElasticSearchInvoker.cs @@ -16,7 +16,7 @@ namespace Yi.Framework.Core public ElasticSearchInvoker(IOptionsMonitor optionsMonitor) { _elasticSearchOptions = optionsMonitor.CurrentValue; - var settings = new ConnectionSettings(new Uri(_elasticSearchOptions.Url)).DefaultIndex(this._elasticSearchOptions.IndexName); + var settings = new ConnectionSettings(new Uri(_elasticSearchOptions.Url)).DefaultIndex(this._elasticSearchOptions.IndexName).BasicAuthentication(this._elasticSearchOptions.UserName, this._elasticSearchOptions.PassWord); ; Client = new ElasticClient(settings); } private ElasticClient Client;