build: 📦 完善构建脚本 (#66)

* style: 💄 代码样式

* style: 💄 代码格式整理

* build: 📦 完善构建脚本

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

prebuild.targets

@@ -1,13 +1,13 @@
 <Project>
     <Target Name="PreBuild" BeforeTargets="PreBuildEvent">
-        <Exec Command="dotnet tool restore" StdOutEncoding="utf-8"/>
+        <Exec Command="dotnet tool restore" StdOutEncoding="utf-8" />
         <Exec Condition="!Exists('$(SolutionDir)/assets/res/Ln.resx')" WorkingDirectory="$(SolutionDir)/scripts"
               Command="dotnet t4 ./gen.resx.tt -o ../assets/res/Ln.resx"
-              StdOutEncoding="utf-8"/>
+              StdOutEncoding="utf-8" />
         <Exec Condition="!Exists('$(SolutionDir)/dist/backend/$(ProjectName)/Ln.cs')"
               WorkingDirectory="$(SolutionDir)/scripts"
               Command="dotnet t4 ./gen.cs.tt -o ../dist/backend/$(ProjectName)/Ln.cs"
-              StdOutEncoding="utf-8"/>
+              StdOutEncoding="utf-8" />
     </Target>
     <ItemGroup>
         <None Include="$(SolutionDir)/assets/res/Ln.txt">

scripts/code.clean.ps1

@@ -1,7 +1,5 @@
-$files = $( foreach ($line in $( git diff head origin/dev --stat-width 200 ) | findstr '\|')
+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
-    $line.split('\|')[0].trim()
+dot rbom -w -e refs -e .git -e node_modules ../
-} ) -join ';'
+dot trim -w -e refs -e .git -e node_modules ../
-echo $files
+dot tolf -w -e refs -e .git -e node_modules ../
-dotnet jb cleanupcode --no-build --include = "$files" ./NetAdmin.sln
-dotnet script ./PushSign.csx

scripts/dot.clean.cmd

@@ -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 ../

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

src/backend/NetAdmin.Application/Repositories/DefaultRepository.cs

@@ -6,7 +6,8 @@ namespace NetAdmin.Application.Repositories;
 /// <summary>
 ///     默认仓储
 /// </summary>
-public sealed class DefaultRepository<TEntity>(IFreeSql          fSql       //
+public sealed class DefaultRepository<TEntity>(
+    IFreeSql          fSql       //
   , UnitOfWorkManager uowManger  //
   , ContextUserToken  userToken) //
     : DefaultRepository<TEntity, long>(fSql, uowManger)

src/backend/NetAdmin.BizServer.Tests/AllTests.cs

@@ -18,8 +18,8 @@ namespace NetAdmin.BizServer.Tests;
 ///     所有测试
 /// </summary>
 [SuppressMessage("Usage", "xUnit1028:Test method must have valid return type")]
-public class AllTests(WebApplicationFactory<Startup> factory, ITestOutputHelper testOutputHelper) :
+public class AllTests(WebApplicationFactory<Startup> factory, ITestOutputHelper testOutputHelper)
-    WebApiTestBase<Startup>(factory, testOutputHelper), IToolsModule, ICacheModule, IApiModule, IConfigModule
+    : WebApiTestBase<Startup>(factory, testOutputHelper), IToolsModule, ICacheModule, IApiModule, IConfigModule
 
 {
     /// <inheritdoc />

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
 {
     /// <summary>
     ///     Initializes a new instance of the <see cref="RegexAttribute" /> class.

src/backend/NetAdmin.Host/Controllers/HealthController.cs

@@ -7,8 +7,8 @@ namespace NetAdmin.Host.Controllers;
 ///     健康控制器
 /// </summary>
 [ApiDescriptionSettings("Health")]
-public sealed class HealthController
+public sealed class HealthController(ICache<IDistributedCache, IService> cache)
-    (ICache<IDistributedCache, IService> cache) : ControllerBase<ICache<IDistributedCache, IService>, IService>(cache)
+    : ControllerBase<ICache<IDistributedCache, IService>, IService>(cache)
 {
     /// <summary>
     ///     健康检查

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;
 

src/backend/NetAdmin.Host/Middlewares/RequestAuditMiddleware.cs

@@ -8,9 +8,10 @@ namespace NetAdmin.Host.Middlewares;
 /// <remarks>
 ///     放在所有中间件最前面
 /// </remarks>
-public sealed class RequestAuditMiddleware(RequestDelegate next
+public sealed class RequestAuditMiddleware(
-                                         , IOptions<DynamicApiControllerSettingsOptions>
+    RequestDelegate                               next
-                                               dynamicApiControllerSettingsOptions, RequestLogger requestLogger)
+  , IOptions<DynamicApiControllerSettingsOptions> dynamicApiControllerSettingsOptions
+  , RequestLogger                                 requestLogger)
 {
     private readonly PathString _defaultRoutePrefix
         = new($"/{dynamicApiControllerSettingsOptions.Value.DefaultRoutePrefix}");

src/backend/NetAdmin.Host/Utils/RequestLogger.cs

@@ -7,7 +7,8 @@ namespace NetAdmin.Host.Utils;
 /// <summary>
 ///     请求日志记录器
 /// </summary>
-public sealed class RequestLogger(ILogger<RequestLogger>                         logger
+public sealed class RequestLogger(
+    ILogger<RequestLogger>                         logger
   , IOptions<SpecificationDocumentSettingsOptions> specificationDocumentSettingsOptions
   , IEventPublisher                                eventPublisher) : ISingleton
 {

src/backend/NetAdmin.Infrastructure/Exceptions/NetAdminException.cs

@@ -5,7 +5,7 @@ namespace NetAdmin.Infrastructure.Exceptions;
 /// </summary>
 #pragma warning disable RCS1194
 public abstract class NetAdminException : Exception
-    #pragma warning restore RCS1194
+#pragma warning restore RCS1194
 {
     /// <summary>
     ///     Initializes a new instance of the <see cref="NetAdminException" /> class.

src/backend/NetAdmin.Infrastructure/Exceptions/NetAdminGetLockerException.cs

@@ -5,5 +5,5 @@ namespace NetAdmin.Infrastructure.Exceptions;
 /// </summary>
 #pragma warning disable RCS1194
 public sealed class NetAdminGetLockerException : NetAdminUnexpectedException
-    #pragma warning restore RCS1194
+#pragma warning restore RCS1194
 { }

src/backend/NetAdmin.Infrastructure/Exceptions/NetAdminInvalidInputException.cs

@@ -7,8 +7,7 @@ namespace NetAdmin.Infrastructure.Exceptions;
 ///     参数格式错误、内容校验错误等
 /// </remarks>
 #pragma warning disable RCS1194
-public sealed class NetAdminInvalidInputException
+public sealed class NetAdminInvalidInputException(string message = null, Exception innerException = null)
-    (string message = null, Exception innerException = null) : NetAdminException(
+    : NetAdminException(ErrorCodes.InvalidInput, message, innerException)
-        ErrorCodes.InvalidInput, message, innerException)
+#pragma warning restore RCS1194
-    #pragma warning restore RCS1194
 { }

src/backend/NetAdmin.Infrastructure/Exceptions/NetAdminInvalidOperationException.cs

@@ -8,7 +8,7 @@ namespace NetAdmin.Infrastructure.Exceptions;
 /// </remarks>
 #pragma warning disable RCS1194, DesignedForInheritance
 public class NetAdminInvalidOperationException : NetAdminException
-    #pragma warning restore DesignedForInheritance, RCS1194
+#pragma warning restore DesignedForInheritance, RCS1194
 {
     /// <summary>
     ///     Initializes a new instance of the <see cref="NetAdminInvalidOperationException" /> class.

src/backend/NetAdmin.Infrastructure/Exceptions/NetAdminUnexpectedException.cs

@@ -8,7 +8,7 @@ namespace NetAdmin.Infrastructure.Exceptions;
 /// </remarks>
 #pragma warning disable RCS1194, DesignedForInheritance
 public class NetAdminUnexpectedException : NetAdminException
-    #pragma warning restore DesignedForInheritance, RCS1194
+#pragma warning restore DesignedForInheritance, RCS1194
 {
     /// <summary>
     ///     Initializes a new instance of the <see cref="NetAdminUnexpectedException" /> class.

src/backend/NetAdmin.Infrastructure/Utils/RedLocker.cs

@@ -9,7 +9,7 @@ namespace NetAdmin.Infrastructure.Utils;
 /// </summary>
 #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;

src/backend/NetAdmin.SysComponent.Application/Services/Sys/ApiService.cs

@@ -8,7 +8,8 @@ using NetAdmin.SysComponent.Application.Services.Sys.Dependency;
 namespace NetAdmin.SysComponent.Application.Services.Sys;
 
 /// <inheritdoc cref="IApiService" />
-public sealed class ApiService(DefaultRepository<Sys_Api>          rpo                                 //
+public sealed class ApiService(
+    DefaultRepository<Sys_Api>          rpo                                 //
   , XmlCommentReader                    xmlCommentReader                    //
   , IActionDescriptorCollectionProvider actionDescriptorCollectionProvider) //
     : RepositoryService<Sys_Api, IApiService>(rpo), IApiService

src/backend/NetAdmin.SysComponent.Application/Services/Sys/SiteMsgService.cs

@@ -12,7 +12,9 @@ using NetAdmin.SysComponent.Application.Services.Sys.Dependency;
 namespace NetAdmin.SysComponent.Application.Services.Sys;
 
 /// <inheritdoc cref="ISiteMsgService" />
-public sealed class SiteMsgService(DefaultRepository<Sys_SiteMsg> rpo, ContextUserInfo contextUserInfo
+public sealed class SiteMsgService(
+    DefaultRepository<Sys_SiteMsg> rpo
+  , ContextUserInfo                contextUserInfo
   , ISiteMsgFlagService            siteMsgFlagService) //
     : RepositoryService<Sys_SiteMsg, ISiteMsgService>(rpo), ISiteMsgService
 {

src/backend/NetAdmin.SysComponent.Application/Services/Sys/UserService.cs

@@ -14,7 +14,8 @@ using NetAdmin.SysComponent.Application.Services.Sys.Dependency;
 namespace NetAdmin.SysComponent.Application.Services.Sys;
 
 /// <inheritdoc cref="IUserService" />
-public sealed class UserService(DefaultRepository<Sys_User> rpo                //
+public sealed class UserService(
+    DefaultRepository<Sys_User> rpo                //
   , IUserProfileService         userProfileService //
   , IVerifyCodeService          verifyCodeService  //
   , IEventPublisher             eventPublisher)    //

src/backend/NetAdmin.SysComponent.Cache/Sys/SiteMsgCache.cs

@@ -8,9 +8,8 @@ using NetAdmin.SysComponent.Cache.Sys.Dependency;
 namespace NetAdmin.SysComponent.Cache.Sys;
 
 /// <inheritdoc cref="ISiteMsgCache" />
-public sealed class SiteMsgCache
+public sealed class SiteMsgCache(IDistributedCache cache, ISiteMsgService service)
-    (IDistributedCache cache, ISiteMsgService service) : DistributedCache<ISiteMsgService>(cache, service), IScoped
+    : DistributedCache<ISiteMsgService>(cache, service), IScoped, ISiteMsgCache
-                                                       , ISiteMsgCache
 {
     /// <inheritdoc />
     public Task<int> BulkDeleteAsync(BulkReq<DelReq> req)

src/backend/NetAdmin.SysComponent.Cache/Sys/SiteMsgDeptCache.cs

@@ -7,10 +7,8 @@ using NetAdmin.SysComponent.Cache.Sys.Dependency;
 namespace NetAdmin.SysComponent.Cache.Sys;
 
 /// <inheritdoc cref="ISiteMsgDeptCache" />
-public sealed class SiteMsgDeptCache
+public sealed class SiteMsgDeptCache(IDistributedCache cache, ISiteMsgDeptService service)
-    (IDistributedCache cache, ISiteMsgDeptService service) : DistributedCache<ISiteMsgDeptService>(cache, service)
+    : DistributedCache<ISiteMsgDeptService>(cache, service), IScoped, ISiteMsgDeptCache
-                                                           , IScoped
-                                                           , ISiteMsgDeptCache
 {
     /// <inheritdoc />
     public Task<int> BulkDeleteAsync(BulkReq<DelReq> req)

src/backend/NetAdmin.SysComponent.Cache/Sys/SiteMsgFlagCache.cs

@@ -7,10 +7,8 @@ using NetAdmin.SysComponent.Cache.Sys.Dependency;
 namespace NetAdmin.SysComponent.Cache.Sys;
 
 /// <inheritdoc cref="ISiteMsgFlagCache" />
-public sealed class SiteMsgFlagCache
+public sealed class SiteMsgFlagCache(IDistributedCache cache, ISiteMsgFlagService service)
-    (IDistributedCache cache, ISiteMsgFlagService service) : DistributedCache<ISiteMsgFlagService>(cache, service)
+    : DistributedCache<ISiteMsgFlagService>(cache, service), IScoped, ISiteMsgFlagCache
-                                                           , IScoped
-                                                           , ISiteMsgFlagCache
 {
     /// <inheritdoc />
     public Task<int> BulkDeleteAsync(BulkReq<DelReq> req)

src/backend/NetAdmin.SysComponent.Cache/Sys/SiteMsgRoleCache.cs

@@ -7,10 +7,8 @@ using NetAdmin.SysComponent.Cache.Sys.Dependency;
 namespace NetAdmin.SysComponent.Cache.Sys;
 
 /// <inheritdoc cref="ISiteMsgRoleCache" />
-public sealed class SiteMsgRoleCache
+public sealed class SiteMsgRoleCache(IDistributedCache cache, ISiteMsgRoleService service)
-    (IDistributedCache cache, ISiteMsgRoleService service) : DistributedCache<ISiteMsgRoleService>(cache, service)
+    : DistributedCache<ISiteMsgRoleService>(cache, service), IScoped, ISiteMsgRoleCache
-                                                           , IScoped
-                                                           , ISiteMsgRoleCache
 {
     /// <inheritdoc />
     public Task<int> BulkDeleteAsync(BulkReq<DelReq> req)

src/backend/NetAdmin.SysComponent.Cache/Sys/SiteMsgUserCache.cs

@@ -7,10 +7,8 @@ using NetAdmin.SysComponent.Cache.Sys.Dependency;
 namespace NetAdmin.SysComponent.Cache.Sys;
 
 /// <inheritdoc cref="ISiteMsgUserCache" />
-public sealed class SiteMsgUserCache
+public sealed class SiteMsgUserCache(IDistributedCache cache, ISiteMsgUserService service)
-    (IDistributedCache cache, ISiteMsgUserService service) : DistributedCache<ISiteMsgUserService>(cache, service)
+    : DistributedCache<ISiteMsgUserService>(cache, service), IScoped, ISiteMsgUserCache
-                                                           , IScoped
-                                                           , ISiteMsgUserCache
 {
     /// <inheritdoc />
     public Task<int> BulkDeleteAsync(BulkReq<DelReq> req)

src/backend/NetAdmin.SysComponent.Cache/Tpl/ExampleCache.cs

@@ -7,9 +7,8 @@ using NetAdmin.SysComponent.Cache.Tpl.Dependency;
 namespace NetAdmin.SysComponent.Cache.Tpl;
 
 /// <inheritdoc cref="IExampleCache" />
-public sealed class ExampleCache
+public sealed class ExampleCache(IDistributedCache cache, IExampleService service)
-    (IDistributedCache cache, IExampleService service) : DistributedCache<IExampleService>(cache, service), IScoped
+    : DistributedCache<IExampleService>(cache, service), IScoped, IExampleCache
-                                                       , IExampleCache
 {
     /// <inheritdoc />
     public Task<int> BulkDeleteAsync(BulkReq<DelReq> req)

src/backend/NetAdmin.SysComponent.Host/Controllers/Sys/ConstantController.cs

@@ -11,9 +11,8 @@ namespace NetAdmin.SysComponent.Host.Controllers.Sys;
 /// </summary>
 [AllowAnonymous]
 [ApiDescriptionSettings(nameof(Sys), Module = nameof(Sys))]
-public sealed class ConstantController
+public sealed class ConstantController(IConstantCache cache, IOptions<JsonOptions> jsonOptions)
-    (IConstantCache cache, IOptions<JsonOptions> jsonOptions) : ControllerBase<IConstantCache, IConstantService>(cache)
+    : ControllerBase<IConstantCache, IConstantService>(cache), IConstantModule
-                                                              , IConstantModule
 {
     /// <summary>
     ///     获得常量字符串

src/backend/NetAdmin.SysComponent.Host/Controllers/Sys/UserController.cs

@@ -13,8 +13,8 @@ namespace NetAdmin.SysComponent.Host.Controllers.Sys;
 ///     用户服务
 /// </summary>
 [ApiDescriptionSettings(nameof(Sys), Module = nameof(Sys))]
-public sealed class UserController
+public sealed class UserController(IUserCache cache, IConfigCache configCache)
-    (IUserCache cache, IConfigCache configCache) : ControllerBase<IUserCache, IUserService>(cache), IUserModule
+    : ControllerBase<IUserCache, IUserService>(cache), IUserModule
 {
     /// <summary>
     ///     批量删除用户

src/backend/NetAdmin.SysComponent.Host/Controllers/Sys/VerifyCodeController.cs

@@ -12,9 +12,8 @@ namespace NetAdmin.SysComponent.Host.Controllers.Sys;
 ///     验证码服务
 /// </summary>
 [ApiDescriptionSettings(nameof(Sys), Module = nameof(Sys))]
-public sealed class VerifyCodeController
+public sealed class VerifyCodeController(IVerifyCodeCache cache, ICaptchaCache captchaCache)
-    (IVerifyCodeCache cache, ICaptchaCache captchaCache) : ControllerBase<IVerifyCodeCache, IVerifyCodeService>(cache)
+    : ControllerBase<IVerifyCodeCache, IVerifyCodeService>(cache), IVerifyCodeModule
-                                                         , IVerifyCodeModule
 {
     /// <inheritdoc />
     [NonAction]

src/backend/NetAdmin.Tests/WebApiTestBase.cs

@@ -11,8 +11,8 @@ namespace NetAdmin.Tests;
 /// <summary>
 ///     WebApi 测试用例基类
 /// </summary>
-public abstract class WebApiTestBase<T>
+public abstract class WebApiTestBase<T>(WebApplicationFactory<T> factory, ITestOutputHelper testOutputHelper)
-    (WebApplicationFactory<T> factory, ITestOutputHelper testOutputHelper) : IClassFixture<WebApplicationFactory<T>>
+    : IClassFixture<WebApplicationFactory<T>>
     where T : AppStartup
 {
     private const string _ACCOUNT                   = "root";