From 0049536d2ec08a99fd71707894278a70eff9db80 Mon Sep 17 00:00:00 2001 From: nsnail Date: Thu, 23 Nov 2023 18:54:26 +0800 Subject: [PATCH] =?UTF-8?q?build:=20=F0=9F=93=A6=20=E5=AE=8C=E5=96=84?= =?UTF-8?q?=E6=9E=84=E5=BB=BA=E8=84=9A=E6=9C=AC=20(#66)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * style: 💄 代码样式 * style: 💄 代码格式整理 * build: 📦 完善构建脚本 --- NetAdmin.sln | 3 +-- prebuild.targets | 6 +++--- scripts/code.clean.ps1 | 12 +++++------- scripts/dot.clean.cmd | 4 ---- scripts/git.pr.ps1 | 3 ++- .../{code.cleanup.full.ps1 => resharper.full.ps1} | 0 .../Repositories/DefaultRepository.cs | 7 ++++--- src/backend/NetAdmin.BizServer.Tests/AllTests.cs | 4 ++-- .../Attributes/DataValidation/RegexAttribute.cs | 2 +- .../NetAdmin.Host/Controllers/HealthController.cs | 4 ++-- .../Extensions/IApplicationBuilderExtensions.cs | 3 ++- .../Middlewares/RequestAuditMiddleware.cs | 7 ++++--- src/backend/NetAdmin.Host/Utils/RequestLogger.cs | 7 ++++--- .../Exceptions/NetAdminException.cs | 2 +- .../Exceptions/NetAdminGetLockerException.cs | 2 +- .../Exceptions/NetAdminInvalidInputException.cs | 7 +++---- .../Exceptions/NetAdminInvalidOperationException.cs | 2 +- .../Exceptions/NetAdminUnexpectedException.cs | 2 +- src/backend/NetAdmin.Infrastructure/GlobalStatic.cs | 2 +- .../NetAdmin.Infrastructure/Utils/RedLocker.cs | 2 +- .../Services/Sys/ApiService.cs | 7 ++++--- .../Services/Sys/SiteMsgService.cs | 6 ++++-- .../Services/Sys/UserService.cs | 9 +++++---- .../NetAdmin.SysComponent.Cache/Sys/SiteMsgCache.cs | 5 ++--- .../Sys/SiteMsgDeptCache.cs | 6 ++---- .../Sys/SiteMsgFlagCache.cs | 6 ++---- .../Sys/SiteMsgRoleCache.cs | 6 ++---- .../Sys/SiteMsgUserCache.cs | 6 ++---- .../NetAdmin.SysComponent.Cache/Tpl/ExampleCache.cs | 5 ++--- .../Controllers/Sys/ConstantController.cs | 5 ++--- .../Controllers/Sys/UserController.cs | 4 ++-- .../Controllers/Sys/VerifyCodeController.cs | 5 ++--- src/backend/NetAdmin.Tests/WebApiTestBase.cs | 4 ++-- 33 files changed, 72 insertions(+), 83 deletions(-) delete mode 100644 scripts/dot.clean.cmd rename scripts/{code.cleanup.full.ps1 => resharper.full.ps1} (100%) diff --git a/NetAdmin.sln b/NetAdmin.sln index ed2e4594..9c3d8914 100644 --- a/NetAdmin.sln +++ b/NetAdmin.sln @@ -36,8 +36,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "scripts", "scripts", "{BB0B ProjectSection(SolutionItems) = preProject code.clean.csx = scripts/code.clean.csx code.clean.ps1 = scripts/code.clean.ps1 - code.cleanup.full.ps1 = scripts/code.cleanup.full.ps1 - dot.clean.cmd = scripts/dot.clean.cmd gen.cs.tt = scripts/gen.cs.tt gen.id.linq = scripts/gen.id.linq gen.ln.cmd = scripts/gen.ln.cmd @@ -47,6 +45,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "scripts", "scripts", "{BB0B image.optimize.csx = scripts/image.optimize.csx install.as.tpl.ps1 = scripts/install.as.tpl.ps1 rename.csx = scripts/rename.csx + resharper.full.ps1 = scripts/resharper.full.ps1 switcher.freesql.json = scripts/switcher.freesql.json switcher.furion.json = scripts/switcher.furion.json switcher.nsext.json = scripts/switcher.nsext.json diff --git a/prebuild.targets b/prebuild.targets index 6218552f..c88b9185 100644 --- a/prebuild.targets +++ b/prebuild.targets @@ -1,13 +1,13 @@ - + + StdOutEncoding="utf-8" /> + StdOutEncoding="utf-8" /> diff --git a/scripts/code.clean.ps1 b/scripts/code.clean.ps1 index 761e743b..99809c64 100644 --- a/scripts/code.clean.ps1 +++ b/scripts/code.clean.ps1 @@ -1,7 +1,5 @@ -$files = $( foreach ($line in $( git diff head origin/dev --stat-width 200 ) | findstr '\|') -{ - $line.split('\|')[0].trim() -} ) -join ';' -echo $files -dotnet jb cleanupcode --no-build --include = "$files" ./NetAdmin.sln -dotnet script ./PushSign.csx \ No newline at end of file +npm --prefix ../src/frontend/admin run prettier +dotnet jb cleanupcode --no-build --include=$($(git status --porcelain | Where-Object { $_ -match "^\s*[MA]" } | ForEach-Object { $_.TrimStart(" M").TrimStart(" A") }) -join ";") ../NetAdmin.sln +dot rbom -w -e refs -e .git -e node_modules ../ +dot trim -w -e refs -e .git -e node_modules ../ +dot tolf -w -e refs -e .git -e node_modules ../ \ No newline at end of file diff --git a/scripts/dot.clean.cmd b/scripts/dot.clean.cmd deleted file mode 100644 index 3c113208..00000000 --- a/scripts/dot.clean.cmd +++ /dev/null @@ -1,4 +0,0 @@ -call npm --prefix ../src/frontend/admin run prettier -dot rbom -w -e refs -e .git -e node_modules ../ -dot trim -w -e refs -e .git -e node_modules ../ -dot tolf -w -e refs -e .git -e node_modules ../ \ No newline at end of file diff --git a/scripts/git.pr.ps1 b/scripts/git.pr.ps1 index ca0a66a8..e2bfd896 100644 --- a/scripts/git.pr.ps1 +++ b/scripts/git.pr.ps1 @@ -1,5 +1,6 @@ $branch = $( git branch --show-current ) -./dot.clean.cmd +git add ../ +./code.clean.ps1 git add ../ ../node_modules/.bin/git-cz.ps1 git pull diff --git a/scripts/code.cleanup.full.ps1 b/scripts/resharper.full.ps1 similarity index 100% rename from scripts/code.cleanup.full.ps1 rename to scripts/resharper.full.ps1 diff --git a/src/backend/NetAdmin.Application/Repositories/DefaultRepository.cs b/src/backend/NetAdmin.Application/Repositories/DefaultRepository.cs index d2384ea6..e7dbcd7b 100644 --- a/src/backend/NetAdmin.Application/Repositories/DefaultRepository.cs +++ b/src/backend/NetAdmin.Application/Repositories/DefaultRepository.cs @@ -6,9 +6,10 @@ namespace NetAdmin.Application.Repositories; /// /// 默认仓储 /// -public sealed class DefaultRepository(IFreeSql fSql // - , UnitOfWorkManager uowManger // - , ContextUserToken userToken) // +public sealed class DefaultRepository( + IFreeSql fSql // + , UnitOfWorkManager uowManger // + , ContextUserToken userToken) // : DefaultRepository(fSql, uowManger) where TEntity : EntityBase { diff --git a/src/backend/NetAdmin.BizServer.Tests/AllTests.cs b/src/backend/NetAdmin.BizServer.Tests/AllTests.cs index 59acd194..c2eb188c 100644 --- a/src/backend/NetAdmin.BizServer.Tests/AllTests.cs +++ b/src/backend/NetAdmin.BizServer.Tests/AllTests.cs @@ -18,8 +18,8 @@ namespace NetAdmin.BizServer.Tests; /// 所有测试 /// [SuppressMessage("Usage", "xUnit1028:Test method must have valid return type")] -public class AllTests(WebApplicationFactory factory, ITestOutputHelper testOutputHelper) : - WebApiTestBase(factory, testOutputHelper), IToolsModule, ICacheModule, IApiModule, IConfigModule +public class AllTests(WebApplicationFactory factory, ITestOutputHelper testOutputHelper) + : WebApiTestBase(factory, testOutputHelper), IToolsModule, ICacheModule, IApiModule, IConfigModule { /// diff --git a/src/backend/NetAdmin.Domain/Attributes/DataValidation/RegexAttribute.cs b/src/backend/NetAdmin.Domain/Attributes/DataValidation/RegexAttribute.cs index f4eeb44d..d00e62c5 100644 --- a/src/backend/NetAdmin.Domain/Attributes/DataValidation/RegexAttribute.cs +++ b/src/backend/NetAdmin.Domain/Attributes/DataValidation/RegexAttribute.cs @@ -6,7 +6,7 @@ namespace NetAdmin.Domain.Attributes.DataValidation; [AttributeUsage(AttributeTargets.Field | AttributeTargets.Property | AttributeTargets.Parameter)] #pragma warning disable DesignedForInheritance public class RegexAttribute : RegularExpressionAttribute - #pragma warning restore DesignedForInheritance +#pragma warning restore DesignedForInheritance { /// /// Initializes a new instance of the class. diff --git a/src/backend/NetAdmin.Host/Controllers/HealthController.cs b/src/backend/NetAdmin.Host/Controllers/HealthController.cs index 724ca370..25600fa6 100644 --- a/src/backend/NetAdmin.Host/Controllers/HealthController.cs +++ b/src/backend/NetAdmin.Host/Controllers/HealthController.cs @@ -7,8 +7,8 @@ namespace NetAdmin.Host.Controllers; /// 健康控制器 /// [ApiDescriptionSettings("Health")] -public sealed class HealthController - (ICache cache) : ControllerBase, IService>(cache) +public sealed class HealthController(ICache cache) + : ControllerBase, IService>(cache) { /// /// 健康检查 diff --git a/src/backend/NetAdmin.Host/Extensions/IApplicationBuilderExtensions.cs b/src/backend/NetAdmin.Host/Extensions/IApplicationBuilderExtensions.cs index 7a507b66..9dd279db 100644 --- a/src/backend/NetAdmin.Host/Extensions/IApplicationBuilderExtensions.cs +++ b/src/backend/NetAdmin.Host/Extensions/IApplicationBuilderExtensions.cs @@ -1,9 +1,10 @@ +using Microsoft.AspNetCore.HttpOverrides; #if DEBUG using IGeekFan.AspNetCore.Knife4jUI; + #else using Prometheus; #endif -using Microsoft.AspNetCore.HttpOverrides; namespace NetAdmin.Host.Extensions; diff --git a/src/backend/NetAdmin.Host/Middlewares/RequestAuditMiddleware.cs b/src/backend/NetAdmin.Host/Middlewares/RequestAuditMiddleware.cs index a5d4ac6b..ca0d30a9 100644 --- a/src/backend/NetAdmin.Host/Middlewares/RequestAuditMiddleware.cs +++ b/src/backend/NetAdmin.Host/Middlewares/RequestAuditMiddleware.cs @@ -8,9 +8,10 @@ namespace NetAdmin.Host.Middlewares; /// /// 放在所有中间件最前面 /// -public sealed class RequestAuditMiddleware(RequestDelegate next - , IOptions - dynamicApiControllerSettingsOptions, RequestLogger requestLogger) +public sealed class RequestAuditMiddleware( + RequestDelegate next + , IOptions dynamicApiControllerSettingsOptions + , RequestLogger requestLogger) { private readonly PathString _defaultRoutePrefix = new($"/{dynamicApiControllerSettingsOptions.Value.DefaultRoutePrefix}"); diff --git a/src/backend/NetAdmin.Host/Utils/RequestLogger.cs b/src/backend/NetAdmin.Host/Utils/RequestLogger.cs index e226fe84..67e60593 100644 --- a/src/backend/NetAdmin.Host/Utils/RequestLogger.cs +++ b/src/backend/NetAdmin.Host/Utils/RequestLogger.cs @@ -7,9 +7,10 @@ namespace NetAdmin.Host.Utils; /// /// 请求日志记录器 /// -public sealed class RequestLogger(ILogger logger - , IOptions specificationDocumentSettingsOptions - , IEventPublisher eventPublisher) : ISingleton +public sealed class RequestLogger( + ILogger logger + , IOptions specificationDocumentSettingsOptions + , IEventPublisher eventPublisher) : ISingleton { private static readonly string[] _textContentTypes = { "text", "json", "xml", "urlencoded" }; diff --git a/src/backend/NetAdmin.Infrastructure/Exceptions/NetAdminException.cs b/src/backend/NetAdmin.Infrastructure/Exceptions/NetAdminException.cs index fe80f205..8d12c61b 100644 --- a/src/backend/NetAdmin.Infrastructure/Exceptions/NetAdminException.cs +++ b/src/backend/NetAdmin.Infrastructure/Exceptions/NetAdminException.cs @@ -5,7 +5,7 @@ namespace NetAdmin.Infrastructure.Exceptions; /// #pragma warning disable RCS1194 public abstract class NetAdminException : Exception - #pragma warning restore RCS1194 +#pragma warning restore RCS1194 { /// /// Initializes a new instance of the class. diff --git a/src/backend/NetAdmin.Infrastructure/Exceptions/NetAdminGetLockerException.cs b/src/backend/NetAdmin.Infrastructure/Exceptions/NetAdminGetLockerException.cs index 16e92b64..eb6530d9 100644 --- a/src/backend/NetAdmin.Infrastructure/Exceptions/NetAdminGetLockerException.cs +++ b/src/backend/NetAdmin.Infrastructure/Exceptions/NetAdminGetLockerException.cs @@ -5,5 +5,5 @@ namespace NetAdmin.Infrastructure.Exceptions; /// #pragma warning disable RCS1194 public sealed class NetAdminGetLockerException : NetAdminUnexpectedException - #pragma warning restore RCS1194 +#pragma warning restore RCS1194 { } \ No newline at end of file diff --git a/src/backend/NetAdmin.Infrastructure/Exceptions/NetAdminInvalidInputException.cs b/src/backend/NetAdmin.Infrastructure/Exceptions/NetAdminInvalidInputException.cs index 7aa0f12c..84ab8869 100644 --- a/src/backend/NetAdmin.Infrastructure/Exceptions/NetAdminInvalidInputException.cs +++ b/src/backend/NetAdmin.Infrastructure/Exceptions/NetAdminInvalidInputException.cs @@ -7,8 +7,7 @@ namespace NetAdmin.Infrastructure.Exceptions; /// 参数格式错误、内容校验错误等 /// #pragma warning disable RCS1194 -public sealed class NetAdminInvalidInputException - (string message = null, Exception innerException = null) : NetAdminException( - ErrorCodes.InvalidInput, message, innerException) - #pragma warning restore RCS1194 +public sealed class NetAdminInvalidInputException(string message = null, Exception innerException = null) + : NetAdminException(ErrorCodes.InvalidInput, message, innerException) +#pragma warning restore RCS1194 { } \ No newline at end of file diff --git a/src/backend/NetAdmin.Infrastructure/Exceptions/NetAdminInvalidOperationException.cs b/src/backend/NetAdmin.Infrastructure/Exceptions/NetAdminInvalidOperationException.cs index b5fda36f..6b2117f2 100644 --- a/src/backend/NetAdmin.Infrastructure/Exceptions/NetAdminInvalidOperationException.cs +++ b/src/backend/NetAdmin.Infrastructure/Exceptions/NetAdminInvalidOperationException.cs @@ -8,7 +8,7 @@ namespace NetAdmin.Infrastructure.Exceptions; /// #pragma warning disable RCS1194, DesignedForInheritance public class NetAdminInvalidOperationException : NetAdminException - #pragma warning restore DesignedForInheritance, RCS1194 +#pragma warning restore DesignedForInheritance, RCS1194 { /// /// Initializes a new instance of the class. diff --git a/src/backend/NetAdmin.Infrastructure/Exceptions/NetAdminUnexpectedException.cs b/src/backend/NetAdmin.Infrastructure/Exceptions/NetAdminUnexpectedException.cs index 895862e9..391e7a74 100644 --- a/src/backend/NetAdmin.Infrastructure/Exceptions/NetAdminUnexpectedException.cs +++ b/src/backend/NetAdmin.Infrastructure/Exceptions/NetAdminUnexpectedException.cs @@ -8,7 +8,7 @@ namespace NetAdmin.Infrastructure.Exceptions; /// #pragma warning disable RCS1194, DesignedForInheritance public class NetAdminUnexpectedException : NetAdminException - #pragma warning restore DesignedForInheritance, RCS1194 +#pragma warning restore DesignedForInheritance, RCS1194 { /// /// Initializes a new instance of the class. diff --git a/src/backend/NetAdmin.Infrastructure/GlobalStatic.cs b/src/backend/NetAdmin.Infrastructure/GlobalStatic.cs index d8e0aac8..9445184c 100644 --- a/src/backend/NetAdmin.Infrastructure/GlobalStatic.cs +++ b/src/backend/NetAdmin.Infrastructure/GlobalStatic.cs @@ -17,7 +17,7 @@ public static class GlobalStatic public static bool DebugMode => #if DEBUG true - #else + #else false #endif ; diff --git a/src/backend/NetAdmin.Infrastructure/Utils/RedLocker.cs b/src/backend/NetAdmin.Infrastructure/Utils/RedLocker.cs index 92d2150c..4ee2fe70 100644 --- a/src/backend/NetAdmin.Infrastructure/Utils/RedLocker.cs +++ b/src/backend/NetAdmin.Infrastructure/Utils/RedLocker.cs @@ -9,7 +9,7 @@ namespace NetAdmin.Infrastructure.Utils; /// #pragma warning disable DesignedForInheritance public class RedLocker : IDisposable, ISingleton - #pragma warning restore DesignedForInheritance +#pragma warning restore DesignedForInheritance { // Track whether Dispose has been called. private bool _disposed; diff --git a/src/backend/NetAdmin.SysComponent.Application/Services/Sys/ApiService.cs b/src/backend/NetAdmin.SysComponent.Application/Services/Sys/ApiService.cs index 50a6439e..f6431943 100644 --- a/src/backend/NetAdmin.SysComponent.Application/Services/Sys/ApiService.cs +++ b/src/backend/NetAdmin.SysComponent.Application/Services/Sys/ApiService.cs @@ -8,9 +8,10 @@ using NetAdmin.SysComponent.Application.Services.Sys.Dependency; namespace NetAdmin.SysComponent.Application.Services.Sys; /// -public sealed class ApiService(DefaultRepository rpo // - , XmlCommentReader xmlCommentReader // - , IActionDescriptorCollectionProvider actionDescriptorCollectionProvider) // +public sealed class ApiService( + DefaultRepository rpo // + , XmlCommentReader xmlCommentReader // + , IActionDescriptorCollectionProvider actionDescriptorCollectionProvider) // : RepositoryService(rpo), IApiService { /// diff --git a/src/backend/NetAdmin.SysComponent.Application/Services/Sys/SiteMsgService.cs b/src/backend/NetAdmin.SysComponent.Application/Services/Sys/SiteMsgService.cs index cc56d8c9..2f6acd1f 100644 --- a/src/backend/NetAdmin.SysComponent.Application/Services/Sys/SiteMsgService.cs +++ b/src/backend/NetAdmin.SysComponent.Application/Services/Sys/SiteMsgService.cs @@ -12,8 +12,10 @@ using NetAdmin.SysComponent.Application.Services.Sys.Dependency; namespace NetAdmin.SysComponent.Application.Services.Sys; /// -public sealed class SiteMsgService(DefaultRepository rpo, ContextUserInfo contextUserInfo - , ISiteMsgFlagService siteMsgFlagService) // +public sealed class SiteMsgService( + DefaultRepository rpo + , ContextUserInfo contextUserInfo + , ISiteMsgFlagService siteMsgFlagService) // : RepositoryService(rpo), ISiteMsgService { /// diff --git a/src/backend/NetAdmin.SysComponent.Application/Services/Sys/UserService.cs b/src/backend/NetAdmin.SysComponent.Application/Services/Sys/UserService.cs index e0f90d06..dd34b7f9 100644 --- a/src/backend/NetAdmin.SysComponent.Application/Services/Sys/UserService.cs +++ b/src/backend/NetAdmin.SysComponent.Application/Services/Sys/UserService.cs @@ -14,10 +14,11 @@ using NetAdmin.SysComponent.Application.Services.Sys.Dependency; namespace NetAdmin.SysComponent.Application.Services.Sys; /// -public sealed class UserService(DefaultRepository rpo // - , IUserProfileService userProfileService // - , IVerifyCodeService verifyCodeService // - , IEventPublisher eventPublisher) // +public sealed class UserService( + DefaultRepository rpo // + , IUserProfileService userProfileService // + , IVerifyCodeService verifyCodeService // + , IEventPublisher eventPublisher) // : RepositoryService(rpo), IUserService { private readonly Expression> _selectUserFields = a => new Sys_User { diff --git a/src/backend/NetAdmin.SysComponent.Cache/Sys/SiteMsgCache.cs b/src/backend/NetAdmin.SysComponent.Cache/Sys/SiteMsgCache.cs index 03b8b37a..e631d045 100644 --- a/src/backend/NetAdmin.SysComponent.Cache/Sys/SiteMsgCache.cs +++ b/src/backend/NetAdmin.SysComponent.Cache/Sys/SiteMsgCache.cs @@ -8,9 +8,8 @@ using NetAdmin.SysComponent.Cache.Sys.Dependency; namespace NetAdmin.SysComponent.Cache.Sys; /// -public sealed class SiteMsgCache - (IDistributedCache cache, ISiteMsgService service) : DistributedCache(cache, service), IScoped - , ISiteMsgCache +public sealed class SiteMsgCache(IDistributedCache cache, ISiteMsgService service) + : DistributedCache(cache, service), IScoped, ISiteMsgCache { /// public Task BulkDeleteAsync(BulkReq req) diff --git a/src/backend/NetAdmin.SysComponent.Cache/Sys/SiteMsgDeptCache.cs b/src/backend/NetAdmin.SysComponent.Cache/Sys/SiteMsgDeptCache.cs index ee6bf76b..4b7f9089 100644 --- a/src/backend/NetAdmin.SysComponent.Cache/Sys/SiteMsgDeptCache.cs +++ b/src/backend/NetAdmin.SysComponent.Cache/Sys/SiteMsgDeptCache.cs @@ -7,10 +7,8 @@ using NetAdmin.SysComponent.Cache.Sys.Dependency; namespace NetAdmin.SysComponent.Cache.Sys; /// -public sealed class SiteMsgDeptCache - (IDistributedCache cache, ISiteMsgDeptService service) : DistributedCache(cache, service) - , IScoped - , ISiteMsgDeptCache +public sealed class SiteMsgDeptCache(IDistributedCache cache, ISiteMsgDeptService service) + : DistributedCache(cache, service), IScoped, ISiteMsgDeptCache { /// public Task BulkDeleteAsync(BulkReq req) diff --git a/src/backend/NetAdmin.SysComponent.Cache/Sys/SiteMsgFlagCache.cs b/src/backend/NetAdmin.SysComponent.Cache/Sys/SiteMsgFlagCache.cs index 4f5572ce..5f2b5b11 100644 --- a/src/backend/NetAdmin.SysComponent.Cache/Sys/SiteMsgFlagCache.cs +++ b/src/backend/NetAdmin.SysComponent.Cache/Sys/SiteMsgFlagCache.cs @@ -7,10 +7,8 @@ using NetAdmin.SysComponent.Cache.Sys.Dependency; namespace NetAdmin.SysComponent.Cache.Sys; /// -public sealed class SiteMsgFlagCache - (IDistributedCache cache, ISiteMsgFlagService service) : DistributedCache(cache, service) - , IScoped - , ISiteMsgFlagCache +public sealed class SiteMsgFlagCache(IDistributedCache cache, ISiteMsgFlagService service) + : DistributedCache(cache, service), IScoped, ISiteMsgFlagCache { /// public Task BulkDeleteAsync(BulkReq req) diff --git a/src/backend/NetAdmin.SysComponent.Cache/Sys/SiteMsgRoleCache.cs b/src/backend/NetAdmin.SysComponent.Cache/Sys/SiteMsgRoleCache.cs index 2e78cc80..9c362a46 100644 --- a/src/backend/NetAdmin.SysComponent.Cache/Sys/SiteMsgRoleCache.cs +++ b/src/backend/NetAdmin.SysComponent.Cache/Sys/SiteMsgRoleCache.cs @@ -7,10 +7,8 @@ using NetAdmin.SysComponent.Cache.Sys.Dependency; namespace NetAdmin.SysComponent.Cache.Sys; /// -public sealed class SiteMsgRoleCache - (IDistributedCache cache, ISiteMsgRoleService service) : DistributedCache(cache, service) - , IScoped - , ISiteMsgRoleCache +public sealed class SiteMsgRoleCache(IDistributedCache cache, ISiteMsgRoleService service) + : DistributedCache(cache, service), IScoped, ISiteMsgRoleCache { /// public Task BulkDeleteAsync(BulkReq req) diff --git a/src/backend/NetAdmin.SysComponent.Cache/Sys/SiteMsgUserCache.cs b/src/backend/NetAdmin.SysComponent.Cache/Sys/SiteMsgUserCache.cs index f7941122..3c90e0ec 100644 --- a/src/backend/NetAdmin.SysComponent.Cache/Sys/SiteMsgUserCache.cs +++ b/src/backend/NetAdmin.SysComponent.Cache/Sys/SiteMsgUserCache.cs @@ -7,10 +7,8 @@ using NetAdmin.SysComponent.Cache.Sys.Dependency; namespace NetAdmin.SysComponent.Cache.Sys; /// -public sealed class SiteMsgUserCache - (IDistributedCache cache, ISiteMsgUserService service) : DistributedCache(cache, service) - , IScoped - , ISiteMsgUserCache +public sealed class SiteMsgUserCache(IDistributedCache cache, ISiteMsgUserService service) + : DistributedCache(cache, service), IScoped, ISiteMsgUserCache { /// public Task BulkDeleteAsync(BulkReq req) diff --git a/src/backend/NetAdmin.SysComponent.Cache/Tpl/ExampleCache.cs b/src/backend/NetAdmin.SysComponent.Cache/Tpl/ExampleCache.cs index 9d519481..394ee721 100644 --- a/src/backend/NetAdmin.SysComponent.Cache/Tpl/ExampleCache.cs +++ b/src/backend/NetAdmin.SysComponent.Cache/Tpl/ExampleCache.cs @@ -7,9 +7,8 @@ using NetAdmin.SysComponent.Cache.Tpl.Dependency; namespace NetAdmin.SysComponent.Cache.Tpl; /// -public sealed class ExampleCache - (IDistributedCache cache, IExampleService service) : DistributedCache(cache, service), IScoped - , IExampleCache +public sealed class ExampleCache(IDistributedCache cache, IExampleService service) + : DistributedCache(cache, service), IScoped, IExampleCache { /// public Task BulkDeleteAsync(BulkReq req) diff --git a/src/backend/NetAdmin.SysComponent.Host/Controllers/Sys/ConstantController.cs b/src/backend/NetAdmin.SysComponent.Host/Controllers/Sys/ConstantController.cs index 805e1ec6..5bad7889 100644 --- a/src/backend/NetAdmin.SysComponent.Host/Controllers/Sys/ConstantController.cs +++ b/src/backend/NetAdmin.SysComponent.Host/Controllers/Sys/ConstantController.cs @@ -11,9 +11,8 @@ namespace NetAdmin.SysComponent.Host.Controllers.Sys; /// [AllowAnonymous] [ApiDescriptionSettings(nameof(Sys), Module = nameof(Sys))] -public sealed class ConstantController - (IConstantCache cache, IOptions jsonOptions) : ControllerBase(cache) - , IConstantModule +public sealed class ConstantController(IConstantCache cache, IOptions jsonOptions) + : ControllerBase(cache), IConstantModule { /// /// 获得常量字符串 diff --git a/src/backend/NetAdmin.SysComponent.Host/Controllers/Sys/UserController.cs b/src/backend/NetAdmin.SysComponent.Host/Controllers/Sys/UserController.cs index 071c7847..d2c3b8e7 100644 --- a/src/backend/NetAdmin.SysComponent.Host/Controllers/Sys/UserController.cs +++ b/src/backend/NetAdmin.SysComponent.Host/Controllers/Sys/UserController.cs @@ -13,8 +13,8 @@ namespace NetAdmin.SysComponent.Host.Controllers.Sys; /// 用户服务 /// [ApiDescriptionSettings(nameof(Sys), Module = nameof(Sys))] -public sealed class UserController - (IUserCache cache, IConfigCache configCache) : ControllerBase(cache), IUserModule +public sealed class UserController(IUserCache cache, IConfigCache configCache) + : ControllerBase(cache), IUserModule { /// /// 批量删除用户 diff --git a/src/backend/NetAdmin.SysComponent.Host/Controllers/Sys/VerifyCodeController.cs b/src/backend/NetAdmin.SysComponent.Host/Controllers/Sys/VerifyCodeController.cs index 76cdd777..4ab462c9 100644 --- a/src/backend/NetAdmin.SysComponent.Host/Controllers/Sys/VerifyCodeController.cs +++ b/src/backend/NetAdmin.SysComponent.Host/Controllers/Sys/VerifyCodeController.cs @@ -12,9 +12,8 @@ namespace NetAdmin.SysComponent.Host.Controllers.Sys; /// 验证码服务 /// [ApiDescriptionSettings(nameof(Sys), Module = nameof(Sys))] -public sealed class VerifyCodeController - (IVerifyCodeCache cache, ICaptchaCache captchaCache) : ControllerBase(cache) - , IVerifyCodeModule +public sealed class VerifyCodeController(IVerifyCodeCache cache, ICaptchaCache captchaCache) + : ControllerBase(cache), IVerifyCodeModule { /// [NonAction] diff --git a/src/backend/NetAdmin.Tests/WebApiTestBase.cs b/src/backend/NetAdmin.Tests/WebApiTestBase.cs index 43ee7f3a..ca4e588c 100644 --- a/src/backend/NetAdmin.Tests/WebApiTestBase.cs +++ b/src/backend/NetAdmin.Tests/WebApiTestBase.cs @@ -11,8 +11,8 @@ namespace NetAdmin.Tests; /// /// WebApi 测试用例基类 /// -public abstract class WebApiTestBase - (WebApplicationFactory factory, ITestOutputHelper testOutputHelper) : IClassFixture> +public abstract class WebApiTestBase(WebApplicationFactory factory, ITestOutputHelper testOutputHelper) + : IClassFixture> where T : AppStartup { private const string _ACCOUNT = "root";