diff --git a/Yi.Abp.Net8/Yi.Abp.sln b/Yi.Abp.Net8/Yi.Abp.sln index fef906fa..0a1bd352 100644 --- a/Yi.Abp.Net8/Yi.Abp.sln +++ b/Yi.Abp.Net8/Yi.Abp.sln @@ -152,19 +152,21 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Yi.Framework.Rbac.Test", "t EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tool", "tool", "{084CBEEC-5D37-4716-B9C7-D80D6960DFF4}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Yi.Abp.Tool", "tool\Yi.Abp.Tool\Yi.Abp.Tool.csproj", "{4FEBBDD9-E4F4-4BAF-8599-E2D57C08A74F}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Yi.Abp.Tool", "tool\Yi.Abp.Tool\Yi.Abp.Tool.csproj", "{4FEBBDD9-E4F4-4BAF-8599-E2D57C08A74F}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Yi.Abp.Tool.Web", "tool\Yi.Abp.Tool.Web\Yi.Abp.Tool.Web.csproj", "{2CE51D4C-1EF9-462B-BA14-7EA01A7E4AF1}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Yi.Abp.Tool.Web", "tool\Yi.Abp.Tool.Web\Yi.Abp.Tool.Web.csproj", "{2CE51D4C-1EF9-462B-BA14-7EA01A7E4AF1}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Yi.Abp.Tool.Application", "tool\Yi.Abp.Tool.Application\Yi.Abp.Tool.Application.csproj", "{776590BA-B900-4C8B-986A-5B721FA4B306}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Yi.Abp.Tool.Application", "tool\Yi.Abp.Tool.Application\Yi.Abp.Tool.Application.csproj", "{776590BA-B900-4C8B-986A-5B721FA4B306}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Yi.Abp.Tool.Application.Contracts", "tool\Yi.Abp.Tool.Application.Contracts\Yi.Abp.Tool.Application.Contracts.csproj", "{3A3AF1ED-FC7F-48CF-8ACE-9D50426B4675}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Yi.Abp.Tool.Application.Contracts", "tool\Yi.Abp.Tool.Application.Contracts\Yi.Abp.Tool.Application.Contracts.csproj", "{3A3AF1ED-FC7F-48CF-8ACE-9D50426B4675}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Yi.Abp.Tool.Domain", "tool\Yi.Abp.Tool.Domain\Yi.Abp.Tool.Domain.csproj", "{68F73B7B-0F8A-41C1-8092-6D6FFAED32F8}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Yi.Abp.Tool.Domain", "tool\Yi.Abp.Tool.Domain\Yi.Abp.Tool.Domain.csproj", "{68F73B7B-0F8A-41C1-8092-6D6FFAED32F8}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Yi.Abp.Tool.Domain.Shared", "tool\Yi.Abp.Tool.Domain.Shared\Yi.Abp.Tool.Domain.Shared.csproj", "{4AE84CDE-2A47-4D68-8E93-86193F72E4E8}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Yi.Abp.Tool.Domain.Shared", "tool\Yi.Abp.Tool.Domain.Shared\Yi.Abp.Tool.Domain.Shared.csproj", "{4AE84CDE-2A47-4D68-8E93-86193F72E4E8}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Yi.Abp.Tool.HttpApi.Client", "tool\Yi.Abp.Tool.HttpApi.Client\Yi.Abp.Tool.HttpApi.Client.csproj", "{C8F97775-D903-4365-A4FF-3DA97E318CD2}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Yi.Abp.Tool.HttpApi.Client", "tool\Yi.Abp.Tool.HttpApi.Client\Yi.Abp.Tool.HttpApi.Client.csproj", "{C8F97775-D903-4365-A4FF-3DA97E318CD2}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Yi.Framework.SettingManagement.Application", "module\setting-management\Yi.Framework.SettingManagement.Application\Yi.Framework.SettingManagement.Application.csproj", "{2A31D7CB-BDCC-4253-BA73-273B6B5E1956}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -420,6 +422,10 @@ Global {C8F97775-D903-4365-A4FF-3DA97E318CD2}.Debug|Any CPU.Build.0 = Debug|Any CPU {C8F97775-D903-4365-A4FF-3DA97E318CD2}.Release|Any CPU.ActiveCfg = Release|Any CPU {C8F97775-D903-4365-A4FF-3DA97E318CD2}.Release|Any CPU.Build.0 = Release|Any CPU + {2A31D7CB-BDCC-4253-BA73-273B6B5E1956}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {2A31D7CB-BDCC-4253-BA73-273B6B5E1956}.Debug|Any CPU.Build.0 = Debug|Any CPU + {2A31D7CB-BDCC-4253-BA73-273B6B5E1956}.Release|Any CPU.ActiveCfg = Release|Any CPU + {2A31D7CB-BDCC-4253-BA73-273B6B5E1956}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -494,6 +500,7 @@ Global {68F73B7B-0F8A-41C1-8092-6D6FFAED32F8} = {084CBEEC-5D37-4716-B9C7-D80D6960DFF4} {4AE84CDE-2A47-4D68-8E93-86193F72E4E8} = {084CBEEC-5D37-4716-B9C7-D80D6960DFF4} {C8F97775-D903-4365-A4FF-3DA97E318CD2} = {084CBEEC-5D37-4716-B9C7-D80D6960DFF4} + {2A31D7CB-BDCC-4253-BA73-273B6B5E1956} = {8C68059E-F3B1-4D28-A1C9-A5830F53E5D3} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {23D6FBC9-C970-4641-BC1E-2AEA59F51C18} diff --git a/Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.Domain/Entities/SettingAggregateRoot.cs b/Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.Domain/Entities/SettingAggregateRoot.cs deleted file mode 100644 index a4881e0e..00000000 --- a/Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.Domain/Entities/SettingAggregateRoot.cs +++ /dev/null @@ -1,18 +0,0 @@ -using SqlSugar; -using Volo.Abp.Domain.Entities; - -namespace Yi.Framework.Bbs.Domain.Entities -{ - [SugarTable("Setting")] - public class SettingAggregateRoot : AggregateRoot - { - - [SugarColumn(ColumnName = "Id", IsPrimaryKey = true)] - public override Guid Id { get; protected set; } - public int CommentPage { get; set; } - public int DiscussPage { get; set; } - public int CommentExperience { get; set; } - public int DiscussExperience { get; set; } - public string Title { get; set; } - } -} diff --git a/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Domain/Managers/AccountManager.cs b/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Domain/Managers/AccountManager.cs index 4e2ba7ff..b7a58206 100644 --- a/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Domain/Managers/AccountManager.cs +++ b/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Domain/Managers/AccountManager.cs @@ -83,7 +83,7 @@ namespace Yi.Framework.Rbac.Domain.Managers { throw new UserFriendlyException(UserConst.No_Permission); } - //这里抛出一个登录的事件 + //这里抛出一个登录的事件,也可以在全部流程走完,在应用层组装 if (_httpContextAccessor.HttpContext is not null) { var loginEntity = new LoginLogAggregateRoot().GetInfoByHttpContext(_httpContextAccessor.HttpContext); diff --git a/Yi.Abp.Net8/module/setting-management/Yi.Framework.SettingManagement.Application/SettingManagementAppServiceBase.cs b/Yi.Abp.Net8/module/setting-management/Yi.Framework.SettingManagement.Application/SettingManagementAppServiceBase.cs new file mode 100644 index 00000000..03ba0bc2 --- /dev/null +++ b/Yi.Abp.Net8/module/setting-management/Yi.Framework.SettingManagement.Application/SettingManagementAppServiceBase.cs @@ -0,0 +1,12 @@ +using Volo.Abp.Application.Services; +using Volo.Abp.SettingManagement.Localization; + +namespace Yi.Framework.SettingManagement.Application; + +public abstract class SettingManagementAppServiceBase : ApplicationService +{ + protected SettingManagementAppServiceBase() + { + LocalizationResource = typeof(AbpSettingManagementResource); + } +} diff --git a/Yi.Abp.Net8/module/setting-management/Yi.Framework.SettingManagement.Application/Yi.Framework.SettingManagement.Application.csproj b/Yi.Abp.Net8/module/setting-management/Yi.Framework.SettingManagement.Application/Yi.Framework.SettingManagement.Application.csproj new file mode 100644 index 00000000..b009a768 --- /dev/null +++ b/Yi.Abp.Net8/module/setting-management/Yi.Framework.SettingManagement.Application/Yi.Framework.SettingManagement.Application.csproj @@ -0,0 +1,17 @@ + + + + net8.0 + enable + enable + + + + + + + + + + + diff --git a/Yi.Abp.Net8/module/setting-management/Yi.Framework.SettingManagement.Application/YiFrameworkSettingManagementApplicationModule.cs b/Yi.Abp.Net8/module/setting-management/Yi.Framework.SettingManagement.Application/YiFrameworkSettingManagementApplicationModule.cs new file mode 100644 index 00000000..6bb5d69a --- /dev/null +++ b/Yi.Abp.Net8/module/setting-management/Yi.Framework.SettingManagement.Application/YiFrameworkSettingManagementApplicationModule.cs @@ -0,0 +1,15 @@ +using Volo.Abp.Application; +using Volo.Abp.Modularity; +using Volo.Abp.SettingManagement; +using Volo.Abp.Timing; + +namespace Yi.Framework.SettingManagement.Application; + +[DependsOn( + typeof(AbpDddApplicationModule), + typeof(AbpSettingManagementApplicationContractsModule), + typeof(AbpTimingModule) +)] +public class YiFrameworkSettingManagementApplicationModule : AbpModule +{ +} diff --git a/Yi.Abp.Net8/module/setting-management/Yi.Framework.SettingManagement.Domain/ISettingRepository.cs b/Yi.Abp.Net8/module/setting-management/Yi.Framework.SettingManagement.Domain/ISettingRepository.cs index b45823db..404804e2 100644 --- a/Yi.Abp.Net8/module/setting-management/Yi.Framework.SettingManagement.Domain/ISettingRepository.cs +++ b/Yi.Abp.Net8/module/setting-management/Yi.Framework.SettingManagement.Domain/ISettingRepository.cs @@ -6,20 +6,20 @@ using Volo.Abp.Domain.Repositories; namespace Yi.Framework.SettingManagement.Domain; -public interface ISettingRepository : IBasicRepository +public interface ISettingRepository : IBasicRepository { - Task FindAsync( + Task FindAsync( string name, string providerName, string providerKey, CancellationToken cancellationToken = default); - Task> GetListAsync( + Task> GetListAsync( string providerName, string providerKey, CancellationToken cancellationToken = default); - Task> GetListAsync( + Task> GetListAsync( string[] names, string providerName, string providerKey, diff --git a/Yi.Abp.Net8/module/setting-management/Yi.Framework.SettingManagement.Domain/SettingEntity.cs b/Yi.Abp.Net8/module/setting-management/Yi.Framework.SettingManagement.Domain/SettingAggregateRoot.cs similarity index 83% rename from Yi.Abp.Net8/module/setting-management/Yi.Framework.SettingManagement.Domain/SettingEntity.cs rename to Yi.Abp.Net8/module/setting-management/Yi.Framework.SettingManagement.Domain/SettingAggregateRoot.cs index 619dc64c..7276fa90 100644 --- a/Yi.Abp.Net8/module/setting-management/Yi.Framework.SettingManagement.Domain/SettingEntity.cs +++ b/Yi.Abp.Net8/module/setting-management/Yi.Framework.SettingManagement.Domain/SettingAggregateRoot.cs @@ -1,10 +1,13 @@ using JetBrains.Annotations; +using SqlSugar; using Volo.Abp; using Volo.Abp.Domain.Entities; +using Check = Volo.Abp.Check; namespace Yi.Framework.SettingManagement.Domain; -public class SettingEntity : Entity, IAggregateRoot +[SugarTable("Setting")] +public class SettingAggregateRoot : Entity, IAggregateRoot { [NotNull] public virtual string Name { get; protected set; } @@ -18,12 +21,12 @@ public class SettingEntity : Entity, IAggregateRoot [CanBeNull] public virtual string ProviderKey { get; protected set; } - public SettingEntity() + public SettingAggregateRoot() { } - public SettingEntity( + public SettingAggregateRoot( Guid id, [NotNull] string name, [NotNull] string value, diff --git a/Yi.Abp.Net8/module/setting-management/Yi.Framework.SettingManagement.Domain/SettingCacheItemInvalidator.cs b/Yi.Abp.Net8/module/setting-management/Yi.Framework.SettingManagement.Domain/SettingCacheItemInvalidator.cs index c8c5278a..7d55ac13 100644 --- a/Yi.Abp.Net8/module/setting-management/Yi.Framework.SettingManagement.Domain/SettingCacheItemInvalidator.cs +++ b/Yi.Abp.Net8/module/setting-management/Yi.Framework.SettingManagement.Domain/SettingCacheItemInvalidator.cs @@ -6,7 +6,7 @@ using Volo.Abp.EventBus; namespace Yi.Framework.SettingManagement.Domain; -public class SettingCacheItemInvalidator : ILocalEventHandler>, ITransientDependency +public class SettingCacheItemInvalidator : ILocalEventHandler>, ITransientDependency { protected IDistributedCache Cache { get; } @@ -15,7 +15,7 @@ public class SettingCacheItemInvalidator : ILocalEventHandler eventData) + public virtual async Task HandleEventAsync(EntityChangedEventData eventData) { var cacheKey = CalculateCacheKey( eventData.Entity.Name, diff --git a/Yi.Abp.Net8/module/setting-management/Yi.Framework.SettingManagement.Domain/SettingManagementStore.cs b/Yi.Abp.Net8/module/setting-management/Yi.Framework.SettingManagement.Domain/SettingManagementStore.cs index 86a52d45..bbb1607c 100644 --- a/Yi.Abp.Net8/module/setting-management/Yi.Framework.SettingManagement.Domain/SettingManagementStore.cs +++ b/Yi.Abp.Net8/module/setting-management/Yi.Framework.SettingManagement.Domain/SettingManagementStore.cs @@ -41,7 +41,7 @@ public class SettingManagementStore : ISettingManagementStore, ITransientDepende var setting = await SettingRepository.FindAsync(name, providerName, providerKey); if (setting == null) { - setting = new SettingEntity(GuidGenerator.Create(), name, value, providerName, providerKey); + setting = new SettingAggregateRoot(GuidGenerator.Create(), name, value, providerName, providerKey); await SettingRepository.InsertAsync(setting); } else diff --git a/Yi.Abp.Net8/module/setting-management/Yi.Framework.SettingManagement.Domain/Yi.Framework.SettingManagement.Domain.csproj b/Yi.Abp.Net8/module/setting-management/Yi.Framework.SettingManagement.Domain/Yi.Framework.SettingManagement.Domain.csproj index 4f307300..b1890f7c 100644 --- a/Yi.Abp.Net8/module/setting-management/Yi.Framework.SettingManagement.Domain/Yi.Framework.SettingManagement.Domain.csproj +++ b/Yi.Abp.Net8/module/setting-management/Yi.Framework.SettingManagement.Domain/Yi.Framework.SettingManagement.Domain.csproj @@ -11,4 +11,8 @@ + + + + diff --git a/Yi.Abp.Net8/module/setting-management/Yi.Framework.SettingManagement.SqlSugarCore/SqlSugarCoreSettingRepository.cs b/Yi.Abp.Net8/module/setting-management/Yi.Framework.SettingManagement.SqlSugarCore/SqlSugarCoreSettingRepository.cs index f4972cc4..db565913 100644 --- a/Yi.Abp.Net8/module/setting-management/Yi.Framework.SettingManagement.SqlSugarCore/SqlSugarCoreSettingRepository.cs +++ b/Yi.Abp.Net8/module/setting-management/Yi.Framework.SettingManagement.SqlSugarCore/SqlSugarCoreSettingRepository.cs @@ -4,14 +4,14 @@ using Yi.Framework.SqlSugarCore.Repositories; namespace Volo.Abp.SettingManagement.EntityFrameworkCore; -public class SqlSugarCoreSettingRepository : SqlSugarRepository, +public class SqlSugarCoreSettingRepository : SqlSugarRepository, ISettingRepository { public SqlSugarCoreSettingRepository(ISugarDbContextProvider sugarDbContextProvider) : base(sugarDbContextProvider) { } - public virtual async Task FindAsync( + public virtual async Task FindAsync( string name, string providerName, string providerKey, @@ -23,7 +23,7 @@ public class SqlSugarCoreSettingRepository : SqlSugarRepository> GetListAsync( + public virtual async Task> GetListAsync( string providerName, string providerKey, CancellationToken cancellationToken = default) @@ -34,7 +34,7 @@ public class SqlSugarCoreSettingRepository : SqlSugarRepository> GetListAsync( + public virtual async Task> GetListAsync( string[] names, string providerName, string providerKey, diff --git a/Yi.Abp.Net8/src/Yi.Abp.Application.Contracts/Yi.Abp.Application.Contracts.csproj b/Yi.Abp.Net8/src/Yi.Abp.Application.Contracts/Yi.Abp.Application.Contracts.csproj index 2f90eaa3..0c0cd33e 100644 --- a/Yi.Abp.Net8/src/Yi.Abp.Application.Contracts/Yi.Abp.Application.Contracts.csproj +++ b/Yi.Abp.Net8/src/Yi.Abp.Application.Contracts/Yi.Abp.Application.Contracts.csproj @@ -9,7 +9,9 @@ - + + + diff --git a/Yi.Abp.Net8/src/Yi.Abp.Application.Contracts/YiAbpApplicationContractsModule.cs b/Yi.Abp.Net8/src/Yi.Abp.Application.Contracts/YiAbpApplicationContractsModule.cs index ccc77746..42fc4229 100644 --- a/Yi.Abp.Net8/src/Yi.Abp.Application.Contracts/YiAbpApplicationContractsModule.cs +++ b/Yi.Abp.Net8/src/Yi.Abp.Application.Contracts/YiAbpApplicationContractsModule.cs @@ -1,4 +1,5 @@ -using Yi.Abp.Domain.Shared; +using Volo.Abp.SettingManagement; +using Yi.Abp.Domain.Shared; using Yi.Framework.Bbs.Application.Contracts; using Yi.Framework.ChatHub.Application.Contracts; using Yi.Framework.Ddd.Application.Contracts; @@ -13,6 +14,7 @@ namespace Yi.Abp.Application.Contracts typeof(YiFrameworkRbacApplicationContractsModule), typeof(YiFrameworkBbsApplicationContractsModule), typeof(YiFrameworkChatHubApplicationContractsModule), + typeof(AbpSettingManagementApplicationContractsModule), typeof(YiFrameworkTenantManagementApplicationContractsModule), typeof(YiFrameworkDddApplicationContractsModule))] diff --git a/Yi.Abp.Net8/src/Yi.Abp.Application/Services/TestService.cs b/Yi.Abp.Net8/src/Yi.Abp.Application/Services/TestService.cs index e8c6bcb2..53e2af71 100644 --- a/Yi.Abp.Net8/src/Yi.Abp.Application/Services/TestService.cs +++ b/Yi.Abp.Net8/src/Yi.Abp.Application/Services/TestService.cs @@ -2,11 +2,13 @@ using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.RateLimiting; using Volo.Abp.Application.Services; +using Volo.Abp.Settings; using Volo.Abp.Uow; using Yi.Framework.Bbs.Application.Contracts.Dtos.Banner; using Yi.Framework.Bbs.Domain.Entities.Forum; using Yi.Framework.Rbac.Domain.Authorization; using Yi.Framework.Rbac.Domain.Extensions; +using Yi.Framework.SettingManagement.Domain; using Yi.Framework.SqlSugarCore.Abstractions; namespace Yi.Abp.Application.Services @@ -120,7 +122,7 @@ namespace Yi.Abp.Application.Services var dto = entity.Adapt(); } - + private static int RequestNumber { get; set; } = 0; /// /// 速率限制 /// @@ -132,6 +134,27 @@ namespace Yi.Abp.Application.Services RequestNumber++; return RequestNumber; } - private static int RequestNumber { get; set; } = 0; + + + public ISettingProvider _settingProvider { get; set; } + + public ISettingManager _settingManager { get; set; } + /// + /// 系统配置模块 + /// + /// + public async Task GetSettingAsync() + { + //默认来说,不提供修改操作,配置应该独立 + var enableOrNull = await _settingProvider.GetOrNullAsync("abp.ddd.enable"); + + //如果要进行修改,可使用yi.framework下的ISettingManager + await _settingManager.SetAsync("abp.ddd.enable", "false", "系统", "admin"); + + var enableOrNull2 = await _settingProvider.GetOrNullAsync("abp.ddd.enable"); + + return enableOrNull2 ?? string.Empty; + } + } } diff --git a/Yi.Abp.Net8/src/Yi.Abp.Application/Yi.Abp.Application.csproj b/Yi.Abp.Net8/src/Yi.Abp.Application/Yi.Abp.Application.csproj index c25d7387..0fba17dc 100644 --- a/Yi.Abp.Net8/src/Yi.Abp.Application/Yi.Abp.Application.csproj +++ b/Yi.Abp.Net8/src/Yi.Abp.Application/Yi.Abp.Application.csproj @@ -8,10 +8,11 @@ + - + diff --git a/Yi.Abp.Net8/src/Yi.Abp.Application/YiAbpApplicationModule.cs b/Yi.Abp.Net8/src/Yi.Abp.Application/YiAbpApplicationModule.cs index 939e5440..87cafe95 100644 --- a/Yi.Abp.Net8/src/Yi.Abp.Application/YiAbpApplicationModule.cs +++ b/Yi.Abp.Net8/src/Yi.Abp.Application/YiAbpApplicationModule.cs @@ -1,10 +1,12 @@ -using Yi.Abp.Application.Contracts; +using Volo.Abp.SettingManagement; +using Yi.Abp.Application.Contracts; using Yi.Abp.Domain; using Yi.Framework.Bbs.Application; using Yi.Framework.ChatHub.Application; using Yi.Framework.CodeGen.Application; using Yi.Framework.Ddd.Application; using Yi.Framework.Rbac.Application; +using Yi.Framework.SettingManagement.Application; using Yi.Framework.TenantManagement.Application; namespace Yi.Abp.Application @@ -19,6 +21,7 @@ namespace Yi.Abp.Application typeof(YiFrameworkChatHubApplicationModule), typeof(YiFrameworkTenantManagementApplicationModule), typeof(YiFrameworkCodeGenApplicationModule), + typeof (YiFrameworkSettingManagementApplicationModule), typeof(YiFrameworkDddApplicationModule) )] diff --git a/Yi.Abp.Net8/src/Yi.Abp.Domain.Shared/Yi.Abp.Domain.Shared.csproj b/Yi.Abp.Net8/src/Yi.Abp.Domain.Shared/Yi.Abp.Domain.Shared.csproj index 3b9750f9..a282e13a 100644 --- a/Yi.Abp.Net8/src/Yi.Abp.Domain.Shared/Yi.Abp.Domain.Shared.csproj +++ b/Yi.Abp.Net8/src/Yi.Abp.Domain.Shared/Yi.Abp.Domain.Shared.csproj @@ -12,6 +12,9 @@ + + + diff --git a/Yi.Abp.Net8/src/Yi.Abp.Domain.Shared/YiAbpDomainSharedModule.cs b/Yi.Abp.Net8/src/Yi.Abp.Domain.Shared/YiAbpDomainSharedModule.cs index d6728103..bab6b8ef 100644 --- a/Yi.Abp.Net8/src/Yi.Abp.Domain.Shared/YiAbpDomainSharedModule.cs +++ b/Yi.Abp.Net8/src/Yi.Abp.Domain.Shared/YiAbpDomainSharedModule.cs @@ -1,4 +1,5 @@ using Volo.Abp.Domain; +using Volo.Abp.SettingManagement; using Yi.Framework.AuditLogging.Domain.Shared; using Yi.Framework.Bbs.Domain.Shared; using Yi.Framework.ChatHub.Domain.Shared; @@ -12,6 +13,7 @@ namespace Yi.Abp.Domain.Shared typeof(YiFrameworkChatHubDomainSharedModule), typeof(YiFrameworkAuditLoggingDomainSharedModule), + typeof(AbpSettingManagementDomainSharedModule), typeof(AbpDddDomainSharedModule))] public class YiAbpDomainSharedModule : AbpModule { diff --git a/Yi.Abp.Net8/src/Yi.Abp.Domain/Yi.Abp.Domain.csproj b/Yi.Abp.Net8/src/Yi.Abp.Domain/Yi.Abp.Domain.csproj index 186560ef..a7e6fbff 100644 --- a/Yi.Abp.Net8/src/Yi.Abp.Domain/Yi.Abp.Domain.csproj +++ b/Yi.Abp.Net8/src/Yi.Abp.Domain/Yi.Abp.Domain.csproj @@ -13,11 +13,13 @@ + - + + diff --git a/Yi.Abp.Net8/src/Yi.Abp.Domain/YiAbpDomainModule.cs b/Yi.Abp.Net8/src/Yi.Abp.Domain/YiAbpDomainModule.cs index f405f28a..d49c75ba 100644 --- a/Yi.Abp.Net8/src/Yi.Abp.Domain/YiAbpDomainModule.cs +++ b/Yi.Abp.Net8/src/Yi.Abp.Domain/YiAbpDomainModule.cs @@ -7,18 +7,20 @@ using Yi.Framework.Bbs.Domain; using Yi.Framework.ChatHub.Domain; using Yi.Framework.Mapster; using Yi.Framework.Rbac.Domain; +using Yi.Framework.SettingManagement.Domain; using Yi.Framework.TenantManagement.Domain; namespace Yi.Abp.Domain { [DependsOn( typeof(YiAbpDomainSharedModule), - + typeof(YiFrameworkTenantManagementDomainModule), typeof(YiFrameworkRbacDomainModule), typeof(YiFrameworkBbsDomainModule), typeof(YiFrameworkChatHubDomainModule), typeof(YiFrameworkAuditLoggingDomainModule), + typeof(YiFrameworkSettingManagementDomainModule), typeof(YiFrameworkMapsterModule), typeof(AbpDddDomainModule), diff --git a/Yi.Abp.Net8/src/Yi.Abp.SqlSugarCore/Yi.Abp.SqlSugarCore.csproj b/Yi.Abp.Net8/src/Yi.Abp.SqlSugarCore/Yi.Abp.SqlSugarCore.csproj index f943ca62..49a97826 100644 --- a/Yi.Abp.Net8/src/Yi.Abp.SqlSugarCore/Yi.Abp.SqlSugarCore.csproj +++ b/Yi.Abp.Net8/src/Yi.Abp.SqlSugarCore/Yi.Abp.SqlSugarCore.csproj @@ -9,10 +9,12 @@ + + diff --git a/Yi.Abp.Net8/src/Yi.Abp.SqlSugarCore/YiAbpSqlSugarCoreModule.cs b/Yi.Abp.Net8/src/Yi.Abp.SqlSugarCore/YiAbpSqlSugarCoreModule.cs index 71c54e4e..b3e27036 100644 --- a/Yi.Abp.Net8/src/Yi.Abp.SqlSugarCore/YiAbpSqlSugarCoreModule.cs +++ b/Yi.Abp.Net8/src/Yi.Abp.SqlSugarCore/YiAbpSqlSugarCoreModule.cs @@ -8,6 +8,7 @@ using Yi.Framework.ChatHub.SqlSugarCore; using Yi.Framework.CodeGen.SqlSugarCore; using Yi.Framework.Mapster; using Yi.Framework.Rbac.SqlSugarCore; +using Yi.Framework.SettingManagement.SqlSugarCore; using Yi.Framework.SqlSugarCore; using Yi.Framework.SqlSugarCore.Abstractions; using Yi.Framework.TenantManagement.SqlSugarCore; @@ -22,6 +23,7 @@ namespace Yi.Abp.SqlsugarCore typeof(YiFrameworkCodeGenSqlSugarCoreModule), typeof(YiFrameworkChatHubSqlSugarCoreModule), + typeof(YiFrameworkSettingManagementSqlSugarCoreModule), typeof(YiFrameworkAuditLoggingSqlSugarCoreModule), typeof(YiFrameworkTenantManagementSqlSugarCoreModule), typeof(YiFrameworkMapsterModule), diff --git a/Yi.Abp.Net8/src/Yi.Abp.Web/yi-abp-dev.db b/Yi.Abp.Net8/src/Yi.Abp.Web/yi-abp-dev.db new file mode 100644 index 00000000..929b55f1 Binary files /dev/null and b/Yi.Abp.Net8/src/Yi.Abp.Web/yi-abp-dev.db differ