From e7d7523114fada6e962d23e27f89f325bebee34b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E5=86=9B?= <510423039@qq.com> Date: Tue, 16 Nov 2021 15:18:47 +0800 Subject: [PATCH] =?UTF-8?q?=E2=9C=A8=20=20=E5=88=A0=E9=99=A4=E5=A4=9A?= =?UTF-8?q?=E4=BD=99ES=E7=B1=BB=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...Name.ElasticsearchRepository.Shared.csproj | 15 ---- .../Dto/PagingElasticSearchLogInput.cs | 14 ---- .../Dto/PagingElasticSearchLogOutput.cs | 27 -------- .../ICompanyNameProjectNameLogRepository.cs | 17 ----- .../ProjectNameElasticSearchSharedModule.cs | 9 --- ...ProjectName.ElasticsearchRepository.csproj | 16 ----- .../CompanyNameProjectNameLogRepository.cs | 69 ------------------- .../ElasticsearchBasicRepository.cs | 18 ----- .../ElasticsearchProvider.cs | 29 -------- .../IElasticsearchProvider.cs | 10 --- .../ProjectNameElasticSearchModule.cs | 10 --- 11 files changed, 234 deletions(-) delete mode 100644 aspnet-core/services/src/CompanyName.ProjectName.ElasticsearchRepository.Shared/CompanyName.ProjectName.ElasticsearchRepository.Shared.csproj delete mode 100644 aspnet-core/services/src/CompanyName.ProjectName.ElasticsearchRepository.Shared/Dto/PagingElasticSearchLogInput.cs delete mode 100644 aspnet-core/services/src/CompanyName.ProjectName.ElasticsearchRepository.Shared/Dto/PagingElasticSearchLogOutput.cs delete mode 100644 aspnet-core/services/src/CompanyName.ProjectName.ElasticsearchRepository.Shared/ICompanyNameProjectNameLogRepository.cs delete mode 100644 aspnet-core/services/src/CompanyName.ProjectName.ElasticsearchRepository.Shared/ProjectNameElasticSearchSharedModule.cs delete mode 100644 aspnet-core/services/src/CompanyName.ProjectName.ElasticsearchRepository/CompanyName.ProjectName.ElasticsearchRepository.csproj delete mode 100644 aspnet-core/services/src/CompanyName.ProjectName.ElasticsearchRepository/CompanyNameProjectNameLogRepository.cs delete mode 100644 aspnet-core/services/src/CompanyName.ProjectName.ElasticsearchRepository/ElasticsearchBasicRepository.cs delete mode 100644 aspnet-core/services/src/CompanyName.ProjectName.ElasticsearchRepository/ElasticsearchProvider.cs delete mode 100644 aspnet-core/services/src/CompanyName.ProjectName.ElasticsearchRepository/IElasticsearchProvider.cs delete mode 100644 aspnet-core/services/src/CompanyName.ProjectName.ElasticsearchRepository/ProjectNameElasticSearchModule.cs diff --git a/aspnet-core/services/src/CompanyName.ProjectName.ElasticsearchRepository.Shared/CompanyName.ProjectName.ElasticsearchRepository.Shared.csproj b/aspnet-core/services/src/CompanyName.ProjectName.ElasticsearchRepository.Shared/CompanyName.ProjectName.ElasticsearchRepository.Shared.csproj deleted file mode 100644 index 786b0390..00000000 --- a/aspnet-core/services/src/CompanyName.ProjectName.ElasticsearchRepository.Shared/CompanyName.ProjectName.ElasticsearchRepository.Shared.csproj +++ /dev/null @@ -1,15 +0,0 @@ - - - - net5.0 - - - - - - - - - - - diff --git a/aspnet-core/services/src/CompanyName.ProjectName.ElasticsearchRepository.Shared/Dto/PagingElasticSearchLogInput.cs b/aspnet-core/services/src/CompanyName.ProjectName.ElasticsearchRepository.Shared/Dto/PagingElasticSearchLogInput.cs deleted file mode 100644 index 1f2a40c2..00000000 --- a/aspnet-core/services/src/CompanyName.ProjectName.ElasticsearchRepository.Shared/Dto/PagingElasticSearchLogInput.cs +++ /dev/null @@ -1,14 +0,0 @@ -using System; -using CompanyName.ProjectName.Extension.Customs.Dtos; - -namespace CompanyName.ProjectName.ElasticsearchRepository.Dto -{ - public class PagingElasticSearchLogInput : PagingBase - { - public string Filter { get; set; } - - public DateTime? StartCreationTime { get; set; } - - public DateTime? EndCreationTime { get; set; } - } -} \ No newline at end of file diff --git a/aspnet-core/services/src/CompanyName.ProjectName.ElasticsearchRepository.Shared/Dto/PagingElasticSearchLogOutput.cs b/aspnet-core/services/src/CompanyName.ProjectName.ElasticsearchRepository.Shared/Dto/PagingElasticSearchLogOutput.cs deleted file mode 100644 index 228f3d7e..00000000 --- a/aspnet-core/services/src/CompanyName.ProjectName.ElasticsearchRepository.Shared/Dto/PagingElasticSearchLogOutput.cs +++ /dev/null @@ -1,27 +0,0 @@ -using System; -using Newtonsoft.Json; - -namespace CompanyName.ProjectName.ElasticsearchRepository.Dto -{ - [Serializable] - public class PagingElasticSearchLogOutput - { - /// - /// 日志级别 - /// - public string Level { get; set; } - - - /// - /// 日志内容 - /// - public string Message { get; set; } - - - /// - /// 创建时间 - /// - [JsonProperty("@timestamp")] - public DateTime CreationTime { get; set; } - } -} \ No newline at end of file diff --git a/aspnet-core/services/src/CompanyName.ProjectName.ElasticsearchRepository.Shared/ICompanyNameProjectNameLogRepository.cs b/aspnet-core/services/src/CompanyName.ProjectName.ElasticsearchRepository.Shared/ICompanyNameProjectNameLogRepository.cs deleted file mode 100644 index ebd8a4dc..00000000 --- a/aspnet-core/services/src/CompanyName.ProjectName.ElasticsearchRepository.Shared/ICompanyNameProjectNameLogRepository.cs +++ /dev/null @@ -1,17 +0,0 @@ -using System.Threading.Tasks; -using CompanyName.ProjectName.ElasticsearchRepository.Dto; -using CompanyName.ProjectName.Extension.Customs.Dtos; -using Volo.Abp.DependencyInjection; - -namespace CompanyName.ProjectName.ElasticsearchRepository -{ - public interface ICompanyNameProjectNameLogRepository : ITransientDependency - { - /// - /// 分页查询es日志 - /// - /// - /// - Task> PaingAsync(PagingElasticSearchLogInput input); - } -} \ No newline at end of file diff --git a/aspnet-core/services/src/CompanyName.ProjectName.ElasticsearchRepository.Shared/ProjectNameElasticSearchSharedModule.cs b/aspnet-core/services/src/CompanyName.ProjectName.ElasticsearchRepository.Shared/ProjectNameElasticSearchSharedModule.cs deleted file mode 100644 index bac67bb9..00000000 --- a/aspnet-core/services/src/CompanyName.ProjectName.ElasticsearchRepository.Shared/ProjectNameElasticSearchSharedModule.cs +++ /dev/null @@ -1,9 +0,0 @@ -using System; -using Volo.Abp.Modularity; - -namespace CompanyName.ProjectName.ElasticsearchRepository.Shared -{ - public class ProjectNameElasticSearchSharedModule : AbpModule - { - } -} diff --git a/aspnet-core/services/src/CompanyName.ProjectName.ElasticsearchRepository/CompanyName.ProjectName.ElasticsearchRepository.csproj b/aspnet-core/services/src/CompanyName.ProjectName.ElasticsearchRepository/CompanyName.ProjectName.ElasticsearchRepository.csproj deleted file mode 100644 index 569d644d..00000000 --- a/aspnet-core/services/src/CompanyName.ProjectName.ElasticsearchRepository/CompanyName.ProjectName.ElasticsearchRepository.csproj +++ /dev/null @@ -1,16 +0,0 @@ - - - - net5.0 - - - - - - - - - - - - \ No newline at end of file diff --git a/aspnet-core/services/src/CompanyName.ProjectName.ElasticsearchRepository/CompanyNameProjectNameLogRepository.cs b/aspnet-core/services/src/CompanyName.ProjectName.ElasticsearchRepository/CompanyNameProjectNameLogRepository.cs deleted file mode 100644 index 692635ff..00000000 --- a/aspnet-core/services/src/CompanyName.ProjectName.ElasticsearchRepository/CompanyNameProjectNameLogRepository.cs +++ /dev/null @@ -1,69 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Threading.Tasks; -using CompanyName.ProjectName.ElasticsearchRepository.Dto; -using CompanyName.ProjectName.Extension.Customs.Dtos; -using Microsoft.Extensions.Configuration; -using Nest; - -namespace CompanyName.ProjectName.ElasticsearchRepository -{ - public class CompanyNameProjectNameLogRepository : ElasticsearchBasicRepository, - ICompanyNameProjectNameLogRepository - { - private readonly IConfiguration _configuration; - - public CompanyNameProjectNameLogRepository( - IElasticsearchProvider elasticsearchProvider, - IConfiguration configuration) : base(elasticsearchProvider) - { - _configuration = configuration; - } - - public async Task> PaingAsync( - PagingElasticSearchLogInput input) - { - var IndexName = - _configuration.GetValue("ElasticSearch:SearchIndexFormat"); - // 默认查询当天 - input.StartCreationTime = input.StartCreationTime?.AddMilliseconds(-1) ?? - DateTime.Now.Date.AddMilliseconds(-1); - input.EndCreationTime = - input.EndCreationTime?.AddDays(1).AddMilliseconds(-1) ?? - DateTime.Now.Date.AddDays(1).AddMilliseconds(-1); - var mustFilters = - new List, - QueryContainer>> - { - t => t.DateRange(f => - f.Field(fd => fd.CreationTime).TimeZone("Asia/Shanghai") - .GreaterThanOrEquals(input.StartCreationTime.Value)), - t => t.DateRange( - f => f.Field(fd => fd.CreationTime).TimeZone("Asia/Shanghai") - .LessThanOrEquals(input.EndCreationTime.Value)) - }; - - if (!string.IsNullOrWhiteSpace(input.Filter)) - { - mustFilters.Add(t => - t.MatchPhrase(f => f.Field(fd => fd.Message).Query(input.Filter.Trim()))); - } - - var result = await Client.SearchAsync(e => e - .Index(IndexName) - .From(input.SkipCount) - .Size(input.PageSize) - .Sort(s => s.Descending(sd => sd.CreationTime)) - .Query(q => q.Bool(qb => qb.Filter(mustFilters)))); - - if (result.HitsMetadata != null) - { - return new CustomePagedResultDto( - result.HitsMetadata.Total.Value, result.Documents.ToList()); - } - - return null; - } - } -} \ No newline at end of file diff --git a/aspnet-core/services/src/CompanyName.ProjectName.ElasticsearchRepository/ElasticsearchBasicRepository.cs b/aspnet-core/services/src/CompanyName.ProjectName.ElasticsearchRepository/ElasticsearchBasicRepository.cs deleted file mode 100644 index 61bb1313..00000000 --- a/aspnet-core/services/src/CompanyName.ProjectName.ElasticsearchRepository/ElasticsearchBasicRepository.cs +++ /dev/null @@ -1,18 +0,0 @@ -using Nest; -using Volo.Abp.Domain.Services; - -namespace CompanyName.ProjectName.ElasticsearchRepository -{ - public abstract class ElasticsearchBasicRepository : DomainService - { - private readonly IElasticsearchProvider _elasticsearchProvider; - - // ReSharper disable once PublicConstructorInAbstractClass - public ElasticsearchBasicRepository(IElasticsearchProvider elasticsearchProvider) - { - _elasticsearchProvider = elasticsearchProvider; - } - - protected IElasticClient Client => _elasticsearchProvider.GetElasticClient(); - } -} \ No newline at end of file diff --git a/aspnet-core/services/src/CompanyName.ProjectName.ElasticsearchRepository/ElasticsearchProvider.cs b/aspnet-core/services/src/CompanyName.ProjectName.ElasticsearchRepository/ElasticsearchProvider.cs deleted file mode 100644 index 5f77a46f..00000000 --- a/aspnet-core/services/src/CompanyName.ProjectName.ElasticsearchRepository/ElasticsearchProvider.cs +++ /dev/null @@ -1,29 +0,0 @@ -using System; -using Elasticsearch.Net; -using Microsoft.Extensions.Configuration; -using Nest; -using Volo.Abp.DependencyInjection; - -namespace CompanyName.ProjectName.ElasticsearchRepository -{ - public class ElasticsearchProvider : IElasticsearchProvider, ISingletonDependency - { - private readonly IConfiguration _configuration; - - public ElasticsearchProvider(IConfiguration configuration) - { - _configuration = configuration; - } - - public IElasticClient GetElasticClient() - { - var pool = new SingleNodeConnectionPool(new Uri(_configuration.GetValue("ElasticSearch:Url"))); - var connectionSettings = - new ConnectionSettings(pool); - connectionSettings.EnableHttpCompression(); - connectionSettings.BasicAuthentication(_configuration.GetValue("ElasticSearch:UserName"), - _configuration.GetValue("ElasticSearch:Password")); - return new ElasticClient(connectionSettings); - } - } -} \ No newline at end of file diff --git a/aspnet-core/services/src/CompanyName.ProjectName.ElasticsearchRepository/IElasticsearchProvider.cs b/aspnet-core/services/src/CompanyName.ProjectName.ElasticsearchRepository/IElasticsearchProvider.cs deleted file mode 100644 index 292f3fd0..00000000 --- a/aspnet-core/services/src/CompanyName.ProjectName.ElasticsearchRepository/IElasticsearchProvider.cs +++ /dev/null @@ -1,10 +0,0 @@ -using Nest; -using Volo.Abp.DependencyInjection; - -namespace CompanyName.ProjectName.ElasticsearchRepository -{ - public interface IElasticsearchProvider : ISingletonDependency - { - IElasticClient GetElasticClient(); - } -} \ No newline at end of file diff --git a/aspnet-core/services/src/CompanyName.ProjectName.ElasticsearchRepository/ProjectNameElasticSearchModule.cs b/aspnet-core/services/src/CompanyName.ProjectName.ElasticsearchRepository/ProjectNameElasticSearchModule.cs deleted file mode 100644 index f7796252..00000000 --- a/aspnet-core/services/src/CompanyName.ProjectName.ElasticsearchRepository/ProjectNameElasticSearchModule.cs +++ /dev/null @@ -1,10 +0,0 @@ -using Volo.Abp.Modularity; - -namespace CompanyName.ProjectName.ElasticsearchRepository -{ - - public class ProjectNameElasticSearchModule : AbpModule - { - - } -} \ No newline at end of file