From 034abb06ad666c7596b7936e2eff74b2840302cd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=A9=99=E5=AD=90?= <454313500@qq.com> Date: Mon, 16 Jan 2023 23:05:01 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0excel=E6=A8=A1=E5=9D=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Yi.Framework.sln | 41 +++++--- .../AspNetCore/Builder/CorsUseExtensions.cs | 0 .../AspNetCore/Builder/SwaggerUseExtensons.cs | 0 .../DependencyInjection/CorsAddExtensions.cs | 0 .../SwaggerAddExtensions.cs | 0 .../Yi.Framework.AspNetCore.csproj | 0 .../Extensions/AutoMapperExtensions.cs | 0 .../Yi.Framework.Core.AutoMapper.csproj | 0 .../YiFrameworkCoreAutoMapperModule.cs | 0 .../Extensions/AutoFacExtensions.cs | 0 .../Extensions/AutoFacModuleExtensions.cs | 0 .../Modules/AutoFacModuleEnum.cs | 0 .../Modules/PropertiesAutowiredModule.cs | 0 .../Modules/YiAutoFacModule.cs | 0 .../Properties/launchSettings.json | 0 .../Yi.Framework.Core.Autofac.csproj | 0 .../Const/SqlsugarConst.cs | 0 .../Extensions/SqlsugarCodeFirstExtensions.cs | 0 .../Extensions/SqlsugarExtensions.cs | 0 .../Options/DbConnOptions.cs | 0 .../Repositories/SqlsugarRepository.cs | 6 ++ .../Yi.Framework.Core.Sqlsugar.csproj | 2 +- .../YiFrameworkCoreSqlsugarModule.cs | 0 .../Attributes/AppServiceAttribute.cs | 0 .../Attributes/AutowiredAttribute.cs | 0 .../Configuration/Appsettings.cs | 0 .../CurrentUser/CurrentUser.cs | 0 .../CurrentUser/ICurrentUser.cs | 0 .../DependencyInjection/IScopedDependency.cs | 0 .../ISingletonDependency.cs | 0 .../ITransientDependency.cs | 0 .../Yi.Framework.Core/Enums/OrderByEnum.cs | 0 .../Yi.Framework.Core/Enums/ResultCodeEnum.cs | 0 .../Exceptions/BusinessException.cs | 0 .../Exceptions/ExceptionExtensions.cs | 0 .../Exceptions/IHasErrorCode.cs | 0 .../Exceptions/IHasErrorDetails.cs | 0 .../Exceptions/IHasLogLevel.cs | 0 .../Exceptions/UserFriendlyException.cs | 0 .../Extensions/AutoIocAddExtensions.cs | 0 .../Extensions/CurrentUserExtensions.cs | 0 .../Extensions/ErrorHandExtensions.cs | 2 +- .../Extensions/ModuleExtensions.cs | 0 .../Helper/AssemblyHelper.cs | 0 .../Yi.Framework.Core/Helper/Base32Helper.cs | 0 .../Yi.Framework.Core/Helper/ConsoleHelper.cs | 0 .../Yi.Framework.Core/Helper/DateHelper.cs | 0 .../Helper/DistinctHelper.cs | 0 .../Yi.Framework.Core/Helper/EnumHelper.cs | 5 + .../Helper/ExpressionHelper.cs | 98 ++++++++++++++++++ .../Yi.Framework.Core/Helper/FileHelper.cs | 0 .../Yi.Framework.Core/Helper/HtmlHelper.cs | 0 .../Yi.Framework.Core/Helper/HttpHelper.cs | 0 .../Yi.Framework.Core/Helper/IdHelper.cs | 0 .../Yi.Framework.Core/Helper/IpHelper.cs | 0 .../Yi.Framework.Core/Helper/JsonHelper.cs | 0 .../Yi.Framework.Core/Helper/MD5Hepler.cs | 0 .../Yi.Framework.Core/Helper/MimeHelper.cs | 0 .../Yi.Framework.Core/Helper/RSAFileHelper.cs | 0 .../Yi.Framework.Core/Helper/RSAHelper.cs | 0 .../Yi.Framework.Core/Helper/RandomHelper.cs | 0 .../Yi.Framework.Core/Helper/ReflexHelper.cs | 0 .../Helper/SnowflakeHelper.cs | 0 .../Yi.Framework.Core/Helper/StringHelper.cs | 0 .../Yi.Framework.Core/Helper/TreeHelper.cs | 0 .../Yi.Framework.Core/Helper/UnicodeHelper.cs | 0 .../Yi.Framework.Core/Helper/UrlHelper.cs | 0 .../Yi.Framework.Core/Helper/XmlHelper.cs | 0 .../Yi.Framework.Core/Model/GobalLogModel.cs | 0 .../Model/ServiceLocatorModel.cs | 0 .../Yi.Framework.Core.csproj | 0 .../YiFrameworkCoreModule.cs | 0 .../Dtos/Abstract/IEntityDto.cs | 0 .../Dtos/Abstract/IHasTotalCount.cs | 0 .../Dtos/Abstract/IListResult.cs | 0 .../Abstract/IPagedAllResultRequestDto.cs | 0 .../IPagedAndSortedResultRequestDto.cs | 5 +- .../Dtos/Abstract/IPagedResult.cs | 0 .../Yi.Framework.Ddd}/Dtos/EntityDto.cs | 0 .../Yi.Framework.Ddd}/Dtos/ListResultDto.cs | 0 .../Dtos/PagedAllResultRequestDto.cs | 4 +- .../Dtos/PagedAndSortedResultRequestDto.cs | 17 +++ .../Yi.Framework.Ddd}/Dtos/PagedResultDto.cs | 0 .../Yi.Framework.Ddd}/Entities/Entity.cs | 0 .../Yi.Framework.Ddd}/Entities/IEntity.cs | 0 .../Repositories/IRepository.cs | 2 + .../Services/Abstract/IApplicationService.cs | 0 .../Services/Abstract/ICreateAppService.cs | 0 .../Abstract/ICreateUpdateAppService.cs | 0 .../Services/Abstract/ICrudAppService.cs | 0 .../Services/Abstract/IDeleteAppService.cs | 0 .../Abstract/IPageTimeResultRequestDto.cs | 15 +++ .../Services/Abstract/IReadOnlyAppService.cs | 0 .../Services/Abstract/IUpdateAppService.cs | 0 .../Services/ApplicationService.cs | 0 .../Services/CrudAppService.cs | 0 .../Services/ReadOnlyAppService.cs | 22 +++- .../Yi - Backup.Framework.Ddd.csproj | 0 .../Yi.Framework.Ddd}/Yi.Framework.Ddd.csproj | 0 .../Yi.Framework.Ddd}/YiFrameworkDddModule.cs | 0 .../YiFrameworkSwaggerDoc.xml | 0 .../src/framework}/Yi.Framework.Uow/Class1.cs | 0 .../Properties/launchSettings.json | 0 .../Yi.Framework.Uow/Yi.Framework.Uow.csproj | 0 .../Class1.cs | 0 .../Properties/launchSettings.json | 0 .../Yi.Framework.BackgroundJobs.Quartz.csproj | 0 .../MemoryCacheClient.cs | 2 +- .../Yi.Framework.Caching.MemoryCache.csproj | 2 +- .../YiFrameworkCachingMemoryCacheModule.cs | 2 +- .../RedisCacheClient.cs | 2 +- .../Yi.Framework.Caching.Redis.csproj | 2 +- .../YiFrameworkCachingRedisModule.cs | 2 +- .../Yi.Framework.Caching/CacheManager.cs | 2 +- .../CachingConnOptions.cs | 0 .../Yi.Framework.Caching.csproj | 0 .../Yi.Framework.Office.Excel/ExcelManager.cs | 47 +++++++++ .../Yi.Framework.Office.Excel.csproj | 17 +++ .../YiFrameworkOfficeExcelModule.cs | 23 ++++ .../ApplicationContractsSwaggerDoc.xml | 0 .../Student/Dtos/StudentCreateInputVo.cs | 2 + .../Student/Dtos/StudentGetListInputVo.cs | 5 +- .../Student/Dtos/StudentGetListOutputDto.cs | 1 + .../Student/Dtos/StudentGetOutputDto.cs | 2 + .../Student/Dtos/StudentUpdateInputVo.cs | 4 +- .../Student/IStudentService.cs | 0 .../Yi.Framework.Application.Contracts.csproj | 0 .../YiFrameworkApplicationContractsModule.cs | 0 .../ApplicationSwaggerDoc.xml | 0 .../Student/MapperConfig/StudentProfile.cs | 0 .../Student/StudentService.cs | 1 + .../Yi.Framework.Application.csproj | 8 -- .../YiFrameworkApplicationModule.cs | 0 .../Student/ConstClasses/StudentConst.cs | 0 .../Yi.Framework.Domain.Shared.csproj | 2 +- .../YiFrameworkDomainSharedModule.cs | 0 .../Yi.Framework.Domain/DomainSwaggerDoc.xml | 5 + .../Student/Entities/StudentEntity.cs | 6 ++ .../Student/IRepository/IStudentRepository.cs | 0 .../Student/StudentManager.cs | 0 .../Yi.Framework.Domain.csproj | 0 .../YiFrameworkDomainModule.cs | 0 .../Student/StudentRepository.cs | 0 .../Yi.Framework.Sqlsugar.csproj | 2 +- .../YiFrameworkSqlsugarModule.cs | 0 .../test}/Yi.Framework.Web/Program.cs | 0 .../Properties/launchSettings.json | 0 .../test}/Yi.Framework.Web/Test2Entity.cs | 0 .../test}/Yi.Framework.Web/TestEntity.cs | 0 .../test}/Yi.Framework.Web/TimeTest.cs | 5 +- .../test/Yi.Framework.Web/TimeTest.txt | 9 ++ .../Yi.Framework.Web/Yi.Framework.Web.csproj | 2 +- .../Yi.Framework.Web/YiFrameworkWebModule.cs | 0 .../test}/Yi.Framework.Web/appsettings.json | 0 .../test}/Yi.Framework.Web/yi-sqlsugar-dev.db | Bin 8192 -> 12288 bytes .../Yi.Framework.Application/SwaggerDoc.xml | 19 ---- .../Class1.cs | 7 -- ...Framework.Ddd.Application.Contracts.csproj | 9 -- .../Dtos/PagedAndSortedResultRequestDto.cs | 16 --- 159 files changed, 328 insertions(+), 97 deletions(-) rename {src/Yi.Framework => Yi.Framework.Net6}/Yi.Framework.sln (77%) rename {src/Yi.Framework => Yi.Framework.Net6/src/framework}/Yi.Framework.AspNetCore/Microsoft/AspNetCore/Builder/CorsUseExtensions.cs (100%) rename {src/Yi.Framework => Yi.Framework.Net6/src/framework}/Yi.Framework.AspNetCore/Microsoft/AspNetCore/Builder/SwaggerUseExtensons.cs (100%) rename {src/Yi.Framework => Yi.Framework.Net6/src/framework}/Yi.Framework.AspNetCore/Microsoft/Extensions/DependencyInjection/CorsAddExtensions.cs (100%) rename {src/Yi.Framework => Yi.Framework.Net6/src/framework}/Yi.Framework.AspNetCore/Microsoft/Extensions/DependencyInjection/SwaggerAddExtensions.cs (100%) rename {src/Yi.Framework => Yi.Framework.Net6/src/framework}/Yi.Framework.AspNetCore/Yi.Framework.AspNetCore.csproj (100%) rename {src/Yi.Framework => Yi.Framework.Net6/src/framework}/Yi.Framework.Core.AutoMapper/Extensions/AutoMapperExtensions.cs (100%) rename {src/Yi.Framework => Yi.Framework.Net6/src/framework}/Yi.Framework.Core.AutoMapper/Yi.Framework.Core.AutoMapper.csproj (100%) rename {src/Yi.Framework => Yi.Framework.Net6/src/framework}/Yi.Framework.Core.AutoMapper/YiFrameworkCoreAutoMapperModule.cs (100%) rename {src/Yi.Framework => Yi.Framework.Net6/src/framework}/Yi.Framework.Core.Autofac/Extensions/AutoFacExtensions.cs (100%) rename {src/Yi.Framework => Yi.Framework.Net6/src/framework}/Yi.Framework.Core.Autofac/Extensions/AutoFacModuleExtensions.cs (100%) rename {src/Yi.Framework => Yi.Framework.Net6/src/framework}/Yi.Framework.Core.Autofac/Modules/AutoFacModuleEnum.cs (100%) rename {src/Yi.Framework => Yi.Framework.Net6/src/framework}/Yi.Framework.Core.Autofac/Modules/PropertiesAutowiredModule.cs (100%) rename {src/Yi.Framework => Yi.Framework.Net6/src/framework}/Yi.Framework.Core.Autofac/Modules/YiAutoFacModule.cs (100%) rename {src/Yi.Framework => Yi.Framework.Net6/src/framework}/Yi.Framework.Core.Autofac/Properties/launchSettings.json (100%) rename {src/Yi.Framework => Yi.Framework.Net6/src/framework}/Yi.Framework.Core.Autofac/Yi.Framework.Core.Autofac.csproj (100%) rename {src/Yi.Framework => Yi.Framework.Net6/src/framework}/Yi.Framework.Core.Sqlsugar/Const/SqlsugarConst.cs (100%) rename {src/Yi.Framework => Yi.Framework.Net6/src/framework}/Yi.Framework.Core.Sqlsugar/Extensions/SqlsugarCodeFirstExtensions.cs (100%) rename {src/Yi.Framework => Yi.Framework.Net6/src/framework}/Yi.Framework.Core.Sqlsugar/Extensions/SqlsugarExtensions.cs (100%) rename {src/Yi.Framework => Yi.Framework.Net6/src/framework}/Yi.Framework.Core.Sqlsugar/Options/DbConnOptions.cs (100%) rename {src/Yi.Framework => Yi.Framework.Net6/src/framework}/Yi.Framework.Core.Sqlsugar/Repositories/SqlsugarRepository.cs (79%) rename {src/Yi.Framework => Yi.Framework.Net6/src/framework}/Yi.Framework.Core.Sqlsugar/Yi.Framework.Core.Sqlsugar.csproj (84%) rename {src/Yi.Framework => Yi.Framework.Net6/src/framework}/Yi.Framework.Core.Sqlsugar/YiFrameworkCoreSqlsugarModule.cs (100%) rename {src/Yi.Framework => Yi.Framework.Net6/src/framework}/Yi.Framework.Core/Attributes/AppServiceAttribute.cs (100%) rename {src/Yi.Framework => Yi.Framework.Net6/src/framework}/Yi.Framework.Core/Attributes/AutowiredAttribute.cs (100%) rename {src/Yi.Framework => Yi.Framework.Net6/src/framework}/Yi.Framework.Core/Configuration/Appsettings.cs (100%) rename {src/Yi.Framework => Yi.Framework.Net6/src/framework}/Yi.Framework.Core/CurrentUser/CurrentUser.cs (100%) rename {src/Yi.Framework => Yi.Framework.Net6/src/framework}/Yi.Framework.Core/CurrentUser/ICurrentUser.cs (100%) rename {src/Yi.Framework => Yi.Framework.Net6/src/framework}/Yi.Framework.Core/DependencyInjection/IScopedDependency.cs (100%) rename {src/Yi.Framework => Yi.Framework.Net6/src/framework}/Yi.Framework.Core/DependencyInjection/ISingletonDependency.cs (100%) rename {src/Yi.Framework => Yi.Framework.Net6/src/framework}/Yi.Framework.Core/DependencyInjection/ITransientDependency.cs (100%) rename {src/Yi.Framework => Yi.Framework.Net6/src/framework}/Yi.Framework.Core/Enums/OrderByEnum.cs (100%) rename {src/Yi.Framework => Yi.Framework.Net6/src/framework}/Yi.Framework.Core/Enums/ResultCodeEnum.cs (100%) rename {src/Yi.Framework => Yi.Framework.Net6/src/framework}/Yi.Framework.Core/Exceptions/BusinessException.cs (100%) rename {src/Yi.Framework => Yi.Framework.Net6/src/framework}/Yi.Framework.Core/Exceptions/ExceptionExtensions.cs (100%) rename {src/Yi.Framework => Yi.Framework.Net6/src/framework}/Yi.Framework.Core/Exceptions/IHasErrorCode.cs (100%) rename {src/Yi.Framework => Yi.Framework.Net6/src/framework}/Yi.Framework.Core/Exceptions/IHasErrorDetails.cs (100%) rename {src/Yi.Framework => Yi.Framework.Net6/src/framework}/Yi.Framework.Core/Exceptions/IHasLogLevel.cs (100%) rename {src/Yi.Framework => Yi.Framework.Net6/src/framework}/Yi.Framework.Core/Exceptions/UserFriendlyException.cs (100%) rename {src/Yi.Framework => Yi.Framework.Net6/src/framework}/Yi.Framework.Core/Extensions/AutoIocAddExtensions.cs (100%) rename {src/Yi.Framework => Yi.Framework.Net6/src/framework}/Yi.Framework.Core/Extensions/CurrentUserExtensions.cs (100%) rename {src/Yi.Framework => Yi.Framework.Net6/src/framework}/Yi.Framework.Core/Extensions/ErrorHandExtensions.cs (96%) rename {src/Yi.Framework => Yi.Framework.Net6/src/framework}/Yi.Framework.Core/Extensions/ModuleExtensions.cs (100%) rename {src/Yi.Framework => Yi.Framework.Net6/src/framework}/Yi.Framework.Core/Helper/AssemblyHelper.cs (100%) rename {src/Yi.Framework => Yi.Framework.Net6/src/framework}/Yi.Framework.Core/Helper/Base32Helper.cs (100%) rename {src/Yi.Framework => Yi.Framework.Net6/src/framework}/Yi.Framework.Core/Helper/ConsoleHelper.cs (100%) rename {src/Yi.Framework => Yi.Framework.Net6/src/framework}/Yi.Framework.Core/Helper/DateHelper.cs (100%) rename {src/Yi.Framework => Yi.Framework.Net6/src/framework}/Yi.Framework.Core/Helper/DistinctHelper.cs (100%) rename {src/Yi.Framework => Yi.Framework.Net6/src/framework}/Yi.Framework.Core/Helper/EnumHelper.cs (77%) create mode 100644 Yi.Framework.Net6/src/framework/Yi.Framework.Core/Helper/ExpressionHelper.cs rename {src/Yi.Framework => Yi.Framework.Net6/src/framework}/Yi.Framework.Core/Helper/FileHelper.cs (100%) rename {src/Yi.Framework => Yi.Framework.Net6/src/framework}/Yi.Framework.Core/Helper/HtmlHelper.cs (100%) rename {src/Yi.Framework => Yi.Framework.Net6/src/framework}/Yi.Framework.Core/Helper/HttpHelper.cs (100%) rename {src/Yi.Framework => Yi.Framework.Net6/src/framework}/Yi.Framework.Core/Helper/IdHelper.cs (100%) rename {src/Yi.Framework => Yi.Framework.Net6/src/framework}/Yi.Framework.Core/Helper/IpHelper.cs (100%) rename {src/Yi.Framework => Yi.Framework.Net6/src/framework}/Yi.Framework.Core/Helper/JsonHelper.cs (100%) rename {src/Yi.Framework => Yi.Framework.Net6/src/framework}/Yi.Framework.Core/Helper/MD5Hepler.cs (100%) rename {src/Yi.Framework => Yi.Framework.Net6/src/framework}/Yi.Framework.Core/Helper/MimeHelper.cs (100%) rename {src/Yi.Framework => Yi.Framework.Net6/src/framework}/Yi.Framework.Core/Helper/RSAFileHelper.cs (100%) rename {src/Yi.Framework => Yi.Framework.Net6/src/framework}/Yi.Framework.Core/Helper/RSAHelper.cs (100%) rename {src/Yi.Framework => Yi.Framework.Net6/src/framework}/Yi.Framework.Core/Helper/RandomHelper.cs (100%) rename {src/Yi.Framework => Yi.Framework.Net6/src/framework}/Yi.Framework.Core/Helper/ReflexHelper.cs (100%) rename {src/Yi.Framework => Yi.Framework.Net6/src/framework}/Yi.Framework.Core/Helper/SnowflakeHelper.cs (100%) rename {src/Yi.Framework => Yi.Framework.Net6/src/framework}/Yi.Framework.Core/Helper/StringHelper.cs (100%) rename {src/Yi.Framework => Yi.Framework.Net6/src/framework}/Yi.Framework.Core/Helper/TreeHelper.cs (100%) rename {src/Yi.Framework => Yi.Framework.Net6/src/framework}/Yi.Framework.Core/Helper/UnicodeHelper.cs (100%) rename {src/Yi.Framework => Yi.Framework.Net6/src/framework}/Yi.Framework.Core/Helper/UrlHelper.cs (100%) rename {src/Yi.Framework => Yi.Framework.Net6/src/framework}/Yi.Framework.Core/Helper/XmlHelper.cs (100%) rename {src/Yi.Framework => Yi.Framework.Net6/src/framework}/Yi.Framework.Core/Model/GobalLogModel.cs (100%) rename {src/Yi.Framework => Yi.Framework.Net6/src/framework}/Yi.Framework.Core/Model/ServiceLocatorModel.cs (100%) rename {src/Yi.Framework => Yi.Framework.Net6/src/framework}/Yi.Framework.Core/Yi.Framework.Core.csproj (100%) rename {src/Yi.Framework => Yi.Framework.Net6/src/framework}/Yi.Framework.Core/YiFrameworkCoreModule.cs (100%) rename {src/Yi.Framework/Yi.Framework.Ddd.Application => Yi.Framework.Net6/src/framework/Yi.Framework.Ddd}/Dtos/Abstract/IEntityDto.cs (100%) rename {src/Yi.Framework/Yi.Framework.Ddd.Application => Yi.Framework.Net6/src/framework/Yi.Framework.Ddd}/Dtos/Abstract/IHasTotalCount.cs (100%) rename {src/Yi.Framework/Yi.Framework.Ddd.Application => Yi.Framework.Net6/src/framework/Yi.Framework.Ddd}/Dtos/Abstract/IListResult.cs (100%) rename {src/Yi.Framework/Yi.Framework.Ddd.Application => Yi.Framework.Net6/src/framework/Yi.Framework.Ddd}/Dtos/Abstract/IPagedAllResultRequestDto.cs (100%) rename {src/Yi.Framework/Yi.Framework.Ddd.Application => Yi.Framework.Net6/src/framework/Yi.Framework.Ddd}/Dtos/Abstract/IPagedAndSortedResultRequestDto.cs (72%) rename {src/Yi.Framework/Yi.Framework.Ddd.Application => Yi.Framework.Net6/src/framework/Yi.Framework.Ddd}/Dtos/Abstract/IPagedResult.cs (100%) rename {src/Yi.Framework/Yi.Framework.Ddd.Application => Yi.Framework.Net6/src/framework/Yi.Framework.Ddd}/Dtos/EntityDto.cs (100%) rename {src/Yi.Framework/Yi.Framework.Ddd.Application => Yi.Framework.Net6/src/framework/Yi.Framework.Ddd}/Dtos/ListResultDto.cs (100%) rename {src/Yi.Framework/Yi.Framework.Ddd.Application => Yi.Framework.Net6/src/framework/Yi.Framework.Ddd}/Dtos/PagedAllResultRequestDto.cs (55%) create mode 100644 Yi.Framework.Net6/src/framework/Yi.Framework.Ddd/Dtos/PagedAndSortedResultRequestDto.cs rename {src/Yi.Framework/Yi.Framework.Ddd.Application => Yi.Framework.Net6/src/framework/Yi.Framework.Ddd}/Dtos/PagedResultDto.cs (100%) rename {src/Yi.Framework/Yi.Framework.Ddd.Application => Yi.Framework.Net6/src/framework/Yi.Framework.Ddd}/Entities/Entity.cs (100%) rename {src/Yi.Framework/Yi.Framework.Ddd.Application => Yi.Framework.Net6/src/framework/Yi.Framework.Ddd}/Entities/IEntity.cs (100%) rename {src/Yi.Framework/Yi.Framework.Ddd.Application => Yi.Framework.Net6/src/framework/Yi.Framework.Ddd}/Repositories/IRepository.cs (92%) rename {src/Yi.Framework/Yi.Framework.Ddd.Application => Yi.Framework.Net6/src/framework/Yi.Framework.Ddd}/Services/Abstract/IApplicationService.cs (100%) rename {src/Yi.Framework/Yi.Framework.Ddd.Application => Yi.Framework.Net6/src/framework/Yi.Framework.Ddd}/Services/Abstract/ICreateAppService.cs (100%) rename {src/Yi.Framework/Yi.Framework.Ddd.Application => Yi.Framework.Net6/src/framework/Yi.Framework.Ddd}/Services/Abstract/ICreateUpdateAppService.cs (100%) rename {src/Yi.Framework/Yi.Framework.Ddd.Application => Yi.Framework.Net6/src/framework/Yi.Framework.Ddd}/Services/Abstract/ICrudAppService.cs (100%) rename {src/Yi.Framework/Yi.Framework.Ddd.Application => Yi.Framework.Net6/src/framework/Yi.Framework.Ddd}/Services/Abstract/IDeleteAppService.cs (100%) create mode 100644 Yi.Framework.Net6/src/framework/Yi.Framework.Ddd/Services/Abstract/IPageTimeResultRequestDto.cs rename {src/Yi.Framework/Yi.Framework.Ddd.Application => Yi.Framework.Net6/src/framework/Yi.Framework.Ddd}/Services/Abstract/IReadOnlyAppService.cs (100%) rename {src/Yi.Framework/Yi.Framework.Ddd.Application => Yi.Framework.Net6/src/framework/Yi.Framework.Ddd}/Services/Abstract/IUpdateAppService.cs (100%) rename {src/Yi.Framework/Yi.Framework.Ddd.Application => Yi.Framework.Net6/src/framework/Yi.Framework.Ddd}/Services/ApplicationService.cs (100%) rename {src/Yi.Framework/Yi.Framework.Ddd.Application => Yi.Framework.Net6/src/framework/Yi.Framework.Ddd}/Services/CrudAppService.cs (100%) rename {src/Yi.Framework/Yi.Framework.Ddd.Application => Yi.Framework.Net6/src/framework/Yi.Framework.Ddd}/Services/ReadOnlyAppService.cs (89%) rename {src/Yi.Framework/Yi.Framework.Ddd.Application => Yi.Framework.Net6/src/framework/Yi.Framework.Ddd}/Yi - Backup.Framework.Ddd.csproj (100%) rename {src/Yi.Framework/Yi.Framework.Ddd.Application => Yi.Framework.Net6/src/framework/Yi.Framework.Ddd}/Yi.Framework.Ddd.csproj (100%) rename {src/Yi.Framework/Yi.Framework.Ddd.Application => Yi.Framework.Net6/src/framework/Yi.Framework.Ddd}/YiFrameworkDddModule.cs (100%) rename {src/Yi.Framework/Yi.Framework.Ddd.Application => Yi.Framework.Net6/src/framework/Yi.Framework.Ddd}/YiFrameworkSwaggerDoc.xml (100%) rename {src/Yi.Framework => Yi.Framework.Net6/src/framework}/Yi.Framework.Uow/Class1.cs (100%) rename {src/Yi.Framework => Yi.Framework.Net6/src/framework}/Yi.Framework.Uow/Properties/launchSettings.json (100%) rename {src/Yi.Framework => Yi.Framework.Net6/src/framework}/Yi.Framework.Uow/Yi.Framework.Uow.csproj (100%) rename {src/Yi.Framework => Yi.Framework.Net6/src/module}/Yi.Framework.BackgroundJobs.Quartz/Class1.cs (100%) rename {src/Yi.Framework => Yi.Framework.Net6/src/module}/Yi.Framework.BackgroundJobs.Quartz/Properties/launchSettings.json (100%) rename {src/Yi.Framework => Yi.Framework.Net6/src/module}/Yi.Framework.BackgroundJobs.Quartz/Yi.Framework.BackgroundJobs.Quartz.csproj (100%) rename {src/Yi.Framework => Yi.Framework.Net6/src/module}/Yi.Framework.Caching.MemoryCache/MemoryCacheClient.cs (95%) rename {src/Yi.Framework => Yi.Framework.Net6/src/module}/Yi.Framework.Caching.MemoryCache/Yi.Framework.Caching.MemoryCache.csproj (82%) rename {src/Yi.Framework => Yi.Framework.Net6/src/module}/Yi.Framework.Caching.MemoryCache/YiFrameworkCachingMemoryCacheModule.cs (90%) rename {src/Yi.Framework => Yi.Framework.Net6/src/module}/Yi.Framework.Caching.Redis/RedisCacheClient.cs (99%) rename {src/Yi.Framework => Yi.Framework.Net6/src/module}/Yi.Framework.Caching.Redis/Yi.Framework.Caching.Redis.csproj (81%) rename {src/Yi.Framework => Yi.Framework.Net6/src/module}/Yi.Framework.Caching.Redis/YiFrameworkCachingRedisModule.cs (90%) rename src/Yi.Framework/Yi.Framework.Caching/CacheInvoker.cs => Yi.Framework.Net6/src/module/Yi.Framework.Caching/CacheManager.cs (98%) rename {src/Yi.Framework => Yi.Framework.Net6/src/module}/Yi.Framework.Caching/CachingConnOptions.cs (100%) rename {src/Yi.Framework => Yi.Framework.Net6/src/module}/Yi.Framework.Caching/Yi.Framework.Caching.csproj (100%) create mode 100644 Yi.Framework.Net6/src/module/Yi.Framework.Office.Excel/ExcelManager.cs create mode 100644 Yi.Framework.Net6/src/module/Yi.Framework.Office.Excel/Yi.Framework.Office.Excel.csproj create mode 100644 Yi.Framework.Net6/src/module/Yi.Framework.Office.Excel/YiFrameworkOfficeExcelModule.cs rename {src/Yi.Framework => Yi.Framework.Net6/test}/Yi.Framework.Application.Contracts/ApplicationContractsSwaggerDoc.xml (100%) rename {src/Yi.Framework => Yi.Framework.Net6/test}/Yi.Framework.Application.Contracts/Student/Dtos/StudentCreateInputVo.cs (89%) rename {src/Yi.Framework => Yi.Framework.Net6/test}/Yi.Framework.Application.Contracts/Student/Dtos/StudentGetListInputVo.cs (62%) rename {src/Yi.Framework => Yi.Framework.Net6/test}/Yi.Framework.Application.Contracts/Student/Dtos/StudentGetListOutputDto.cs (89%) rename {src/Yi.Framework => Yi.Framework.Net6/test}/Yi.Framework.Application.Contracts/Student/Dtos/StudentGetOutputDto.cs (89%) rename {src/Yi.Framework => Yi.Framework.Net6/test}/Yi.Framework.Application.Contracts/Student/Dtos/StudentUpdateInputVo.cs (75%) rename {src/Yi.Framework => Yi.Framework.Net6/test}/Yi.Framework.Application.Contracts/Student/IStudentService.cs (100%) rename {src/Yi.Framework => Yi.Framework.Net6/test}/Yi.Framework.Application.Contracts/Yi.Framework.Application.Contracts.csproj (100%) rename {src/Yi.Framework => Yi.Framework.Net6/test}/Yi.Framework.Application.Contracts/YiFrameworkApplicationContractsModule.cs (100%) rename {src/Yi.Framework => Yi.Framework.Net6/test}/Yi.Framework.Application/ApplicationSwaggerDoc.xml (100%) rename {src/Yi.Framework => Yi.Framework.Net6/test}/Yi.Framework.Application/Student/MapperConfig/StudentProfile.cs (100%) rename {src/Yi.Framework => Yi.Framework.Net6/test}/Yi.Framework.Application/Student/StudentService.cs (96%) rename {src/Yi.Framework => Yi.Framework.Net6/test}/Yi.Framework.Application/Yi.Framework.Application.csproj (63%) rename {src/Yi.Framework => Yi.Framework.Net6/test}/Yi.Framework.Application/YiFrameworkApplicationModule.cs (100%) rename {src/Yi.Framework => Yi.Framework.Net6/test}/Yi.Framework.Domain.Shared/Student/ConstClasses/StudentConst.cs (100%) rename {src/Yi.Framework => Yi.Framework.Net6/test}/Yi.Framework.Domain.Shared/Yi.Framework.Domain.Shared.csproj (71%) rename {src/Yi.Framework => Yi.Framework.Net6/test}/Yi.Framework.Domain.Shared/YiFrameworkDomainSharedModule.cs (100%) rename {src/Yi.Framework => Yi.Framework.Net6/test}/Yi.Framework.Domain/DomainSwaggerDoc.xml (82%) rename {src/Yi.Framework => Yi.Framework.Net6/test}/Yi.Framework.Domain/Student/Entities/StudentEntity.cs (78%) rename {src/Yi.Framework => Yi.Framework.Net6/test}/Yi.Framework.Domain/Student/IRepository/IStudentRepository.cs (100%) rename {src/Yi.Framework => Yi.Framework.Net6/test}/Yi.Framework.Domain/Student/StudentManager.cs (100%) rename {src/Yi.Framework => Yi.Framework.Net6/test}/Yi.Framework.Domain/Yi.Framework.Domain.csproj (100%) rename {src/Yi.Framework => Yi.Framework.Net6/test}/Yi.Framework.Domain/YiFrameworkDomainModule.cs (100%) rename {src/Yi.Framework => Yi.Framework.Net6/test}/Yi.Framework.Sqlsugar/Student/StudentRepository.cs (100%) rename {src/Yi.Framework => Yi.Framework.Net6/test}/Yi.Framework.Sqlsugar/Yi.Framework.Sqlsugar.csproj (73%) rename {src/Yi.Framework => Yi.Framework.Net6/test}/Yi.Framework.Sqlsugar/YiFrameworkSqlsugarModule.cs (100%) rename {src/Yi.Framework => Yi.Framework.Net6/test}/Yi.Framework.Web/Program.cs (100%) rename {src/Yi.Framework => Yi.Framework.Net6/test}/Yi.Framework.Web/Properties/launchSettings.json (100%) rename {src/Yi.Framework => Yi.Framework.Net6/test}/Yi.Framework.Web/Test2Entity.cs (100%) rename {src/Yi.Framework => Yi.Framework.Net6/test}/Yi.Framework.Web/TestEntity.cs (100%) rename {src/Yi.Framework => Yi.Framework.Net6/test}/Yi.Framework.Web/TimeTest.cs (68%) create mode 100644 Yi.Framework.Net6/test/Yi.Framework.Web/TimeTest.txt rename {src/Yi.Framework => Yi.Framework.Net6/test}/Yi.Framework.Web/Yi.Framework.Web.csproj (78%) rename {src/Yi.Framework => Yi.Framework.Net6/test}/Yi.Framework.Web/YiFrameworkWebModule.cs (100%) rename {src/Yi.Framework => Yi.Framework.Net6/test}/Yi.Framework.Web/appsettings.json (100%) rename {src/Yi.Framework => Yi.Framework.Net6/test}/Yi.Framework.Web/yi-sqlsugar-dev.db (64%) delete mode 100644 src/Yi.Framework/Yi.Framework.Application/SwaggerDoc.xml delete mode 100644 src/Yi.Framework/Yi.Framework.Ddd.Application.Contracts/Class1.cs delete mode 100644 src/Yi.Framework/Yi.Framework.Ddd.Application.Contracts/Yi.Framework.Ddd.Application.Contracts.csproj delete mode 100644 src/Yi.Framework/Yi.Framework.Ddd.Application/Dtos/PagedAndSortedResultRequestDto.cs diff --git a/src/Yi.Framework/Yi.Framework.sln b/Yi.Framework.Net6/Yi.Framework.sln similarity index 77% rename from src/Yi.Framework/Yi.Framework.sln rename to Yi.Framework.Net6/Yi.Framework.sln index 251d1ebc..b71defd6 100644 --- a/src/Yi.Framework/Yi.Framework.sln +++ b/Yi.Framework.Net6/Yi.Framework.sln @@ -9,39 +9,41 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{32A813F5-1 EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "framework", "framework", "{5F2B846D-96CE-400A-878E-220498F4EE31}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Yi.Framework.Core", "Yi.Framework.Core\Yi.Framework.Core.csproj", "{83B2D7AD-ED8E-4392-B0AE-4227498CD75F}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Yi.Framework.Core", "src\framework\Yi.Framework.Core\Yi.Framework.Core.csproj", "{83B2D7AD-ED8E-4392-B0AE-4227498CD75F}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Yi.Framework.Application", "Yi.Framework.Application\Yi.Framework.Application.csproj", "{456835D1-4968-4195-9993-B2A580E85056}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Yi.Framework.Application", "test\Yi.Framework.Application\Yi.Framework.Application.csproj", "{456835D1-4968-4195-9993-B2A580E85056}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Yi.Framework.Application.Contracts", "Yi.Framework.Application.Contracts\Yi.Framework.Application.Contracts.csproj", "{D2378C23-2CFE-468A-924A-B8C9D4A3A8ED}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Yi.Framework.Application.Contracts", "test\Yi.Framework.Application.Contracts\Yi.Framework.Application.Contracts.csproj", "{D2378C23-2CFE-468A-924A-B8C9D4A3A8ED}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Yi.Framework.Domain", "Yi.Framework.Domain\Yi.Framework.Domain.csproj", "{C02A954D-CCCB-41BD-ADAD-9D7ECBF1A828}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Yi.Framework.Domain", "test\Yi.Framework.Domain\Yi.Framework.Domain.csproj", "{C02A954D-CCCB-41BD-ADAD-9D7ECBF1A828}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Yi.Framework.Domain.Shared", "Yi.Framework.Domain.Shared\Yi.Framework.Domain.Shared.csproj", "{26171153-1784-455B-9582-0558AEEC03CF}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Yi.Framework.Domain.Shared", "test\Yi.Framework.Domain.Shared\Yi.Framework.Domain.Shared.csproj", "{26171153-1784-455B-9582-0558AEEC03CF}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Yi.Framework.Sqlsugar", "Yi.Framework.Sqlsugar\Yi.Framework.Sqlsugar.csproj", "{3C3A7BAC-F27F-433E-BF91-289FA42E4995}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Yi.Framework.Sqlsugar", "test\Yi.Framework.Sqlsugar\Yi.Framework.Sqlsugar.csproj", "{3C3A7BAC-F27F-433E-BF91-289FA42E4995}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Yi.Framework.Web", "Yi.Framework.Web\Yi.Framework.Web.csproj", "{01CC7B62-F42C-45CE-BACA-F450593A1AF2}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Yi.Framework.Web", "test\Yi.Framework.Web\Yi.Framework.Web.csproj", "{01CC7B62-F42C-45CE-BACA-F450593A1AF2}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Yi.Framework.BackgroundJobs.Quartz", "Yi.Framework.BackgroundJobs.Quartz\Yi.Framework.BackgroundJobs.Quartz.csproj", "{1879A863-9864-4E16-8492-504055807684}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Yi.Framework.BackgroundJobs.Quartz", "src\module\Yi.Framework.BackgroundJobs.Quartz\Yi.Framework.BackgroundJobs.Quartz.csproj", "{1879A863-9864-4E16-8492-504055807684}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Yi.Framework.Ddd", "Yi.Framework.Ddd.Application\Yi.Framework.Ddd.csproj", "{949F35A7-36E4-4080-9940-24BE52532078}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Yi.Framework.Ddd", "src\framework\Yi.Framework.Ddd\Yi.Framework.Ddd.csproj", "{949F35A7-36E4-4080-9940-24BE52532078}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Yi.Framework.Core.Autofac", "Yi.Framework.Core.Autofac\Yi.Framework.Core.Autofac.csproj", "{63BA134E-9D23-4EB8-87E4-B45B33D954F5}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Yi.Framework.Core.Autofac", "src\framework\Yi.Framework.Core.Autofac\Yi.Framework.Core.Autofac.csproj", "{63BA134E-9D23-4EB8-87E4-B45B33D954F5}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Yi.Framework.AspNetCore", "Yi.Framework.AspNetCore\Yi.Framework.AspNetCore.csproj", "{2F5E5843-14FB-48F1-AEB0-B9FFE103B972}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Yi.Framework.AspNetCore", "src\framework\Yi.Framework.AspNetCore\Yi.Framework.AspNetCore.csproj", "{2F5E5843-14FB-48F1-AEB0-B9FFE103B972}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Yi.Framework.Caching", "Yi.Framework.Caching\Yi.Framework.Caching.csproj", "{8767C5B7-3A17-4729-BCAA-B391B6A215AA}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Yi.Framework.Caching", "src\module\Yi.Framework.Caching\Yi.Framework.Caching.csproj", "{8767C5B7-3A17-4729-BCAA-B391B6A215AA}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Yi.Framework.Caching.Redis", "Yi.Framework.Caching.Redis\Yi.Framework.Caching.Redis.csproj", "{F13D4F03-3FA0-43E9-BBAA-F618E1A3CF41}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Yi.Framework.Caching.Redis", "src\module\Yi.Framework.Caching.Redis\Yi.Framework.Caching.Redis.csproj", "{F13D4F03-3FA0-43E9-BBAA-F618E1A3CF41}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Yi.Framework.Caching.MemoryCache", "Yi.Framework.Caching.MemoryCache\Yi.Framework.Caching.MemoryCache.csproj", "{67CF07AB-2A72-4B36-A3A5-4CEB82B7C43C}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Yi.Framework.Caching.MemoryCache", "src\module\Yi.Framework.Caching.MemoryCache\Yi.Framework.Caching.MemoryCache.csproj", "{67CF07AB-2A72-4B36-A3A5-4CEB82B7C43C}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Yi.Framework.Uow", "Yi.Framework.Uow\Yi.Framework.Uow.csproj", "{3D83BE69-71BB-43BE-B3F1-A532215561CD}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Yi.Framework.Uow", "src\framework\Yi.Framework.Uow\Yi.Framework.Uow.csproj", "{3D83BE69-71BB-43BE-B3F1-A532215561CD}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Yi.Framework.Core.Sqlsugar", "Yi.Framework.Core.Sqlsugar\Yi.Framework.Core.Sqlsugar.csproj", "{58F4071D-66B7-4839-A247-79AF0E4E1C8E}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Yi.Framework.Core.Sqlsugar", "src\framework\Yi.Framework.Core.Sqlsugar\Yi.Framework.Core.Sqlsugar.csproj", "{58F4071D-66B7-4839-A247-79AF0E4E1C8E}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Yi.Framework.Core.AutoMapper", "Yi.Framework.Core.AutoMapper\Yi.Framework.Core.AutoMapper.csproj", "{DFD34702-2EF6-4ECC-AE6E-9A1A3885BD26}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Yi.Framework.Core.AutoMapper", "src\framework\Yi.Framework.Core.AutoMapper\Yi.Framework.Core.AutoMapper.csproj", "{DFD34702-2EF6-4ECC-AE6E-9A1A3885BD26}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Yi.Framework.Office.Excel", "src\module\Yi.Framework.Office.Excel\Yi.Framework.Office.Excel.csproj", "{4EEC6607-F0D8-4277-9463-104DA7E184B6}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -117,6 +119,10 @@ Global {DFD34702-2EF6-4ECC-AE6E-9A1A3885BD26}.Debug|Any CPU.Build.0 = Debug|Any CPU {DFD34702-2EF6-4ECC-AE6E-9A1A3885BD26}.Release|Any CPU.ActiveCfg = Release|Any CPU {DFD34702-2EF6-4ECC-AE6E-9A1A3885BD26}.Release|Any CPU.Build.0 = Release|Any CPU + {4EEC6607-F0D8-4277-9463-104DA7E184B6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {4EEC6607-F0D8-4277-9463-104DA7E184B6}.Debug|Any CPU.Build.0 = Debug|Any CPU + {4EEC6607-F0D8-4277-9463-104DA7E184B6}.Release|Any CPU.ActiveCfg = Release|Any CPU + {4EEC6607-F0D8-4277-9463-104DA7E184B6}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -139,6 +145,7 @@ Global {3D83BE69-71BB-43BE-B3F1-A532215561CD} = {5F2B846D-96CE-400A-878E-220498F4EE31} {58F4071D-66B7-4839-A247-79AF0E4E1C8E} = {5F2B846D-96CE-400A-878E-220498F4EE31} {DFD34702-2EF6-4ECC-AE6E-9A1A3885BD26} = {5F2B846D-96CE-400A-878E-220498F4EE31} + {4EEC6607-F0D8-4277-9463-104DA7E184B6} = {EEF5F221-0E32-4A3D-B647-B4B5E7305806} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {6C1A3808-0F4F-43FB-A9FE-5F27A3BB2ECF} diff --git a/src/Yi.Framework/Yi.Framework.AspNetCore/Microsoft/AspNetCore/Builder/CorsUseExtensions.cs b/Yi.Framework.Net6/src/framework/Yi.Framework.AspNetCore/Microsoft/AspNetCore/Builder/CorsUseExtensions.cs similarity index 100% rename from src/Yi.Framework/Yi.Framework.AspNetCore/Microsoft/AspNetCore/Builder/CorsUseExtensions.cs rename to Yi.Framework.Net6/src/framework/Yi.Framework.AspNetCore/Microsoft/AspNetCore/Builder/CorsUseExtensions.cs diff --git a/src/Yi.Framework/Yi.Framework.AspNetCore/Microsoft/AspNetCore/Builder/SwaggerUseExtensons.cs b/Yi.Framework.Net6/src/framework/Yi.Framework.AspNetCore/Microsoft/AspNetCore/Builder/SwaggerUseExtensons.cs similarity index 100% rename from src/Yi.Framework/Yi.Framework.AspNetCore/Microsoft/AspNetCore/Builder/SwaggerUseExtensons.cs rename to Yi.Framework.Net6/src/framework/Yi.Framework.AspNetCore/Microsoft/AspNetCore/Builder/SwaggerUseExtensons.cs diff --git a/src/Yi.Framework/Yi.Framework.AspNetCore/Microsoft/Extensions/DependencyInjection/CorsAddExtensions.cs b/Yi.Framework.Net6/src/framework/Yi.Framework.AspNetCore/Microsoft/Extensions/DependencyInjection/CorsAddExtensions.cs similarity index 100% rename from src/Yi.Framework/Yi.Framework.AspNetCore/Microsoft/Extensions/DependencyInjection/CorsAddExtensions.cs rename to Yi.Framework.Net6/src/framework/Yi.Framework.AspNetCore/Microsoft/Extensions/DependencyInjection/CorsAddExtensions.cs diff --git a/src/Yi.Framework/Yi.Framework.AspNetCore/Microsoft/Extensions/DependencyInjection/SwaggerAddExtensions.cs b/Yi.Framework.Net6/src/framework/Yi.Framework.AspNetCore/Microsoft/Extensions/DependencyInjection/SwaggerAddExtensions.cs similarity index 100% rename from src/Yi.Framework/Yi.Framework.AspNetCore/Microsoft/Extensions/DependencyInjection/SwaggerAddExtensions.cs rename to Yi.Framework.Net6/src/framework/Yi.Framework.AspNetCore/Microsoft/Extensions/DependencyInjection/SwaggerAddExtensions.cs diff --git a/src/Yi.Framework/Yi.Framework.AspNetCore/Yi.Framework.AspNetCore.csproj b/Yi.Framework.Net6/src/framework/Yi.Framework.AspNetCore/Yi.Framework.AspNetCore.csproj similarity index 100% rename from src/Yi.Framework/Yi.Framework.AspNetCore/Yi.Framework.AspNetCore.csproj rename to Yi.Framework.Net6/src/framework/Yi.Framework.AspNetCore/Yi.Framework.AspNetCore.csproj diff --git a/src/Yi.Framework/Yi.Framework.Core.AutoMapper/Extensions/AutoMapperExtensions.cs b/Yi.Framework.Net6/src/framework/Yi.Framework.Core.AutoMapper/Extensions/AutoMapperExtensions.cs similarity index 100% rename from src/Yi.Framework/Yi.Framework.Core.AutoMapper/Extensions/AutoMapperExtensions.cs rename to Yi.Framework.Net6/src/framework/Yi.Framework.Core.AutoMapper/Extensions/AutoMapperExtensions.cs diff --git a/src/Yi.Framework/Yi.Framework.Core.AutoMapper/Yi.Framework.Core.AutoMapper.csproj b/Yi.Framework.Net6/src/framework/Yi.Framework.Core.AutoMapper/Yi.Framework.Core.AutoMapper.csproj similarity index 100% rename from src/Yi.Framework/Yi.Framework.Core.AutoMapper/Yi.Framework.Core.AutoMapper.csproj rename to Yi.Framework.Net6/src/framework/Yi.Framework.Core.AutoMapper/Yi.Framework.Core.AutoMapper.csproj diff --git a/src/Yi.Framework/Yi.Framework.Core.AutoMapper/YiFrameworkCoreAutoMapperModule.cs b/Yi.Framework.Net6/src/framework/Yi.Framework.Core.AutoMapper/YiFrameworkCoreAutoMapperModule.cs similarity index 100% rename from src/Yi.Framework/Yi.Framework.Core.AutoMapper/YiFrameworkCoreAutoMapperModule.cs rename to Yi.Framework.Net6/src/framework/Yi.Framework.Core.AutoMapper/YiFrameworkCoreAutoMapperModule.cs diff --git a/src/Yi.Framework/Yi.Framework.Core.Autofac/Extensions/AutoFacExtensions.cs b/Yi.Framework.Net6/src/framework/Yi.Framework.Core.Autofac/Extensions/AutoFacExtensions.cs similarity index 100% rename from src/Yi.Framework/Yi.Framework.Core.Autofac/Extensions/AutoFacExtensions.cs rename to Yi.Framework.Net6/src/framework/Yi.Framework.Core.Autofac/Extensions/AutoFacExtensions.cs diff --git a/src/Yi.Framework/Yi.Framework.Core.Autofac/Extensions/AutoFacModuleExtensions.cs b/Yi.Framework.Net6/src/framework/Yi.Framework.Core.Autofac/Extensions/AutoFacModuleExtensions.cs similarity index 100% rename from src/Yi.Framework/Yi.Framework.Core.Autofac/Extensions/AutoFacModuleExtensions.cs rename to Yi.Framework.Net6/src/framework/Yi.Framework.Core.Autofac/Extensions/AutoFacModuleExtensions.cs diff --git a/src/Yi.Framework/Yi.Framework.Core.Autofac/Modules/AutoFacModuleEnum.cs b/Yi.Framework.Net6/src/framework/Yi.Framework.Core.Autofac/Modules/AutoFacModuleEnum.cs similarity index 100% rename from src/Yi.Framework/Yi.Framework.Core.Autofac/Modules/AutoFacModuleEnum.cs rename to Yi.Framework.Net6/src/framework/Yi.Framework.Core.Autofac/Modules/AutoFacModuleEnum.cs diff --git a/src/Yi.Framework/Yi.Framework.Core.Autofac/Modules/PropertiesAutowiredModule.cs b/Yi.Framework.Net6/src/framework/Yi.Framework.Core.Autofac/Modules/PropertiesAutowiredModule.cs similarity index 100% rename from src/Yi.Framework/Yi.Framework.Core.Autofac/Modules/PropertiesAutowiredModule.cs rename to Yi.Framework.Net6/src/framework/Yi.Framework.Core.Autofac/Modules/PropertiesAutowiredModule.cs diff --git a/src/Yi.Framework/Yi.Framework.Core.Autofac/Modules/YiAutoFacModule.cs b/Yi.Framework.Net6/src/framework/Yi.Framework.Core.Autofac/Modules/YiAutoFacModule.cs similarity index 100% rename from src/Yi.Framework/Yi.Framework.Core.Autofac/Modules/YiAutoFacModule.cs rename to Yi.Framework.Net6/src/framework/Yi.Framework.Core.Autofac/Modules/YiAutoFacModule.cs diff --git a/src/Yi.Framework/Yi.Framework.Core.Autofac/Properties/launchSettings.json b/Yi.Framework.Net6/src/framework/Yi.Framework.Core.Autofac/Properties/launchSettings.json similarity index 100% rename from src/Yi.Framework/Yi.Framework.Core.Autofac/Properties/launchSettings.json rename to Yi.Framework.Net6/src/framework/Yi.Framework.Core.Autofac/Properties/launchSettings.json diff --git a/src/Yi.Framework/Yi.Framework.Core.Autofac/Yi.Framework.Core.Autofac.csproj b/Yi.Framework.Net6/src/framework/Yi.Framework.Core.Autofac/Yi.Framework.Core.Autofac.csproj similarity index 100% rename from src/Yi.Framework/Yi.Framework.Core.Autofac/Yi.Framework.Core.Autofac.csproj rename to Yi.Framework.Net6/src/framework/Yi.Framework.Core.Autofac/Yi.Framework.Core.Autofac.csproj diff --git a/src/Yi.Framework/Yi.Framework.Core.Sqlsugar/Const/SqlsugarConst.cs b/Yi.Framework.Net6/src/framework/Yi.Framework.Core.Sqlsugar/Const/SqlsugarConst.cs similarity index 100% rename from src/Yi.Framework/Yi.Framework.Core.Sqlsugar/Const/SqlsugarConst.cs rename to Yi.Framework.Net6/src/framework/Yi.Framework.Core.Sqlsugar/Const/SqlsugarConst.cs diff --git a/src/Yi.Framework/Yi.Framework.Core.Sqlsugar/Extensions/SqlsugarCodeFirstExtensions.cs b/Yi.Framework.Net6/src/framework/Yi.Framework.Core.Sqlsugar/Extensions/SqlsugarCodeFirstExtensions.cs similarity index 100% rename from src/Yi.Framework/Yi.Framework.Core.Sqlsugar/Extensions/SqlsugarCodeFirstExtensions.cs rename to Yi.Framework.Net6/src/framework/Yi.Framework.Core.Sqlsugar/Extensions/SqlsugarCodeFirstExtensions.cs diff --git a/src/Yi.Framework/Yi.Framework.Core.Sqlsugar/Extensions/SqlsugarExtensions.cs b/Yi.Framework.Net6/src/framework/Yi.Framework.Core.Sqlsugar/Extensions/SqlsugarExtensions.cs similarity index 100% rename from src/Yi.Framework/Yi.Framework.Core.Sqlsugar/Extensions/SqlsugarExtensions.cs rename to Yi.Framework.Net6/src/framework/Yi.Framework.Core.Sqlsugar/Extensions/SqlsugarExtensions.cs diff --git a/src/Yi.Framework/Yi.Framework.Core.Sqlsugar/Options/DbConnOptions.cs b/Yi.Framework.Net6/src/framework/Yi.Framework.Core.Sqlsugar/Options/DbConnOptions.cs similarity index 100% rename from src/Yi.Framework/Yi.Framework.Core.Sqlsugar/Options/DbConnOptions.cs rename to Yi.Framework.Net6/src/framework/Yi.Framework.Core.Sqlsugar/Options/DbConnOptions.cs diff --git a/src/Yi.Framework/Yi.Framework.Core.Sqlsugar/Repositories/SqlsugarRepository.cs b/Yi.Framework.Net6/src/framework/Yi.Framework.Core.Sqlsugar/Repositories/SqlsugarRepository.cs similarity index 79% rename from src/Yi.Framework/Yi.Framework.Core.Sqlsugar/Repositories/SqlsugarRepository.cs rename to Yi.Framework.Net6/src/framework/Yi.Framework.Core.Sqlsugar/Repositories/SqlsugarRepository.cs index 3a3ca907..9a583257 100644 --- a/src/Yi.Framework/Yi.Framework.Core.Sqlsugar/Repositories/SqlsugarRepository.cs +++ b/Yi.Framework.Net6/src/framework/Yi.Framework.Core.Sqlsugar/Repositories/SqlsugarRepository.cs @@ -32,5 +32,11 @@ namespace Yi.Framework.Core.Sqlsugar.Repositories { return await base.GetPageListAsync(whereExpression, new PageModel { PageIndex = page.PageIndex, PageSize = page.PageSize }, orderByExpression, orderByType.EnumToEnum()); } + + public async Task> GetPageListAsync(Expression> whereExpression, IPagedAndSortedResultRequestDto page, string? orderBy, OrderByEnum orderByType = OrderByEnum.Asc) + { + return await _DbQueryable.Where(whereExpression).OrderByIF(orderBy is not null, orderBy + " "+orderByType.ToString().ToLower()).ToPageListAsync(page.PageIndex, page.PageSize); + } + } } diff --git a/src/Yi.Framework/Yi.Framework.Core.Sqlsugar/Yi.Framework.Core.Sqlsugar.csproj b/Yi.Framework.Net6/src/framework/Yi.Framework.Core.Sqlsugar/Yi.Framework.Core.Sqlsugar.csproj similarity index 84% rename from src/Yi.Framework/Yi.Framework.Core.Sqlsugar/Yi.Framework.Core.Sqlsugar.csproj rename to Yi.Framework.Net6/src/framework/Yi.Framework.Core.Sqlsugar/Yi.Framework.Core.Sqlsugar.csproj index cfdd1f64..f994d88c 100644 --- a/src/Yi.Framework/Yi.Framework.Core.Sqlsugar/Yi.Framework.Core.Sqlsugar.csproj +++ b/Yi.Framework.Net6/src/framework/Yi.Framework.Core.Sqlsugar/Yi.Framework.Core.Sqlsugar.csproj @@ -12,7 +12,7 @@ - + diff --git a/src/Yi.Framework/Yi.Framework.Core.Sqlsugar/YiFrameworkCoreSqlsugarModule.cs b/Yi.Framework.Net6/src/framework/Yi.Framework.Core.Sqlsugar/YiFrameworkCoreSqlsugarModule.cs similarity index 100% rename from src/Yi.Framework/Yi.Framework.Core.Sqlsugar/YiFrameworkCoreSqlsugarModule.cs rename to Yi.Framework.Net6/src/framework/Yi.Framework.Core.Sqlsugar/YiFrameworkCoreSqlsugarModule.cs diff --git a/src/Yi.Framework/Yi.Framework.Core/Attributes/AppServiceAttribute.cs b/Yi.Framework.Net6/src/framework/Yi.Framework.Core/Attributes/AppServiceAttribute.cs similarity index 100% rename from src/Yi.Framework/Yi.Framework.Core/Attributes/AppServiceAttribute.cs rename to Yi.Framework.Net6/src/framework/Yi.Framework.Core/Attributes/AppServiceAttribute.cs diff --git a/src/Yi.Framework/Yi.Framework.Core/Attributes/AutowiredAttribute.cs b/Yi.Framework.Net6/src/framework/Yi.Framework.Core/Attributes/AutowiredAttribute.cs similarity index 100% rename from src/Yi.Framework/Yi.Framework.Core/Attributes/AutowiredAttribute.cs rename to Yi.Framework.Net6/src/framework/Yi.Framework.Core/Attributes/AutowiredAttribute.cs diff --git a/src/Yi.Framework/Yi.Framework.Core/Configuration/Appsettings.cs b/Yi.Framework.Net6/src/framework/Yi.Framework.Core/Configuration/Appsettings.cs similarity index 100% rename from src/Yi.Framework/Yi.Framework.Core/Configuration/Appsettings.cs rename to Yi.Framework.Net6/src/framework/Yi.Framework.Core/Configuration/Appsettings.cs diff --git a/src/Yi.Framework/Yi.Framework.Core/CurrentUser/CurrentUser.cs b/Yi.Framework.Net6/src/framework/Yi.Framework.Core/CurrentUser/CurrentUser.cs similarity index 100% rename from src/Yi.Framework/Yi.Framework.Core/CurrentUser/CurrentUser.cs rename to Yi.Framework.Net6/src/framework/Yi.Framework.Core/CurrentUser/CurrentUser.cs diff --git a/src/Yi.Framework/Yi.Framework.Core/CurrentUser/ICurrentUser.cs b/Yi.Framework.Net6/src/framework/Yi.Framework.Core/CurrentUser/ICurrentUser.cs similarity index 100% rename from src/Yi.Framework/Yi.Framework.Core/CurrentUser/ICurrentUser.cs rename to Yi.Framework.Net6/src/framework/Yi.Framework.Core/CurrentUser/ICurrentUser.cs diff --git a/src/Yi.Framework/Yi.Framework.Core/DependencyInjection/IScopedDependency.cs b/Yi.Framework.Net6/src/framework/Yi.Framework.Core/DependencyInjection/IScopedDependency.cs similarity index 100% rename from src/Yi.Framework/Yi.Framework.Core/DependencyInjection/IScopedDependency.cs rename to Yi.Framework.Net6/src/framework/Yi.Framework.Core/DependencyInjection/IScopedDependency.cs diff --git a/src/Yi.Framework/Yi.Framework.Core/DependencyInjection/ISingletonDependency.cs b/Yi.Framework.Net6/src/framework/Yi.Framework.Core/DependencyInjection/ISingletonDependency.cs similarity index 100% rename from src/Yi.Framework/Yi.Framework.Core/DependencyInjection/ISingletonDependency.cs rename to Yi.Framework.Net6/src/framework/Yi.Framework.Core/DependencyInjection/ISingletonDependency.cs diff --git a/src/Yi.Framework/Yi.Framework.Core/DependencyInjection/ITransientDependency.cs b/Yi.Framework.Net6/src/framework/Yi.Framework.Core/DependencyInjection/ITransientDependency.cs similarity index 100% rename from src/Yi.Framework/Yi.Framework.Core/DependencyInjection/ITransientDependency.cs rename to Yi.Framework.Net6/src/framework/Yi.Framework.Core/DependencyInjection/ITransientDependency.cs diff --git a/src/Yi.Framework/Yi.Framework.Core/Enums/OrderByEnum.cs b/Yi.Framework.Net6/src/framework/Yi.Framework.Core/Enums/OrderByEnum.cs similarity index 100% rename from src/Yi.Framework/Yi.Framework.Core/Enums/OrderByEnum.cs rename to Yi.Framework.Net6/src/framework/Yi.Framework.Core/Enums/OrderByEnum.cs diff --git a/src/Yi.Framework/Yi.Framework.Core/Enums/ResultCodeEnum.cs b/Yi.Framework.Net6/src/framework/Yi.Framework.Core/Enums/ResultCodeEnum.cs similarity index 100% rename from src/Yi.Framework/Yi.Framework.Core/Enums/ResultCodeEnum.cs rename to Yi.Framework.Net6/src/framework/Yi.Framework.Core/Enums/ResultCodeEnum.cs diff --git a/src/Yi.Framework/Yi.Framework.Core/Exceptions/BusinessException.cs b/Yi.Framework.Net6/src/framework/Yi.Framework.Core/Exceptions/BusinessException.cs similarity index 100% rename from src/Yi.Framework/Yi.Framework.Core/Exceptions/BusinessException.cs rename to Yi.Framework.Net6/src/framework/Yi.Framework.Core/Exceptions/BusinessException.cs diff --git a/src/Yi.Framework/Yi.Framework.Core/Exceptions/ExceptionExtensions.cs b/Yi.Framework.Net6/src/framework/Yi.Framework.Core/Exceptions/ExceptionExtensions.cs similarity index 100% rename from src/Yi.Framework/Yi.Framework.Core/Exceptions/ExceptionExtensions.cs rename to Yi.Framework.Net6/src/framework/Yi.Framework.Core/Exceptions/ExceptionExtensions.cs diff --git a/src/Yi.Framework/Yi.Framework.Core/Exceptions/IHasErrorCode.cs b/Yi.Framework.Net6/src/framework/Yi.Framework.Core/Exceptions/IHasErrorCode.cs similarity index 100% rename from src/Yi.Framework/Yi.Framework.Core/Exceptions/IHasErrorCode.cs rename to Yi.Framework.Net6/src/framework/Yi.Framework.Core/Exceptions/IHasErrorCode.cs diff --git a/src/Yi.Framework/Yi.Framework.Core/Exceptions/IHasErrorDetails.cs b/Yi.Framework.Net6/src/framework/Yi.Framework.Core/Exceptions/IHasErrorDetails.cs similarity index 100% rename from src/Yi.Framework/Yi.Framework.Core/Exceptions/IHasErrorDetails.cs rename to Yi.Framework.Net6/src/framework/Yi.Framework.Core/Exceptions/IHasErrorDetails.cs diff --git a/src/Yi.Framework/Yi.Framework.Core/Exceptions/IHasLogLevel.cs b/Yi.Framework.Net6/src/framework/Yi.Framework.Core/Exceptions/IHasLogLevel.cs similarity index 100% rename from src/Yi.Framework/Yi.Framework.Core/Exceptions/IHasLogLevel.cs rename to Yi.Framework.Net6/src/framework/Yi.Framework.Core/Exceptions/IHasLogLevel.cs diff --git a/src/Yi.Framework/Yi.Framework.Core/Exceptions/UserFriendlyException.cs b/Yi.Framework.Net6/src/framework/Yi.Framework.Core/Exceptions/UserFriendlyException.cs similarity index 100% rename from src/Yi.Framework/Yi.Framework.Core/Exceptions/UserFriendlyException.cs rename to Yi.Framework.Net6/src/framework/Yi.Framework.Core/Exceptions/UserFriendlyException.cs diff --git a/src/Yi.Framework/Yi.Framework.Core/Extensions/AutoIocAddExtensions.cs b/Yi.Framework.Net6/src/framework/Yi.Framework.Core/Extensions/AutoIocAddExtensions.cs similarity index 100% rename from src/Yi.Framework/Yi.Framework.Core/Extensions/AutoIocAddExtensions.cs rename to Yi.Framework.Net6/src/framework/Yi.Framework.Core/Extensions/AutoIocAddExtensions.cs diff --git a/src/Yi.Framework/Yi.Framework.Core/Extensions/CurrentUserExtensions.cs b/Yi.Framework.Net6/src/framework/Yi.Framework.Core/Extensions/CurrentUserExtensions.cs similarity index 100% rename from src/Yi.Framework/Yi.Framework.Core/Extensions/CurrentUserExtensions.cs rename to Yi.Framework.Net6/src/framework/Yi.Framework.Core/Extensions/CurrentUserExtensions.cs diff --git a/src/Yi.Framework/Yi.Framework.Core/Extensions/ErrorHandExtensions.cs b/Yi.Framework.Net6/src/framework/Yi.Framework.Core/Extensions/ErrorHandExtensions.cs similarity index 96% rename from src/Yi.Framework/Yi.Framework.Core/Extensions/ErrorHandExtensions.cs rename to Yi.Framework.Net6/src/framework/Yi.Framework.Core/Extensions/ErrorHandExtensions.cs index 5c9e1129..4ea71124 100644 --- a/src/Yi.Framework/Yi.Framework.Core/Extensions/ErrorHandExtensions.cs +++ b/Yi.Framework.Net6/src/framework/Yi.Framework.Core/Extensions/ErrorHandExtensions.cs @@ -20,7 +20,7 @@ namespace Yi.Framework.Core.Extensions this._next = next; this._logger = loggerFactory.CreateLogger(); } - public async Task Invoke(HttpContext context) + public async Task InvokeAsync(HttpContext context) { bool isNext = true; try diff --git a/src/Yi.Framework/Yi.Framework.Core/Extensions/ModuleExtensions.cs b/Yi.Framework.Net6/src/framework/Yi.Framework.Core/Extensions/ModuleExtensions.cs similarity index 100% rename from src/Yi.Framework/Yi.Framework.Core/Extensions/ModuleExtensions.cs rename to Yi.Framework.Net6/src/framework/Yi.Framework.Core/Extensions/ModuleExtensions.cs diff --git a/src/Yi.Framework/Yi.Framework.Core/Helper/AssemblyHelper.cs b/Yi.Framework.Net6/src/framework/Yi.Framework.Core/Helper/AssemblyHelper.cs similarity index 100% rename from src/Yi.Framework/Yi.Framework.Core/Helper/AssemblyHelper.cs rename to Yi.Framework.Net6/src/framework/Yi.Framework.Core/Helper/AssemblyHelper.cs diff --git a/src/Yi.Framework/Yi.Framework.Core/Helper/Base32Helper.cs b/Yi.Framework.Net6/src/framework/Yi.Framework.Core/Helper/Base32Helper.cs similarity index 100% rename from src/Yi.Framework/Yi.Framework.Core/Helper/Base32Helper.cs rename to Yi.Framework.Net6/src/framework/Yi.Framework.Core/Helper/Base32Helper.cs diff --git a/src/Yi.Framework/Yi.Framework.Core/Helper/ConsoleHelper.cs b/Yi.Framework.Net6/src/framework/Yi.Framework.Core/Helper/ConsoleHelper.cs similarity index 100% rename from src/Yi.Framework/Yi.Framework.Core/Helper/ConsoleHelper.cs rename to Yi.Framework.Net6/src/framework/Yi.Framework.Core/Helper/ConsoleHelper.cs diff --git a/src/Yi.Framework/Yi.Framework.Core/Helper/DateHelper.cs b/Yi.Framework.Net6/src/framework/Yi.Framework.Core/Helper/DateHelper.cs similarity index 100% rename from src/Yi.Framework/Yi.Framework.Core/Helper/DateHelper.cs rename to Yi.Framework.Net6/src/framework/Yi.Framework.Core/Helper/DateHelper.cs diff --git a/src/Yi.Framework/Yi.Framework.Core/Helper/DistinctHelper.cs b/Yi.Framework.Net6/src/framework/Yi.Framework.Core/Helper/DistinctHelper.cs similarity index 100% rename from src/Yi.Framework/Yi.Framework.Core/Helper/DistinctHelper.cs rename to Yi.Framework.Net6/src/framework/Yi.Framework.Core/Helper/DistinctHelper.cs diff --git a/src/Yi.Framework/Yi.Framework.Core/Helper/EnumHelper.cs b/Yi.Framework.Net6/src/framework/Yi.Framework.Core/Helper/EnumHelper.cs similarity index 77% rename from src/Yi.Framework/Yi.Framework.Core/Helper/EnumHelper.cs rename to Yi.Framework.Net6/src/framework/Yi.Framework.Core/Helper/EnumHelper.cs index 61d2e842..eaef0d79 100644 --- a/src/Yi.Framework/Yi.Framework.Core/Helper/EnumHelper.cs +++ b/Yi.Framework.Net6/src/framework/Yi.Framework.Core/Helper/EnumHelper.cs @@ -16,5 +16,10 @@ namespace Yi.Framework.Core.Helper } return (New)Enum.ToObject(typeof(New), oldEnum.GetHashCode()); } + + public static TEnum StringToEnum(this string str) + { + return (TEnum)Enum.Parse(typeof(TEnum), str); + } } } diff --git a/Yi.Framework.Net6/src/framework/Yi.Framework.Core/Helper/ExpressionHelper.cs b/Yi.Framework.Net6/src/framework/Yi.Framework.Core/Helper/ExpressionHelper.cs new file mode 100644 index 00000000..bac80dc0 --- /dev/null +++ b/Yi.Framework.Net6/src/framework/Yi.Framework.Core/Helper/ExpressionHelper.cs @@ -0,0 +1,98 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Linq.Expressions; +using System.Text; +using System.Threading.Tasks; + +namespace Yi.Framework.Core.Helper +{ + public static class ExpressionHelper + { + + + /// + /// Expression表达式树lambda参数拼接组合 + /// + /// + /// + /// + /// + /// + public static Expression Compose(this Expression first, Expression second, Func merge) + { + var parameterMap = first.Parameters.Select((f, i) => new { f, s = second.Parameters[i] }).ToDictionary(p => p.s, p => p.f); + var secondBody = LambdaParameteRebinder.ReplaceParameter(parameterMap, second.Body); + return Expression.Lambda(merge(first.Body, secondBody), first.Parameters); + } + + /// + /// Expression表达式树lambda参数拼接--false + /// + /// + /// + public static Expression> False() => f => false; + + /// + /// Expression表达式树lambda参数拼接-true + /// + /// + /// + public static Expression> True() => f => true; + + /// + /// Expression表达式树lambda参数拼接--and + /// + /// + /// + /// + /// + public static Expression> And(this Expression> first, Expression> second) => first.Compose(second, Expression.And); + + /// + /// Expression表达式树lambda参数拼接--or + /// + /// + /// + /// + /// + public static Expression> Or(this Expression> first, Expression> second) => first.Compose(second, Expression.Or); + } + + public class LambdaParameteRebinder : ExpressionVisitor + { + /// + /// 存放表达式树的参数的字典 + /// + private readonly Dictionary map; + + /// + /// 构造函数 + /// + /// + public LambdaParameteRebinder(Dictionary map) + { + this.map = map ?? new Dictionary(); + } + + /// + /// 重载参数访问的方法，访问表达式树参数，如果字典中包含，则取出 + /// + /// 表达式树参数 + /// + protected override Expression VisitParameter(ParameterExpression node) + { + if (map.TryGetValue(node, out ParameterExpression expression)) + { + node = expression; + } + return base.VisitParameter(node); + } + + public static Expression ReplaceParameter(Dictionary map, Expression exp) + { + return new LambdaParameteRebinder(map).Visit(exp); + } + } + +} diff --git a/src/Yi.Framework/Yi.Framework.Core/Helper/FileHelper.cs b/Yi.Framework.Net6/src/framework/Yi.Framework.Core/Helper/FileHelper.cs similarity index 100% rename from src/Yi.Framework/Yi.Framework.Core/Helper/FileHelper.cs rename to Yi.Framework.Net6/src/framework/Yi.Framework.Core/Helper/FileHelper.cs diff --git a/src/Yi.Framework/Yi.Framework.Core/Helper/HtmlHelper.cs b/Yi.Framework.Net6/src/framework/Yi.Framework.Core/Helper/HtmlHelper.cs similarity index 100% rename from src/Yi.Framework/Yi.Framework.Core/Helper/HtmlHelper.cs rename to Yi.Framework.Net6/src/framework/Yi.Framework.Core/Helper/HtmlHelper.cs diff --git a/src/Yi.Framework/Yi.Framework.Core/Helper/HttpHelper.cs b/Yi.Framework.Net6/src/framework/Yi.Framework.Core/Helper/HttpHelper.cs similarity index 100% rename from src/Yi.Framework/Yi.Framework.Core/Helper/HttpHelper.cs rename to Yi.Framework.Net6/src/framework/Yi.Framework.Core/Helper/HttpHelper.cs diff --git a/src/Yi.Framework/Yi.Framework.Core/Helper/IdHelper.cs b/Yi.Framework.Net6/src/framework/Yi.Framework.Core/Helper/IdHelper.cs similarity index 100% rename from src/Yi.Framework/Yi.Framework.Core/Helper/IdHelper.cs rename to Yi.Framework.Net6/src/framework/Yi.Framework.Core/Helper/IdHelper.cs diff --git a/src/Yi.Framework/Yi.Framework.Core/Helper/IpHelper.cs b/Yi.Framework.Net6/src/framework/Yi.Framework.Core/Helper/IpHelper.cs similarity index 100% rename from src/Yi.Framework/Yi.Framework.Core/Helper/IpHelper.cs rename to Yi.Framework.Net6/src/framework/Yi.Framework.Core/Helper/IpHelper.cs diff --git a/src/Yi.Framework/Yi.Framework.Core/Helper/JsonHelper.cs b/Yi.Framework.Net6/src/framework/Yi.Framework.Core/Helper/JsonHelper.cs similarity index 100% rename from src/Yi.Framework/Yi.Framework.Core/Helper/JsonHelper.cs rename to Yi.Framework.Net6/src/framework/Yi.Framework.Core/Helper/JsonHelper.cs diff --git a/src/Yi.Framework/Yi.Framework.Core/Helper/MD5Hepler.cs b/Yi.Framework.Net6/src/framework/Yi.Framework.Core/Helper/MD5Hepler.cs similarity index 100% rename from src/Yi.Framework/Yi.Framework.Core/Helper/MD5Hepler.cs rename to Yi.Framework.Net6/src/framework/Yi.Framework.Core/Helper/MD5Hepler.cs diff --git a/src/Yi.Framework/Yi.Framework.Core/Helper/MimeHelper.cs b/Yi.Framework.Net6/src/framework/Yi.Framework.Core/Helper/MimeHelper.cs similarity index 100% rename from src/Yi.Framework/Yi.Framework.Core/Helper/MimeHelper.cs rename to Yi.Framework.Net6/src/framework/Yi.Framework.Core/Helper/MimeHelper.cs diff --git a/src/Yi.Framework/Yi.Framework.Core/Helper/RSAFileHelper.cs b/Yi.Framework.Net6/src/framework/Yi.Framework.Core/Helper/RSAFileHelper.cs similarity index 100% rename from src/Yi.Framework/Yi.Framework.Core/Helper/RSAFileHelper.cs rename to Yi.Framework.Net6/src/framework/Yi.Framework.Core/Helper/RSAFileHelper.cs diff --git a/src/Yi.Framework/Yi.Framework.Core/Helper/RSAHelper.cs b/Yi.Framework.Net6/src/framework/Yi.Framework.Core/Helper/RSAHelper.cs similarity index 100% rename from src/Yi.Framework/Yi.Framework.Core/Helper/RSAHelper.cs rename to Yi.Framework.Net6/src/framework/Yi.Framework.Core/Helper/RSAHelper.cs diff --git a/src/Yi.Framework/Yi.Framework.Core/Helper/RandomHelper.cs b/Yi.Framework.Net6/src/framework/Yi.Framework.Core/Helper/RandomHelper.cs similarity index 100% rename from src/Yi.Framework/Yi.Framework.Core/Helper/RandomHelper.cs rename to Yi.Framework.Net6/src/framework/Yi.Framework.Core/Helper/RandomHelper.cs diff --git a/src/Yi.Framework/Yi.Framework.Core/Helper/ReflexHelper.cs b/Yi.Framework.Net6/src/framework/Yi.Framework.Core/Helper/ReflexHelper.cs similarity index 100% rename from src/Yi.Framework/Yi.Framework.Core/Helper/ReflexHelper.cs rename to Yi.Framework.Net6/src/framework/Yi.Framework.Core/Helper/ReflexHelper.cs diff --git a/src/Yi.Framework/Yi.Framework.Core/Helper/SnowflakeHelper.cs b/Yi.Framework.Net6/src/framework/Yi.Framework.Core/Helper/SnowflakeHelper.cs similarity index 100% rename from src/Yi.Framework/Yi.Framework.Core/Helper/SnowflakeHelper.cs rename to Yi.Framework.Net6/src/framework/Yi.Framework.Core/Helper/SnowflakeHelper.cs diff --git a/src/Yi.Framework/Yi.Framework.Core/Helper/StringHelper.cs b/Yi.Framework.Net6/src/framework/Yi.Framework.Core/Helper/StringHelper.cs similarity index 100% rename from src/Yi.Framework/Yi.Framework.Core/Helper/StringHelper.cs rename to Yi.Framework.Net6/src/framework/Yi.Framework.Core/Helper/StringHelper.cs diff --git a/src/Yi.Framework/Yi.Framework.Core/Helper/TreeHelper.cs b/Yi.Framework.Net6/src/framework/Yi.Framework.Core/Helper/TreeHelper.cs similarity index 100% rename from src/Yi.Framework/Yi.Framework.Core/Helper/TreeHelper.cs rename to Yi.Framework.Net6/src/framework/Yi.Framework.Core/Helper/TreeHelper.cs diff --git a/src/Yi.Framework/Yi.Framework.Core/Helper/UnicodeHelper.cs b/Yi.Framework.Net6/src/framework/Yi.Framework.Core/Helper/UnicodeHelper.cs similarity index 100% rename from src/Yi.Framework/Yi.Framework.Core/Helper/UnicodeHelper.cs rename to Yi.Framework.Net6/src/framework/Yi.Framework.Core/Helper/UnicodeHelper.cs diff --git a/src/Yi.Framework/Yi.Framework.Core/Helper/UrlHelper.cs b/Yi.Framework.Net6/src/framework/Yi.Framework.Core/Helper/UrlHelper.cs similarity index 100% rename from src/Yi.Framework/Yi.Framework.Core/Helper/UrlHelper.cs rename to Yi.Framework.Net6/src/framework/Yi.Framework.Core/Helper/UrlHelper.cs diff --git a/src/Yi.Framework/Yi.Framework.Core/Helper/XmlHelper.cs b/Yi.Framework.Net6/src/framework/Yi.Framework.Core/Helper/XmlHelper.cs similarity index 100% rename from src/Yi.Framework/Yi.Framework.Core/Helper/XmlHelper.cs rename to Yi.Framework.Net6/src/framework/Yi.Framework.Core/Helper/XmlHelper.cs diff --git a/src/Yi.Framework/Yi.Framework.Core/Model/GobalLogModel.cs b/Yi.Framework.Net6/src/framework/Yi.Framework.Core/Model/GobalLogModel.cs similarity index 100% rename from src/Yi.Framework/Yi.Framework.Core/Model/GobalLogModel.cs rename to Yi.Framework.Net6/src/framework/Yi.Framework.Core/Model/GobalLogModel.cs diff --git a/src/Yi.Framework/Yi.Framework.Core/Model/ServiceLocatorModel.cs b/Yi.Framework.Net6/src/framework/Yi.Framework.Core/Model/ServiceLocatorModel.cs similarity index 100% rename from src/Yi.Framework/Yi.Framework.Core/Model/ServiceLocatorModel.cs rename to Yi.Framework.Net6/src/framework/Yi.Framework.Core/Model/ServiceLocatorModel.cs diff --git a/src/Yi.Framework/Yi.Framework.Core/Yi.Framework.Core.csproj b/Yi.Framework.Net6/src/framework/Yi.Framework.Core/Yi.Framework.Core.csproj similarity index 100% rename from src/Yi.Framework/Yi.Framework.Core/Yi.Framework.Core.csproj rename to Yi.Framework.Net6/src/framework/Yi.Framework.Core/Yi.Framework.Core.csproj diff --git a/src/Yi.Framework/Yi.Framework.Core/YiFrameworkCoreModule.cs b/Yi.Framework.Net6/src/framework/Yi.Framework.Core/YiFrameworkCoreModule.cs similarity index 100% rename from src/Yi.Framework/Yi.Framework.Core/YiFrameworkCoreModule.cs rename to Yi.Framework.Net6/src/framework/Yi.Framework.Core/YiFrameworkCoreModule.cs diff --git a/src/Yi.Framework/Yi.Framework.Ddd.Application/Dtos/Abstract/IEntityDto.cs b/Yi.Framework.Net6/src/framework/Yi.Framework.Ddd/Dtos/Abstract/IEntityDto.cs similarity index 100% rename from src/Yi.Framework/Yi.Framework.Ddd.Application/Dtos/Abstract/IEntityDto.cs rename to Yi.Framework.Net6/src/framework/Yi.Framework.Ddd/Dtos/Abstract/IEntityDto.cs diff --git a/src/Yi.Framework/Yi.Framework.Ddd.Application/Dtos/Abstract/IHasTotalCount.cs b/Yi.Framework.Net6/src/framework/Yi.Framework.Ddd/Dtos/Abstract/IHasTotalCount.cs similarity index 100% rename from src/Yi.Framework/Yi.Framework.Ddd.Application/Dtos/Abstract/IHasTotalCount.cs rename to Yi.Framework.Net6/src/framework/Yi.Framework.Ddd/Dtos/Abstract/IHasTotalCount.cs diff --git a/src/Yi.Framework/Yi.Framework.Ddd.Application/Dtos/Abstract/IListResult.cs b/Yi.Framework.Net6/src/framework/Yi.Framework.Ddd/Dtos/Abstract/IListResult.cs similarity index 100% rename from src/Yi.Framework/Yi.Framework.Ddd.Application/Dtos/Abstract/IListResult.cs rename to Yi.Framework.Net6/src/framework/Yi.Framework.Ddd/Dtos/Abstract/IListResult.cs diff --git a/src/Yi.Framework/Yi.Framework.Ddd.Application/Dtos/Abstract/IPagedAllResultRequestDto.cs b/Yi.Framework.Net6/src/framework/Yi.Framework.Ddd/Dtos/Abstract/IPagedAllResultRequestDto.cs similarity index 100% rename from src/Yi.Framework/Yi.Framework.Ddd.Application/Dtos/Abstract/IPagedAllResultRequestDto.cs rename to Yi.Framework.Net6/src/framework/Yi.Framework.Ddd/Dtos/Abstract/IPagedAllResultRequestDto.cs diff --git a/src/Yi.Framework/Yi.Framework.Ddd.Application/Dtos/Abstract/IPagedAndSortedResultRequestDto.cs b/Yi.Framework.Net6/src/framework/Yi.Framework.Ddd/Dtos/Abstract/IPagedAndSortedResultRequestDto.cs similarity index 72% rename from src/Yi.Framework/Yi.Framework.Ddd.Application/Dtos/Abstract/IPagedAndSortedResultRequestDto.cs rename to Yi.Framework.Net6/src/framework/Yi.Framework.Ddd/Dtos/Abstract/IPagedAndSortedResultRequestDto.cs index cb5d91ef..c35f05b5 100644 --- a/src/Yi.Framework/Yi.Framework.Ddd.Application/Dtos/Abstract/IPagedAndSortedResultRequestDto.cs +++ b/Yi.Framework.Net6/src/framework/Yi.Framework.Ddd/Dtos/Abstract/IPagedAndSortedResultRequestDto.cs @@ -3,6 +3,7 @@ using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; +using Yi.Framework.Core.Enums; namespace Yi.Framework.Ddd.Dtos { @@ -10,6 +11,8 @@ namespace Yi.Framework.Ddd.Dtos { int PageIndex { get; set; } int PageSize { get; set; } - string? PageSort { get; set; } + string? SortBy { get; set; } + + OrderByEnum SortType { get; set; } } } diff --git a/src/Yi.Framework/Yi.Framework.Ddd.Application/Dtos/Abstract/IPagedResult.cs b/Yi.Framework.Net6/src/framework/Yi.Framework.Ddd/Dtos/Abstract/IPagedResult.cs similarity index 100% rename from src/Yi.Framework/Yi.Framework.Ddd.Application/Dtos/Abstract/IPagedResult.cs rename to Yi.Framework.Net6/src/framework/Yi.Framework.Ddd/Dtos/Abstract/IPagedResult.cs diff --git a/src/Yi.Framework/Yi.Framework.Ddd.Application/Dtos/EntityDto.cs b/Yi.Framework.Net6/src/framework/Yi.Framework.Ddd/Dtos/EntityDto.cs similarity index 100% rename from src/Yi.Framework/Yi.Framework.Ddd.Application/Dtos/EntityDto.cs rename to Yi.Framework.Net6/src/framework/Yi.Framework.Ddd/Dtos/EntityDto.cs diff --git a/src/Yi.Framework/Yi.Framework.Ddd.Application/Dtos/ListResultDto.cs b/Yi.Framework.Net6/src/framework/Yi.Framework.Ddd/Dtos/ListResultDto.cs similarity index 100% rename from src/Yi.Framework/Yi.Framework.Ddd.Application/Dtos/ListResultDto.cs rename to Yi.Framework.Net6/src/framework/Yi.Framework.Ddd/Dtos/ListResultDto.cs diff --git a/src/Yi.Framework/Yi.Framework.Ddd.Application/Dtos/PagedAllResultRequestDto.cs b/Yi.Framework.Net6/src/framework/Yi.Framework.Ddd/Dtos/PagedAllResultRequestDto.cs similarity index 55% rename from src/Yi.Framework/Yi.Framework.Ddd.Application/Dtos/PagedAllResultRequestDto.cs rename to Yi.Framework.Net6/src/framework/Yi.Framework.Ddd/Dtos/PagedAllResultRequestDto.cs index a156a654..186ce02a 100644 --- a/src/Yi.Framework/Yi.Framework.Ddd.Application/Dtos/PagedAllResultRequestDto.cs +++ b/Yi.Framework.Net6/src/framework/Yi.Framework.Ddd/Dtos/PagedAllResultRequestDto.cs @@ -3,10 +3,12 @@ using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; +using Yi.Framework.Ddd.Dtos.Abstract; +using Yi.Framework.Ddd.Services.Abstract; namespace Yi.Framework.Ddd.Dtos { - public class PagedAllResultRequestDto: PagedAndSortedResultRequestDto + public class PagedAllResultRequestDto : PagedAndSortedResultRequestDto, IPageTimeResultRequestDto, IPagedAndSortedResultRequestDto { public DateTime? StartTime { get; set; } public DateTime? EndTime { get; set; } diff --git a/Yi.Framework.Net6/src/framework/Yi.Framework.Ddd/Dtos/PagedAndSortedResultRequestDto.cs b/Yi.Framework.Net6/src/framework/Yi.Framework.Ddd/Dtos/PagedAndSortedResultRequestDto.cs new file mode 100644 index 00000000..bea64671 --- /dev/null +++ b/Yi.Framework.Net6/src/framework/Yi.Framework.Ddd/Dtos/PagedAndSortedResultRequestDto.cs @@ -0,0 +1,17 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using Yi.Framework.Core.Enums; + +namespace Yi.Framework.Ddd.Dtos +{ + public class PagedAndSortedResultRequestDto : IPagedAndSortedResultRequestDto + { + public int PageIndex { get; set; } = 1; + public int PageSize { get; set; } = int.MaxValue; + public string? SortBy { get; set; } + public OrderByEnum SortType { get; set; } = OrderByEnum.Desc; + } +} diff --git a/src/Yi.Framework/Yi.Framework.Ddd.Application/Dtos/PagedResultDto.cs b/Yi.Framework.Net6/src/framework/Yi.Framework.Ddd/Dtos/PagedResultDto.cs similarity index 100% rename from src/Yi.Framework/Yi.Framework.Ddd.Application/Dtos/PagedResultDto.cs rename to Yi.Framework.Net6/src/framework/Yi.Framework.Ddd/Dtos/PagedResultDto.cs diff --git a/src/Yi.Framework/Yi.Framework.Ddd.Application/Entities/Entity.cs b/Yi.Framework.Net6/src/framework/Yi.Framework.Ddd/Entities/Entity.cs similarity index 100% rename from src/Yi.Framework/Yi.Framework.Ddd.Application/Entities/Entity.cs rename to Yi.Framework.Net6/src/framework/Yi.Framework.Ddd/Entities/Entity.cs diff --git a/src/Yi.Framework/Yi.Framework.Ddd.Application/Entities/IEntity.cs b/Yi.Framework.Net6/src/framework/Yi.Framework.Ddd/Entities/IEntity.cs similarity index 100% rename from src/Yi.Framework/Yi.Framework.Ddd.Application/Entities/IEntity.cs rename to Yi.Framework.Net6/src/framework/Yi.Framework.Ddd/Entities/IEntity.cs diff --git a/src/Yi.Framework/Yi.Framework.Ddd.Application/Repositories/IRepository.cs b/Yi.Framework.Net6/src/framework/Yi.Framework.Ddd/Repositories/IRepository.cs similarity index 92% rename from src/Yi.Framework/Yi.Framework.Ddd.Application/Repositories/IRepository.cs rename to Yi.Framework.Net6/src/framework/Yi.Framework.Ddd/Repositories/IRepository.cs index 5493c5d3..2a6d3cd8 100644 --- a/src/Yi.Framework/Yi.Framework.Ddd.Application/Repositories/IRepository.cs +++ b/Yi.Framework.Net6/src/framework/Yi.Framework.Ddd/Repositories/IRepository.cs @@ -25,6 +25,8 @@ namespace Yi.Framework.Ddd.Repositories //分页查 Task> GetPageListAsync(Expression> whereExpression, IPagedAndSortedResultRequestDto page); Task> GetPageListAsync(Expression> whereExpression, IPagedAndSortedResultRequestDto page, Expression>? orderByExpression = null, OrderByEnum orderByType = OrderByEnum.Asc); + Task> GetPageListAsync(Expression> whereExpression, IPagedAndSortedResultRequestDto page, string? orderBy, OrderByEnum orderByType = OrderByEnum.Asc); + //插入 Task InsertAsync(T insertObj); diff --git a/src/Yi.Framework/Yi.Framework.Ddd.Application/Services/Abstract/IApplicationService.cs b/Yi.Framework.Net6/src/framework/Yi.Framework.Ddd/Services/Abstract/IApplicationService.cs similarity index 100% rename from src/Yi.Framework/Yi.Framework.Ddd.Application/Services/Abstract/IApplicationService.cs rename to Yi.Framework.Net6/src/framework/Yi.Framework.Ddd/Services/Abstract/IApplicationService.cs diff --git a/src/Yi.Framework/Yi.Framework.Ddd.Application/Services/Abstract/ICreateAppService.cs b/Yi.Framework.Net6/src/framework/Yi.Framework.Ddd/Services/Abstract/ICreateAppService.cs similarity index 100% rename from src/Yi.Framework/Yi.Framework.Ddd.Application/Services/Abstract/ICreateAppService.cs rename to Yi.Framework.Net6/src/framework/Yi.Framework.Ddd/Services/Abstract/ICreateAppService.cs diff --git a/src/Yi.Framework/Yi.Framework.Ddd.Application/Services/Abstract/ICreateUpdateAppService.cs b/Yi.Framework.Net6/src/framework/Yi.Framework.Ddd/Services/Abstract/ICreateUpdateAppService.cs similarity index 100% rename from src/Yi.Framework/Yi.Framework.Ddd.Application/Services/Abstract/ICreateUpdateAppService.cs rename to Yi.Framework.Net6/src/framework/Yi.Framework.Ddd/Services/Abstract/ICreateUpdateAppService.cs diff --git a/src/Yi.Framework/Yi.Framework.Ddd.Application/Services/Abstract/ICrudAppService.cs b/Yi.Framework.Net6/src/framework/Yi.Framework.Ddd/Services/Abstract/ICrudAppService.cs similarity index 100% rename from src/Yi.Framework/Yi.Framework.Ddd.Application/Services/Abstract/ICrudAppService.cs rename to Yi.Framework.Net6/src/framework/Yi.Framework.Ddd/Services/Abstract/ICrudAppService.cs diff --git a/src/Yi.Framework/Yi.Framework.Ddd.Application/Services/Abstract/IDeleteAppService.cs b/Yi.Framework.Net6/src/framework/Yi.Framework.Ddd/Services/Abstract/IDeleteAppService.cs similarity index 100% rename from src/Yi.Framework/Yi.Framework.Ddd.Application/Services/Abstract/IDeleteAppService.cs rename to Yi.Framework.Net6/src/framework/Yi.Framework.Ddd/Services/Abstract/IDeleteAppService.cs diff --git a/Yi.Framework.Net6/src/framework/Yi.Framework.Ddd/Services/Abstract/IPageTimeResultRequestDto.cs b/Yi.Framework.Net6/src/framework/Yi.Framework.Ddd/Services/Abstract/IPageTimeResultRequestDto.cs new file mode 100644 index 00000000..cae8b825 --- /dev/null +++ b/Yi.Framework.Net6/src/framework/Yi.Framework.Ddd/Services/Abstract/IPageTimeResultRequestDto.cs @@ -0,0 +1,15 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using Yi.Framework.Ddd.Dtos; + +namespace Yi.Framework.Ddd.Services.Abstract +{ + public interface IPageTimeResultRequestDto: IPagedAndSortedResultRequestDto + { + DateTime? StartTime { get; set; } + DateTime? EndTime { get; set; } + } +} diff --git a/src/Yi.Framework/Yi.Framework.Ddd.Application/Services/Abstract/IReadOnlyAppService.cs b/Yi.Framework.Net6/src/framework/Yi.Framework.Ddd/Services/Abstract/IReadOnlyAppService.cs similarity index 100% rename from src/Yi.Framework/Yi.Framework.Ddd.Application/Services/Abstract/IReadOnlyAppService.cs rename to Yi.Framework.Net6/src/framework/Yi.Framework.Ddd/Services/Abstract/IReadOnlyAppService.cs diff --git a/src/Yi.Framework/Yi.Framework.Ddd.Application/Services/Abstract/IUpdateAppService.cs b/Yi.Framework.Net6/src/framework/Yi.Framework.Ddd/Services/Abstract/IUpdateAppService.cs similarity index 100% rename from src/Yi.Framework/Yi.Framework.Ddd.Application/Services/Abstract/IUpdateAppService.cs rename to Yi.Framework.Net6/src/framework/Yi.Framework.Ddd/Services/Abstract/IUpdateAppService.cs diff --git a/src/Yi.Framework/Yi.Framework.Ddd.Application/Services/ApplicationService.cs b/Yi.Framework.Net6/src/framework/Yi.Framework.Ddd/Services/ApplicationService.cs similarity index 100% rename from src/Yi.Framework/Yi.Framework.Ddd.Application/Services/ApplicationService.cs rename to Yi.Framework.Net6/src/framework/Yi.Framework.Ddd/Services/ApplicationService.cs diff --git a/src/Yi.Framework/Yi.Framework.Ddd.Application/Services/CrudAppService.cs b/Yi.Framework.Net6/src/framework/Yi.Framework.Ddd/Services/CrudAppService.cs similarity index 100% rename from src/Yi.Framework/Yi.Framework.Ddd.Application/Services/CrudAppService.cs rename to Yi.Framework.Net6/src/framework/Yi.Framework.Ddd/Services/CrudAppService.cs diff --git a/src/Yi.Framework/Yi.Framework.Ddd.Application/Services/ReadOnlyAppService.cs b/Yi.Framework.Net6/src/framework/Yi.Framework.Ddd/Services/ReadOnlyAppService.cs similarity index 89% rename from src/Yi.Framework/Yi.Framework.Ddd.Application/Services/ReadOnlyAppService.cs rename to Yi.Framework.Net6/src/framework/Yi.Framework.Ddd/Services/ReadOnlyAppService.cs index 58ae977c..0a9d73bf 100644 --- a/src/Yi.Framework/Yi.Framework.Ddd.Application/Services/ReadOnlyAppService.cs +++ b/Yi.Framework.Net6/src/framework/Yi.Framework.Ddd/Services/ReadOnlyAppService.cs @@ -2,8 +2,10 @@ using System; using System.Collections.Generic; using System.Linq; +using System.Linq.Expressions; using System.Text; using System.Threading.Tasks; +using Yi.Framework.Core.Helper; using Yi.Framework.Core.Model; using Yi.Framework.Ddd.Dtos; using Yi.Framework.Ddd.Entities; @@ -87,11 +89,23 @@ where TEntityDto : IEntityDto if (totalCount > 0) { - if (input is IPagedAndSortedResultRequestDto sortInput) - { - entities = await _repository.GetPageListAsync(_ => true, sortInput); - } + //这里还可以追加如果是审计日志，继续拼接条件即可 + if (input is IPageTimeResultRequestDto timeInput) + { + if (timeInput.StartTime is not null) + { + timeInput.EndTime = timeInput.EndTime ?? DateTime.Now; + } + } + + + if (input is IPagedAndSortedResultRequestDto sortInput) + { + entities = await _repository.GetPageListAsync(_ => true, sortInput,sortInput.SortBy, sortInput.SortType); + } + + else { entities = await _repository.GetListAsync(); diff --git a/src/Yi.Framework/Yi.Framework.Ddd.Application/Yi - Backup.Framework.Ddd.csproj b/Yi.Framework.Net6/src/framework/Yi.Framework.Ddd/Yi - Backup.Framework.Ddd.csproj similarity index 100% rename from src/Yi.Framework/Yi.Framework.Ddd.Application/Yi - Backup.Framework.Ddd.csproj rename to Yi.Framework.Net6/src/framework/Yi.Framework.Ddd/Yi - Backup.Framework.Ddd.csproj diff --git a/src/Yi.Framework/Yi.Framework.Ddd.Application/Yi.Framework.Ddd.csproj b/Yi.Framework.Net6/src/framework/Yi.Framework.Ddd/Yi.Framework.Ddd.csproj similarity index 100% rename from src/Yi.Framework/Yi.Framework.Ddd.Application/Yi.Framework.Ddd.csproj rename to Yi.Framework.Net6/src/framework/Yi.Framework.Ddd/Yi.Framework.Ddd.csproj diff --git a/src/Yi.Framework/Yi.Framework.Ddd.Application/YiFrameworkDddModule.cs b/Yi.Framework.Net6/src/framework/Yi.Framework.Ddd/YiFrameworkDddModule.cs similarity index 100% rename from src/Yi.Framework/Yi.Framework.Ddd.Application/YiFrameworkDddModule.cs rename to Yi.Framework.Net6/src/framework/Yi.Framework.Ddd/YiFrameworkDddModule.cs diff --git a/src/Yi.Framework/Yi.Framework.Ddd.Application/YiFrameworkSwaggerDoc.xml b/Yi.Framework.Net6/src/framework/Yi.Framework.Ddd/YiFrameworkSwaggerDoc.xml similarity index 100% rename from src/Yi.Framework/Yi.Framework.Ddd.Application/YiFrameworkSwaggerDoc.xml rename to Yi.Framework.Net6/src/framework/Yi.Framework.Ddd/YiFrameworkSwaggerDoc.xml diff --git a/src/Yi.Framework/Yi.Framework.Uow/Class1.cs b/Yi.Framework.Net6/src/framework/Yi.Framework.Uow/Class1.cs similarity index 100% rename from src/Yi.Framework/Yi.Framework.Uow/Class1.cs rename to Yi.Framework.Net6/src/framework/Yi.Framework.Uow/Class1.cs diff --git a/src/Yi.Framework/Yi.Framework.Uow/Properties/launchSettings.json b/Yi.Framework.Net6/src/framework/Yi.Framework.Uow/Properties/launchSettings.json similarity index 100% rename from src/Yi.Framework/Yi.Framework.Uow/Properties/launchSettings.json rename to Yi.Framework.Net6/src/framework/Yi.Framework.Uow/Properties/launchSettings.json diff --git a/src/Yi.Framework/Yi.Framework.Uow/Yi.Framework.Uow.csproj b/Yi.Framework.Net6/src/framework/Yi.Framework.Uow/Yi.Framework.Uow.csproj similarity index 100% rename from src/Yi.Framework/Yi.Framework.Uow/Yi.Framework.Uow.csproj rename to Yi.Framework.Net6/src/framework/Yi.Framework.Uow/Yi.Framework.Uow.csproj diff --git a/src/Yi.Framework/Yi.Framework.BackgroundJobs.Quartz/Class1.cs b/Yi.Framework.Net6/src/module/Yi.Framework.BackgroundJobs.Quartz/Class1.cs similarity index 100% rename from src/Yi.Framework/Yi.Framework.BackgroundJobs.Quartz/Class1.cs rename to Yi.Framework.Net6/src/module/Yi.Framework.BackgroundJobs.Quartz/Class1.cs diff --git a/src/Yi.Framework/Yi.Framework.BackgroundJobs.Quartz/Properties/launchSettings.json b/Yi.Framework.Net6/src/module/Yi.Framework.BackgroundJobs.Quartz/Properties/launchSettings.json similarity index 100% rename from src/Yi.Framework/Yi.Framework.BackgroundJobs.Quartz/Properties/launchSettings.json rename to Yi.Framework.Net6/src/module/Yi.Framework.BackgroundJobs.Quartz/Properties/launchSettings.json diff --git a/src/Yi.Framework/Yi.Framework.BackgroundJobs.Quartz/Yi.Framework.BackgroundJobs.Quartz.csproj b/Yi.Framework.Net6/src/module/Yi.Framework.BackgroundJobs.Quartz/Yi.Framework.BackgroundJobs.Quartz.csproj similarity index 100% rename from src/Yi.Framework/Yi.Framework.BackgroundJobs.Quartz/Yi.Framework.BackgroundJobs.Quartz.csproj rename to Yi.Framework.Net6/src/module/Yi.Framework.BackgroundJobs.Quartz/Yi.Framework.BackgroundJobs.Quartz.csproj diff --git a/src/Yi.Framework/Yi.Framework.Caching.MemoryCache/MemoryCacheClient.cs b/Yi.Framework.Net6/src/module/Yi.Framework.Caching.MemoryCache/MemoryCacheClient.cs similarity index 95% rename from src/Yi.Framework/Yi.Framework.Caching.MemoryCache/MemoryCacheClient.cs rename to Yi.Framework.Net6/src/module/Yi.Framework.Caching.MemoryCache/MemoryCacheClient.cs index 1338c729..be3dd23d 100644 --- a/src/Yi.Framework/Yi.Framework.Caching.MemoryCache/MemoryCacheClient.cs +++ b/Yi.Framework.Net6/src/module/Yi.Framework.Caching.MemoryCache/MemoryCacheClient.cs @@ -7,7 +7,7 @@ using System.Threading.Tasks; namespace Yi.Framework.Caching.MemoryCache { - public class MemoryCacheClient : CacheInvoker + public class MemoryCacheClient : CacheManager { private IMemoryCache _client; public MemoryCacheClient() diff --git a/src/Yi.Framework/Yi.Framework.Caching.MemoryCache/Yi.Framework.Caching.MemoryCache.csproj b/Yi.Framework.Net6/src/module/Yi.Framework.Caching.MemoryCache/Yi.Framework.Caching.MemoryCache.csproj similarity index 82% rename from src/Yi.Framework/Yi.Framework.Caching.MemoryCache/Yi.Framework.Caching.MemoryCache.csproj rename to Yi.Framework.Net6/src/module/Yi.Framework.Caching.MemoryCache/Yi.Framework.Caching.MemoryCache.csproj index 829e6465..2371c385 100644 --- a/src/Yi.Framework/Yi.Framework.Caching.MemoryCache/Yi.Framework.Caching.MemoryCache.csproj +++ b/Yi.Framework.Net6/src/module/Yi.Framework.Caching.MemoryCache/Yi.Framework.Caching.MemoryCache.csproj @@ -11,8 +11,8 @@ + - diff --git a/src/Yi.Framework/Yi.Framework.Caching.MemoryCache/YiFrameworkCachingMemoryCacheModule.cs b/Yi.Framework.Net6/src/module/Yi.Framework.Caching.MemoryCache/YiFrameworkCachingMemoryCacheModule.cs similarity index 90% rename from src/Yi.Framework/Yi.Framework.Caching.MemoryCache/YiFrameworkCachingMemoryCacheModule.cs rename to Yi.Framework.Net6/src/module/Yi.Framework.Caching.MemoryCache/YiFrameworkCachingMemoryCacheModule.cs index 4656bdf5..d4dc5ea7 100644 --- a/src/Yi.Framework/Yi.Framework.Caching.MemoryCache/YiFrameworkCachingMemoryCacheModule.cs +++ b/Yi.Framework.Net6/src/module/Yi.Framework.Caching.MemoryCache/YiFrameworkCachingMemoryCacheModule.cs @@ -19,7 +19,7 @@ namespace Yi.Framework.Ddd public void ConfigureServices(IServiceCollection services, ConfigureServicesContext context) { - services.AddSingleton(); + services.AddSingleton(); } } } diff --git a/src/Yi.Framework/Yi.Framework.Caching.Redis/RedisCacheClient.cs b/Yi.Framework.Net6/src/module/Yi.Framework.Caching.Redis/RedisCacheClient.cs similarity index 99% rename from src/Yi.Framework/Yi.Framework.Caching.Redis/RedisCacheClient.cs rename to Yi.Framework.Net6/src/module/Yi.Framework.Caching.Redis/RedisCacheClient.cs index ff36c8d9..eca5c698 100644 --- a/src/Yi.Framework/Yi.Framework.Caching.Redis/RedisCacheClient.cs +++ b/Yi.Framework.Net6/src/module/Yi.Framework.Caching.Redis/RedisCacheClient.cs @@ -14,7 +14,7 @@ using CSRedis; namespace Yi.Framework.Caching.Redis { - public class RedisCacheClient : CacheInvoker + public class RedisCacheClient : CacheManager { private readonly CachingConnOptions _RedisOptions; diff --git a/src/Yi.Framework/Yi.Framework.Caching.Redis/Yi.Framework.Caching.Redis.csproj b/Yi.Framework.Net6/src/module/Yi.Framework.Caching.Redis/Yi.Framework.Caching.Redis.csproj similarity index 81% rename from src/Yi.Framework/Yi.Framework.Caching.Redis/Yi.Framework.Caching.Redis.csproj rename to Yi.Framework.Net6/src/module/Yi.Framework.Caching.Redis/Yi.Framework.Caching.Redis.csproj index 19bf78cb..e378e221 100644 --- a/src/Yi.Framework/Yi.Framework.Caching.Redis/Yi.Framework.Caching.Redis.csproj +++ b/Yi.Framework.Net6/src/module/Yi.Framework.Caching.Redis/Yi.Framework.Caching.Redis.csproj @@ -11,8 +11,8 @@ + - diff --git a/src/Yi.Framework/Yi.Framework.Caching.Redis/YiFrameworkCachingRedisModule.cs b/Yi.Framework.Net6/src/module/Yi.Framework.Caching.Redis/YiFrameworkCachingRedisModule.cs similarity index 90% rename from src/Yi.Framework/Yi.Framework.Caching.Redis/YiFrameworkCachingRedisModule.cs rename to Yi.Framework.Net6/src/module/Yi.Framework.Caching.Redis/YiFrameworkCachingRedisModule.cs index fa1881c6..a965ddb9 100644 --- a/src/Yi.Framework/Yi.Framework.Caching.Redis/YiFrameworkCachingRedisModule.cs +++ b/Yi.Framework.Net6/src/module/Yi.Framework.Caching.Redis/YiFrameworkCachingRedisModule.cs @@ -15,7 +15,7 @@ namespace Yi.Framework.Caching.Redis public void ConfigureServices(IServiceCollection services, ConfigureServicesContext context) { services.Configure(Appsettings.appConfiguration("CachingConnOptions")); - services.AddSingleton(); + services.AddSingleton(); } } diff --git a/src/Yi.Framework/Yi.Framework.Caching/CacheInvoker.cs b/Yi.Framework.Net6/src/module/Yi.Framework.Caching/CacheManager.cs similarity index 98% rename from src/Yi.Framework/Yi.Framework.Caching/CacheInvoker.cs rename to Yi.Framework.Net6/src/module/Yi.Framework.Caching/CacheManager.cs index c5ee8ea2..93efa93f 100644 --- a/src/Yi.Framework/Yi.Framework.Caching/CacheInvoker.cs +++ b/Yi.Framework.Net6/src/module/Yi.Framework.Caching/CacheManager.cs @@ -6,7 +6,7 @@ using System.Threading.Tasks; namespace Yi.Framework.Caching { - public abstract class CacheInvoker + public abstract class CacheManager { public virtual bool Exits(string key) diff --git a/src/Yi.Framework/Yi.Framework.Caching/CachingConnOptions.cs b/Yi.Framework.Net6/src/module/Yi.Framework.Caching/CachingConnOptions.cs similarity index 100% rename from src/Yi.Framework/Yi.Framework.Caching/CachingConnOptions.cs rename to Yi.Framework.Net6/src/module/Yi.Framework.Caching/CachingConnOptions.cs diff --git a/src/Yi.Framework/Yi.Framework.Caching/Yi.Framework.Caching.csproj b/Yi.Framework.Net6/src/module/Yi.Framework.Caching/Yi.Framework.Caching.csproj similarity index 100% rename from src/Yi.Framework/Yi.Framework.Caching/Yi.Framework.Caching.csproj rename to Yi.Framework.Net6/src/module/Yi.Framework.Caching/Yi.Framework.Caching.csproj diff --git a/Yi.Framework.Net6/src/module/Yi.Framework.Office.Excel/ExcelManager.cs b/Yi.Framework.Net6/src/module/Yi.Framework.Office.Excel/ExcelManager.cs new file mode 100644 index 00000000..8241376c --- /dev/null +++ b/Yi.Framework.Net6/src/module/Yi.Framework.Office.Excel/ExcelManager.cs @@ -0,0 +1,47 @@ +using OEM.Core; + +namespace Yi.Framework.Office.Excel +{ + public class ExcelManager + { + private IExcelFactory _excelFactory; + public ExcelManager(IExcelFactory excelFactory) + { + _excelFactory = excelFactory; + } + + public List ReadListByNameManager(string path, string sheet) where T : class, new() + { + using (var excelAppService = _excelFactory.Create(System.IO.File.Open(path, FileMode.OpenOrCreate, FileAccess.ReadWrite))) + { + return excelAppService.ReadListByNameManager(sheet); + } + } + + public T ReadByNameManager(string path, string sheet) where T : class, new() + { + using (var excelAppService = _excelFactory.Create(System.IO.File.Open(path, FileMode.OpenOrCreate, FileAccess.ReadWrite))) + { + return excelAppService.ReadByNameManager(sheet); + } + } + + public void WriteListByNameManager(List objcts, string sheet, string oldPath, string newPath) where T : class, new() + { + using (var excelAppService = _excelFactory.Create(System.IO.File.Open(oldPath, FileMode.OpenOrCreate, FileAccess.ReadWrite))) + { + excelAppService.WriteListByNameManager(objcts, sheet); + excelAppService.Write(newPath); + } + } + + public void WriteByNameManager(T objct, string sheet, string oldPath, string newPath) where T : class, new() + { + using (var excelAppService = _excelFactory.Create(System.IO.File.Open(oldPath, FileMode.OpenOrCreate, FileAccess.ReadWrite))) + { + excelAppService.WriteByNameManager(objct, sheet); + excelAppService.Write(newPath); + } + } + } +} \ No newline at end of file diff --git a/Yi.Framework.Net6/src/module/Yi.Framework.Office.Excel/Yi.Framework.Office.Excel.csproj b/Yi.Framework.Net6/src/module/Yi.Framework.Office.Excel/Yi.Framework.Office.Excel.csproj new file mode 100644 index 00000000..4c47aa32 --- /dev/null +++ b/Yi.Framework.Net6/src/module/Yi.Framework.Office.Excel/Yi.Framework.Office.Excel.csproj @@ -0,0 +1,17 @@ + + + + net6.0 + enable + enable + + + + + + + + + + + diff --git a/Yi.Framework.Net6/src/module/Yi.Framework.Office.Excel/YiFrameworkOfficeExcelModule.cs b/Yi.Framework.Net6/src/module/Yi.Framework.Office.Excel/YiFrameworkOfficeExcelModule.cs new file mode 100644 index 00000000..61c93edf --- /dev/null +++ b/Yi.Framework.Net6/src/module/Yi.Framework.Office.Excel/YiFrameworkOfficeExcelModule.cs @@ -0,0 +1,23 @@ +using Microsoft.AspNetCore.Builder; +using Microsoft.Extensions.DependencyInjection; +using StartupModules; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Yi.Framework.Office.Excel +{ + public class YiFrameworkOfficeExcelModule : IStartupModule + { + public void Configure(IApplicationBuilder app, ConfigureMiddlewareContext context) + { + } + + public void ConfigureServices(IServiceCollection services, ConfigureServicesContext context) + { + services.AddExcelToObjectNpoiService(); + } + } +} diff --git a/src/Yi.Framework/Yi.Framework.Application.Contracts/ApplicationContractsSwaggerDoc.xml b/Yi.Framework.Net6/test/Yi.Framework.Application.Contracts/ApplicationContractsSwaggerDoc.xml similarity index 100% rename from src/Yi.Framework/Yi.Framework.Application.Contracts/ApplicationContractsSwaggerDoc.xml rename to Yi.Framework.Net6/test/Yi.Framework.Application.Contracts/ApplicationContractsSwaggerDoc.xml diff --git a/src/Yi.Framework/Yi.Framework.Application.Contracts/Student/Dtos/StudentCreateInputVo.cs b/Yi.Framework.Net6/test/Yi.Framework.Application.Contracts/Student/Dtos/StudentCreateInputVo.cs similarity index 89% rename from src/Yi.Framework/Yi.Framework.Application.Contracts/Student/Dtos/StudentCreateInputVo.cs rename to Yi.Framework.Net6/test/Yi.Framework.Application.Contracts/Student/Dtos/StudentCreateInputVo.cs index 2850490a..1fb8c8c0 100644 --- a/src/Yi.Framework/Yi.Framework.Application.Contracts/Student/Dtos/StudentCreateInputVo.cs +++ b/Yi.Framework.Net6/test/Yi.Framework.Application.Contracts/Student/Dtos/StudentCreateInputVo.cs @@ -12,5 +12,7 @@ namespace Yi.Framework.Application.Contracts.Student.Dtos public class StudentCreateInputVo { public string Name { get; set; } + + public long Number { get; set; } } } diff --git a/src/Yi.Framework/Yi.Framework.Application.Contracts/Student/Dtos/StudentGetListInputVo.cs b/Yi.Framework.Net6/test/Yi.Framework.Application.Contracts/Student/Dtos/StudentGetListInputVo.cs similarity index 62% rename from src/Yi.Framework/Yi.Framework.Application.Contracts/Student/Dtos/StudentGetListInputVo.cs rename to Yi.Framework.Net6/test/Yi.Framework.Application.Contracts/Student/Dtos/StudentGetListInputVo.cs index a8d48c99..1cb0d043 100644 --- a/src/Yi.Framework/Yi.Framework.Application.Contracts/Student/Dtos/StudentGetListInputVo.cs +++ b/Yi.Framework.Net6/test/Yi.Framework.Application.Contracts/Student/Dtos/StudentGetListInputVo.cs @@ -3,11 +3,14 @@ using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; +using Yi.Framework.Ddd.Dtos; namespace Yi.Framework.Application.Contracts.Student.Dtos { - public class StudentGetListInputVo + public class StudentGetListInputVo : PagedAndSortedResultRequestDto { public string? Name { get; set; } + + public long? Number { get; set; } } } diff --git a/src/Yi.Framework/Yi.Framework.Application.Contracts/Student/Dtos/StudentGetListOutputDto.cs b/Yi.Framework.Net6/test/Yi.Framework.Application.Contracts/Student/Dtos/StudentGetListOutputDto.cs similarity index 89% rename from src/Yi.Framework/Yi.Framework.Application.Contracts/Student/Dtos/StudentGetListOutputDto.cs rename to Yi.Framework.Net6/test/Yi.Framework.Application.Contracts/Student/Dtos/StudentGetListOutputDto.cs index ab35ff82..038089fc 100644 --- a/src/Yi.Framework/Yi.Framework.Application.Contracts/Student/Dtos/StudentGetListOutputDto.cs +++ b/Yi.Framework.Net6/test/Yi.Framework.Application.Contracts/Student/Dtos/StudentGetListOutputDto.cs @@ -11,5 +11,6 @@ namespace Yi.Framework.Application.Contracts.Student.Dtos { public long Id { get; set; } public string Name { get; set; } + public long Number { get; set; } } } diff --git a/src/Yi.Framework/Yi.Framework.Application.Contracts/Student/Dtos/StudentGetOutputDto.cs b/Yi.Framework.Net6/test/Yi.Framework.Application.Contracts/Student/Dtos/StudentGetOutputDto.cs similarity index 89% rename from src/Yi.Framework/Yi.Framework.Application.Contracts/Student/Dtos/StudentGetOutputDto.cs rename to Yi.Framework.Net6/test/Yi.Framework.Application.Contracts/Student/Dtos/StudentGetOutputDto.cs index 9b04889a..2146e653 100644 --- a/src/Yi.Framework/Yi.Framework.Application.Contracts/Student/Dtos/StudentGetOutputDto.cs +++ b/Yi.Framework.Net6/test/Yi.Framework.Application.Contracts/Student/Dtos/StudentGetOutputDto.cs @@ -11,5 +11,7 @@ namespace Yi.Framework.Application.Contracts.Student.Dtos { public long Id { get; set; } public string Name { get; set; } + + public long Number { get; set; } } } diff --git a/src/Yi.Framework/Yi.Framework.Application.Contracts/Student/Dtos/StudentUpdateInputVo.cs b/Yi.Framework.Net6/test/Yi.Framework.Application.Contracts/Student/Dtos/StudentUpdateInputVo.cs similarity index 75% rename from src/Yi.Framework/Yi.Framework.Application.Contracts/Student/Dtos/StudentUpdateInputVo.cs rename to Yi.Framework.Net6/test/Yi.Framework.Application.Contracts/Student/Dtos/StudentUpdateInputVo.cs index d273f329..6d08896e 100644 --- a/src/Yi.Framework/Yi.Framework.Application.Contracts/Student/Dtos/StudentUpdateInputVo.cs +++ b/Yi.Framework.Net6/test/Yi.Framework.Application.Contracts/Student/Dtos/StudentUpdateInputVo.cs @@ -9,6 +9,8 @@ namespace Yi.Framework.Application.Contracts.Student.Dtos public class StudentUpdateInputVo { public long Id { get; set; } - public string Name { get; set; } + public string? Name { get; set; } + + public long? Number { get; set; } } } diff --git a/src/Yi.Framework/Yi.Framework.Application.Contracts/Student/IStudentService.cs b/Yi.Framework.Net6/test/Yi.Framework.Application.Contracts/Student/IStudentService.cs similarity index 100% rename from src/Yi.Framework/Yi.Framework.Application.Contracts/Student/IStudentService.cs rename to Yi.Framework.Net6/test/Yi.Framework.Application.Contracts/Student/IStudentService.cs diff --git a/src/Yi.Framework/Yi.Framework.Application.Contracts/Yi.Framework.Application.Contracts.csproj b/Yi.Framework.Net6/test/Yi.Framework.Application.Contracts/Yi.Framework.Application.Contracts.csproj similarity index 100% rename from src/Yi.Framework/Yi.Framework.Application.Contracts/Yi.Framework.Application.Contracts.csproj rename to Yi.Framework.Net6/test/Yi.Framework.Application.Contracts/Yi.Framework.Application.Contracts.csproj diff --git a/src/Yi.Framework/Yi.Framework.Application.Contracts/YiFrameworkApplicationContractsModule.cs b/Yi.Framework.Net6/test/Yi.Framework.Application.Contracts/YiFrameworkApplicationContractsModule.cs similarity index 100% rename from src/Yi.Framework/Yi.Framework.Application.Contracts/YiFrameworkApplicationContractsModule.cs rename to Yi.Framework.Net6/test/Yi.Framework.Application.Contracts/YiFrameworkApplicationContractsModule.cs diff --git a/src/Yi.Framework/Yi.Framework.Application/ApplicationSwaggerDoc.xml b/Yi.Framework.Net6/test/Yi.Framework.Application/ApplicationSwaggerDoc.xml similarity index 100% rename from src/Yi.Framework/Yi.Framework.Application/ApplicationSwaggerDoc.xml rename to Yi.Framework.Net6/test/Yi.Framework.Application/ApplicationSwaggerDoc.xml diff --git a/src/Yi.Framework/Yi.Framework.Application/Student/MapperConfig/StudentProfile.cs b/Yi.Framework.Net6/test/Yi.Framework.Application/Student/MapperConfig/StudentProfile.cs similarity index 100% rename from src/Yi.Framework/Yi.Framework.Application/Student/MapperConfig/StudentProfile.cs rename to Yi.Framework.Net6/test/Yi.Framework.Application/Student/MapperConfig/StudentProfile.cs diff --git a/src/Yi.Framework/Yi.Framework.Application/Student/StudentService.cs b/Yi.Framework.Net6/test/Yi.Framework.Application/Student/StudentService.cs similarity index 96% rename from src/Yi.Framework/Yi.Framework.Application/Student/StudentService.cs rename to Yi.Framework.Net6/test/Yi.Framework.Application/Student/StudentService.cs index e4a0fd23..f41f7052 100644 --- a/src/Yi.Framework/Yi.Framework.Application/Student/StudentService.cs +++ b/Yi.Framework.Net6/test/Yi.Framework.Application/Student/StudentService.cs @@ -35,6 +35,7 @@ namespace Yi.Framework.Application.Student /// public async Task> PostShijie() { + throw new NotImplementedException(); var entities = await _studentRepository.GetMyListAsync(); return await MapToGetListOutputDtosAsync(entities); } diff --git a/src/Yi.Framework/Yi.Framework.Application/Yi.Framework.Application.csproj b/Yi.Framework.Net6/test/Yi.Framework.Application/Yi.Framework.Application.csproj similarity index 63% rename from src/Yi.Framework/Yi.Framework.Application/Yi.Framework.Application.csproj rename to Yi.Framework.Net6/test/Yi.Framework.Application/Yi.Framework.Application.csproj index d498f23e..16e3b0a4 100644 --- a/src/Yi.Framework/Yi.Framework.Application/Yi.Framework.Application.csproj +++ b/Yi.Framework.Net6/test/Yi.Framework.Application/Yi.Framework.Application.csproj @@ -10,15 +10,7 @@ - - - - - Always - - - diff --git a/src/Yi.Framework/Yi.Framework.Application/YiFrameworkApplicationModule.cs b/Yi.Framework.Net6/test/Yi.Framework.Application/YiFrameworkApplicationModule.cs similarity index 100% rename from src/Yi.Framework/Yi.Framework.Application/YiFrameworkApplicationModule.cs rename to Yi.Framework.Net6/test/Yi.Framework.Application/YiFrameworkApplicationModule.cs diff --git a/src/Yi.Framework/Yi.Framework.Domain.Shared/Student/ConstClasses/StudentConst.cs b/Yi.Framework.Net6/test/Yi.Framework.Domain.Shared/Student/ConstClasses/StudentConst.cs similarity index 100% rename from src/Yi.Framework/Yi.Framework.Domain.Shared/Student/ConstClasses/StudentConst.cs rename to Yi.Framework.Net6/test/Yi.Framework.Domain.Shared/Student/ConstClasses/StudentConst.cs diff --git a/src/Yi.Framework/Yi.Framework.Domain.Shared/Yi.Framework.Domain.Shared.csproj b/Yi.Framework.Net6/test/Yi.Framework.Domain.Shared/Yi.Framework.Domain.Shared.csproj similarity index 71% rename from src/Yi.Framework/Yi.Framework.Domain.Shared/Yi.Framework.Domain.Shared.csproj rename to Yi.Framework.Net6/test/Yi.Framework.Domain.Shared/Yi.Framework.Domain.Shared.csproj index 0bc0d438..a83a1530 100644 --- a/src/Yi.Framework/Yi.Framework.Domain.Shared/Yi.Framework.Domain.Shared.csproj +++ b/Yi.Framework.Net6/test/Yi.Framework.Domain.Shared/Yi.Framework.Domain.Shared.csproj @@ -7,7 +7,7 @@ - + diff --git a/src/Yi.Framework/Yi.Framework.Domain.Shared/YiFrameworkDomainSharedModule.cs b/Yi.Framework.Net6/test/Yi.Framework.Domain.Shared/YiFrameworkDomainSharedModule.cs similarity index 100% rename from src/Yi.Framework/Yi.Framework.Domain.Shared/YiFrameworkDomainSharedModule.cs rename to Yi.Framework.Net6/test/Yi.Framework.Domain.Shared/YiFrameworkDomainSharedModule.cs diff --git a/src/Yi.Framework/Yi.Framework.Domain/DomainSwaggerDoc.xml b/Yi.Framework.Net6/test/Yi.Framework.Domain/DomainSwaggerDoc.xml similarity index 82% rename from src/Yi.Framework/Yi.Framework.Domain/DomainSwaggerDoc.xml rename to Yi.Framework.Net6/test/Yi.Framework.Domain/DomainSwaggerDoc.xml index c12ad92c..58ec9d8d 100644 --- a/src/Yi.Framework/Yi.Framework.Domain/DomainSwaggerDoc.xml +++ b/Yi.Framework.Net6/test/Yi.Framework.Domain/DomainSwaggerDoc.xml @@ -14,6 +14,11 @@ 学生名称 + + + 学号 + + 仓储抽象 diff --git a/src/Yi.Framework/Yi.Framework.Domain/Student/Entities/StudentEntity.cs b/Yi.Framework.Net6/test/Yi.Framework.Domain/Student/Entities/StudentEntity.cs similarity index 78% rename from src/Yi.Framework/Yi.Framework.Domain/Student/Entities/StudentEntity.cs rename to Yi.Framework.Net6/test/Yi.Framework.Domain/Student/Entities/StudentEntity.cs index a1cb4a62..77041083 100644 --- a/src/Yi.Framework/Yi.Framework.Domain/Student/Entities/StudentEntity.cs +++ b/Yi.Framework.Net6/test/Yi.Framework.Domain/Student/Entities/StudentEntity.cs @@ -14,11 +14,17 @@ namespace Yi.Framework.Domain.Student.Entities [SugarTable("Student")] public class StudentEntity : IEntity { + [SugarColumn(IsPrimaryKey = true)] public long Id { get; set; } /// /// 学生名称 /// public string Name { get; set; } = string.Empty; + + /// + /// 学号 + /// + public long Number { get;set ; } } } diff --git a/src/Yi.Framework/Yi.Framework.Domain/Student/IRepository/IStudentRepository.cs b/Yi.Framework.Net6/test/Yi.Framework.Domain/Student/IRepository/IStudentRepository.cs similarity index 100% rename from src/Yi.Framework/Yi.Framework.Domain/Student/IRepository/IStudentRepository.cs rename to Yi.Framework.Net6/test/Yi.Framework.Domain/Student/IRepository/IStudentRepository.cs diff --git a/src/Yi.Framework/Yi.Framework.Domain/Student/StudentManager.cs b/Yi.Framework.Net6/test/Yi.Framework.Domain/Student/StudentManager.cs similarity index 100% rename from src/Yi.Framework/Yi.Framework.Domain/Student/StudentManager.cs rename to Yi.Framework.Net6/test/Yi.Framework.Domain/Student/StudentManager.cs diff --git a/src/Yi.Framework/Yi.Framework.Domain/Yi.Framework.Domain.csproj b/Yi.Framework.Net6/test/Yi.Framework.Domain/Yi.Framework.Domain.csproj similarity index 100% rename from src/Yi.Framework/Yi.Framework.Domain/Yi.Framework.Domain.csproj rename to Yi.Framework.Net6/test/Yi.Framework.Domain/Yi.Framework.Domain.csproj diff --git a/src/Yi.Framework/Yi.Framework.Domain/YiFrameworkDomainModule.cs b/Yi.Framework.Net6/test/Yi.Framework.Domain/YiFrameworkDomainModule.cs similarity index 100% rename from src/Yi.Framework/Yi.Framework.Domain/YiFrameworkDomainModule.cs rename to Yi.Framework.Net6/test/Yi.Framework.Domain/YiFrameworkDomainModule.cs diff --git a/src/Yi.Framework/Yi.Framework.Sqlsugar/Student/StudentRepository.cs b/Yi.Framework.Net6/test/Yi.Framework.Sqlsugar/Student/StudentRepository.cs similarity index 100% rename from src/Yi.Framework/Yi.Framework.Sqlsugar/Student/StudentRepository.cs rename to Yi.Framework.Net6/test/Yi.Framework.Sqlsugar/Student/StudentRepository.cs diff --git a/src/Yi.Framework/Yi.Framework.Sqlsugar/Yi.Framework.Sqlsugar.csproj b/Yi.Framework.Net6/test/Yi.Framework.Sqlsugar/Yi.Framework.Sqlsugar.csproj similarity index 73% rename from src/Yi.Framework/Yi.Framework.Sqlsugar/Yi.Framework.Sqlsugar.csproj rename to Yi.Framework.Net6/test/Yi.Framework.Sqlsugar/Yi.Framework.Sqlsugar.csproj index 11db2576..da0ecd39 100644 --- a/src/Yi.Framework/Yi.Framework.Sqlsugar/Yi.Framework.Sqlsugar.csproj +++ b/Yi.Framework.Net6/test/Yi.Framework.Sqlsugar/Yi.Framework.Sqlsugar.csproj @@ -7,7 +7,7 @@ - + diff --git a/src/Yi.Framework/Yi.Framework.Sqlsugar/YiFrameworkSqlsugarModule.cs b/Yi.Framework.Net6/test/Yi.Framework.Sqlsugar/YiFrameworkSqlsugarModule.cs similarity index 100% rename from src/Yi.Framework/Yi.Framework.Sqlsugar/YiFrameworkSqlsugarModule.cs rename to Yi.Framework.Net6/test/Yi.Framework.Sqlsugar/YiFrameworkSqlsugarModule.cs diff --git a/src/Yi.Framework/Yi.Framework.Web/Program.cs b/Yi.Framework.Net6/test/Yi.Framework.Web/Program.cs similarity index 100% rename from src/Yi.Framework/Yi.Framework.Web/Program.cs rename to Yi.Framework.Net6/test/Yi.Framework.Web/Program.cs diff --git a/src/Yi.Framework/Yi.Framework.Web/Properties/launchSettings.json b/Yi.Framework.Net6/test/Yi.Framework.Web/Properties/launchSettings.json similarity index 100% rename from src/Yi.Framework/Yi.Framework.Web/Properties/launchSettings.json rename to Yi.Framework.Net6/test/Yi.Framework.Web/Properties/launchSettings.json diff --git a/src/Yi.Framework/Yi.Framework.Web/Test2Entity.cs b/Yi.Framework.Net6/test/Yi.Framework.Web/Test2Entity.cs similarity index 100% rename from src/Yi.Framework/Yi.Framework.Web/Test2Entity.cs rename to Yi.Framework.Net6/test/Yi.Framework.Web/Test2Entity.cs diff --git a/src/Yi.Framework/Yi.Framework.Web/TestEntity.cs b/Yi.Framework.Net6/test/Yi.Framework.Web/TestEntity.cs similarity index 100% rename from src/Yi.Framework/Yi.Framework.Web/TestEntity.cs rename to Yi.Framework.Net6/test/Yi.Framework.Web/TestEntity.cs diff --git a/src/Yi.Framework/Yi.Framework.Web/TimeTest.cs b/Yi.Framework.Net6/test/Yi.Framework.Web/TimeTest.cs similarity index 68% rename from src/Yi.Framework/Yi.Framework.Web/TimeTest.cs rename to Yi.Framework.Net6/test/Yi.Framework.Web/TimeTest.cs index c8e518b2..749aec9a 100644 --- a/src/Yi.Framework/Yi.Framework.Web/TimeTest.cs +++ b/Yi.Framework.Net6/test/Yi.Framework.Web/TimeTest.cs @@ -16,8 +16,11 @@ namespace Yi.Framework.Web Stopwatch.Stop(); string time = Stopwatch.ElapsedMilliseconds.ToString(); - Console.WriteLine($"本次运行启动时间为：{time}毫秒"); Stopwatch.Restart(); + string res = $"{DateTime.Now.ToString("yyyy:MM:dd-HH:mm:ss")}本次运行启动时间为：{time}毫秒\r\n"; + Console.WriteLine(res); + File.AppendAllText("./TimeTest.txt", res); + } } } diff --git a/Yi.Framework.Net6/test/Yi.Framework.Web/TimeTest.txt b/Yi.Framework.Net6/test/Yi.Framework.Web/TimeTest.txt new file mode 100644 index 00000000..9a4b2259 --- /dev/null +++ b/Yi.Framework.Net6/test/Yi.Framework.Web/TimeTest.txt @@ -0,0 +1,9 @@ +2023:01:16-22:36:40本次运行启动时间为：2089毫秒 +2023:01:16-22:36:49本次运行启动时间为：2021毫秒 +2023:01:16-22:37:01本次运行启动时间为：2072毫秒 +2023:01:16-22:39:23本次运行启动时间为：2075毫秒 +2023:01:16-22:40:48本次运行启动时间为：2172毫秒 +2023:01:16-22:41:12本次运行启动时间为：2142毫秒 +2023:01:16-22:42:05本次运行启动时间为：2008毫秒 +2023:01:16-22:43:22本次运行启动时间为：1910毫秒 +2023:01:16-22:44:33本次运行启动时间为：2017毫秒 diff --git a/src/Yi.Framework/Yi.Framework.Web/Yi.Framework.Web.csproj b/Yi.Framework.Net6/test/Yi.Framework.Web/Yi.Framework.Web.csproj similarity index 78% rename from src/Yi.Framework/Yi.Framework.Web/Yi.Framework.Web.csproj rename to Yi.Framework.Net6/test/Yi.Framework.Web/Yi.Framework.Web.csproj index f9cd981f..a4a4a1d9 100644 --- a/src/Yi.Framework/Yi.Framework.Web/Yi.Framework.Web.csproj +++ b/Yi.Framework.Net6/test/Yi.Framework.Web/Yi.Framework.Web.csproj @@ -7,8 +7,8 @@ + - diff --git a/src/Yi.Framework/Yi.Framework.Web/YiFrameworkWebModule.cs b/Yi.Framework.Net6/test/Yi.Framework.Web/YiFrameworkWebModule.cs similarity index 100% rename from src/Yi.Framework/Yi.Framework.Web/YiFrameworkWebModule.cs rename to Yi.Framework.Net6/test/Yi.Framework.Web/YiFrameworkWebModule.cs diff --git a/src/Yi.Framework/Yi.Framework.Web/appsettings.json b/Yi.Framework.Net6/test/Yi.Framework.Web/appsettings.json similarity index 100% rename from src/Yi.Framework/Yi.Framework.Web/appsettings.json rename to Yi.Framework.Net6/test/Yi.Framework.Web/appsettings.json diff --git a/src/Yi.Framework/Yi.Framework.Web/yi-sqlsugar-dev.db b/Yi.Framework.Net6/test/Yi.Framework.Web/yi-sqlsugar-dev.db similarity index 64% rename from src/Yi.Framework/Yi.Framework.Web/yi-sqlsugar-dev.db rename to Yi.Framework.Net6/test/Yi.Framework.Web/yi-sqlsugar-dev.db index 56b55a0b801360da5c7ed698e90f72174005e414..ceeda9cc3b6aac28acc02dda1dd5d56f1c4d4e5c 100644 GIT binary patch delta 338 zcmZp0Xh@hK&C1Haz`#6F!CsJ+LC<{!FaHk)CVm43egpoK8w(HcaW#rDvWrVgGd3|# zp2_dT9T4Q{>lhTN;O!bY`8K~&x(+Xwl3!_VQfiTsLQ-aWW?qScpMQvgU#O3d0uX5G zGO>v}N;5KK=B1=o6c^@XmZZifmX_p$`SHOer75X-CGmz(1~bqt96-##3&bq^D;fA- z^IzrP&%biBpukN2bP*O7Hc2M2%(+KjISDYl+_n4Z+6hdvM3|wXdtWmNFg)+;ezI!{ zqpt`PRCHS%Q0=q1eNSi4X1FKJ2oz-mny@kJkO0HeJqw=f=*;H=TXvR#{|opMGqZ8R%mV-p5n_@6 delta 109 zcmZojXmFSy&C1Ncz`!(7!JeO)LC<{!FObK`KY@XN!e&7MC4SC4Ms{&&X~st5$yWSM zliT@~_!Sg1L5i68A2INM<$ttUP+<@M#0DujK_+H4NwEyxgGNpQ3{Unhc)D~iCnGb5 M - - - Yi.Framework.Application - - - - - 服务实现 - - - - - 你好世界 - - - - - diff --git a/src/Yi.Framework/Yi.Framework.Ddd.Application.Contracts/Class1.cs b/src/Yi.Framework/Yi.Framework.Ddd.Application.Contracts/Class1.cs deleted file mode 100644 index a0378ac2..00000000 --- a/src/Yi.Framework/Yi.Framework.Ddd.Application.Contracts/Class1.cs +++ /dev/null @@ -1,7 +0,0 @@ -namespace Yi.Framework.Ddd.Application.Contracts -{ - public class Class1 - { - - } -} \ No newline at end of file diff --git a/src/Yi.Framework/Yi.Framework.Ddd.Application.Contracts/Yi.Framework.Ddd.Application.Contracts.csproj b/src/Yi.Framework/Yi.Framework.Ddd.Application.Contracts/Yi.Framework.Ddd.Application.Contracts.csproj deleted file mode 100644 index 132c02c5..00000000 --- a/src/Yi.Framework/Yi.Framework.Ddd.Application.Contracts/Yi.Framework.Ddd.Application.Contracts.csproj +++ /dev/null @@ -1,9 +0,0 @@ - - - - net6.0 - enable - enable - - - diff --git a/src/Yi.Framework/Yi.Framework.Ddd.Application/Dtos/PagedAndSortedResultRequestDto.cs b/src/Yi.Framework/Yi.Framework.Ddd.Application/Dtos/PagedAndSortedResultRequestDto.cs deleted file mode 100644 index b52ebbe8..00000000 --- a/src/Yi.Framework/Yi.Framework.Ddd.Application/Dtos/PagedAndSortedResultRequestDto.cs +++ /dev/null @@ -1,16 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace Yi.Framework.Ddd.Dtos -{ - public class PagedAndSortedResultRequestDto : IPagedAndSortedResultRequestDto - { - public int PageIndex { get; set; } - public int PageSize { get; set; } - public string? PageSort { get; set; } - - } -}