lingyun/NetAdmin
Template
7
0
Fork 0
mirror of https://github.com/nsnail/NetAdmin.git synced 2025-10-31 11:25:27 +08:00
Code Issues 1 Packages Projects Releases Wiki Activity

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

Browse Source 
* style: 💄 代码样式

* style: 💄 代码格式整理

* build: 📦 完善构建脚本
This commit is contained in:
nsnail
2023-11-23 18:54:26 +08:00
committed by GitHub
parent 9134c4fe01
commit 0049536d2e
33 changed files with 72 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
NetAdmin.sln
View File

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

6
prebuild.targets
View File

@@ -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">

12
scripts/code.clean.ps1
View File

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

4
scripts/dot.clean.cmd
View File

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

3
scripts/git.pr.ps1
View File

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

0
scripts/code.cleanup.full.ps1 → scripts/resharper.full.ps1
View File

7
src/backend/NetAdmin.Application/Repositories/DefaultRepository.cs
View File

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

4
src/backend/NetAdmin.BizServer.Tests/AllTests.cs
View File

@@ -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) :
WebApiTestBase<Startup>(factory, testOutputHelper), IToolsModule, ICacheModule, IApiModule, IConfigModule
public class AllTests(WebApplicationFactory<Startup> factory, ITestOutputHelper testOutputHelper)
: WebApiTestBase<Startup>(factory, testOutputHelper), IToolsModule, ICacheModule, IApiModule, IConfigModule
{
/// <inheritdoc />

2
src/backend/NetAdmin.Domain/Attributes/DataValidation/RegexAttribute.cs
View File

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

4
src/backend/NetAdmin.Host/Controllers/HealthController.cs
View File

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

3
src/backend/NetAdmin.Host/Extensions/IApplicationBuilderExtensions.cs
View File

@@ -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;

7
src/backend/NetAdmin.Host/Middlewares/RequestAuditMiddleware.cs
View File

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

7
src/backend/NetAdmin.Host/Utils/RequestLogger.cs
View File

@@ -7,9 +7,10 @@ namespace NetAdmin.Host.Utils;
/// <summary>
/// 请求日志记录器
/// </summary>
public sealed class RequestLogger(ILogger<RequestLogger> logger
, IOptions<SpecificationDocumentSettingsOptions> specificationDocumentSettingsOptions
, IEventPublisher eventPublisher) : ISingleton
public sealed class RequestLogger(
ILogger<RequestLogger> logger
, IOptions<SpecificationDocumentSettingsOptions> specificationDocumentSettingsOptions
, IEventPublisher eventPublisher) : ISingleton
{
private static readonly string[] _textContentTypes = { "text", "json", "xml", "urlencoded" };

2
src/backend/NetAdmin.Infrastructure/Exceptions/NetAdminException.cs
View File

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

2
src/backend/NetAdmin.Infrastructure/Exceptions/NetAdminGetLockerException.cs
View File

@@ -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
{ }

7
src/backend/NetAdmin.Infrastructure/Exceptions/NetAdminInvalidInputException.cs
View File

@@ -7,8 +7,7 @@ namespace NetAdmin.Infrastructure.Exceptions;
/// 参数格式错误、内容校验错误等
/// </remarks>
#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
{ }

2
src/backend/NetAdmin.Infrastructure/Exceptions/NetAdminInvalidOperationException.cs
View File

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

2
src/backend/NetAdmin.Infrastructure/Exceptions/NetAdminUnexpectedException.cs
View File

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

2
src/backend/NetAdmin.Infrastructure/GlobalStatic.cs
View File

@@ -17,7 +17,7 @@ public static class GlobalStatic
public static bool DebugMode =>
#if DEBUG
true
#else
#else
false
#endif
;

2
src/backend/NetAdmin.Infrastructure/Utils/RedLocker.cs
View File

@@ -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;

7
src/backend/NetAdmin.SysComponent.Application/Services/Sys/ApiService.cs
View File

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

6
src/backend/NetAdmin.SysComponent.Application/Services/Sys/SiteMsgService.cs
View File

@@ -12,8 +12,10 @@ 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
, ISiteMsgFlagService siteMsgFlagService) //
public sealed class SiteMsgService(
DefaultRepository<Sys_SiteMsg> rpo
, ContextUserInfo contextUserInfo
, ISiteMsgFlagService siteMsgFlagService) //
: RepositoryService<Sys_SiteMsg, ISiteMsgService>(rpo), ISiteMsgService
{
/// <inheritdoc />

9
src/backend/NetAdmin.SysComponent.Application/Services/Sys/UserService.cs
View File

@@ -14,10 +14,11 @@ using NetAdmin.SysComponent.Application.Services.Sys.Dependency;
namespace NetAdmin.SysComponent.Application.Services.Sys;
/// <inheritdoc cref="IUserService" />
public sealed class UserService(DefaultRepository<Sys_User> rpo //
, IUserProfileService userProfileService //
, IVerifyCodeService verifyCodeService //
, IEventPublisher eventPublisher) //
public sealed class UserService(
DefaultRepository<Sys_User> rpo //
, IUserProfileService userProfileService //
, IVerifyCodeService verifyCodeService //
, IEventPublisher eventPublisher) //
: RepositoryService<Sys_User, IUserService>(rpo), IUserService
{
private readonly Expression<Func<Sys_User, Sys_User>> _selectUserFields = a => new Sys_User {

5
src/backend/NetAdmin.SysComponent.Cache/Sys/SiteMsgCache.cs
View File

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

6
src/backend/NetAdmin.SysComponent.Cache/Sys/SiteMsgDeptCache.cs
View File

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

6
src/backend/NetAdmin.SysComponent.Cache/Sys/SiteMsgFlagCache.cs
View File

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

6
src/backend/NetAdmin.SysComponent.Cache/Sys/SiteMsgRoleCache.cs
View File

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

6
src/backend/NetAdmin.SysComponent.Cache/Sys/SiteMsgUserCache.cs
View File

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

5
src/backend/NetAdmin.SysComponent.Cache/Tpl/ExampleCache.cs
View File

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

5
src/backend/NetAdmin.SysComponent.Host/Controllers/Sys/ConstantController.cs
View File

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

4
src/backend/NetAdmin.SysComponent.Host/Controllers/Sys/UserController.cs
View File

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

5
src/backend/NetAdmin.SysComponent.Host/Controllers/Sys/VerifyCodeController.cs
View File

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

4
src/backend/NetAdmin.Tests/WebApiTestBase.cs
View File

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