From 3376fbbdfa0b277008f261208d3e8041462c9cb7 Mon Sep 17 00:00:00 2001 From: nsnail Date: Thu, 30 Nov 2023 13:17:02 +0800 Subject: [PATCH] =?UTF-8?q?chore:=20=F0=9F=94=A8=20=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E7=BB=86=E8=8A=82=E8=B0=83=E6=95=B4=20(#68)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build/code.quality.props | 4 ++-- .../Repositories/DefaultRepository.cs | 2 +- .../NetAdmin.Application/Services/IService.cs | 2 +- .../Extensions/IApplicationBuilderExtensions.cs | 2 +- .../Extensions/ServiceCollectionExtensions.cs | 2 +- .../DbMaps/Sys/Sys_SiteMsgFlag.cs | 1 + .../Dto/Sys/SiteMsgFlag/CreateSiteMsgFlagReq.cs | 1 + .../Dto/Sys/SiteMsgFlag/QuerySiteMsgFlagRsp.cs | 1 + .../Enums/Sys}/UserSiteMsgStatues.cs | 2 +- .../Extensions/ServiceCollectionExtensions.cs | 4 ++-- .../Extensions/UnitOfWorkManagerExtensions.cs | 2 +- ...eeSqlInitOptions.cs => FreeSqlInitMethods.cs} | 4 ++-- .../Extensions/ObjectExtensions.cs | 2 +- .../Extensions/StringExtensions.cs | 2 +- .../Utils/FreeSqlBuilder.cs | 16 ++++++++-------- .../Utils/MimeTypeHelper.cs | 2 +- .../NetAdmin.Infrastructure/Utils/MinioHelper.cs | 2 +- .../Utils/UserAgentParser.cs | 2 +- .../Utils/XmlCommentReader.cs | 2 +- src/backend/NetAdmin.Tests/NetAdmin.Tests.csproj | 4 ++-- 20 files changed, 31 insertions(+), 28 deletions(-) rename src/backend/{NetAdmin.Infrastructure/Enums => NetAdmin.Domain/Enums/Sys}/UserSiteMsgStatues.cs (91%) rename src/backend/NetAdmin.Infrastructure/Enums/{FreeSqlInitOptions.cs => FreeSqlInitMethods.cs} (91%) diff --git a/build/code.quality.props b/build/code.quality.props index d37e69c9..3f6c1b26 100644 --- a/build/code.quality.props +++ b/build/code.quality.props @@ -19,11 +19,11 @@ all runtime; build; native; contentfiles; analyzers; buildtransitive - + all runtime; build; native; contentfiles; analyzers; buildtransitive - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/src/backend/NetAdmin.Application/Repositories/DefaultRepository.cs b/src/backend/NetAdmin.Application/Repositories/DefaultRepository.cs index e7dbcd7b..5448e130 100644 --- a/src/backend/NetAdmin.Application/Repositories/DefaultRepository.cs +++ b/src/backend/NetAdmin.Application/Repositories/DefaultRepository.cs @@ -14,7 +14,7 @@ public sealed class DefaultRepository( where TEntity : EntityBase { /// - /// 当前上下文关联的用户 + /// 当前上下文关联的用户令牌 /// public ContextUserToken UserToken => userToken; } \ No newline at end of file diff --git a/src/backend/NetAdmin.Application/Services/IService.cs b/src/backend/NetAdmin.Application/Services/IService.cs index 7453be44..62025b6b 100644 --- a/src/backend/NetAdmin.Application/Services/IService.cs +++ b/src/backend/NetAdmin.Application/Services/IService.cs @@ -13,7 +13,7 @@ public interface IService Guid ServiceId { get; set; } /// - /// 上下文用户 + /// 上下文用户令牌 /// ContextUserToken UserToken { get; set; } } \ No newline at end of file diff --git a/src/backend/NetAdmin.BizServer.Host/Extensions/IApplicationBuilderExtensions.cs b/src/backend/NetAdmin.BizServer.Host/Extensions/IApplicationBuilderExtensions.cs index ada097cb..7bc4b464 100644 --- a/src/backend/NetAdmin.BizServer.Host/Extensions/IApplicationBuilderExtensions.cs +++ b/src/backend/NetAdmin.BizServer.Host/Extensions/IApplicationBuilderExtensions.cs @@ -1,7 +1,7 @@ namespace NetAdmin.BizServer.Host.Extensions; /// -/// ApplicationBuilder对象 扩展方法 +/// ApplicationBuilder 扩展方法 /// [SuppressSniffer] diff --git a/src/backend/NetAdmin.BizServer.Host/Extensions/ServiceCollectionExtensions.cs b/src/backend/NetAdmin.BizServer.Host/Extensions/ServiceCollectionExtensions.cs index e36766a7..34ee7eee 100644 --- a/src/backend/NetAdmin.BizServer.Host/Extensions/ServiceCollectionExtensions.cs +++ b/src/backend/NetAdmin.BizServer.Host/Extensions/ServiceCollectionExtensions.cs @@ -18,7 +18,7 @@ public static class ServiceCollectionExtensions public static IServiceCollection AddFreeSql(this IServiceCollection me) { return me.AddFreeSql( // - FreeSqlInitOptions.SyncStructure | FreeSqlInitOptions.InsertSeedData, freeSql => { + FreeSqlInitMethods.SyncStructure | FreeSqlInitMethods.InsertSeedData, freeSql => { // 数据权限过滤器 _ = freeSql.GlobalFilter.ApplyOnlyIf( // Chars.FLG_GLOBAL_FILTER_DATA diff --git a/src/backend/NetAdmin.Domain/DbMaps/Sys/Sys_SiteMsgFlag.cs b/src/backend/NetAdmin.Domain/DbMaps/Sys/Sys_SiteMsgFlag.cs index c25fc86b..d9d8d804 100644 --- a/src/backend/NetAdmin.Domain/DbMaps/Sys/Sys_SiteMsgFlag.cs +++ b/src/backend/NetAdmin.Domain/DbMaps/Sys/Sys_SiteMsgFlag.cs @@ -1,4 +1,5 @@ using NetAdmin.Domain.DbMaps.Dependency; +using NetAdmin.Domain.Enums.Sys; namespace NetAdmin.Domain.DbMaps.Sys; diff --git a/src/backend/NetAdmin.Domain/Dto/Sys/SiteMsgFlag/CreateSiteMsgFlagReq.cs b/src/backend/NetAdmin.Domain/Dto/Sys/SiteMsgFlag/CreateSiteMsgFlagReq.cs index abeb1c81..9991b625 100644 --- a/src/backend/NetAdmin.Domain/Dto/Sys/SiteMsgFlag/CreateSiteMsgFlagReq.cs +++ b/src/backend/NetAdmin.Domain/Dto/Sys/SiteMsgFlag/CreateSiteMsgFlagReq.cs @@ -1,4 +1,5 @@ using NetAdmin.Domain.DbMaps.Sys; +using NetAdmin.Domain.Enums.Sys; namespace NetAdmin.Domain.Dto.Sys.SiteMsgFlag; diff --git a/src/backend/NetAdmin.Domain/Dto/Sys/SiteMsgFlag/QuerySiteMsgFlagRsp.cs b/src/backend/NetAdmin.Domain/Dto/Sys/SiteMsgFlag/QuerySiteMsgFlagRsp.cs index 20be4ef9..4d5f180c 100644 --- a/src/backend/NetAdmin.Domain/Dto/Sys/SiteMsgFlag/QuerySiteMsgFlagRsp.cs +++ b/src/backend/NetAdmin.Domain/Dto/Sys/SiteMsgFlag/QuerySiteMsgFlagRsp.cs @@ -1,5 +1,6 @@ using NetAdmin.Domain.DbMaps.Dependency.Fields; using NetAdmin.Domain.DbMaps.Sys; +using NetAdmin.Domain.Enums.Sys; namespace NetAdmin.Domain.Dto.Sys.SiteMsgFlag; diff --git a/src/backend/NetAdmin.Infrastructure/Enums/UserSiteMsgStatues.cs b/src/backend/NetAdmin.Domain/Enums/Sys/UserSiteMsgStatues.cs similarity index 91% rename from src/backend/NetAdmin.Infrastructure/Enums/UserSiteMsgStatues.cs rename to src/backend/NetAdmin.Domain/Enums/Sys/UserSiteMsgStatues.cs index ba41cee5..839f23f7 100644 --- a/src/backend/NetAdmin.Infrastructure/Enums/UserSiteMsgStatues.cs +++ b/src/backend/NetAdmin.Domain/Enums/Sys/UserSiteMsgStatues.cs @@ -1,4 +1,4 @@ -namespace NetAdmin.Infrastructure.Enums; +namespace NetAdmin.Domain.Enums.Sys; /// /// 站内信状态 diff --git a/src/backend/NetAdmin.Host/Extensions/ServiceCollectionExtensions.cs b/src/backend/NetAdmin.Host/Extensions/ServiceCollectionExtensions.cs index e06ef126..4321b395 100644 --- a/src/backend/NetAdmin.Host/Extensions/ServiceCollectionExtensions.cs +++ b/src/backend/NetAdmin.Host/Extensions/ServiceCollectionExtensions.cs @@ -149,14 +149,14 @@ public static class ServiceCollectionExtensions /// 添加 freeSql orm工具 /// public static IServiceCollection AddFreeSql( // - this IServiceCollection me, FreeSqlInitOptions initOptions = FreeSqlInitOptions.None + this IServiceCollection me, FreeSqlInitMethods initMethods = FreeSqlInitMethods.None , Action freeSqlConfig = null) { // // 非调试模式下禁止同步数据库 // #if !DEBUG // initOptions = FreeSqlInitOptions.None; // #endif - var freeSql = new FreeSqlBuilder(App.GetOptions()).Build(initOptions); + var freeSql = new FreeSqlBuilder(App.GetOptions()).Build(initMethods); _ = me.AddSingleton(freeSql); var sqlAuditor = App.GetService(); diff --git a/src/backend/NetAdmin.Host/Extensions/UnitOfWorkManagerExtensions.cs b/src/backend/NetAdmin.Host/Extensions/UnitOfWorkManagerExtensions.cs index fea74aab..1316c5f0 100644 --- a/src/backend/NetAdmin.Host/Extensions/UnitOfWorkManagerExtensions.cs +++ b/src/backend/NetAdmin.Host/Extensions/UnitOfWorkManagerExtensions.cs @@ -1,7 +1,7 @@ namespace NetAdmin.Host.Extensions; /// -/// 工作单元管理器扩展类 +/// 工作单元管理器扩展方法 /// public static class UnitOfWorkManagerExtensions { diff --git a/src/backend/NetAdmin.Infrastructure/Enums/FreeSqlInitOptions.cs b/src/backend/NetAdmin.Infrastructure/Enums/FreeSqlInitMethods.cs similarity index 91% rename from src/backend/NetAdmin.Infrastructure/Enums/FreeSqlInitOptions.cs rename to src/backend/NetAdmin.Infrastructure/Enums/FreeSqlInitMethods.cs index 115f1be1..7cc4fc79 100644 --- a/src/backend/NetAdmin.Infrastructure/Enums/FreeSqlInitOptions.cs +++ b/src/backend/NetAdmin.Infrastructure/Enums/FreeSqlInitMethods.cs @@ -1,10 +1,10 @@ namespace NetAdmin.Infrastructure.Enums; /// -/// 初始化选项 +/// FreeSql 初始化方式 /// [Flags] -public enum FreeSqlInitOptions +public enum FreeSqlInitMethods { /// /// 无 diff --git a/src/backend/NetAdmin.Infrastructure/Extensions/ObjectExtensions.cs b/src/backend/NetAdmin.Infrastructure/Extensions/ObjectExtensions.cs index 1444ce13..0ad2047e 100644 --- a/src/backend/NetAdmin.Infrastructure/Extensions/ObjectExtensions.cs +++ b/src/backend/NetAdmin.Infrastructure/Extensions/ObjectExtensions.cs @@ -1,7 +1,7 @@ namespace NetAdmin.Infrastructure.Extensions; /// -/// Object 扩展类 +/// Object 扩展方法 /// public static class ObjectExtensions { diff --git a/src/backend/NetAdmin.Infrastructure/Extensions/StringExtensions.cs b/src/backend/NetAdmin.Infrastructure/Extensions/StringExtensions.cs index 0cf4bf93..936c6699 100644 --- a/src/backend/NetAdmin.Infrastructure/Extensions/StringExtensions.cs +++ b/src/backend/NetAdmin.Infrastructure/Extensions/StringExtensions.cs @@ -1,7 +1,7 @@ namespace NetAdmin.Infrastructure.Extensions; /// -/// String 扩展类 +/// String 扩展方法 /// public static class StringExtensions { diff --git a/src/backend/NetAdmin.Infrastructure/Utils/FreeSqlBuilder.cs b/src/backend/NetAdmin.Infrastructure/Utils/FreeSqlBuilder.cs index cf04c104..6246f246 100644 --- a/src/backend/NetAdmin.Infrastructure/Utils/FreeSqlBuilder.cs +++ b/src/backend/NetAdmin.Infrastructure/Utils/FreeSqlBuilder.cs @@ -4,20 +4,20 @@ using DataType = FreeSql.DataType; namespace NetAdmin.Infrastructure.Utils; /// -/// FreeSqlBuilder +/// FreeSql 构建器 /// public sealed class FreeSqlBuilder(DatabaseOptions databaseOptions) { /// /// 构建freeSql对象 /// - public IFreeSql Build(FreeSqlInitOptions initOptions) + public IFreeSql Build(FreeSqlInitMethods initMethods) { var freeSql = new FreeSql.FreeSqlBuilder().UseConnectionString(databaseOptions.DbType, databaseOptions.ConnStr) .UseAutoSyncStructure(false) .Build(); - _ = InitDbAsync(freeSql, initOptions); // 初始化数据库 ，异步 + _ = InitDbAsync(freeSql, initMethods); // 初始化数据库 ，异步 return freeSql; } @@ -59,23 +59,23 @@ public sealed class FreeSqlBuilder(DatabaseOptions databaseOptions) /// /// 初始化数据库 /// - private Task InitDbAsync(IFreeSql freeSql, FreeSqlInitOptions initOptions) + private Task InitDbAsync(IFreeSql freeSql, FreeSqlInitMethods initMethods) { return Task.Run(() => { - if (initOptions == FreeSqlInitOptions.None) { + if (initMethods == FreeSqlInitMethods.None) { return; } var entityTypes = GetEntityTypes(); - if (initOptions.HasFlag(FreeSqlInitOptions.SyncStructure)) { + if (initMethods.HasFlag(FreeSqlInitMethods.SyncStructure)) { SyncStructure(freeSql, entityTypes); } - if (initOptions.HasFlag(FreeSqlInitOptions.InsertSeedData)) { + if (initMethods.HasFlag(FreeSqlInitMethods.InsertSeedData)) { InsertSeedData(freeSql, entityTypes); } - if (initOptions.HasFlag(FreeSqlInitOptions.CompareStructure)) { + if (initMethods.HasFlag(FreeSqlInitMethods.CompareStructure)) { CompareStructure(freeSql, entityTypes); } }); diff --git a/src/backend/NetAdmin.Infrastructure/Utils/MimeTypeHelper.cs b/src/backend/NetAdmin.Infrastructure/Utils/MimeTypeHelper.cs index e284a320..6fbadc19 100644 --- a/src/backend/NetAdmin.Infrastructure/Utils/MimeTypeHelper.cs +++ b/src/backend/NetAdmin.Infrastructure/Utils/MimeTypeHelper.cs @@ -1,7 +1,7 @@ namespace NetAdmin.Infrastructure.Utils; /// -/// MIME类型帮助类 +/// MIME 类型帮助类 /// public static class MimeTypeHelper { diff --git a/src/backend/NetAdmin.Infrastructure/Utils/MinioHelper.cs b/src/backend/NetAdmin.Infrastructure/Utils/MinioHelper.cs index 5eafe657..f7d039bc 100644 --- a/src/backend/NetAdmin.Infrastructure/Utils/MinioHelper.cs +++ b/src/backend/NetAdmin.Infrastructure/Utils/MinioHelper.cs @@ -4,7 +4,7 @@ using Minio.DataModel.Args; namespace NetAdmin.Infrastructure.Utils; /// -/// MinioHelper +/// Minio 帮助类 /// public sealed class MinioHelper(IOptions uploadOptions) : IScoped { diff --git a/src/backend/NetAdmin.Infrastructure/Utils/UserAgentParser.cs b/src/backend/NetAdmin.Infrastructure/Utils/UserAgentParser.cs index bb1cef3a..a0db1d28 100644 --- a/src/backend/NetAdmin.Infrastructure/Utils/UserAgentParser.cs +++ b/src/backend/NetAdmin.Infrastructure/Utils/UserAgentParser.cs @@ -3,7 +3,7 @@ namespace NetAdmin.Infrastructure.Utils; /// -/// 解析用户代理字符串 +/// 用户代理字符串解析器 /// public sealed class UserAgentParser { diff --git a/src/backend/NetAdmin.Infrastructure/Utils/XmlCommentReader.cs b/src/backend/NetAdmin.Infrastructure/Utils/XmlCommentReader.cs index 784750a0..fceda9fb 100644 --- a/src/backend/NetAdmin.Infrastructure/Utils/XmlCommentReader.cs +++ b/src/backend/NetAdmin.Infrastructure/Utils/XmlCommentReader.cs @@ -3,7 +3,7 @@ using System.Xml; namespace NetAdmin.Infrastructure.Utils; /// -/// 程序集注释文档读取工具 +/// 程序集注释文档读取器 /// public sealed class XmlCommentReader : ISingleton { diff --git a/src/backend/NetAdmin.Tests/NetAdmin.Tests.csproj b/src/backend/NetAdmin.Tests/NetAdmin.Tests.csproj index ebed62df..38fc040b 100644 --- a/src/backend/NetAdmin.Tests/NetAdmin.Tests.csproj +++ b/src/backend/NetAdmin.Tests/NetAdmin.Tests.csproj @@ -3,9 +3,9 @@ - + - + runtime; build; native; contentfiles; analyzers; buildtransitive all