diff --git a/src/Yi.Framework/Yi.Framework.Application.Contracts/YiFrameworkApplicationContractsModule.cs b/src/Yi.Framework/Yi.Framework.Application.Contracts/YiFrameworkApplicationContractsModule.cs index 74067ff9..3b4ff5a2 100644 --- a/src/Yi.Framework/Yi.Framework.Application.Contracts/YiFrameworkApplicationContractsModule.cs +++ b/src/Yi.Framework/Yi.Framework.Application.Contracts/YiFrameworkApplicationContractsModule.cs @@ -1,22 +1,20 @@ -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; +using Volo.Abp; +using Volo.Abp.Modularity; +using Yi.Framework.Domain.Shared; namespace Yi.Framework.Application.Contracts { - public class YiFrameworkApplicationContractsModule : IStartupModule + [DependsOn( + typeof(YiFrameworkDomainSharedModule))] + public class YiFrameworkApplicationContractsModule : AbpModule { - public void Configure(IApplicationBuilder app, ConfigureMiddlewareContext context) + public override void ConfigureServices(ServiceConfigurationContext context) + { + } + public override void OnApplicationInitialization(ApplicationInitializationContext context) { } - public void ConfigureServices(IServiceCollection services, ConfigureServicesContext context) - { - } + } } diff --git a/src/Yi.Framework/Yi.Framework.Application/Student/StudentService.cs b/src/Yi.Framework/Yi.Framework.Application/Student/StudentService.cs index 2e896389..5e661c59 100644 --- a/src/Yi.Framework/Yi.Framework.Application/Student/StudentService.cs +++ b/src/Yi.Framework/Yi.Framework.Application/Student/StudentService.cs @@ -1,21 +1,21 @@ -using System; +using Microsoft.AspNetCore.Http; +using System; using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; +using Volo.Abp.Application.Services; using Yi.Framework.Application.Contracts.Student; using Yi.Framework.Domain.Student; using Yi.Framework.Domain.Student.IRepository; -using Microsoft.AspNetCore.Mvc; -using NET.AutoWebApi.Setting; -using Microsoft.AspNetCore.Http; + namespace Yi.Framework.Application.Student { /// /// 服务实现 /// - public class StudentService : IStudentService, IAutoApiService + public class StudentService : ApplicationService, IStudentService { private readonly IStudentRepository _studentRepository; private readonly StudentManager _studentManager; @@ -25,7 +25,12 @@ namespace Yi.Framework.Application.Student _studentManager = studentManager; } - public string PostShijie(IFormFile formFile) + /// + /// 你好世界 + /// + /// + /// + public string PostShijie(string formFile) { var ss = formFile; return "你好世界"; diff --git a/src/Yi.Framework/Yi.Framework.Application/SwaggerDoc.xml b/src/Yi.Framework/Yi.Framework.Application/SwaggerDoc.xml index 221447a6..4ac16ab2 100644 --- a/src/Yi.Framework/Yi.Framework.Application/SwaggerDoc.xml +++ b/src/Yi.Framework/Yi.Framework.Application/SwaggerDoc.xml @@ -9,5 +9,12 @@ 服务实现 + + + 你好世界 + + + + diff --git a/src/Yi.Framework/Yi.Framework.Application/Yi.Framework.Application.csproj b/src/Yi.Framework/Yi.Framework.Application/Yi.Framework.Application.csproj index 121d981f..7585cff5 100644 --- a/src/Yi.Framework/Yi.Framework.Application/Yi.Framework.Application.csproj +++ b/src/Yi.Framework/Yi.Framework.Application/Yi.Framework.Application.csproj @@ -8,9 +8,13 @@ ./SwaggerDoc.xml + + + + + - diff --git a/src/Yi.Framework/Yi.Framework.Application/YiFrameworkApplicationModule.cs b/src/Yi.Framework/Yi.Framework.Application/YiFrameworkApplicationModule.cs index 3dc3333d..4fb49d09 100644 --- a/src/Yi.Framework/Yi.Framework.Application/YiFrameworkApplicationModule.cs +++ b/src/Yi.Framework/Yi.Framework.Application/YiFrameworkApplicationModule.cs @@ -1,26 +1,32 @@ -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; +using Volo.Abp; +using Volo.Abp.Modularity; +using Yi.Framework.Application.Contracts; using Yi.Framework.Application.Contracts.Student; using Yi.Framework.Application.Student; +using Yi.Framework.Domain.Shared; namespace Yi.Framework.Application { - public class YiFrameworkApplicationModule : IStartupModule + [DependsOn( + typeof(YiFrameworkDomainSharedModule), + typeof(YiFrameworkApplicationContractsModule) )] + public class YiFrameworkApplicationModule : AbpModule { - public void Configure(IApplicationBuilder app, ConfigureMiddlewareContext context) + public override void ConfigureServices(ServiceConfigurationContext context) { - + context.Services.AddTransient(); } - public void ConfigureServices(IServiceCollection services, ConfigureServicesContext context) + public override void OnApplicationInitialization(ApplicationInitializationContext context) { - services.AddTransient(); + } } } diff --git a/src/Yi.Framework/Yi.Framework.Caching.MemoryCache/Yi.Framework.Caching.MemoryCache.csproj b/src/Yi.Framework/Yi.Framework.Caching.MemoryCache/Yi.Framework.Caching.MemoryCache.csproj index 829e6465..ec274e38 100644 --- a/src/Yi.Framework/Yi.Framework.Caching.MemoryCache/Yi.Framework.Caching.MemoryCache.csproj +++ b/src/Yi.Framework/Yi.Framework.Caching.MemoryCache/Yi.Framework.Caching.MemoryCache.csproj @@ -12,7 +12,6 @@ - diff --git a/src/Yi.Framework/Yi.Framework.Caching.Redis/Yi.Framework.Caching.Redis.csproj b/src/Yi.Framework/Yi.Framework.Caching.Redis/Yi.Framework.Caching.Redis.csproj index 19bf78cb..b7fc1320 100644 --- a/src/Yi.Framework/Yi.Framework.Caching.Redis/Yi.Framework.Caching.Redis.csproj +++ b/src/Yi.Framework/Yi.Framework.Caching.Redis/Yi.Framework.Caching.Redis.csproj @@ -12,7 +12,6 @@ - diff --git a/src/Yi.Framework/Yi.Framework.Core/Yi.Framework.Core.csproj b/src/Yi.Framework/Yi.Framework.Core/Yi.Framework.Core.csproj index b7d607f3..373d8915 100644 --- a/src/Yi.Framework/Yi.Framework.Core/Yi.Framework.Core.csproj +++ b/src/Yi.Framework/Yi.Framework.Core/Yi.Framework.Core.csproj @@ -11,10 +11,7 @@ - - - - + diff --git a/src/Yi.Framework/Yi.Framework.Core/YiFrameworkCoreModule.cs b/src/Yi.Framework/Yi.Framework.Core/YiFrameworkCoreModule.cs index 8178b352..ee6a4980 100644 --- a/src/Yi.Framework/Yi.Framework.Core/YiFrameworkCoreModule.cs +++ b/src/Yi.Framework/Yi.Framework.Core/YiFrameworkCoreModule.cs @@ -1,7 +1,6 @@ using Microsoft.AspNetCore.Builder; using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; -using StartupModules; using System; using System.Collections.Generic; using System.Linq; diff --git a/src/Yi.Framework/Yi.Framework.Domain.Shared/Yi.Framework.Domain.Shared.csproj b/src/Yi.Framework/Yi.Framework.Domain.Shared/Yi.Framework.Domain.Shared.csproj index 0bc0d438..635e9090 100644 --- a/src/Yi.Framework/Yi.Framework.Domain.Shared/Yi.Framework.Domain.Shared.csproj +++ b/src/Yi.Framework/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/src/Yi.Framework/Yi.Framework.Domain.Shared/YiFrameworkDomainSharedModule.cs index 437b87fa..b59d9490 100644 --- a/src/Yi.Framework/Yi.Framework.Domain.Shared/YiFrameworkDomainSharedModule.cs +++ b/src/Yi.Framework/Yi.Framework.Domain.Shared/YiFrameworkDomainSharedModule.cs @@ -1,21 +1,21 @@ -using Microsoft.AspNetCore.Builder; -using Microsoft.Extensions.DependencyInjection; -using StartupModules; +using Microsoft.Extensions.DependencyInjection; using System; using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; +using Volo.Abp; +using Volo.Abp.Modularity; namespace Yi.Framework.Domain.Shared { - public class YiFrameworkDomainSharedModule : IStartupModule + public class YiFrameworkDomainSharedModule : AbpModule { - public void Configure(IApplicationBuilder app, ConfigureMiddlewareContext context) + public override void ConfigureServices(ServiceConfigurationContext context) { } - public void ConfigureServices(IServiceCollection services, ConfigureServicesContext context) + public override void OnApplicationInitialization(ApplicationInitializationContext context) { } } diff --git a/src/Yi.Framework/Yi.Framework.Domain/Student/IRepository/IStudentRepository.cs b/src/Yi.Framework/Yi.Framework.Domain/Student/IRepository/IStudentRepository.cs index e31bd2e1..9a3bd463 100644 --- a/src/Yi.Framework/Yi.Framework.Domain/Student/IRepository/IStudentRepository.cs +++ b/src/Yi.Framework/Yi.Framework.Domain/Student/IRepository/IStudentRepository.cs @@ -3,15 +3,14 @@ using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; -using Yi.Framework.Ddd.Repository; using Yi.Framework.Domain.Student.Entities; namespace Yi.Framework.Domain.Student.IRepository { - /// - /// 仓储抽象 - /// - public interface IStudentRepository:IRepository + // + // 仓储抽象 + // + public interface IStudentRepository { } } diff --git a/src/Yi.Framework/Yi.Framework.Domain/Yi.Framework.Domain.csproj b/src/Yi.Framework/Yi.Framework.Domain/Yi.Framework.Domain.csproj index b1d51c1d..39124612 100644 --- a/src/Yi.Framework/Yi.Framework.Domain/Yi.Framework.Domain.csproj +++ b/src/Yi.Framework/Yi.Framework.Domain/Yi.Framework.Domain.csproj @@ -6,6 +6,10 @@ enable + + + + diff --git a/src/Yi.Framework/Yi.Framework.Domain/YiFrameworkDomainModule.cs b/src/Yi.Framework/Yi.Framework.Domain/YiFrameworkDomainModule.cs index 7e8ee6e5..43051766 100644 --- a/src/Yi.Framework/Yi.Framework.Domain/YiFrameworkDomainModule.cs +++ b/src/Yi.Framework/Yi.Framework.Domain/YiFrameworkDomainModule.cs @@ -1,24 +1,28 @@ -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; +using Volo.Abp.Modularity; +using Volo.Abp; using Yi.Framework.Domain.Student; +using Yi.Framework.Domain.Shared; namespace Yi.Framework.Domain { - public class YiFrameworkDomainModule : IStartupModule + [DependsOn(typeof(YiFrameworkDomainSharedModule))] + public class YiFrameworkDomainModule : AbpModule { - public void Configure(IApplicationBuilder app, ConfigureMiddlewareContext context) + public override void ConfigureServices(ServiceConfigurationContext context) { + context.Services.AddTransient(); } - public void ConfigureServices(IServiceCollection services, ConfigureServicesContext context) + public override void OnApplicationInitialization(ApplicationInitializationContext context) { - services.AddTransient(); + } } } diff --git a/src/Yi.Framework/Yi.Framework.Sqlsugar/Student/StudentRepository.cs b/src/Yi.Framework/Yi.Framework.Sqlsugar/Student/StudentRepository.cs index 5ba9c262..042a00f4 100644 --- a/src/Yi.Framework/Yi.Framework.Sqlsugar/Student/StudentRepository.cs +++ b/src/Yi.Framework/Yi.Framework.Sqlsugar/Student/StudentRepository.cs @@ -4,8 +4,6 @@ using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; -using Yi.Framework.Core.Sqlsugar.Repository; -using Yi.Framework.Ddd.Repository; using Yi.Framework.Domain.Student.Entities; using Yi.Framework.Domain.Student.IRepository; @@ -14,10 +12,7 @@ namespace Yi.Framework.Sqlsugar.Student /// /// 仓储实现方式 /// - public class StudentRepository : SqlsugarRepository ,IStudentRepository + public class StudentRepository : IStudentRepository { - public StudentRepository(ISqlSugarClient context) : base(context) - { - } } } diff --git a/src/Yi.Framework/Yi.Framework.Sqlsugar/Yi.Framework.Sqlsugar.csproj b/src/Yi.Framework/Yi.Framework.Sqlsugar/Yi.Framework.Sqlsugar.csproj index 11db2576..2e67a0db 100644 --- a/src/Yi.Framework/Yi.Framework.Sqlsugar/Yi.Framework.Sqlsugar.csproj +++ b/src/Yi.Framework/Yi.Framework.Sqlsugar/Yi.Framework.Sqlsugar.csproj @@ -7,7 +7,6 @@ - diff --git a/src/Yi.Framework/Yi.Framework.Sqlsugar/YiFrameworkSqlsugarModule.cs b/src/Yi.Framework/Yi.Framework.Sqlsugar/YiFrameworkSqlsugarModule.cs index 169c09fc..cbad3015 100644 --- a/src/Yi.Framework/Yi.Framework.Sqlsugar/YiFrameworkSqlsugarModule.cs +++ b/src/Yi.Framework/Yi.Framework.Sqlsugar/YiFrameworkSqlsugarModule.cs @@ -1,25 +1,29 @@ -using Microsoft.AspNetCore.Builder; -using Microsoft.Extensions.DependencyInjection; -using StartupModules; +using Microsoft.Extensions.DependencyInjection; using System; using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; +using Volo.Abp; +using Volo.Abp.Modularity; +using Yi.Framework.Domain; using Yi.Framework.Domain.Student.IRepository; using Yi.Framework.Sqlsugar.Student; namespace Yi.Framework.Sqlsugar { - public class YiFrameworkSqlsugarModule : IStartupModule + [DependsOn(typeof(YiFrameworkDomainModule))] + public class YiFrameworkSqlsugarModule : AbpModule { - public void Configure(IApplicationBuilder app, ConfigureMiddlewareContext context) + public override void ConfigureServices(ServiceConfigurationContext context) { + context.Services.AddTransient(); + } + public override void OnApplicationInitialization(ApplicationInitializationContext context) + { + } - public void ConfigureServices(IServiceCollection services, ConfigureServicesContext context) - { - services.AddTransient(); - } + } } diff --git a/src/Yi.Framework/Yi.Framework.Web/Program.cs b/src/Yi.Framework/Yi.Framework.Web/Program.cs index 0a0554e9..c1ea39f4 100644 --- a/src/Yi.Framework/Yi.Framework.Web/Program.cs +++ b/src/Yi.Framework/Yi.Framework.Web/Program.cs @@ -1,70 +1,15 @@ -using AspNetCore.Microsoft.AspNetCore.Builder; -using System.Reflection; -using Yi.Framework.Application; -using Yi.Framework.Application.Contracts; -using Yi.Framework.Autofac.Extensions; -using Yi.Framework.Core; -using Yi.Framework.Core.AutoMapper; -using Yi.Framework.Core.Extensions; -using Yi.Framework.Core.Sqlsugar; -using Yi.Framework.Core.Sqlsugar.Repository; -using Yi.Framework.Ddd; -using Yi.Framework.Ddd.Repository; -using Yi.Framework.Domain; -using Yi.Framework.Domain.Shared; -using Yi.Framework.Sqlsugar; using Yi.Framework.Web; var builder = WebApplication.CreateBuilder(args); -builder.WebHost.UseUrls(builder.Configuration.GetValue("StartUrl")); - -//ģ -builder.UseYiModules( - typeof(YiFrameworkCoreModule).Assembly, - typeof(YiFrameworkCoreAutoMapperModule).Assembly, - typeof(YiFrameworkDddModule).Assembly, - typeof(YiFrameworkCoreSqlsugarModule).Assembly, - - typeof(YiFrameworkSqlsugarModule).Assembly, - typeof(YiFrameworkDomainSharedModule).Assembly, - typeof(YiFrameworkDomainModule).Assembly, - typeof(YiFrameworkApplicationContractsModule).Assembly, - typeof(YiFrameworkApplicationModule).Assembly - ); - -//ʹautofac -builder.Host.UseAutoFacServerProviderFactory(); - -//ӿ붯̬api -builder.Services.AddControllers(); -builder.Services.AddAutoApiService(opt => -{ - //NETServiceTestڳӽ̬api - opt.CreateConventional(typeof(YiFrameworkApplicationModule).Assembly); -}); - -//swagger -builder.Services.AddSwaggerServer(); - +//ļ +builder.Host.AddAppSettingsSecretsJson(); +//ģ黯 +await builder.AddApplicationAsync(); var app = builder.Build(); -app.Services.GetRequiredService>(); -//if (app.Environment.IsDevelopment()) -{ - app.UseSwaggerServer(); -} - -app.UseHttpsRedirection(); - -app.UseAuthorization(); - -app.UseRouting(); - -//ʹö̬api -app.UseAutoApiService(); -app.MapControllers(); - -app.Run(); +//ʹģ黯 +await app.InitializeApplicationAsync(); +await app.RunAsync(); diff --git a/src/Yi.Framework/Yi.Framework.Web/TestEntity.cs b/src/Yi.Framework/Yi.Framework.Web/TestEntity.cs deleted file mode 100644 index 242d5933..00000000 --- a/src/Yi.Framework/Yi.Framework.Web/TestEntity.cs +++ /dev/null @@ -1,9 +0,0 @@ -using Yi.Framework.Core.Attribute; -using Yi.Framework.Core.DependencyInjection; - -namespace Yi.Framework.Web -{ - public class TestEntity: ITransientDependency - { - } -} diff --git a/src/Yi.Framework/Yi.Framework.Web/Yi.Framework.Web.csproj b/src/Yi.Framework/Yi.Framework.Web/Yi.Framework.Web.csproj index db54d323..b467d16f 100644 --- a/src/Yi.Framework/Yi.Framework.Web/Yi.Framework.Web.csproj +++ b/src/Yi.Framework/Yi.Framework.Web/Yi.Framework.Web.csproj @@ -6,10 +6,13 @@ enable + + + + + - - diff --git a/src/Yi.Framework/Yi.Framework.Web/YiFrameworkWebModule.cs b/src/Yi.Framework/Yi.Framework.Web/YiFrameworkWebModule.cs index cb0a1a58..264ea9b7 100644 --- a/src/Yi.Framework/Yi.Framework.Web/YiFrameworkWebModule.cs +++ b/src/Yi.Framework/Yi.Framework.Web/YiFrameworkWebModule.cs @@ -1,17 +1,73 @@ -using StartupModules; +using Microsoft.AspNetCore.Cors; +using Microsoft.OpenApi.Models; +using Volo.Abp; +using Volo.Abp.AspNetCore.Mvc; +using Volo.Abp.Modularity; +using Volo.Abp.Swashbuckle; +using Yi.Framework.Application; +using Yi.Framework.Sqlsugar; namespace Yi.Framework.Web { - public class YiFrameworkWebModule : IStartupModule + [DependsOn( + typeof(AbpSwashbuckleModule), + typeof(YiFrameworkApplicationModule), + typeof(YiFrameworkSqlsugarModule), + typeof(AbpAspNetCoreMvcModule) + + )] + public class YiFrameworkWebModule : AbpModule { - public void ConfigureServices(IServiceCollection services, ConfigureServicesContext context) + public override void ConfigureServices(ServiceConfigurationContext context) { - + + ConfigureAutoApiControllers(); + + + ConfigureSwaggerServices(context.Services); } - public void Configure(IApplicationBuilder app, ConfigureMiddlewareContext context) + public override void OnApplicationInitialization(ApplicationInitializationContext context) { - Console.WriteLine("还有谁"); - + var app = context.GetApplicationBuilder(); + + app.UseStaticFiles(); + app.UseRouting(); + + app.UseSwagger(); + app.UseAbpSwaggerUI(options => + { + options.SwaggerEndpoint("/swagger/v1/swagger.json", "YiFramework API"); + }); + app.UseConfiguredEndpoints(); + } + + private void ConfigureAutoApiControllers() + { + Configure(options => + { + options.ConventionalControllers.Create(typeof(YiFrameworkApplicationModule).Assembly); + }); + } + + private void ConfigureSwaggerServices(IServiceCollection services) + { + services.AddSwaggerGen( + options => + { + options.SwaggerDoc("v1", new OpenApiInfo { Title = "YiFramework API", Version = "v1" }); + options.DocInclusionPredicate((docName, description) => true); + options.CustomSchemaIds(type => type.FullName); + var basePath = Path.GetDirectoryName(this.GetType().Assembly.Location); + if (basePath is not null) + { + foreach (var item in Directory.GetFiles(basePath, "*.xml")) + { + options.IncludeXmlComments(item, true); + } + } + + } + ); } } } diff --git a/src/Yi.Framework/Yi.Framework.sln b/src/Yi.Framework/Yi.Framework.sln index 251d1ebc..ca7fca92 100644 --- a/src/Yi.Framework/Yi.Framework.sln +++ b/src/Yi.Framework/Yi.Framework.sln @@ -9,8 +9,6 @@ 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}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Yi.Framework.Application", "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}" @@ -25,23 +23,13 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Yi.Framework.Web", "Yi.Fram 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}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Yi.Framework.Ddd", "Yi.Framework.Ddd.Application\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}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Yi.Framework.AspNetCore", "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}" 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}" 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}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Yi.Framework.Uow", "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}" -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.AspNetCore", "Yi.Framework.AspNetCore\Yi.Framework.AspNetCore.csproj", "{5A91C3DD-9547-47EE-91F3-84C8931FA424}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -49,10 +37,6 @@ Global Release|Any CPU = Release|Any CPU EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {83B2D7AD-ED8E-4392-B0AE-4227498CD75F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {83B2D7AD-ED8E-4392-B0AE-4227498CD75F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {83B2D7AD-ED8E-4392-B0AE-4227498CD75F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {83B2D7AD-ED8E-4392-B0AE-4227498CD75F}.Release|Any CPU.Build.0 = Release|Any CPU {456835D1-4968-4195-9993-B2A580E85056}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {456835D1-4968-4195-9993-B2A580E85056}.Debug|Any CPU.Build.0 = Debug|Any CPU {456835D1-4968-4195-9993-B2A580E85056}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -81,18 +65,6 @@ Global {1879A863-9864-4E16-8492-504055807684}.Debug|Any CPU.Build.0 = Debug|Any CPU {1879A863-9864-4E16-8492-504055807684}.Release|Any CPU.ActiveCfg = Release|Any CPU {1879A863-9864-4E16-8492-504055807684}.Release|Any CPU.Build.0 = Release|Any CPU - {949F35A7-36E4-4080-9940-24BE52532078}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {949F35A7-36E4-4080-9940-24BE52532078}.Debug|Any CPU.Build.0 = Debug|Any CPU - {949F35A7-36E4-4080-9940-24BE52532078}.Release|Any CPU.ActiveCfg = Release|Any CPU - {949F35A7-36E4-4080-9940-24BE52532078}.Release|Any CPU.Build.0 = Release|Any CPU - {63BA134E-9D23-4EB8-87E4-B45B33D954F5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {63BA134E-9D23-4EB8-87E4-B45B33D954F5}.Debug|Any CPU.Build.0 = Debug|Any CPU - {63BA134E-9D23-4EB8-87E4-B45B33D954F5}.Release|Any CPU.ActiveCfg = Release|Any CPU - {63BA134E-9D23-4EB8-87E4-B45B33D954F5}.Release|Any CPU.Build.0 = Release|Any CPU - {2F5E5843-14FB-48F1-AEB0-B9FFE103B972}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2F5E5843-14FB-48F1-AEB0-B9FFE103B972}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2F5E5843-14FB-48F1-AEB0-B9FFE103B972}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2F5E5843-14FB-48F1-AEB0-B9FFE103B972}.Release|Any CPU.Build.0 = Release|Any CPU {8767C5B7-3A17-4729-BCAA-B391B6A215AA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {8767C5B7-3A17-4729-BCAA-B391B6A215AA}.Debug|Any CPU.Build.0 = Debug|Any CPU {8767C5B7-3A17-4729-BCAA-B391B6A215AA}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -105,24 +77,15 @@ Global {67CF07AB-2A72-4B36-A3A5-4CEB82B7C43C}.Debug|Any CPU.Build.0 = Debug|Any CPU {67CF07AB-2A72-4B36-A3A5-4CEB82B7C43C}.Release|Any CPU.ActiveCfg = Release|Any CPU {67CF07AB-2A72-4B36-A3A5-4CEB82B7C43C}.Release|Any CPU.Build.0 = Release|Any CPU - {3D83BE69-71BB-43BE-B3F1-A532215561CD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {3D83BE69-71BB-43BE-B3F1-A532215561CD}.Debug|Any CPU.Build.0 = Debug|Any CPU - {3D83BE69-71BB-43BE-B3F1-A532215561CD}.Release|Any CPU.ActiveCfg = Release|Any CPU - {3D83BE69-71BB-43BE-B3F1-A532215561CD}.Release|Any CPU.Build.0 = Release|Any CPU - {58F4071D-66B7-4839-A247-79AF0E4E1C8E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {58F4071D-66B7-4839-A247-79AF0E4E1C8E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {58F4071D-66B7-4839-A247-79AF0E4E1C8E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {58F4071D-66B7-4839-A247-79AF0E4E1C8E}.Release|Any CPU.Build.0 = Release|Any CPU - {DFD34702-2EF6-4ECC-AE6E-9A1A3885BD26}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {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 + {5A91C3DD-9547-47EE-91F3-84C8931FA424}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {5A91C3DD-9547-47EE-91F3-84C8931FA424}.Debug|Any CPU.Build.0 = Debug|Any CPU + {5A91C3DD-9547-47EE-91F3-84C8931FA424}.Release|Any CPU.ActiveCfg = Release|Any CPU + {5A91C3DD-9547-47EE-91F3-84C8931FA424}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection GlobalSection(NestedProjects) = preSolution - {83B2D7AD-ED8E-4392-B0AE-4227498CD75F} = {5F2B846D-96CE-400A-878E-220498F4EE31} {456835D1-4968-4195-9993-B2A580E85056} = {32A813F5-13B2-4DCA-8B59-F27F1B0D5678} {D2378C23-2CFE-468A-924A-B8C9D4A3A8ED} = {32A813F5-13B2-4DCA-8B59-F27F1B0D5678} {C02A954D-CCCB-41BD-ADAD-9D7ECBF1A828} = {32A813F5-13B2-4DCA-8B59-F27F1B0D5678} @@ -130,15 +93,10 @@ Global {3C3A7BAC-F27F-433E-BF91-289FA42E4995} = {32A813F5-13B2-4DCA-8B59-F27F1B0D5678} {01CC7B62-F42C-45CE-BACA-F450593A1AF2} = {32A813F5-13B2-4DCA-8B59-F27F1B0D5678} {1879A863-9864-4E16-8492-504055807684} = {EEF5F221-0E32-4A3D-B647-B4B5E7305806} - {949F35A7-36E4-4080-9940-24BE52532078} = {5F2B846D-96CE-400A-878E-220498F4EE31} - {63BA134E-9D23-4EB8-87E4-B45B33D954F5} = {5F2B846D-96CE-400A-878E-220498F4EE31} - {2F5E5843-14FB-48F1-AEB0-B9FFE103B972} = {5F2B846D-96CE-400A-878E-220498F4EE31} {8767C5B7-3A17-4729-BCAA-B391B6A215AA} = {EEF5F221-0E32-4A3D-B647-B4B5E7305806} {F13D4F03-3FA0-43E9-BBAA-F618E1A3CF41} = {EEF5F221-0E32-4A3D-B647-B4B5E7305806} {67CF07AB-2A72-4B36-A3A5-4CEB82B7C43C} = {EEF5F221-0E32-4A3D-B647-B4B5E7305806} - {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} + {5A91C3DD-9547-47EE-91F3-84C8931FA424} = {5F2B846D-96CE-400A-878E-220498F4EE31} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {6C1A3808-0F4F-43FB-A9FE-5F27A3BB2ECF}