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

chore: 🔨 代码细节调整 (#68)

Browse Source
This commit is contained in:
nsnail
2023-11-30 13:17:02 +08:00
committed by GitHub
parent bebddb3558
commit 3376fbbdfa
20 changed files with 31 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
build/code.quality.props
View File

@@ -19,11 +19,11 @@
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Roslynator.Analyzers" Version="4.6.2">
<PackageReference Include="Roslynator.Analyzers" Version="4.6.4">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="SonarAnalyzer.CSharp" Version="9.12.0.78982">
<PackageReference Include="SonarAnalyzer.CSharp" Version="9.14.0.81108">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>

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

@@ -14,7 +14,7 @@ public sealed class DefaultRepository<TEntity>(
where TEntity : EntityBase
{
/// <summary>
/// 当前上下文关联的用户
/// 当前上下文关联的用户令牌
/// </summary>
public ContextUserToken UserToken => userToken;
}

2
src/backend/NetAdmin.Application/Services/IService.cs
View File

@@ -13,7 +13,7 @@ public interface IService
Guid ServiceId { get; set; }
/// <summary>
/// 上下文用户
/// 上下文用户令牌
/// </summary>
ContextUserToken UserToken { get; set; }
}

2
src/backend/NetAdmin.BizServer.Host/Extensions/IApplicationBuilderExtensions.cs
View File

@@ -1,7 +1,7 @@
namespace NetAdmin.BizServer.Host.Extensions;
/// <summary>
/// ApplicationBuilder对象 扩展方法
/// ApplicationBuilder 扩展方法
/// </summary>
[SuppressSniffer]

2
src/backend/NetAdmin.BizServer.Host/Extensions/ServiceCollectionExtensions.cs
View File

@@ -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<IFieldOwner>( //
Chars.FLG_GLOBAL_FILTER_DATA

1
src/backend/NetAdmin.Domain/DbMaps/Sys/Sys_SiteMsgFlag.cs
View File

@@ -1,4 +1,5 @@
using NetAdmin.Domain.DbMaps.Dependency;
using NetAdmin.Domain.Enums.Sys;
namespace NetAdmin.Domain.DbMaps.Sys;

1
src/backend/NetAdmin.Domain/Dto/Sys/SiteMsgFlag/CreateSiteMsgFlagReq.cs
View File

@@ -1,4 +1,5 @@
using NetAdmin.Domain.DbMaps.Sys;
using NetAdmin.Domain.Enums.Sys;
namespace NetAdmin.Domain.Dto.Sys.SiteMsgFlag;

1
src/backend/NetAdmin.Domain/Dto/Sys/SiteMsgFlag/QuerySiteMsgFlagRsp.cs
View File

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

2
src/backend/NetAdmin.Infrastructure/Enums/UserSiteMsgStatues.cs → src/backend/NetAdmin.Domain/Enums/Sys/UserSiteMsgStatues.cs
View File

@@ -1,4 +1,4 @@
namespace NetAdmin.Infrastructure.Enums;
namespace NetAdmin.Domain.Enums.Sys;
/// <summary>
/// 站内信状态

4
src/backend/NetAdmin.Host/Extensions/ServiceCollectionExtensions.cs
View File

@@ -149,14 +149,14 @@ public static class ServiceCollectionExtensions
/// 添加 freeSql orm工具
/// </summary>
public static IServiceCollection AddFreeSql( //
this IServiceCollection me, FreeSqlInitOptions initOptions = FreeSqlInitOptions.None
this IServiceCollection me, FreeSqlInitMethods initMethods = FreeSqlInitMethods.None
, Action<IFreeSql> freeSqlConfig = null)
{
// // 非调试模式下禁止同步数据库
// #if !DEBUG
// initOptions = FreeSqlInitOptions.None;
// #endif
var freeSql = new FreeSqlBuilder(App.GetOptions<DatabaseOptions>()).Build(initOptions);
var freeSql = new FreeSqlBuilder(App.GetOptions<DatabaseOptions>()).Build(initMethods);
_ = me.AddSingleton(freeSql);
var sqlAuditor = App.GetService<SqlAuditor>();

2
src/backend/NetAdmin.Host/Extensions/UnitOfWorkManagerExtensions.cs
View File

@@ -1,7 +1,7 @@
namespace NetAdmin.Host.Extensions;
/// <summary>
/// 工作单元管理器扩展类
/// 工作单元管理器扩展方法
/// </summary>
public static class UnitOfWorkManagerExtensions
{

4
src/backend/NetAdmin.Infrastructure/Enums/FreeSqlInitOptions.cs → src/backend/NetAdmin.Infrastructure/Enums/FreeSqlInitMethods.cs
View File

@@ -1,10 +1,10 @@
namespace NetAdmin.Infrastructure.Enums;
/// <summary>
/// 初始化选项
/// FreeSql 初始化方式
/// </summary>
[Flags]
public enum FreeSqlInitOptions
public enum FreeSqlInitMethods
{
/// <summary>
/// 无

2
src/backend/NetAdmin.Infrastructure/Extensions/ObjectExtensions.cs
View File

@@ -1,7 +1,7 @@
namespace NetAdmin.Infrastructure.Extensions;
/// <summary>
/// Object 扩展类
/// Object 扩展方法
/// </summary>
public static class ObjectExtensions
{

2
src/backend/NetAdmin.Infrastructure/Extensions/StringExtensions.cs
View File

@@ -1,7 +1,7 @@
namespace NetAdmin.Infrastructure.Extensions;
/// <summary>
/// String 扩展类
/// String 扩展方法
/// </summary>
public static class StringExtensions
{

16
src/backend/NetAdmin.Infrastructure/Utils/FreeSqlBuilder.cs
View File

@@ -4,20 +4,20 @@ using DataType = FreeSql.DataType;
namespace NetAdmin.Infrastructure.Utils;
/// <summary>
/// FreeSqlBuilder
/// FreeSql 构建器
/// </summary>
public sealed class FreeSqlBuilder(DatabaseOptions databaseOptions)
{
/// <summary>
/// 构建freeSql对象
/// </summary>
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)
/// <summary>
/// 初始化数据库
/// </summary>
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);
}
});

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

@@ -1,7 +1,7 @@
namespace NetAdmin.Infrastructure.Utils;
/// <summary>
/// MIME类型帮助类
/// MIME 类型帮助类
/// </summary>
public static class MimeTypeHelper
{

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

@@ -4,7 +4,7 @@ using Minio.DataModel.Args;
namespace NetAdmin.Infrastructure.Utils;
/// <summary>
/// MinioHelper
/// Minio 帮助类
/// </summary>
public sealed class MinioHelper(IOptions<UploadOptions> uploadOptions) : IScoped
{

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

@@ -3,7 +3,7 @@
namespace NetAdmin.Infrastructure.Utils;
/// <summary>
/// 解析用户代理字符串
/// 用户代理字符串解析器
/// </summary>
public sealed class UserAgentParser
{

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

@@ -3,7 +3,7 @@ using System.Xml;
namespace NetAdmin.Infrastructure.Utils;
/// <summary>
/// 程序集注释文档读取工具
/// 程序集注释文档读取器
/// </summary>
public sealed class XmlCommentReader : ISingleton
{

4
src/backend/NetAdmin.Tests/NetAdmin.Tests.csproj
View File

@@ -3,9 +3,9 @@
<ProjectReference Include="../NetAdmin.Host/NetAdmin.Host.csproj"/>
</ItemGroup>
<ItemGroup>
<PackageReference Include="xunit" Version="2.6.1"/>
<PackageReference Include="xunit" Version="2.6.2"/>
<PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="8.0.0"/>
<PackageReference Include="xunit.runner.visualstudio" Version="2.5.3">
<PackageReference Include="xunit.runner.visualstudio" Version="2.5.4">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>