style: format code

jianxuanbing · jianxuanbing · commit c72b2e39d81a · 2023-03-13T11:05:42.000+08:00
diff --git a/framework/src/Bing.Auditing.Contracts/Bing/Auditing/EntityChangeType.cs b/framework/src/Bing.Auditing.Contracts/Bing/Auditing/EntityChangeType.cs
diff --git a/framework/src/Bing.Auditing/Bing/Auditing/AuditLogContributionContext.cs b/framework/src/Bing.Auditing/Bing/Auditing/AuditLogContributionContext.cs
@@ -3,7 +3,7 @@
 namespace Bing.Auditing;
 
 /// <summary>
-/// 审计日志贡献上下文
+/// 审计日志构造上下文
 /// </summary>
 public class AuditLogContributionContext : IServiceProviderAccessor
 {
diff --git a/framework/src/Bing.Auditing/Bing/Auditing/AuditLogContributor.cs b/framework/src/Bing.Auditing/Bing/Auditing/AuditLogContributor.cs
@@ -0,0 +1,23 @@
+﻿namespace Bing.Auditing;
+
+/// <summary>
+/// 审计日志构造函数
+/// </summary>
+public abstract class AuditLogContributor
+{
+    /// <summary>
+    /// 构造前
+    /// </summary>
+    /// <param name="context">审计日志构造上下文</param>
+    public virtual void PreContribute(AuditLogContributionContext context)
+    {
+    }
+
+    /// <summary>
+    /// 构造后
+    /// </summary>
+    /// <param name="context">审计日志构造上下文</param>
+    public virtual void PostContribute(AuditLogContributionContext context)
+    {
+    }
+}
diff --git a/framework/src/Bing.Auditing/Bing/Auditing/AuditPropertySetter.cs b/framework/src/Bing.Auditing/Bing/Auditing/AuditPropertySetter.cs
@@ -1,5 +1,4 @@
-﻿using System;
-using Bing.DependencyInjection;
+﻿using Bing.DependencyInjection;
 using Bing.Extensions;
 using Bing.Users;
 
@@ -297,4 +296,4 @@ protected virtual string GetUserName()
         var name = CurrentUser.GetFullName();
         return string.IsNullOrEmpty(name) ? CurrentUser.GetUserName() : name;
     }
-}
+}
diff --git a/framework/src/Bing.Auditing/Bing/Auditing/CreationAuditedInitializer.cs b/framework/src/Bing.Auditing/Bing/Auditing/CreationAuditedInitializer.cs
@@ -1,5 +1,4 @@
-﻿using System;
-using Bing.Extensions;
+﻿using Bing.Extensions;
 
 namespace Bing.Auditing;
 
@@ -193,4 +192,4 @@ private void InitString()
         var result = (ICreationAuditedObject<string>)_entity;
         result.CreatorId = _userId.SafeString();
     }
-}
+}
diff --git a/framework/src/Bing.Auditing/Bing/Auditing/DeletionAuditedInitializer.cs b/framework/src/Bing.Auditing/Bing/Auditing/DeletionAuditedInitializer.cs
@@ -1,5 +1,4 @@
-﻿using System;
-using Bing.Extensions;
+﻿using Bing.Extensions;
 
 namespace Bing.Auditing;
 
@@ -175,4 +174,4 @@ private void InitString()
         var result = (IDeletionAuditedObject<string>)_entity;
         result.DeleterId = _userId.SafeString();
     }
-}
+}
diff --git a/framework/src/Bing.Auditing/Bing/Auditing/DisableAuditingAttribute.cs b/framework/src/Bing.Auditing/Bing/Auditing/DisableAuditingAttribute.cs
@@ -1,11 +1,9 @@
-﻿using System;
-
-namespace Bing.Auditing;
+﻿namespace Bing.Auditing;
 
 /// <summary>
 /// 禁用审计 特性
 /// </summary>
 [AttributeUsage(AttributeTargets.Class | AttributeTargets.Method | AttributeTargets.Property)]
 public class DisableAuditingAttribute : Attribute
 {
-}
+}
diff --git a/framework/src/Bing.Auditing/Bing/Auditing/IAuditLogSaveHandle.cs b/framework/src/Bing.Auditing/Bing/Auditing/IAuditLogSaveHandle.cs
@@ -0,0 +1,12 @@
+﻿namespace Bing.Auditing;
+
+/// <summary>
+/// 审计日志保存处理
+/// </summary>
+public interface IAuditLogSaveHandle : IDisposable
+{
+    /// <summary>
+    /// 保存
+    /// </summary>
+    Task SaveAsync();
+}
diff --git a/framework/src/Bing.Auditing/Bing/Auditing/IAuditSerializer.cs b/framework/src/Bing.Auditing/Bing/Auditing/IAuditSerializer.cs
@@ -0,0 +1,14 @@
+﻿namespace Bing.Auditing;
+
+/// <summary>
+/// 审计序列化器
+/// </summary>
+public interface IAuditSerializer
+{
+    /// <summary>
+    /// 序列化
+    /// </summary>
+    /// <param name="obj">对象</param>
+    /// <returns></returns>
+    string Serialize(object obj);
+}
diff --git a/framework/src/Bing.Auditing/Bing/Auditing/IAuditingManager.cs b/framework/src/Bing.Auditing/Bing/Auditing/IAuditingManager.cs
@@ -0,0 +1,17 @@
+﻿namespace Bing.Auditing;
+
+/// <summary>
+/// 审计日志管理器
+/// </summary>
+public interface IAuditingManager
+{
+    /// <summary>
+    /// 当前审计日志作用域
+    /// </summary>
+    IAuditLogScope Current { get; }
+
+    /// <summary>
+    /// 开始作用范围
+    /// </summary>
+    IAuditLogSaveHandle BeginScope();
+}
diff --git a/framework/src/Bing.Auditing/Bing/Auditing/IAuditingStore.cs b/framework/src/Bing.Auditing/Bing/Auditing/IAuditingStore.cs
@@ -0,0 +1,13 @@
+﻿namespace Bing.Auditing;
+
+/// <summary>
+/// 审计日志存储器
+/// </summary>
+public interface IAuditingStore
+{
+    /// <summary>
+    /// 保存
+    /// </summary>
+    /// <param name="auditInfo">审计日志信息</param>
+    Task SaveAsync(AuditLogInfo auditInfo);
+}
diff --git a/framework/src/Bing.Auditing/Bing/Auditing/ModificationAuditedInitializer.cs b/framework/src/Bing.Auditing/Bing/Auditing/ModificationAuditedInitializer.cs
@@ -1,5 +1,4 @@
-﻿using System;
-using Bing.Extensions;
+﻿using Bing.Extensions;
 
 namespace Bing.Auditing;
 
@@ -193,4 +192,4 @@ private void InitString()
         var result = (IModificationAuditedObject<string>)_entity;
         result.LastModifierId = _userId.SafeString();
     }
-}
+}
diff --git a/framework/src/Bing.Auditing/Bing/Auditing/SimpleLogAuditingStore.cs b/framework/src/Bing.Auditing/Bing/Auditing/SimpleLogAuditingStore.cs
@@ -0,0 +1,36 @@
+﻿using Bing.DependencyInjection;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Logging.Abstractions;
+
+namespace Bing.Auditing;
+
+/// <summary>
+/// 简单的日志审计存储器
+/// </summary>
+[Dependency(ServiceLifetime.Singleton, TryAdd = true)]
+public class SimpleLogAuditingStore : IAuditingStore
+{
+    /// <summary>
+    /// 初始化一个<see cref="SimpleLogAuditingStore"/>类型的实例
+    /// </summary>
+    public SimpleLogAuditingStore()
+    {
+        Logger = NullLogger<SimpleLogAuditingStore>.Instance;
+    }
+
+    /// <summary>
+    /// 日志
+    /// </summary>
+    public ILogger<SimpleLogAuditingStore> Logger { get; set; }
+
+    /// <summary>
+    /// 保存
+    /// </summary>
+    /// <param name="auditInfo">审计日志信息</param>
+    public Task SaveAsync(AuditLogInfo auditInfo)
+    {
+        Logger.LogInformation(auditInfo.ToString());
+        return Task.FromResult(0);
+    }
+}
diff --git a/framework/src/Bing.Security/Bing/Clients/CurrentClient.cs b/framework/src/Bing.Security/Bing/Clients/CurrentClient.cs
@@ -14,6 +14,12 @@ public class CurrentClient : ICurrentClient, ITransientDependency
     /// </summary>
     private readonly ICurrentPrincipalAccessor _principalAccessor;
 
+    /// <summary>
+    /// 初始化一个<see cref="CurrentClient"/>类型的实例
+    /// </summary>
+    /// <param name="principalAccessor">安全主体访问器</param>
+    public CurrentClient(ICurrentPrincipalAccessor principalAccessor) => _principalAccessor = principalAccessor;
+
     /// <summary>
     /// 标识
     /// </summary>
@@ -23,10 +29,4 @@ public class CurrentClient : ICurrentClient, ITransientDependency
     /// 是否已认证
     /// </summary>
     public virtual bool IsAuthenticated => Id != null;
-
-    /// <summary>
-    /// 初始化一个<see cref="CurrentClient"/>类型的实例
-    /// </summary>
-    /// <param name="principalAccessor">安全主体访问器</param>
-    public CurrentClient(ICurrentPrincipalAccessor principalAccessor) => _principalAccessor = principalAccessor;
-}
+}
diff --git a/framework/src/Bing.Security/Bing/Security/Claims/CurrentPrincipalAccessorBase.cs b/framework/src/Bing.Security/Bing/Security/Claims/CurrentPrincipalAccessorBase.cs
@@ -1,6 +1,4 @@
-﻿using System;
-using System.Security.Claims;
-using System.Threading;
+﻿using System.Security.Claims;
 
 namespace Bing.Security.Claims;
 
@@ -43,4 +41,4 @@ private IDisposable SetCurrent(ClaimsPrincipal principal)
             _currentPrincipal.Value = parent;
         });
     }
-}
+}
diff --git a/framework/src/Bing.Security/Bing/Security/Claims/IBingClaimsPrincipalFactory.cs b/framework/src/Bing.Security/Bing/Security/Claims/IBingClaimsPrincipalFactory.cs
@@ -0,0 +1,16 @@
+﻿using System.Security.Claims;
+
+namespace Bing.Security.Claims;
+
+/// <summary>
+/// 安全主体工厂
+/// </summary>
+public interface IBingClaimsPrincipalFactory
+{
+    /// <summary>
+    /// 创建
+    /// </summary>
+    /// <param name="existsClaimsPrincipal">安全主体</param>
+    Task<ClaimsPrincipal> CreateAsync(ClaimsPrincipal existsClaimsPrincipal = null);
+
+}
diff --git a/framework/src/Bing.Security/Bing/SecurityLog/BingSecurityLogOptions.cs b/framework/src/Bing.Security/Bing/SecurityLog/BingSecurityLogOptions.cs
@@ -5,6 +5,11 @@
 /// </summary>
 public class BingSecurityLogOptions
 {
+    /// <summary>
+    /// 初始化一个<see cref="BingSecurityLogOptions"/>类型的实例
+    /// </summary>
+    public BingSecurityLogOptions() => IsEnabled = true;
+
     /// <summary>
     /// 是否已启用
     /// </summary>
@@ -14,9 +19,4 @@ public class BingSecurityLogOptions
     /// 应用程序名称
     /// </summary>
     public string ApplicationName { get; set; }
-
-    /// <summary>
-    /// 初始化一个<see cref="BingSecurityLogOptions"/>类型的实例
-    /// </summary>
-    public BingSecurityLogOptions() => IsEnabled = true;
-}
+}
diff --git a/framework/src/Bing.Security/Bing/SecurityLog/DefaultSecurityLogManager.cs b/framework/src/Bing.Security/Bing/SecurityLog/DefaultSecurityLogManager.cs
@@ -1,6 +1,4 @@
-﻿using System;
-using System.Threading.Tasks;
-using Bing.DependencyInjection;
+﻿using Bing.DependencyInjection;
 using Microsoft.Extensions.Options;
 
 namespace Bing.SecurityLog;
@@ -10,16 +8,6 @@ namespace Bing.SecurityLog;
 /// </summary>
 public class DefaultSecurityLogManager : ISecurityLogManager, ITransientDependency
 {
-    /// <summary>
-    /// 安全日志选项配置
-    /// </summary>
-    protected BingSecurityLogOptions SecurityLogOptions { get; }
-
-    /// <summary>
-    /// 安全日志存储器
-    /// </summary>
-    protected ISecurityLogStore SecurityLogStore { get; }
-
     /// <summary>
     /// /初始化一个<see cref="DefaultSecurityLogManager"/>类型的实例
     /// </summary>
@@ -31,6 +19,16 @@ public DefaultSecurityLogManager(IOptions<BingSecurityLogOptions> securityLogOpt
         SecurityLogStore = securityLogStore;
     }
 
+    /// <summary>
+    /// 安全日志选项配置
+    /// </summary>
+    protected BingSecurityLogOptions SecurityLogOptions { get; }
+
+    /// <summary>
+    /// 安全日志存储器
+    /// </summary>
+    protected ISecurityLogStore SecurityLogStore { get; }
+
     /// <summary>
     /// 保存
     /// </summary>
@@ -48,4 +46,4 @@ public async Task SaveAsync(Action<SecurityLogInfo> saveAction = null)
     /// 创建
     /// </summary>
     protected virtual Task<SecurityLogInfo> CreateAsync() => Task.FromResult(new SecurityLogInfo { ApplicationName = SecurityLogOptions.ApplicationName });
-}
+}
diff --git a/framework/src/Bing.Security/Bing/SecurityLog/ISecurityLogManager.cs b/framework/src/Bing.Security/Bing/SecurityLog/ISecurityLogManager.cs
@@ -1,7 +1,4 @@
-﻿using System;
-using System.Threading.Tasks;
-
-namespace Bing.SecurityLog;
+﻿namespace Bing.SecurityLog;
 
 /// <summary>
 /// 安全日志管理
@@ -13,4 +10,4 @@ public interface ISecurityLogManager
     /// </summary>
     /// <param name="saveAction">保存操作</param>
     Task SaveAsync(Action<SecurityLogInfo> saveAction = null);
-}
+}
diff --git a/framework/src/Bing.Security/Bing/SecurityLog/ISecurityLogStore.cs b/framework/src/Bing.Security/Bing/SecurityLog/ISecurityLogStore.cs
@@ -1,6 +1,4 @@
-﻿using System.Threading.Tasks;
-
-namespace Bing.SecurityLog;
+﻿namespace Bing.SecurityLog;
 
 /// <summary>
 /// 安全日志存储器
@@ -12,4 +10,4 @@ public interface ISecurityLogStore
     /// </summary>
     /// <param name="securityLogInfo">安全日志信息</param>
     Task SaveAsync(SecurityLogInfo securityLogInfo);
-}
+}
diff --git a/framework/src/Bing.Security/Bing/SecurityLog/SecurityLogInfo.cs b/framework/src/Bing.Security/Bing/SecurityLog/SecurityLogInfo.cs
@@ -1,7 +1,4 @@
-﻿using System;
-using System.Collections.Generic;
-
-namespace Bing.SecurityLog;
+﻿namespace Bing.SecurityLog;
 
 /// <summary>
 /// 安全日志信息
@@ -86,4 +83,4 @@ public SecurityLogInfo()
     /// 输出字符串
     /// </summary>
     public override string ToString() => $"SECURITY LOG: [{ApplicationName} - {Identity} -{Action}]";
-}
+}
diff --git a/framework/src/Bing.Security/Bing/SecurityLog/SimpleSecurityLogStore.cs b/framework/src/Bing.Security/Bing/SecurityLog/SimpleSecurityLogStore.cs
diff --git a/framework/src/Bing.Security/Bing/Users/CurrentUser.cs b/framework/src/Bing.Security/Bing/Users/CurrentUser.cs
diff --git a/framework/src/Bing.Security/Bing/Users/CurrentUserExtensions.cs b/framework/src/Bing.Security/Bing/Users/CurrentUserExtensions.cs
diff --git a/framework/src/Bing.Security/System/Security/Principal/BingClaimsIdentityExtensions.cs b/framework/src/Bing.Security/System/Security/Principal/BingClaimsIdentityExtensions.cs

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`	`namespace Bing.Auditing;`
`4`	`4`
`5`	`5`	`/// <summary>`
`6`		`-/// 审计日志贡献上下文`
	`6`	`+/// 审计日志构造上下文`
`7`	`7`	`/// </summary>`
`8`	`8`	`public class AuditLogContributionContext : IServiceProviderAccessor`
`9`	`9`	`{`