1, add SimpleMvcLogFilter

2, 一些命名空间调整

src/ClownFish.Office/ClownFish.Office.csproj

@@ -4,8 +4,8 @@
         <TargetFramework>net7.0</TargetFramework>
         <RootNamespace>ClownFish.Office</RootNamespace>
         <AssemblyVersion>7.0.0.0</AssemblyVersion>
-        <Version>7.23.830.100</Version>
-        <FileVersion>7.23.830.100</FileVersion>
+        <Version>7.23.901.100</Version>
+        <FileVersion>7.23.901.100</FileVersion>
         <SatelliteResourceLanguages>xx</SatelliteResourceLanguages>
         <OutputPath>bin</OutputPath>
         <TreatWarningsAsErrors>true</TreatWarningsAsErrors>

src/ClownFish.Tracing/ClownFish.Tracing.csproj

@@ -4,8 +4,8 @@
         <TargetFrameworks>netcoreapp3.1;net6.0;net7.0</TargetFrameworks>
         <RootNamespace>ClownFish.Tracing</RootNamespace>
         <AssemblyVersion>7.0.0.0</AssemblyVersion>
-        <Version>7.23.830.100</Version>
-        <FileVersion>7.23.830.100</FileVersion>
+        <Version>7.23.901.100</Version>
+        <FileVersion>7.23.901.100</FileVersion>
         <GeneratePackageOnBuild>false</GeneratePackageOnBuild>
         <ApplicationIcon />
         <OutputType>Library</OutputType>

src/ClownFish.Web/Aspnetcore/ExceptionModule.cs

@@ -32,7 +32,7 @@ public override void OnError(NHttpContext httpContext)
 
         httpContext.TimeEvents?.Add(new NameTime("ExceptionModule.OnError begin"));
 
-        if( ex is ClownFish.Base.HttpException ex2 ) {
+        if( ex is HttpException ex2 ) {
             httpContext.Response.StatusCode = ex.GetErrorCode();
             httpContext.Response.ContentType = ResponseContentType.TextUtf8;
             httpContext.Response.WriteAll(ex2.Message.GetBytes());

src/ClownFish.Web/Aspnetcore/Filters/SimpleMvcLogFilter.cs

@@ -0,0 +1,100 @@
+#if NET6_0_OR_GREATER
+using Microsoft.AspNetCore.Mvc.Filters;
+
+namespace ClownFish.Web.Aspnetcore.Filters;
+
+public sealed class SimpleMvcLogFilter : IAsyncActionFilter
+{
+    private static readonly int s_frameworkBeforePerformanceThresholdMs = LocalSettings.GetInt("MVC_FrameworkBefore_PerformanceThresholdMs", 10);
+
+    public async Task OnActionExecutionAsync(ActionExecutingContext context, ActionExecutionDelegate next)
+    {
+        HttpPipelineContext pipelineContext = HttpPipelineContext.Get();
+        if( pipelineContext == null )
+            throw new InvalidOperationException("当前请求没有关联到一个PipelineContext实例。");
+
+        NHttpContext httpContext = pipelineContext.HttpContext;
+
+        Microsoft.AspNetCore.Mvc.Controllers.ControllerActionDescriptor actionDescriptor
+                = context.ActionDescriptor as Microsoft.AspNetCore.Mvc.Controllers.ControllerActionDescriptor;
+
+        // 补充 Controller/Action 信息
+        ActionDescription action = new ActionDescription(context.Controller,
+                                                        actionDescriptor.MethodInfo,
+                                                        actionDescriptor.ControllerTypeInfo);
+
+        // 检查当前Action是否与登录有关，如果是，则做个标记，避免日志时记录敏感信息
+        bool isLogin = LoginActionAttribute.CurrentIsLogin(action);
+        pipelineContext.SetAction(action, isLogin);
+
+
+        // 登录请求一定不允许记录请求体，不管有没有 [LogRequestBody] 标记！
+        if( isLogin ) {
+            httpContext.Request.LogRequestBody = false;
+        }
+        else {
+            // 非登录请求，并且【明确】要求记录请体
+            if( action.GetActionAttribute<LogRequestBodyAttribute>() != null ) {
+                httpContext.Request.LogRequestBody = true;
+            }
+        }
+
+
+        NHttpApplication app = AspnetCoreStarter.NApplication;
+        app.PostFindAction(httpContext);
+        app.AuthorizeRequest(httpContext);
+
+        ControllerInit(httpContext);
+        app.PreRequestExecute(httpContext);
+
+        if( pipelineContext.OprLogScope.IsNull == false ) {
+            WriteLog(pipelineContext);
+        }
+
+        httpContext.BeginExecuteTime = DateTime.Now;
+        httpContext.TimeEvents?.Add(new NameTime("UserCode begin", httpContext.BeginExecuteTime));
+        await next();
+        httpContext.EndExecuteTime = DateTime.Now;
+        httpContext.TimeEvents?.Add(new NameTime("UserCode end", httpContext.EndExecuteTime));
+
+        pipelineContext.ActionResult = context.Result;
+
+        app.PostRequestExecute(httpContext);
+    }
+
+    private void ControllerInit(NHttpContext httpContext)
+    {
+        ActionDescription action = httpContext.PipelineContext.Action;
+
+        IControllerInit controller = action.Controller as IControllerInit;
+        if( controller != null ) {
+            controller.ControllerInit(httpContext);
+        }
+
+        IDisposable disposable = action.Controller as IDisposable;
+        if( disposable != null ) {
+            httpContext.RegisterForDispose(disposable);
+        }
+    }
+
+
+    private void WriteLog(HttpPipelineContext pipelineContext)
+    {
+        DateTime endTime = DateTime.Now;
+        TimeSpan time = endTime - pipelineContext.StartTime;
+
+        // 如果框架部分的执行时间较短就不记录到日志中
+        if( time.TotalMilliseconds < s_frameworkBeforePerformanceThresholdMs )
+            return;
+
+
+        StepItem step = StepItem.CreateNew(pipelineContext.StartTime);
+
+        step.StepKind = "framework";
+        step.StepName = "Framework_Before";
+        step.End(endTime);
+
+        pipelineContext.OprLogScope.AddStep(step);
+    }
+}
+#endif

src/ClownFish.Web/Aspnetcore/Filters/StatusCodeFilter.cs

@@ -42,7 +42,7 @@ private IActionResult CreateResult400(ResultExecutingContext context)
 
         ErrorPageModel model = new ErrorPageModel {
             Message = message,
-            ExceptionType = typeof(ValidationException).FullName,
+            ExceptionType = typeof(System.ComponentModel.DataAnnotations.ValidationException).FullName,
             RequestId = HttpPipelineContext.Get()?.ProcessId,
             StatusCode = 400
         };

src/ClownFish.Web/Aspnetcore/IControllerInit.cs

@@ -0,0 +1,6 @@
+namespace ClownFish.Web.Aspnetcore;
+
+public interface IControllerInit
+{
+    void ControllerInit(NHttpContext httpContext);
+}

src/ClownFish.Web/ClownFish.Web.csproj

@@ -4,8 +4,8 @@
         <TargetFrameworks>netcoreapp3.1;net6.0;net7.0</TargetFrameworks>
         <RootNamespace>ClownFish.Web</RootNamespace>
         <AssemblyVersion>7.0.0.0</AssemblyVersion>
-        <Version>7.23.830.100</Version>
-        <FileVersion>7.23.830.100</FileVersion>
+        <Version>7.23.901.100</Version>
+        <FileVersion>7.23.901.100</FileVersion>
         <RunAnalyzersDuringBuild>false</RunAnalyzersDuringBuild>
         <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
         <GenerateBindingRedirectsOutputType>true</GenerateBindingRedirectsOutputType>

src/ClownFish.Web/GlobalUsing.cs

@@ -23,13 +23,16 @@
 global using System.Xml.Serialization;
 
 global using ClownFish.Base;
+global using ClownFish.Base.Exceptions;
+global using ClownFish.Base.Reflection;
 global using ClownFish.Base.WebClient;
 global using ClownFish.Data;
 global using ClownFish.Http.Pipleline;
 global using ClownFish.Http.Proxy;
 global using ClownFish.Log;
 global using ClownFish.Log.Logging;
 global using ClownFish.Log.Models;
+global using ClownFish.Log.Attributes;
 
 global using ClownFish.Web.Aspnetcore;
 global using ClownFish.Web.AspnetCore.Objects;

src/ClownFish.net/Base/Config/EnvironmentVariables.cs

@@ -1,6 +1,4 @@
-using System.Collections.Generic;
-
-namespace ClownFish.Base;
+namespace ClownFish.Base;
 
 /// <summary>
 /// 读取环境变量的工具类

src/ClownFish.net/Base/Exceptions/BusinessLogicException.cs

@@ -1,4 +1,4 @@
-namespace ClownFish.Base;
+namespace ClownFish.Base.Exceptions;
 
 /// <summary>
 /// 表示一个业务逻辑异常

src/ClownFish.net/Base/Exceptions/ClientDataException.cs

@@ -1,4 +1,4 @@
-namespace ClownFish.Base;
+namespace ClownFish.Base.Exceptions;
 
 /// <summary>
 /// 验证参数时产生的异常

src/ClownFish.net/Base/Exceptions/ConfigurationErrorsException.cs

@@ -1,4 +1,4 @@
-namespace ClownFish.Base;
+namespace ClownFish.Base.Exceptions;
 
 /// <summary>
 /// 表示一个配置相关的错误

src/ClownFish.net/Base/Exceptions/DatabaseNotFoundException.cs

@@ -1,4 +1,4 @@
-namespace ClownFish.Base;
+namespace ClownFish.Base.Exceptions;
 
 /// <summary>
 /// 数据库没找到异常

src/ClownFish.net/Base/Exceptions/DuplicateInsertException.cs

@@ -1,4 +1,4 @@
-namespace ClownFish.Base;
+namespace ClownFish.Base.Exceptions;
 
 /// <summary>
 /// 表示数据库的重复插入异常

src/ClownFish.net/Base/Exceptions/ForbiddenException.cs

@@ -1,4 +1,4 @@
-namespace ClownFish.Base;
+namespace ClownFish.Base.Exceptions;
 
 /// <summary>
 /// 表示一个禁止访问的异常

src/ClownFish.net/Base/Exceptions/HttpException.cs

@@ -1,4 +1,4 @@
-namespace ClownFish.Base;
+namespace ClownFish.Base.Exceptions;
 
 /// <summary>
 /// 

src/ClownFish.net/Base/Exceptions/IErrorCode.cs

@@ -1,4 +1,4 @@
-namespace ClownFish.Base;
+namespace ClownFish.Base.Exceptions;
 
 /// <summary>
 /// 获取异常的状态码接口定义

src/ClownFish.net/Base/Exceptions/InvalidCodeException.cs

@@ -1,4 +1,4 @@
-namespace ClownFish.Base;
+namespace ClownFish.Base.Exceptions;
 
 /// <summary>
 /// 表示错误的代码异常

src/ClownFish.net/Base/Exceptions/MessageException.cs

@@ -1,4 +1,4 @@
-namespace ClownFish.Base;
+namespace ClownFish.Base.Exceptions;
 
 /// <summary>
 /// 表示一个普通的消息异常，用于从代码中快速退出。

src/ClownFish.net/Base/Exceptions/RemoteWebException.cs

@@ -1,4 +1,4 @@
-namespace ClownFish.Base;
+namespace ClownFish.Base.Exceptions;
 
 /// <summary>
 /// 表示在HTTP调用时发生的远程服务端异常。例如：HTTP 404, HTTP500 之类的异常。

src/ClownFish.net/Base/Exceptions/TenantNotFoundException.cs

@@ -1,4 +1,4 @@
-namespace ClownFish.Base;
+namespace ClownFish.Base.Exceptions;
 
 /// <summary>
 /// 租户没找到异常

src/ClownFish.net/Base/Exceptions/ValidationException.cs → src/ClownFish.net/Base/Exceptions/ValidationException2.cs

@@ -3,7 +3,7 @@
 /// <summary>
 /// 验证参数时产生的异常
 /// </summary>
-public sealed class ValidationException : Exception, IErrorCode
+public sealed class ValidationException2 : Exception, IErrorCode
 {
     /// <summary>
     /// StatusCode, default value: 400
@@ -16,7 +16,7 @@ public sealed class ValidationException : Exception, IErrorCode
     /// 构造方法
     /// </summary>
     /// <param name="message"></param>
-    public ValidationException(string message) : base(message)
+    public ValidationException2(string message) : base(message)
     {
     }
 
@@ -25,7 +25,7 @@ public ValidationException(string message) : base(message)
     /// </summary>
     /// <param name="message"></param>
     /// <param name="innerException"></param>
-    public ValidationException(string message, Exception innerException) : base(message, innerException)
+    public ValidationException2(string message, Exception innerException) : base(message, innerException)
     {
     }
 

src/ClownFish.net/ClownFish.net.csproj

@@ -4,8 +4,8 @@
         <TargetFrameworks>net48;netcoreapp3.1;net6.0;net7.0</TargetFrameworks>
         <RootNamespace>ClownFish</RootNamespace>
         <AssemblyVersion>7.0.0.0</AssemblyVersion>
-        <Version>7.23.830.100</Version>
-        <FileVersion>7.23.830.100</FileVersion>
+        <Version>7.23.901.100</Version>
+        <FileVersion>7.23.901.100</FileVersion>
         <RunAnalyzersDuringBuild>false</RunAnalyzersDuringBuild>
         <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
         <GenerateBindingRedirectsOutputType>true</GenerateBindingRedirectsOutputType>

src/ClownFish.net/GlobalUsing.cs

@@ -28,11 +28,13 @@
 global using ClownFish.Base.Reflection;
 global using ClownFish.Base.WebClient;
 global using ClownFish.Base.Xml;
+global using ClownFish.Base.Exceptions;
 global using ClownFish.Data;
 global using ClownFish.Data.Internals;
 global using ClownFish.Http.Pipleline;
 global using ClownFish.Log;
 global using ClownFish.Log.Logging;
 global using ClownFish.Log.Models;
 global using ClownFish.Log.Configuration;
+global using ClownFish.Log.Attributes;
 global using Newtonsoft.Json;

src/ClownFish.net/Log/Attributes/ActionTitleAttribute.cs

@@ -1,4 +1,4 @@
-namespace ClownFish.Log;
+namespace ClownFish.Log.Attributes;
 
 /// <summary>
 /// 定义Action的功能性描述

src/ClownFish.net/Log/Attributes/BatchWritableAttribute.cs

@@ -1,4 +1,4 @@
-namespace ClownFish.Log;
+namespace ClownFish.Log.Attributes;
 
 /// <summary>
 /// 指标某个消息类型在日志写入时【可以】做批次操作。

src/ClownFish.net/Log/Attributes/ControllerTitleAttribute.cs

@@ -1,4 +1,4 @@
-namespace ClownFish.Log;
+namespace ClownFish.Log.Attributes;
 
 /// <summary>
 /// 定义Controller类型的功能性描述

src/ClownFish.net/Log/Attributes/LogRequestBodyAttribute.cs

@@ -1,4 +1,4 @@
-namespace ClownFish.Log;
+namespace ClownFish.Log.Attributes;
 
 /// <summary>
 /// 标记当前请求在记录日志时，将请求体也记录到日志中

src/ClownFish.net/Log/Attributes/LoginActionAttribute.cs

@@ -0,0 +1,22 @@
+namespace ClownFish.Log.Attributes;
+
+/// <summary>
+/// 指示当前Action是不是登录相关的操作。
+/// 
+/// 登录请求会有二个不同的处理方式：
+/// 1、登录凭证不做自动续期处理
+/// 2、日志记录时忽略请求体
+/// </summary>
+/// <remarks>
+/// 注意：
+/// 在登录请求中，尤其是接收到用户提交的密码时，必须尽快验证处理，不要再传递到外部进程，否则可能造成密码泄露。
+/// 例如在查询数据库对比密码时，应该先用HASH处理，避免使用明文。
+/// </remarks>
+[AttributeUsage(AttributeTargets.Method, AllowMultiple = false, Inherited = false)]
+public sealed class LoginActionAttribute : Attribute
+{
+    internal static bool CurrentIsLogin(ActionDescription action)
+    {
+        return action.MethodInfo.GetMyAttribute<LoginActionAttribute>() != null;
+    }
+}

src/ClownFish.netfx/WebHost/Config/ServerOption.cs

@@ -6,6 +6,7 @@
 using System.Threading.Tasks;
 using System.Xml.Serialization;
 using ClownFish.Base;
+using ClownFish.Base.Exceptions;
 using ClownFish.Base.Xml;
 
 namespace ClownFish.WebHost.Config

src/ClownFish.netfx/WebHost/Config/ServerOptionValidator.cs

@@ -7,6 +7,7 @@
 using ClownFish.Base;
 using ClownFish.WebHost.Utils;
 using ClownFish.Http.Pipleline;
+using ClownFish.Base.Exceptions;
 
 namespace ClownFish.WebHost.Config
 {