diff --git a/DOAN.Service/MES/Group/AchievementService.cs b/DOAN.Service/MES/Group/AchievementService.cs index 46a1696..5327eb0 100644 --- a/DOAN.Service/MES/Group/AchievementService.cs +++ b/DOAN.Service/MES/Group/AchievementService.cs @@ -67,8 +67,6 @@ namespace DOAN.Service.MES.Group .AndIF(!string.IsNullOrEmpty(parm.Worker), it => it.Worker.Contains(parm.Worker)) .AndIF(parm.JobDatetime != null&& parm.JobDatetime[0]>DateTime.MinValue, it => it.JobDateTime >=parm.JobDatetime[0]) .AndIF(parm.JobDatetime != null&& parm.JobDatetime[0]>DateTime.MinValue, it => it.JobDateTime <=parm.JobDatetime[1]) - - ; return predicate; diff --git a/DOAN.ServiceCore/Filters/GlobalActionMonitor.cs b/DOAN.ServiceCore/Filters/GlobalActionMonitor.cs index 64acdd7..0987c7b 100644 --- a/DOAN.ServiceCore/Filters/GlobalActionMonitor.cs +++ b/DOAN.ServiceCore/Filters/GlobalActionMonitor.cs @@ -29,27 +29,35 @@ namespace DOAN.ServiceCore.Middleware /// public override Task OnActionExecutionAsync(ActionExecutingContext context, ActionExecutionDelegate next) { - string msg = string.Empty; - var values = context.ModelState.Values; - foreach (var item in values) - { - foreach (var err in item.Errors) + // 打印请求参数 + + + + + string msg = string.Empty; + var values = context.ModelState.Values; + foreach (var item in values) { - if (!string.IsNullOrEmpty(msg)) + foreach (var err in item.Errors) { - msg += " | "; + if (!string.IsNullOrEmpty(msg)) + { + msg += " | "; + } + + msg += err.ErrorMessage; } - - msg += err.ErrorMessage; } - } - if (!string.IsNullOrEmpty(msg)) - { - logger.Info($"请求参数错误,{msg}"); - ApiResult response = new((int)ResultCode.PARAM_ERROR, msg); + if (!string.IsNullOrEmpty(msg)) + { + logger.Info($"请求参数错误,{msg}"); + ApiResult response = new((int)ResultCode.PARAM_ERROR, msg); - context.Result = new JsonResult(response); - } + context.Result = new JsonResult(response); + } + + + return base.OnActionExecutionAsync(context, next); } diff --git a/Infrastructure/Converter/JsonConverterUtil.cs b/Infrastructure/Converter/JsonConverterUtil.cs index caf4bf8..e6ca958 100644 --- a/Infrastructure/Converter/JsonConverterUtil.cs +++ b/Infrastructure/Converter/JsonConverterUtil.cs @@ -16,7 +16,7 @@ namespace Infrastructure.Converter => string.IsNullOrEmpty(reader.GetString()) ? default : ParseDateTime(reader.GetString()); public override void Write(Utf8JsonWriter writer, DateTime? value, JsonSerializerOptions options) - => writer.WriteStringValue(value?.ToString("yyyy-MM-dd HH:mm:ss")); + => writer.WriteStringValue(value?.ToLocalTime().ToString("yyyy-MM-dd HH:mm:ss")); } public class DateTimeConverter : JsonConverter @@ -28,13 +28,13 @@ namespace Infrastructure.Converter } public override void Write(Utf8JsonWriter writer, DateTime value, JsonSerializerOptions options) - => writer.WriteStringValue(value.ToString("yyyy-MM-dd HH:mm:ss")); + => writer.WriteStringValue(value.ToLocalTime().ToString("yyyy-MM-dd HH:mm:ss")); } public static DateTime? ParseDateTime(string dateStr) { if (System.Text.RegularExpressions.Regex.IsMatch(dateStr, @"^\d{4}[/-]") && DateTime.TryParse(dateStr, null, System.Globalization.DateTimeStyles.AssumeLocal, out var dateVal)) - return dateVal; + return dateVal.ToLocalTime(); return null; } @@ -55,7 +55,7 @@ namespace Infrastructure.Converter public override void Write(Utf8JsonWriter writer, DateTime value, JsonSerializerOptions options) { - writer.WriteStringValue(value.ToString("yyyy-MM-ddTHH:mm:ss")); + writer.WriteStringValue(value.ToLocalTime().ToString("yyyy-MM-ddTHH:mm:ss")); } } @@ -109,7 +109,7 @@ namespace Infrastructure.Converter { if (date.HasValue) { - writer.WriteStringValue(date.Value.ToString("yyyy-MM-dd HH:mm:ss")); + writer.WriteStringValue(date.Value.ToLocalTime().ToString("yyyy-MM-dd HH:mm:ss")); } else {