diff --git a/aspnet-core/CompanyName.ProjectName.sln b/aspnet-core/CompanyName.ProjectName.sln index cb65b665..f5106908 100644 --- a/aspnet-core/CompanyName.ProjectName.sln +++ b/aspnet-core/CompanyName.ProjectName.sln @@ -109,7 +109,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CompanyName.ProjectName.Dat EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "host", "host", "{5AACD0EE-F2B2-49F6-868F-8FE08D7243C0}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CompanyName.ProjectName.DataDictionaryManagement.HttpApi.Host", "modules\DataDictionaryManagement\host\CompanyName.ProjectName.DataDictionaryManagement.HttpApi.Host\CompanyName.ProjectName.DataDictionaryManagement.HttpApi.Host.csproj", "{8D196E3D-6F95-4793-B948-79669AF09017}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CompanyName.ProjectName.DataDictionaryManagement.HttpApi.Host", "modules\DataDictionaryManagement\host\CompanyName.ProjectName.DataDictionaryManagement.HttpApi.Host\CompanyName.ProjectName.DataDictionaryManagement.HttpApi.Host.csproj", "{8D196E3D-6F95-4793-B948-79669AF09017}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "host", "host", "{8C1B8C6C-C518-4290-B070-622CCA6004DA}" EndProject @@ -117,27 +117,25 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "CAP", "CAP", "{2C09EED0-5AF EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{11ED8435-B5AE-4BF3-9D4B-51FA1E4A18A6}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CompanyName.ProjectName.HttpApi.Host", "services\host\CompanyName.ProjectName.HttpApi.Host\CompanyName.ProjectName.HttpApi.Host.csproj", "{FB20372D-6C96-4733-9AAC-12522F15CAA6}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CompanyName.ProjectName.HttpApi.Host", "services\host\CompanyName.ProjectName.HttpApi.Host\CompanyName.ProjectName.HttpApi.Host.csproj", "{FB20372D-6C96-4733-9AAC-12522F15CAA6}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CompanyName.ProjectName.IdentityServer", "services\host\CompanyName.ProjectName.IdentityServer\CompanyName.ProjectName.IdentityServer.csproj", "{FB1C29FF-5467-4CF0-995D-5B3F931AB135}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CompanyName.ProjectName.IdentityServer", "services\host\CompanyName.ProjectName.IdentityServer\CompanyName.ProjectName.IdentityServer.csproj", "{FB1C29FF-5467-4CF0-995D-5B3F931AB135}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "shared", "shared", "{6434E3F2-B352-4B30-839A-88C2BA166D96}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CompanyName.ProjectName.Shared.Hosting.Microservices", "shared\CompanyName.ProjectName.Shared.Hosting.Microservices\CompanyName.ProjectName.Shared.Hosting.Microservices.csproj", "{A091AE9B-3A1E-49AC-9AD5-D29310512A3D}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CompanyName.ProjectName.Shared.Hosting.Microservices", "shared\CompanyName.ProjectName.Shared.Hosting.Microservices\CompanyName.ProjectName.Shared.Hosting.Microservices.csproj", "{A091AE9B-3A1E-49AC-9AD5-D29310512A3D}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CompanyName.ProjectName.Shared.Hosting.Gateways", "shared\CompanyName.ProjectName.Shared.Hosting.Gateways\CompanyName.ProjectName.Shared.Hosting.Gateways.csproj", "{C018EFF9-579E-43B3-9181-543BE95E2E03}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CompanyName.ProjectName.Shared.Hosting.Gateways", "shared\CompanyName.ProjectName.Shared.Hosting.Gateways\CompanyName.ProjectName.Shared.Hosting.Gateways.csproj", "{C018EFF9-579E-43B3-9181-543BE95E2E03}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gateways", "gateways", "{5C304CBC-F30D-413C-A0AF-8B6814A2D4A3}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CompanyName.ProjectName.WebGateway", "gateways\CompanyName.ProjectName.WebGateway\CompanyName.ProjectName.WebGateway.csproj", "{D9108313-8D05-4F5F-9AA0-B443EC3374B6}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CompanyName.ProjectName.WebGateway", "gateways\CompanyName.ProjectName.WebGateway\CompanyName.ProjectName.WebGateway.csproj", "{D9108313-8D05-4F5F-9AA0-B443EC3374B6}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CompanyName.ProjectName.FreeSqlRepository", "services\src\CompanyName.ProjectName.FreeSqlRepository\CompanyName.ProjectName.FreeSqlRepository.csproj", "{FC30B17B-F671-4E55-90C6-9F37E40B483D}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CompanyName.ProjectName.FreeSqlRepository", "services\src\CompanyName.ProjectName.FreeSqlRepository\CompanyName.ProjectName.FreeSqlRepository.csproj", "{FC30B17B-F671-4E55-90C6-9F37E40B483D}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CompanyName.ProjectName.ElasticsearchRepository", "services\src\CompanyName.ProjectName.ElasticsearchRepository\CompanyName.ProjectName.ElasticsearchRepository.csproj", "{5910B07F-1520-45D6-A15F-7A3E0698BE18}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CompanyName.ProjectName.Extension", "frameworks\Extensions\src\CompanyName.ProjectName.Extension\CompanyName.ProjectName.Extension.csproj", "{4C65690E-2C17-46A1-BB35-A51BAB2EA3B7}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CompanyName.ProjectName.Extension", "frameworks\Extensions\src\CompanyName.ProjectName.Extension\CompanyName.ProjectName.Extension.csproj", "{4C65690E-2C17-46A1-BB35-A51BAB2EA3B7}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CompanyName.ProjectName.CAP", "frameworks\CAP\src\CompanyName.ProjectName.CAP\CompanyName.ProjectName.CAP.csproj", "{3C3FF821-E43D-4D58-8B3C-1E97F4518EF7}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CompanyName.ProjectName.CAP", "frameworks\CAP\src\CompanyName.ProjectName.CAP\CompanyName.ProjectName.CAP.csproj", "{3C3FF821-E43D-4D58-8B3C-1E97F4518EF7}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -313,10 +311,6 @@ Global {FC30B17B-F671-4E55-90C6-9F37E40B483D}.Debug|Any CPU.Build.0 = Debug|Any CPU {FC30B17B-F671-4E55-90C6-9F37E40B483D}.Release|Any CPU.ActiveCfg = Release|Any CPU {FC30B17B-F671-4E55-90C6-9F37E40B483D}.Release|Any CPU.Build.0 = Release|Any CPU - {5910B07F-1520-45D6-A15F-7A3E0698BE18}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {5910B07F-1520-45D6-A15F-7A3E0698BE18}.Debug|Any CPU.Build.0 = Debug|Any CPU - {5910B07F-1520-45D6-A15F-7A3E0698BE18}.Release|Any CPU.ActiveCfg = Release|Any CPU - {5910B07F-1520-45D6-A15F-7A3E0698BE18}.Release|Any CPU.Build.0 = Release|Any CPU {4C65690E-2C17-46A1-BB35-A51BAB2EA3B7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {4C65690E-2C17-46A1-BB35-A51BAB2EA3B7}.Debug|Any CPU.Build.0 = Debug|Any CPU {4C65690E-2C17-46A1-BB35-A51BAB2EA3B7}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -386,7 +380,6 @@ Global {C018EFF9-579E-43B3-9181-543BE95E2E03} = {6434E3F2-B352-4B30-839A-88C2BA166D96} {D9108313-8D05-4F5F-9AA0-B443EC3374B6} = {5C304CBC-F30D-413C-A0AF-8B6814A2D4A3} {FC30B17B-F671-4E55-90C6-9F37E40B483D} = {CA9AC87F-097E-4F15-8393-4BC07735A5B0} - {5910B07F-1520-45D6-A15F-7A3E0698BE18} = {CA9AC87F-097E-4F15-8393-4BC07735A5B0} {4C65690E-2C17-46A1-BB35-A51BAB2EA3B7} = {C4AC9352-C9F5-4096-8D73-13638232CFB9} {3C3FF821-E43D-4D58-8B3C-1E97F4518EF7} = {11ED8435-B5AE-4BF3-9D4B-51FA1E4A18A6} EndGlobalSection diff --git a/aspnet-core/gateways/CompanyName.ProjectName.WebGateway/Properties/launchSettings.json b/aspnet-core/gateways/CompanyName.ProjectName.WebGateway/Properties/launchSettings.json index bc139af1..e2aab069 100644 --- a/aspnet-core/gateways/CompanyName.ProjectName.WebGateway/Properties/launchSettings.json +++ b/aspnet-core/gateways/CompanyName.ProjectName.WebGateway/Properties/launchSettings.json @@ -7,7 +7,7 @@ "launchUrl": "swagger", "applicationUrl": "http://localhost:44314", "environmentVariables": { - "ASPNETCORE_ENVIRONMENT": "Production" + "ASPNETCORE_ENVIRONMENT": "Development" } } } diff --git a/aspnet-core/services/host/CompanyName.ProjectName.HttpApi.Host/Properties/launchSettings.json b/aspnet-core/services/host/CompanyName.ProjectName.HttpApi.Host/Properties/launchSettings.json index ec45c5f9..d1785b53 100644 --- a/aspnet-core/services/host/CompanyName.ProjectName.HttpApi.Host/Properties/launchSettings.json +++ b/aspnet-core/services/host/CompanyName.ProjectName.HttpApi.Host/Properties/launchSettings.json @@ -5,7 +5,7 @@ "launchBrowser": true, "applicationUrl": "http://localhost:44315", "environmentVariables": { - "ASPNETCORE_ENVIRONMENT": "Production" + "ASPNETCORE_ENVIRONMENT": "Development" } } } diff --git a/aspnet-core/services/host/CompanyName.ProjectName.HttpApi.Host/appsettings.Development.json b/aspnet-core/services/host/CompanyName.ProjectName.HttpApi.Host/appsettings.Development.json index 14b754e3..28000a8a 100644 --- a/aspnet-core/services/host/CompanyName.ProjectName.HttpApi.Host/appsettings.Development.json +++ b/aspnet-core/services/host/CompanyName.ProjectName.HttpApi.Host/appsettings.Development.json @@ -44,7 +44,7 @@ "IndexFormat": "companyname.projectname.development.{0:yyyy.MM.dd}", "UserName": "elastic", "Password": "aVVhjQ95RP7nbwNy", - "SearchIndexFormat": "companyname.projectname.development.*" + "SearchIndexFormat": "companyname.projectname.development*" }, "HttpClient": { "Sts": { diff --git a/aspnet-core/services/src/CompanyName.ProjectName.Application.Contracts/CompanyName.ProjectName.Application.Contracts.csproj b/aspnet-core/services/src/CompanyName.ProjectName.Application.Contracts/CompanyName.ProjectName.Application.Contracts.csproj index eac55cb5..c61dd555 100644 --- a/aspnet-core/services/src/CompanyName.ProjectName.Application.Contracts/CompanyName.ProjectName.Application.Contracts.csproj +++ b/aspnet-core/services/src/CompanyName.ProjectName.Application.Contracts/CompanyName.ProjectName.Application.Contracts.csproj @@ -10,7 +10,6 @@ - diff --git a/aspnet-core/services/src/CompanyName.ProjectName.ElasticsearchRepository/Dto/PagingElasticSearchLogInput.cs b/aspnet-core/services/src/CompanyName.ProjectName.Application.Contracts/ElasticSearchs/Dto/PagingElasticSearchLogInput.cs similarity index 100% rename from aspnet-core/services/src/CompanyName.ProjectName.ElasticsearchRepository/Dto/PagingElasticSearchLogInput.cs rename to aspnet-core/services/src/CompanyName.ProjectName.Application.Contracts/ElasticSearchs/Dto/PagingElasticSearchLogInput.cs diff --git a/aspnet-core/services/src/CompanyName.ProjectName.Application.Contracts/ElasticSearchs/Dto/PagingElasticSearchLogOutput.cs b/aspnet-core/services/src/CompanyName.ProjectName.Application.Contracts/ElasticSearchs/Dto/PagingElasticSearchLogOutput.cs new file mode 100644 index 00000000..a61cb1db --- /dev/null +++ b/aspnet-core/services/src/CompanyName.ProjectName.Application.Contracts/ElasticSearchs/Dto/PagingElasticSearchLogOutput.cs @@ -0,0 +1,26 @@ +using System; + + +namespace CompanyName.ProjectName.ElasticsearchRepository.Dto +{ + + public class PagingElasticSearchLogOutput + { + /// + /// 日志级别 + /// + public string Level { get; set; } + + + /// + /// 日志内容 + /// + public string Message { get; set; } + + + /// + /// 创建时间 + /// + public DateTime CreationTime { get; set; } + } +} \ No newline at end of file diff --git a/aspnet-core/services/src/CompanyName.ProjectName.Application/CompanyName.ProjectName.Application.csproj b/aspnet-core/services/src/CompanyName.ProjectName.Application/CompanyName.ProjectName.Application.csproj index a1ccb2c5..cfb59ef6 100644 --- a/aspnet-core/services/src/CompanyName.ProjectName.Application/CompanyName.ProjectName.Application.csproj +++ b/aspnet-core/services/src/CompanyName.ProjectName.Application/CompanyName.ProjectName.Application.csproj @@ -1,27 +1,28 @@ - - + + - - net5.0 - CompanyName.ProjectName - + + net5.0 + CompanyName.ProjectName + - - - - - - - + + + + + + + - - - - - - - - - + + + + + + + + + + diff --git a/aspnet-core/services/src/CompanyName.ProjectName.Application/ElasticSearchs/CompanyNameProjectNameLogAppService.cs b/aspnet-core/services/src/CompanyName.ProjectName.Application/ElasticSearchs/CompanyNameProjectNameLogAppService.cs index a59adbd2..b19ab154 100644 --- a/aspnet-core/services/src/CompanyName.ProjectName.Application/ElasticSearchs/CompanyNameProjectNameLogAppService.cs +++ b/aspnet-core/services/src/CompanyName.ProjectName.Application/ElasticSearchs/CompanyNameProjectNameLogAppService.cs @@ -1,25 +1,76 @@ -using System.Threading.Tasks; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Threading.Tasks; using CompanyName.ProjectName.ElasticsearchRepository; using CompanyName.ProjectName.ElasticsearchRepository.Dto; using CompanyName.ProjectName.Extension.Customs.Dtos; using CompanyName.ProjectName.Permissions; using Microsoft.AspNetCore.Authorization; +using Microsoft.Extensions.Configuration; +using Nest; namespace CompanyName.ProjectName.ElasticSearchs { [Authorize(Policy = ProjectNamePermissions.SystemManagement.ES)] - public class CompanyNameProjectNameLogAppService:ProjectNameAppService,ICompanyNameProjectNameLogAppService + public class CompanyNameProjectNameLogAppService : ElasticsearchBasicService, + ICompanyNameProjectNameLogAppService { - private readonly ICompanyNameProjectNameLogRepository _companyNameProjectNameLogRepository; + private readonly IConfiguration _configuration; - public CompanyNameProjectNameLogAppService(ICompanyNameProjectNameLogRepository companyNameProjectNameLogRepository) + public CompanyNameProjectNameLogAppService( + IElasticsearchProvider elasticsearchProvider, + IConfiguration configuration) : base(elasticsearchProvider) { - _companyNameProjectNameLogRepository = companyNameProjectNameLogRepository; + _configuration = configuration; } - public Task> PaingAsync(PagingElasticSearchLogInput input) + public async Task> PaingAsync( + PagingElasticSearchLogInput input) { - return _companyNameProjectNameLogRepository.PaingAsync(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, + ObjectMapper + .Map, List>( + result.Documents.ToList())); + } + + return null; } } } \ No newline at end of file diff --git a/aspnet-core/services/src/CompanyName.ProjectName.Application/ElasticSearchs/Dto/PagingElasticSearchLogDto.cs b/aspnet-core/services/src/CompanyName.ProjectName.Application/ElasticSearchs/Dto/PagingElasticSearchLogDto.cs new file mode 100644 index 00000000..d29e8692 --- /dev/null +++ b/aspnet-core/services/src/CompanyName.ProjectName.Application/ElasticSearchs/Dto/PagingElasticSearchLogDto.cs @@ -0,0 +1,32 @@ +using System; +using Nest; + +namespace CompanyName.ProjectName.ElasticSearchs +{ + /// + /// Dto为什么在Service层 + /// 因为NEST 类库的坑 PropertyName必须用这个 + /// 不想在契约层添加NEST 包引用 + /// + [Serializable] + public class PagingElasticSearchLogDto + { + /// + /// 日志级别 + /// + public string Level { get; set; } + + + /// + /// 日志内容 + /// + public string Message { get; set; } + + + /// + /// 创建时间 + /// + [PropertyName("@timestamp")] + public DateTime CreationTime { get; set; } + } +} \ No newline at end of file diff --git a/aspnet-core/services/src/CompanyName.ProjectName.Application/ElasticSearchs/Providers/ElasticsearchBasicService.cs b/aspnet-core/services/src/CompanyName.ProjectName.Application/ElasticSearchs/Providers/ElasticsearchBasicService.cs new file mode 100644 index 00000000..bbdb2604 --- /dev/null +++ b/aspnet-core/services/src/CompanyName.ProjectName.Application/ElasticSearchs/Providers/ElasticsearchBasicService.cs @@ -0,0 +1,18 @@ +using Nest; +using Volo.Abp.Domain.Services; + +namespace CompanyName.ProjectName.ElasticsearchRepository +{ + public abstract class ElasticsearchBasicService : ProjectNameAppService + { + private readonly IElasticsearchProvider _elasticsearchProvider; + + // ReSharper disable once PublicConstructorInAbstractClass + public ElasticsearchBasicService(IElasticsearchProvider elasticsearchProvider) + { + _elasticsearchProvider = elasticsearchProvider; + } + + protected IElasticClient Client => _elasticsearchProvider.GetElasticClient(); + } +} \ No newline at end of file diff --git a/aspnet-core/services/src/CompanyName.ProjectName.Application/ElasticSearchs/Providers/ElasticsearchProvider.cs b/aspnet-core/services/src/CompanyName.ProjectName.Application/ElasticSearchs/Providers/ElasticsearchProvider.cs new file mode 100644 index 00000000..5f77a46f --- /dev/null +++ b/aspnet-core/services/src/CompanyName.ProjectName.Application/ElasticSearchs/Providers/ElasticsearchProvider.cs @@ -0,0 +1,29 @@ +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.Application/ElasticSearchs/Providers/IElasticsearchProvider.cs b/aspnet-core/services/src/CompanyName.ProjectName.Application/ElasticSearchs/Providers/IElasticsearchProvider.cs new file mode 100644 index 00000000..292f3fd0 --- /dev/null +++ b/aspnet-core/services/src/CompanyName.ProjectName.Application/ElasticSearchs/Providers/IElasticsearchProvider.cs @@ -0,0 +1,10 @@ +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.Application/IdentityServers/IdentityServerApplicationAutoMapperProfile.cs b/aspnet-core/services/src/CompanyName.ProjectName.Application/IdentityServers/IdentityServerApplicationAutoMapperProfile.cs index b99c4fc7..843988f4 100644 --- a/aspnet-core/services/src/CompanyName.ProjectName.Application/IdentityServers/IdentityServerApplicationAutoMapperProfile.cs +++ b/aspnet-core/services/src/CompanyName.ProjectName.Application/IdentityServers/IdentityServerApplicationAutoMapperProfile.cs @@ -1,4 +1,6 @@ using AutoMapper; +using CompanyName.ProjectName.ElasticsearchRepository.Dto; +using CompanyName.ProjectName.ElasticSearchs; using CompanyName.ProjectName.IdentityServers.ApiScopes.Dtos; using CompanyName.ProjectName.IdentityServers.Clients; using CompanyName.ProjectName.IdentityServers.Dtos; @@ -35,6 +37,8 @@ namespace CompanyName.ProjectName.IdentityServers.Mappers CreateMap(); CreateMap(); + + CreateMap(); } } } \ No newline at end of file diff --git a/aspnet-core/services/src/CompanyName.ProjectName.Application/ProjectNameApplicationModule.cs b/aspnet-core/services/src/CompanyName.ProjectName.Application/ProjectNameApplicationModule.cs index b42e70ee..ec546d15 100644 --- a/aspnet-core/services/src/CompanyName.ProjectName.Application/ProjectNameApplicationModule.cs +++ b/aspnet-core/services/src/CompanyName.ProjectName.Application/ProjectNameApplicationModule.cs @@ -1,5 +1,4 @@ using CompanyName.ProjectName.DataDictionaryManagement; -using CompanyName.ProjectName.ElasticsearchRepository; using CompanyName.ProjectName.FreeSqlRepository; using CompanyName.ProjectName.NotificationManagement; using EasyAbp.Abp.SettingUi; @@ -28,8 +27,7 @@ namespace CompanyName.ProjectName typeof(DataDictionaryManagementApplicationModule), typeof(NotificationManagementApplicationModule), typeof(AbpSettingUiApplicationModule), - typeof(FreeSqlRepositoryModule), - typeof(ProjectNameElasticSearchModule) + typeof(FreeSqlRepositoryModule) )] public class ProjectNameApplicationModule : AbpModule { 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 new file mode 100644 index 00000000..786b0390 --- /dev/null +++ b/aspnet-core/services/src/CompanyName.ProjectName.ElasticsearchRepository.Shared/CompanyName.ProjectName.ElasticsearchRepository.Shared.csproj @@ -0,0 +1,15 @@ + + + + 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 new file mode 100644 index 00000000..1f2a40c2 --- /dev/null +++ b/aspnet-core/services/src/CompanyName.ProjectName.ElasticsearchRepository.Shared/Dto/PagingElasticSearchLogInput.cs @@ -0,0 +1,14 @@ +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/Dto/PagingElasticSearchLogOutput.cs b/aspnet-core/services/src/CompanyName.ProjectName.ElasticsearchRepository.Shared/Dto/PagingElasticSearchLogOutput.cs similarity index 89% rename from aspnet-core/services/src/CompanyName.ProjectName.ElasticsearchRepository/Dto/PagingElasticSearchLogOutput.cs rename to aspnet-core/services/src/CompanyName.ProjectName.ElasticsearchRepository.Shared/Dto/PagingElasticSearchLogOutput.cs index e4a4f122..228f3d7e 100644 --- a/aspnet-core/services/src/CompanyName.ProjectName.ElasticsearchRepository/Dto/PagingElasticSearchLogOutput.cs +++ b/aspnet-core/services/src/CompanyName.ProjectName.ElasticsearchRepository.Shared/Dto/PagingElasticSearchLogOutput.cs @@ -1,5 +1,5 @@ using System; -using Nest; +using Newtonsoft.Json; namespace CompanyName.ProjectName.ElasticsearchRepository.Dto { @@ -21,7 +21,7 @@ namespace CompanyName.ProjectName.ElasticsearchRepository.Dto /// /// 创建时间 /// - [PropertyName("@timestamp")] + [JsonProperty("@timestamp")] public DateTime CreationTime { get; set; } } } \ No newline at end of file diff --git a/aspnet-core/services/src/CompanyName.ProjectName.ElasticsearchRepository/ICompanyNameProjectNameLogRepository.cs b/aspnet-core/services/src/CompanyName.ProjectName.ElasticsearchRepository.Shared/ICompanyNameProjectNameLogRepository.cs similarity index 100% rename from aspnet-core/services/src/CompanyName.ProjectName.ElasticsearchRepository/ICompanyNameProjectNameLogRepository.cs rename to aspnet-core/services/src/CompanyName.ProjectName.ElasticsearchRepository.Shared/ICompanyNameProjectNameLogRepository.cs diff --git a/aspnet-core/services/src/CompanyName.ProjectName.ElasticsearchRepository.Shared/ProjectNameElasticSearchSharedModule.cs b/aspnet-core/services/src/CompanyName.ProjectName.ElasticsearchRepository.Shared/ProjectNameElasticSearchSharedModule.cs new file mode 100644 index 00000000..bac67bb9 --- /dev/null +++ b/aspnet-core/services/src/CompanyName.ProjectName.ElasticsearchRepository.Shared/ProjectNameElasticSearchSharedModule.cs @@ -0,0 +1,9 @@ +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 index 2c77a716..569d644d 100644 --- a/aspnet-core/services/src/CompanyName.ProjectName.ElasticsearchRepository/CompanyName.ProjectName.ElasticsearchRepository.csproj +++ b/aspnet-core/services/src/CompanyName.ProjectName.ElasticsearchRepository/CompanyName.ProjectName.ElasticsearchRepository.csproj @@ -1,17 +1,16 @@ - - + + net5.0 - - + + - - + - + \ No newline at end of file