From 2adafdf0317fa6a18fe3add8ccf0cb18c08648cd Mon Sep 17 00:00:00 2001
From: chenhaozhe <cgz@hz-kingdee.com>
Date: 星期三, 06 五月 2026 13:06:43 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API

---
 WebAPI/Service/SignatureVerifyAttribute.cs |   24 ++++++++++++++++++++----
 1 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/WebAPI/Service/SignatureVerifyAttribute.cs b/WebAPI/Service/SignatureVerifyAttribute.cs
index 8f24798..1c9583a 100644
--- a/WebAPI/Service/SignatureVerifyAttribute.cs
+++ b/WebAPI/Service/SignatureVerifyAttribute.cs
@@ -74,17 +74,33 @@
             }
             else
             {
+
+                var originalContentType = actionContext.Request.Content.Headers.ContentType;
+
+
                 var bodyBytes = await actionContext.Request.Content.ReadAsByteArrayAsync();
                 rawData = Encoding.UTF8.GetString(bodyBytes);
 
+
                 actionContext.Request.Content = new ByteArrayContent(bodyBytes);
-                if (actionContext.Request.Content.Headers.ContentType != null)
+                if (originalContentType != null)
                 {
-                    actionContext.Request.Content.Headers.ContentType =
-                        new System.Net.Http.Headers.MediaTypeHeaderValue(
-                            actionContext.Request.Content.Headers.ContentType.MediaType);
+                    actionContext.Request.Content.Headers.ContentType = originalContentType;
                 }
             }
+            //else
+            //{
+            //    var bodyBytes = await actionContext.Request.Content.ReadAsByteArrayAsync();
+            //    rawData = Encoding.UTF8.GetString(bodyBytes);
+
+            //    actionContext.Request.Content = new ByteArrayContent(bodyBytes);
+            //    if (actionContext.Request.Content.Headers.ContentType != null)
+            //    {
+            //        actionContext.Request.Content.Headers.ContentType =
+            //            new System.Net.Http.Headers.MediaTypeHeaderValue(
+            //                actionContext.Request.Content.Headers.ContentType.MediaType);
+            //    }
+            //}
             rawData = rawData.Replace("'", "%27");
             var signStr = rawData + "&timestamp=" + timestamp + "&nonce=" + nonce + "&key=" + SecretKey;
             var serverSign = ComputeHmacSha256(signStr, SecretKey);

--
Gitblit v1.9.1