From 4b483d9d06bead231b88ca212fd799196668a057 Mon Sep 17 00:00:00 2001
From: wanshenmean <cathay_xy@163.com>
Date: 星期二, 28 四月 2026 22:58:27 +0800
Subject: [PATCH] fix(任务服务): 修复出库任务选择逻辑和货位分配问题
---
Code/WMS/WIDESEA_WMSServer/WIDESEA_Core/Middlewares/ApiLogMiddleware.cs | 34 +++++++++++++++-------------------
1 files changed, 15 insertions(+), 19 deletions(-)
diff --git a/Code/WMS/WIDESEA_WMSServer/WIDESEA_Core/Middlewares/ApiLogMiddleware.cs b/Code/WMS/WIDESEA_WMSServer/WIDESEA_Core/Middlewares/ApiLogMiddleware.cs
index d047780..86728ff 100644
--- a/Code/WMS/WIDESEA_WMSServer/WIDESEA_Core/Middlewares/ApiLogMiddleware.cs
+++ b/Code/WMS/WIDESEA_WMSServer/WIDESEA_Core/Middlewares/ApiLogMiddleware.cs
@@ -1,14 +1,8 @@
锘縰sing Microsoft.AspNetCore.Http;
using Microsoft.Extensions.Logging;
using Newtonsoft.Json;
-using Org.BouncyCastle.Asn1.Ocsp;
-using System;
-using System.Collections.Generic;
-using System.Linq;
using System.Net;
using System.Text;
-using System.Text.RegularExpressions;
-using System.Threading.Tasks;
using WIDESEA_Core.Helper;
using WIDESEA_Core.LogHelper;
@@ -20,7 +14,7 @@
public class ApiLogMiddleware
{
/// <summary>
- ///
+ ///
/// </summary>
private readonly RequestDelegate _next;
@@ -51,7 +45,7 @@
var json = new WebResponseContent();
json.Message = HttpStatusCode.InternalServerError.ToString();//閿欒淇℃伅
- json.Code = 500;//500寮傚父
+ json.Code = 500;//500寮傚父
StreamWriter streamWriter = new StreamWriter(context.Response.Body);
await streamWriter.WriteAsync(json.Serialize());
@@ -74,7 +68,7 @@
try
{
// 瀛樺偍璇锋眰鏁版嵁
- requestParam = RequestDataLog(context);
+ requestParam = await RequestDataLogAsync(context);
context.Request.Body.Position = 0;
}
catch { }
@@ -86,7 +80,7 @@
try
{
// 瀛樺偍鍝嶅簲鏁版嵁
- responseParam = ResponseDataLog(context.Response);
+ responseParam = await ResponseDataLogAsync(context.Response);
}
catch { }
@@ -101,7 +95,6 @@
catch (Exception ex)
{
// 璁板綍寮傚父
-
}
finally
{
@@ -114,20 +107,23 @@
}
}
- private string RequestDataLog(HttpContext context)
+ private async Task<string> RequestDataLogAsync(HttpContext context)
{
var request = context.Request;
+ //request.EnableBuffering();
+ //request.Body.Position = 0;
- var sr = new StreamReader(request.Body);
+ var sr = new StreamReader(request.Body, Encoding.UTF8);
object obj;
- string bodyData = sr.ReadToEndAsync().Result;
+ string bodyData = await sr.ReadToEndAsync();
if (request.ContentLength <= 100000)
{
obj = new
{
QueryString = request.QueryString.ToString(),
- BodyData = bodyData
+ BodyData = JsonConvert.DeserializeObject(bodyData)
+ //BodyData = bodyData
};
}
else
@@ -145,17 +141,17 @@
return data; ;
}
- private string ResponseDataLog(HttpResponse response)
+ private async Task<string> ResponseDataLogAsync(HttpResponse response)
{
if (response.ContentLength <= 100000)
{
response.Body.Position = 0;
- using StreamReader stream = new StreamReader(response.Body, leaveOpen: true);
- string body = stream.ReadToEnd();
+ using StreamReader stream = new StreamReader(response.Body, Encoding.UTF8, leaveOpen: true);
+ string body = await stream.ReadToEndAsync();
response.Body.Position = 0;
return body;
}
return "";
}
}
-}
+}
\ No newline at end of file
--
Gitblit v1.9.3