mirror of
https://github.com/nsnail/NetAdmin.git
synced 2025-04-23 14:42:51 +08:00
chore: 🔨 代码细节调整 (#68)
This commit is contained in:
parent
bebddb3558
commit
3376fbbdfa
@ -19,11 +19,11 @@
|
|||||||
<PrivateAssets>all</PrivateAssets>
|
<PrivateAssets>all</PrivateAssets>
|
||||||
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
|
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
|
||||||
</PackageReference>
|
</PackageReference>
|
||||||
<PackageReference Include="Roslynator.Analyzers" Version="4.6.2">
|
<PackageReference Include="Roslynator.Analyzers" Version="4.6.4">
|
||||||
<PrivateAssets>all</PrivateAssets>
|
<PrivateAssets>all</PrivateAssets>
|
||||||
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
|
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
|
||||||
</PackageReference>
|
</PackageReference>
|
||||||
<PackageReference Include="SonarAnalyzer.CSharp" Version="9.12.0.78982">
|
<PackageReference Include="SonarAnalyzer.CSharp" Version="9.14.0.81108">
|
||||||
<PrivateAssets>all</PrivateAssets>
|
<PrivateAssets>all</PrivateAssets>
|
||||||
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
|
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
|
||||||
</PackageReference>
|
</PackageReference>
|
||||||
|
@ -14,7 +14,7 @@ public sealed class DefaultRepository<TEntity>(
|
|||||||
where TEntity : EntityBase
|
where TEntity : EntityBase
|
||||||
{
|
{
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 当前上下文关联的用户
|
/// 当前上下文关联的用户令牌
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public ContextUserToken UserToken => userToken;
|
public ContextUserToken UserToken => userToken;
|
||||||
}
|
}
|
@ -13,7 +13,7 @@ public interface IService
|
|||||||
Guid ServiceId { get; set; }
|
Guid ServiceId { get; set; }
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 上下文用户
|
/// 上下文用户令牌
|
||||||
/// </summary>
|
/// </summary>
|
||||||
ContextUserToken UserToken { get; set; }
|
ContextUserToken UserToken { get; set; }
|
||||||
}
|
}
|
@ -1,7 +1,7 @@
|
|||||||
namespace NetAdmin.BizServer.Host.Extensions;
|
namespace NetAdmin.BizServer.Host.Extensions;
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// ApplicationBuilder对象 扩展方法
|
/// ApplicationBuilder 扩展方法
|
||||||
/// </summary>
|
/// </summary>
|
||||||
[SuppressSniffer]
|
[SuppressSniffer]
|
||||||
|
|
||||||
|
@ -18,7 +18,7 @@ public static class ServiceCollectionExtensions
|
|||||||
public static IServiceCollection AddFreeSql(this IServiceCollection me)
|
public static IServiceCollection AddFreeSql(this IServiceCollection me)
|
||||||
{
|
{
|
||||||
return me.AddFreeSql( //
|
return me.AddFreeSql( //
|
||||||
FreeSqlInitOptions.SyncStructure | FreeSqlInitOptions.InsertSeedData, freeSql => {
|
FreeSqlInitMethods.SyncStructure | FreeSqlInitMethods.InsertSeedData, freeSql => {
|
||||||
// 数据权限过滤器
|
// 数据权限过滤器
|
||||||
_ = freeSql.GlobalFilter.ApplyOnlyIf<IFieldOwner>( //
|
_ = freeSql.GlobalFilter.ApplyOnlyIf<IFieldOwner>( //
|
||||||
Chars.FLG_GLOBAL_FILTER_DATA
|
Chars.FLG_GLOBAL_FILTER_DATA
|
||||||
|
@ -1,4 +1,5 @@
|
|||||||
using NetAdmin.Domain.DbMaps.Dependency;
|
using NetAdmin.Domain.DbMaps.Dependency;
|
||||||
|
using NetAdmin.Domain.Enums.Sys;
|
||||||
|
|
||||||
namespace NetAdmin.Domain.DbMaps.Sys;
|
namespace NetAdmin.Domain.DbMaps.Sys;
|
||||||
|
|
||||||
|
@ -1,4 +1,5 @@
|
|||||||
using NetAdmin.Domain.DbMaps.Sys;
|
using NetAdmin.Domain.DbMaps.Sys;
|
||||||
|
using NetAdmin.Domain.Enums.Sys;
|
||||||
|
|
||||||
namespace NetAdmin.Domain.Dto.Sys.SiteMsgFlag;
|
namespace NetAdmin.Domain.Dto.Sys.SiteMsgFlag;
|
||||||
|
|
||||||
|
@ -1,5 +1,6 @@
|
|||||||
using NetAdmin.Domain.DbMaps.Dependency.Fields;
|
using NetAdmin.Domain.DbMaps.Dependency.Fields;
|
||||||
using NetAdmin.Domain.DbMaps.Sys;
|
using NetAdmin.Domain.DbMaps.Sys;
|
||||||
|
using NetAdmin.Domain.Enums.Sys;
|
||||||
|
|
||||||
namespace NetAdmin.Domain.Dto.Sys.SiteMsgFlag;
|
namespace NetAdmin.Domain.Dto.Sys.SiteMsgFlag;
|
||||||
|
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
namespace NetAdmin.Infrastructure.Enums;
|
namespace NetAdmin.Domain.Enums.Sys;
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 站内信状态
|
/// 站内信状态
|
@ -149,14 +149,14 @@ public static class ServiceCollectionExtensions
|
|||||||
/// 添加 freeSql orm工具
|
/// 添加 freeSql orm工具
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public static IServiceCollection AddFreeSql( //
|
public static IServiceCollection AddFreeSql( //
|
||||||
this IServiceCollection me, FreeSqlInitOptions initOptions = FreeSqlInitOptions.None
|
this IServiceCollection me, FreeSqlInitMethods initMethods = FreeSqlInitMethods.None
|
||||||
, Action<IFreeSql> freeSqlConfig = null)
|
, Action<IFreeSql> freeSqlConfig = null)
|
||||||
{
|
{
|
||||||
// // 非调试模式下禁止同步数据库
|
// // 非调试模式下禁止同步数据库
|
||||||
// #if !DEBUG
|
// #if !DEBUG
|
||||||
// initOptions = FreeSqlInitOptions.None;
|
// initOptions = FreeSqlInitOptions.None;
|
||||||
// #endif
|
// #endif
|
||||||
var freeSql = new FreeSqlBuilder(App.GetOptions<DatabaseOptions>()).Build(initOptions);
|
var freeSql = new FreeSqlBuilder(App.GetOptions<DatabaseOptions>()).Build(initMethods);
|
||||||
_ = me.AddSingleton(freeSql);
|
_ = me.AddSingleton(freeSql);
|
||||||
|
|
||||||
var sqlAuditor = App.GetService<SqlAuditor>();
|
var sqlAuditor = App.GetService<SqlAuditor>();
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
namespace NetAdmin.Host.Extensions;
|
namespace NetAdmin.Host.Extensions;
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 工作单元管理器扩展类
|
/// 工作单元管理器扩展方法
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public static class UnitOfWorkManagerExtensions
|
public static class UnitOfWorkManagerExtensions
|
||||||
{
|
{
|
||||||
|
@ -1,10 +1,10 @@
|
|||||||
namespace NetAdmin.Infrastructure.Enums;
|
namespace NetAdmin.Infrastructure.Enums;
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 初始化选项
|
/// FreeSql 初始化方式
|
||||||
/// </summary>
|
/// </summary>
|
||||||
[Flags]
|
[Flags]
|
||||||
public enum FreeSqlInitOptions
|
public enum FreeSqlInitMethods
|
||||||
{
|
{
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 无
|
/// 无
|
@ -1,7 +1,7 @@
|
|||||||
namespace NetAdmin.Infrastructure.Extensions;
|
namespace NetAdmin.Infrastructure.Extensions;
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Object 扩展类
|
/// Object 扩展方法
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public static class ObjectExtensions
|
public static class ObjectExtensions
|
||||||
{
|
{
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
namespace NetAdmin.Infrastructure.Extensions;
|
namespace NetAdmin.Infrastructure.Extensions;
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// String 扩展类
|
/// String 扩展方法
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public static class StringExtensions
|
public static class StringExtensions
|
||||||
{
|
{
|
||||||
|
@ -4,20 +4,20 @@ using DataType = FreeSql.DataType;
|
|||||||
namespace NetAdmin.Infrastructure.Utils;
|
namespace NetAdmin.Infrastructure.Utils;
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// FreeSqlBuilder
|
/// FreeSql 构建器
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public sealed class FreeSqlBuilder(DatabaseOptions databaseOptions)
|
public sealed class FreeSqlBuilder(DatabaseOptions databaseOptions)
|
||||||
{
|
{
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 构建freeSql对象
|
/// 构建freeSql对象
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public IFreeSql Build(FreeSqlInitOptions initOptions)
|
public IFreeSql Build(FreeSqlInitMethods initMethods)
|
||||||
{
|
{
|
||||||
var freeSql = new FreeSql.FreeSqlBuilder().UseConnectionString(databaseOptions.DbType, databaseOptions.ConnStr)
|
var freeSql = new FreeSql.FreeSqlBuilder().UseConnectionString(databaseOptions.DbType, databaseOptions.ConnStr)
|
||||||
.UseAutoSyncStructure(false)
|
.UseAutoSyncStructure(false)
|
||||||
.Build();
|
.Build();
|
||||||
|
|
||||||
_ = InitDbAsync(freeSql, initOptions); // 初始化数据库 ,异步
|
_ = InitDbAsync(freeSql, initMethods); // 初始化数据库 ,异步
|
||||||
return freeSql;
|
return freeSql;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -59,23 +59,23 @@ public sealed class FreeSqlBuilder(DatabaseOptions databaseOptions)
|
|||||||
/// <summary>
|
/// <summary>
|
||||||
/// 初始化数据库
|
/// 初始化数据库
|
||||||
/// </summary>
|
/// </summary>
|
||||||
private Task InitDbAsync(IFreeSql freeSql, FreeSqlInitOptions initOptions)
|
private Task InitDbAsync(IFreeSql freeSql, FreeSqlInitMethods initMethods)
|
||||||
{
|
{
|
||||||
return Task.Run(() => {
|
return Task.Run(() => {
|
||||||
if (initOptions == FreeSqlInitOptions.None) {
|
if (initMethods == FreeSqlInitMethods.None) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
var entityTypes = GetEntityTypes();
|
var entityTypes = GetEntityTypes();
|
||||||
if (initOptions.HasFlag(FreeSqlInitOptions.SyncStructure)) {
|
if (initMethods.HasFlag(FreeSqlInitMethods.SyncStructure)) {
|
||||||
SyncStructure(freeSql, entityTypes);
|
SyncStructure(freeSql, entityTypes);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (initOptions.HasFlag(FreeSqlInitOptions.InsertSeedData)) {
|
if (initMethods.HasFlag(FreeSqlInitMethods.InsertSeedData)) {
|
||||||
InsertSeedData(freeSql, entityTypes);
|
InsertSeedData(freeSql, entityTypes);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (initOptions.HasFlag(FreeSqlInitOptions.CompareStructure)) {
|
if (initMethods.HasFlag(FreeSqlInitMethods.CompareStructure)) {
|
||||||
CompareStructure(freeSql, entityTypes);
|
CompareStructure(freeSql, entityTypes);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
namespace NetAdmin.Infrastructure.Utils;
|
namespace NetAdmin.Infrastructure.Utils;
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// MIME类型帮助类
|
/// MIME 类型帮助类
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public static class MimeTypeHelper
|
public static class MimeTypeHelper
|
||||||
{
|
{
|
||||||
|
@ -4,7 +4,7 @@ using Minio.DataModel.Args;
|
|||||||
namespace NetAdmin.Infrastructure.Utils;
|
namespace NetAdmin.Infrastructure.Utils;
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// MinioHelper
|
/// Minio 帮助类
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public sealed class MinioHelper(IOptions<UploadOptions> uploadOptions) : IScoped
|
public sealed class MinioHelper(IOptions<UploadOptions> uploadOptions) : IScoped
|
||||||
{
|
{
|
||||||
|
@ -3,7 +3,7 @@
|
|||||||
namespace NetAdmin.Infrastructure.Utils;
|
namespace NetAdmin.Infrastructure.Utils;
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 解析用户代理字符串
|
/// 用户代理字符串解析器
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public sealed class UserAgentParser
|
public sealed class UserAgentParser
|
||||||
{
|
{
|
||||||
|
@ -3,7 +3,7 @@ using System.Xml;
|
|||||||
namespace NetAdmin.Infrastructure.Utils;
|
namespace NetAdmin.Infrastructure.Utils;
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 程序集注释文档读取工具
|
/// 程序集注释文档读取器
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public sealed class XmlCommentReader : ISingleton
|
public sealed class XmlCommentReader : ISingleton
|
||||||
{
|
{
|
||||||
|
@ -3,9 +3,9 @@
|
|||||||
<ProjectReference Include="../NetAdmin.Host/NetAdmin.Host.csproj"/>
|
<ProjectReference Include="../NetAdmin.Host/NetAdmin.Host.csproj"/>
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<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="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>
|
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
|
||||||
<PrivateAssets>all</PrivateAssets>
|
<PrivateAssets>all</PrivateAssets>
|
||||||
</PackageReference>
|
</PackageReference>
|
||||||
|
Loading…
x
Reference in New Issue
Block a user