diff --git a/src/Yi.Framework/Yi.Framework.Application.Contracts/Class1.cs b/src/Yi.Framework/Yi.Framework.Application.Contracts/Class1.cs deleted file mode 100644 index db294d74..00000000 --- a/src/Yi.Framework/Yi.Framework.Application.Contracts/Class1.cs +++ /dev/null @@ -1,7 +0,0 @@ -namespace Yi.Framework.Application.Contracts -{ - public class Class1 - { - - } -} \ No newline at end of file diff --git a/src/Yi.Framework/Yi.Framework.Application.Contracts/Properties/launchSettings.json b/src/Yi.Framework/Yi.Framework.Application.Contracts/Properties/launchSettings.json deleted file mode 100644 index b96981bb..00000000 --- a/src/Yi.Framework/Yi.Framework.Application.Contracts/Properties/launchSettings.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "profiles": { - "Yi.Framework.Application.Contracts": { - "commandName": "Project", - "launchBrowser": true, - "environmentVariables": { - "ASPNETCORE_ENVIRONMENT": "Development" - }, - "applicationUrl": "https://localhost:53034;http://localhost:53037" - } - } -} \ No newline at end of file diff --git a/src/Yi.Framework/Yi.Framework.Application.Contracts/Student/IStudentService.cs b/src/Yi.Framework/Yi.Framework.Application.Contracts/Student/IStudentService.cs new file mode 100644 index 00000000..f02c2faa --- /dev/null +++ b/src/Yi.Framework/Yi.Framework.Application.Contracts/Student/IStudentService.cs @@ -0,0 +1,17 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using Yi.Framework.Domain.Shared.Student.IRepository; + +namespace Yi.Framework.Application.Contracts.Student +{ + /// + /// 服务抽象 + /// + public interface IStudentService + { + + } +} diff --git a/src/Yi.Framework/Yi.Framework.Application.Contracts/Yi.Framework.Application.Contracts.csproj b/src/Yi.Framework/Yi.Framework.Application.Contracts/Yi.Framework.Application.Contracts.csproj index 132c02c5..d012a3c6 100644 --- a/src/Yi.Framework/Yi.Framework.Application.Contracts/Yi.Framework.Application.Contracts.csproj +++ b/src/Yi.Framework/Yi.Framework.Application.Contracts/Yi.Framework.Application.Contracts.csproj @@ -6,4 +6,12 @@ enable + + + + + + + + diff --git a/src/Yi.Framework/Yi.Framework.Application.Contracts/YiFrameworkApplicationContractsModule.cs b/src/Yi.Framework/Yi.Framework.Application.Contracts/YiFrameworkApplicationContractsModule.cs new file mode 100644 index 00000000..74067ff9 --- /dev/null +++ b/src/Yi.Framework/Yi.Framework.Application.Contracts/YiFrameworkApplicationContractsModule.cs @@ -0,0 +1,22 @@ +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.Application.Contracts +{ + public class YiFrameworkApplicationContractsModule : IStartupModule + { + public void Configure(IApplicationBuilder app, ConfigureMiddlewareContext context) + { + } + + public void ConfigureServices(IServiceCollection services, ConfigureServicesContext context) + { + } + } +} diff --git a/src/Yi.Framework/Yi.Framework.Application/Properties/launchSettings.json b/src/Yi.Framework/Yi.Framework.Application/Properties/launchSettings.json deleted file mode 100644 index d145776a..00000000 --- a/src/Yi.Framework/Yi.Framework.Application/Properties/launchSettings.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "profiles": { - "Yi.Framework.Application": { - "commandName": "Project", - "launchBrowser": true, - "environmentVariables": { - "ASPNETCORE_ENVIRONMENT": "Development" - }, - "applicationUrl": "https://localhost:53032;http://localhost:53036" - } - } -} \ No newline at end of file diff --git a/src/Yi.Framework/Yi.Framework.Application/Student/MapperConfig/StudentProfile.cs b/src/Yi.Framework/Yi.Framework.Application/Student/MapperConfig/StudentProfile.cs new file mode 100644 index 00000000..932359b4 --- /dev/null +++ b/src/Yi.Framework/Yi.Framework.Application/Student/MapperConfig/StudentProfile.cs @@ -0,0 +1,12 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Yi.Framework.Application.Student.MapperConfig +{ + internal class StudentProfile + { + } +} diff --git a/src/Yi.Framework/Yi.Framework.Application/Student/StudentService.cs b/src/Yi.Framework/Yi.Framework.Application/Student/StudentService.cs new file mode 100644 index 00000000..aa2e73c9 --- /dev/null +++ b/src/Yi.Framework/Yi.Framework.Application/Student/StudentService.cs @@ -0,0 +1,32 @@ +using Panda.DynamicWebApi; +using Panda.DynamicWebApi.Attributes; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using Yi.Framework.Application.Contracts.Student; +using Yi.Framework.Domain.Shared.Student.IRepository; +using Yi.Framework.Domain.Student; + +namespace Yi.Framework.Application.Student +{ + /// + /// 服务实现 + /// + [DynamicWebApi] + public class StudentService : IStudentService, IDynamicWebApi + { + private readonly IStudentRepository _studentRepository; + private readonly StudentManager _studentManager; + public StudentService(IStudentRepository studentRepository, StudentManager studentManager ) + { + _studentRepository = studentRepository; + _studentManager = studentManager; + } + public string GetShijie() + { + return "你好世界"; + } + } +} diff --git a/src/Yi.Framework/Yi.Framework.Application/SwaggerDoc.xml b/src/Yi.Framework/Yi.Framework.Application/SwaggerDoc.xml index 63b3b0e5..221447a6 100644 --- a/src/Yi.Framework/Yi.Framework.Application/SwaggerDoc.xml +++ b/src/Yi.Framework/Yi.Framework.Application/SwaggerDoc.xml @@ -4,5 +4,10 @@ Yi.Framework.Application + + + 服务实现 + + diff --git a/src/Yi.Framework/Yi.Framework.Application/TestService.cs b/src/Yi.Framework/Yi.Framework.Application/TestService.cs deleted file mode 100644 index 1314d27a..00000000 --- a/src/Yi.Framework/Yi.Framework.Application/TestService.cs +++ /dev/null @@ -1,15 +0,0 @@ -using Microsoft.AspNetCore.Mvc; -using Panda.DynamicWebApi; -using Panda.DynamicWebApi.Attributes; - -namespace Yi.Framework.Application -{ - [DynamicWebApi] - public class TestService : IDynamicWebApi - { - public string GetShijie() - { - return "你好世界"; - } - } -} \ No newline at end of file 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 99fcd661..121d981f 100644 --- a/src/Yi.Framework/Yi.Framework.Application/Yi.Framework.Application.csproj +++ b/src/Yi.Framework/Yi.Framework.Application/Yi.Framework.Application.csproj @@ -9,7 +9,9 @@ - + + + diff --git a/src/Yi.Framework/Yi.Framework.Application/YiFrameworkApplicationModule.cs b/src/Yi.Framework/Yi.Framework.Application/YiFrameworkApplicationModule.cs index 3f328608..3dc3333d 100644 --- a/src/Yi.Framework/Yi.Framework.Application/YiFrameworkApplicationModule.cs +++ b/src/Yi.Framework/Yi.Framework.Application/YiFrameworkApplicationModule.cs @@ -6,6 +6,8 @@ using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; +using Yi.Framework.Application.Contracts.Student; +using Yi.Framework.Application.Student; namespace Yi.Framework.Application { @@ -18,7 +20,7 @@ namespace Yi.Framework.Application public void ConfigureServices(IServiceCollection services, ConfigureServicesContext context) { - + services.AddTransient(); } } } diff --git a/src/Yi.Framework/Yi.Framework.Caching.Redis/RedisCacheClient.cs b/src/Yi.Framework/Yi.Framework.Caching.Redis/RedisCacheClient.cs index 23ad98dd..ff36c8d9 100644 --- a/src/Yi.Framework/Yi.Framework.Caching.Redis/RedisCacheClient.cs +++ b/src/Yi.Framework/Yi.Framework.Caching.Redis/RedisCacheClient.cs @@ -98,7 +98,7 @@ namespace Yi.Framework.Caching.Redis /// /// /// - public override SubscribeObject Subscribe(params (string, Action)[] channels) + public SubscribeObject Subscribe(params (string, Action)[] channels) { return _client.Subscribe(channels); } @@ -109,7 +109,7 @@ namespace Yi.Framework.Caching.Redis /// /// /// - public override SubscribeListObject SubscribeList(string listKey, Action onMessage) + public SubscribeListObject SubscribeList(string listKey, Action onMessage) { return _client.SubscribeList(listKey, onMessage); } @@ -121,7 +121,7 @@ namespace Yi.Framework.Caching.Redis /// /// /// - public override SubscribeListBroadcastObject SubscribeListBroadcast(string listKey, string clientId, Action onMessage) + public SubscribeListBroadcastObject SubscribeListBroadcast(string listKey, string clientId, Action onMessage) { return _client.SubscribeListBroadcast(listKey, clientId, onMessage); } diff --git a/src/Yi.Framework/Yi.Framework.Core/Extensions/CurrentUserExtensions.cs b/src/Yi.Framework/Yi.Framework.Core/Extensions/CurrentUserExtensions.cs index 18a17b89..23621cc6 100644 --- a/src/Yi.Framework/Yi.Framework.Core/Extensions/CurrentUserExtensions.cs +++ b/src/Yi.Framework/Yi.Framework.Core/Extensions/CurrentUserExtensions.cs @@ -51,10 +51,10 @@ namespace Yi.Framework.Core.Extensions var claims = authenticateContext.Principal.Claims; //通过鉴权之后,开始赋值 _currentUser.IsAuthenticated = true; - _currentUser.Id = claims.GetClaim(JwtRegisteredClaimNames.Sid) is null ? 0 : Convert.ToInt64(claims.GetClaim(JwtRegisteredClaimNames.Sid)); - _currentUser.UserName = claims.GetClaim(SystemConst.UserName) ?? ""; - _currentUser.Permission = claims.GetClaims(SystemConst.PermissionClaim); - _currentUser.TenantId = claims.GetClaim(SystemConst.TenantId) is null ? null : Guid.Parse(claims.GetClaim(SystemConst.TenantId)!); + //_currentUser.Id = claims.GetClaim(JwtRegisteredClaimNames.Sid) is null ? 0 : Convert.ToInt64(claims.GetClaim(JwtRegisteredClaimNames.Sid)); + //_currentUser.UserName = claims.GetClaim(SystemConst.UserName) ?? ""; + //_currentUser.Permission = claims.GetClaims(SystemConst.PermissionClaim); + //_currentUser.TenantId = claims.GetClaim(SystemConst.TenantId) is null ? null : Guid.Parse(claims.GetClaim(SystemConst.TenantId)!); await _next(context); } diff --git a/src/Yi.Framework/Yi.Framework.Domain.Shared/Class1.cs b/src/Yi.Framework/Yi.Framework.Domain.Shared/Class1.cs deleted file mode 100644 index ecb631e7..00000000 --- a/src/Yi.Framework/Yi.Framework.Domain.Shared/Class1.cs +++ /dev/null @@ -1,7 +0,0 @@ -namespace Yi.Framework.Domain.Shared -{ - public class Class1 - { - - } -} \ No newline at end of file diff --git a/src/Yi.Framework/Yi.Framework.Domain.Shared/Properties/launchSettings.json b/src/Yi.Framework/Yi.Framework.Domain.Shared/Properties/launchSettings.json deleted file mode 100644 index 19804200..00000000 --- a/src/Yi.Framework/Yi.Framework.Domain.Shared/Properties/launchSettings.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "profiles": { - "Yi.Framework.Domain.Shared": { - "commandName": "Project", - "launchBrowser": true, - "environmentVariables": { - "ASPNETCORE_ENVIRONMENT": "Development" - }, - "applicationUrl": "https://localhost:53033;http://localhost:53038" - } - } -} \ No newline at end of file diff --git a/src/Yi.Framework/Yi.Framework.Domain.Shared/Student/ConstClasses/StudentConst.cs b/src/Yi.Framework/Yi.Framework.Domain.Shared/Student/ConstClasses/StudentConst.cs new file mode 100644 index 00000000..1b8c27cf --- /dev/null +++ b/src/Yi.Framework/Yi.Framework.Domain.Shared/Student/ConstClasses/StudentConst.cs @@ -0,0 +1,16 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Yi.Framework.Domain.Shared.Student.ConstClasses +{ + /// + /// 常量定义 + /// + public class StudentConst + { + public const string 学生已重复 = "失败!学生已经重复"; + } +} diff --git a/src/Yi.Framework/Yi.Framework.Domain.Shared/Student/IRepository/IStudentRepository.cs b/src/Yi.Framework/Yi.Framework.Domain.Shared/Student/IRepository/IStudentRepository.cs new file mode 100644 index 00000000..cfad4e33 --- /dev/null +++ b/src/Yi.Framework/Yi.Framework.Domain.Shared/Student/IRepository/IStudentRepository.cs @@ -0,0 +1,15 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Yi.Framework.Domain.Shared.Student.IRepository +{ + /// + /// 仓储抽象 + /// + public interface IStudentRepository + { + } +} 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 132c02c5..0bc0d438 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 @@ -6,4 +6,8 @@ enable + + + + diff --git a/src/Yi.Framework/Yi.Framework.Domain.Shared/YiFrameworkDomainSharedModule.cs b/src/Yi.Framework/Yi.Framework.Domain.Shared/YiFrameworkDomainSharedModule.cs new file mode 100644 index 00000000..437b87fa --- /dev/null +++ b/src/Yi.Framework/Yi.Framework.Domain.Shared/YiFrameworkDomainSharedModule.cs @@ -0,0 +1,22 @@ +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.Domain.Shared +{ + public class YiFrameworkDomainSharedModule : IStartupModule + { + public void Configure(IApplicationBuilder app, ConfigureMiddlewareContext context) + { + } + + public void ConfigureServices(IServiceCollection services, ConfigureServicesContext context) + { + } + } +} diff --git a/src/Yi.Framework/Yi.Framework.Domain/Class1.cs b/src/Yi.Framework/Yi.Framework.Domain/Class1.cs deleted file mode 100644 index 4ee30659..00000000 --- a/src/Yi.Framework/Yi.Framework.Domain/Class1.cs +++ /dev/null @@ -1,7 +0,0 @@ -namespace Yi.Framework.Domain -{ - public class Class1 - { - - } -} \ No newline at end of file diff --git a/src/Yi.Framework/Yi.Framework.Domain/Properties/launchSettings.json b/src/Yi.Framework/Yi.Framework.Domain/Properties/launchSettings.json deleted file mode 100644 index 3959a78c..00000000 --- a/src/Yi.Framework/Yi.Framework.Domain/Properties/launchSettings.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "profiles": { - "Yi.Framework.Domain": { - "commandName": "Project", - "launchBrowser": true, - "environmentVariables": { - "ASPNETCORE_ENVIRONMENT": "Development" - }, - "applicationUrl": "https://localhost:53035;http://localhost:53040" - } - } -} \ No newline at end of file diff --git a/src/Yi.Framework/Yi.Framework.Domain/Student/Entities/StudentEntity.cs b/src/Yi.Framework/Yi.Framework.Domain/Student/Entities/StudentEntity.cs new file mode 100644 index 00000000..f850ab2f --- /dev/null +++ b/src/Yi.Framework/Yi.Framework.Domain/Student/Entities/StudentEntity.cs @@ -0,0 +1,19 @@ +using SqlSugar; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Yi.Framework.Domain.Student.Entities +{ + /// + /// 实体 + /// + [SugarTable("Student")] + public class StudentEntity + { + public long Id { get; set; } + public string Name { get; set; } = string.Empty; + } +} diff --git a/src/Yi.Framework/Yi.Framework.Domain/Student/StudentManager.cs b/src/Yi.Framework/Yi.Framework.Domain/Student/StudentManager.cs new file mode 100644 index 00000000..eeecd72c --- /dev/null +++ b/src/Yi.Framework/Yi.Framework.Domain/Student/StudentManager.cs @@ -0,0 +1,21 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using Yi.Framework.Domain.Shared.Student.IRepository; + +namespace Yi.Framework.Domain.Student +{ + /// + /// 领域服务 + /// + public class StudentManager + { + private readonly IStudentRepository _studentRepository; + public StudentManager(IStudentRepository studentRepository) + { + _studentRepository=studentRepository; + } + } +} 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 132c02c5..5a36f2d6 100644 --- a/src/Yi.Framework/Yi.Framework.Domain/Yi.Framework.Domain.csproj +++ b/src/Yi.Framework/Yi.Framework.Domain/Yi.Framework.Domain.csproj @@ -6,4 +6,9 @@ enable + + + + + diff --git a/src/Yi.Framework/Yi.Framework.Domain/YiFrameworkDomainModule.cs b/src/Yi.Framework/Yi.Framework.Domain/YiFrameworkDomainModule.cs new file mode 100644 index 00000000..7e8ee6e5 --- /dev/null +++ b/src/Yi.Framework/Yi.Framework.Domain/YiFrameworkDomainModule.cs @@ -0,0 +1,24 @@ +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 Yi.Framework.Domain.Student; + +namespace Yi.Framework.Domain +{ + public class YiFrameworkDomainModule : IStartupModule + { + public void Configure(IApplicationBuilder app, ConfigureMiddlewareContext context) + { + } + + public void ConfigureServices(IServiceCollection services, ConfigureServicesContext context) + { + services.AddTransient(); + } + } +} diff --git a/src/Yi.Framework/Yi.Framework.Sqlsugar/Class1.cs b/src/Yi.Framework/Yi.Framework.Sqlsugar/Class1.cs deleted file mode 100644 index 58452370..00000000 --- a/src/Yi.Framework/Yi.Framework.Sqlsugar/Class1.cs +++ /dev/null @@ -1,7 +0,0 @@ -namespace Yi.Framework.Sqlsugar -{ - public class Class1 - { - - } -} \ No newline at end of file diff --git a/src/Yi.Framework/Yi.Framework.Sqlsugar/Properties/launchSettings.json b/src/Yi.Framework/Yi.Framework.Sqlsugar/Properties/launchSettings.json deleted file mode 100644 index d1468b60..00000000 --- a/src/Yi.Framework/Yi.Framework.Sqlsugar/Properties/launchSettings.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "profiles": { - "Yi.Framework.Sqlsugar": { - "commandName": "Project", - "launchBrowser": true, - "environmentVariables": { - "ASPNETCORE_ENVIRONMENT": "Development" - }, - "applicationUrl": "https://localhost:53031;http://localhost:53039" - } - } -} \ No newline at end of file diff --git a/src/Yi.Framework/Yi.Framework.Sqlsugar/Student/StudentRepository.cs b/src/Yi.Framework/Yi.Framework.Sqlsugar/Student/StudentRepository.cs new file mode 100644 index 00000000..b5ecac07 --- /dev/null +++ b/src/Yi.Framework/Yi.Framework.Sqlsugar/Student/StudentRepository.cs @@ -0,0 +1,16 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using Yi.Framework.Domain.Shared.Student.IRepository; + +namespace Yi.Framework.Sqlsugar.Student +{ + /// + /// 仓储实现方式 + /// + public class StudentRepository: IStudentRepository + { + } +} 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 132c02c5..82b959f4 100644 --- a/src/Yi.Framework/Yi.Framework.Sqlsugar/Yi.Framework.Sqlsugar.csproj +++ b/src/Yi.Framework/Yi.Framework.Sqlsugar/Yi.Framework.Sqlsugar.csproj @@ -6,4 +6,9 @@ enable + + + + + diff --git a/src/Yi.Framework/Yi.Framework.Sqlsugar/YiFrameworkSqlsugarModule.cs b/src/Yi.Framework/Yi.Framework.Sqlsugar/YiFrameworkSqlsugarModule.cs new file mode 100644 index 00000000..444aa1a3 --- /dev/null +++ b/src/Yi.Framework/Yi.Framework.Sqlsugar/YiFrameworkSqlsugarModule.cs @@ -0,0 +1,25 @@ +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 Yi.Framework.Domain.Shared.Student.IRepository; +using Yi.Framework.Sqlsugar.Student; + +namespace Yi.Framework.Sqlsugar +{ + public class YiFrameworkSqlsugarModule : IStartupModule + { + public void Configure(IApplicationBuilder app, ConfigureMiddlewareContext 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 2e65aa22..bc8b21b5 100644 --- a/src/Yi.Framework/Yi.Framework.Web/Program.cs +++ b/src/Yi.Framework/Yi.Framework.Web/Program.cs @@ -3,6 +3,7 @@ using AspNetCore.Microsoft.AspNetCore.Builder; using Panda.DynamicWebApi; 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; @@ -11,6 +12,9 @@ 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); @@ -22,7 +26,13 @@ builder.UseYiModules( typeof(YiFrameworkCoreModule).Assembly, typeof(YiFrameworkCoreAutoMapperModule).Assembly, typeof(YiFrameworkDddModule).Assembly, - typeof(YiFrameworkCoreSqlsugarModule).Assembly + typeof(YiFrameworkCoreSqlsugarModule).Assembly, + + typeof(YiFrameworkSqlsugarModule).Assembly, + typeof(YiFrameworkDomainSharedModule).Assembly, + typeof(YiFrameworkDomainModule).Assembly, + typeof(YiFrameworkApplicationContractsModule).Assembly, + typeof(YiFrameworkApplicationModule).Assembly ); //ʹautofac diff --git a/src/Yi.Framework/Yi.Framework.Web/Properties/launchSettings.json b/src/Yi.Framework/Yi.Framework.Web/Properties/launchSettings.json index 51cff78b..100aebd5 100644 --- a/src/Yi.Framework/Yi.Framework.Web/Properties/launchSettings.json +++ b/src/Yi.Framework/Yi.Framework.Web/Properties/launchSettings.json @@ -1,28 +1,12 @@ { "$schema": "https://json.schemastore.org/launchsettings.json", - "iisSettings": { - "windowsAuthentication": false, - "anonymousAuthentication": true, - "iisExpress": { - "applicationUrl": "http://localhost:56921", - "sslPort": 44346 - } - }, "profiles": { "Yi.Framework.Web": { "commandName": "Project", "dotnetRunMessages": true, "launchBrowser": true, "launchUrl": "swagger", - "applicationUrl": "https://localhost:7253;http://localhost:5109", - "environmentVariables": { - "ASPNETCORE_ENVIRONMENT": "Development" - } - }, - "IIS Express": { - "commandName": "IISExpress", - "launchBrowser": true, - "launchUrl": "swagger", + "applicationUrl": "http://localhost:19002", "environmentVariables": { "ASPNETCORE_ENVIRONMENT": "Development" } 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 76343b14..9cb6d744 100644 --- a/src/Yi.Framework/Yi.Framework.Web/Yi.Framework.Web.csproj +++ b/src/Yi.Framework/Yi.Framework.Web/Yi.Framework.Web.csproj @@ -8,11 +8,7 @@ - - - -