From d0450c95859ba1166826266883a7763c6f584f34 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8C=83=E9=9C=B2=E5=B0=A7?= Date: Tue, 7 Mar 2023 23:32:57 +0800 Subject: [PATCH] =?UTF-8?q?.net=205.0=E6=94=B9=E6=88=906.0=20=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D=E5=A4=96=E7=BD=91=E6=96=87=E4=BB=B6=E4=B8=8A=E4=BC=A0?= =?UTF-8?q?bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BodyEntity.cs | 24 +++++++++++ ...Transfer_Client_Service_HttpHandler.csproj | 2 +- .../HttpWebService.cs | 41 +++++++++++++++---- ...Service_Transfer_Client_coreService.csproj | 2 +- .../Getf_Service_Transfer_core_client.csproj | 2 +- 5 files changed, 59 insertions(+), 12 deletions(-) create mode 100644 93_nei_core/Getf_Service_Transfer_Client_Service_HttpHandler/BodyEntity.cs diff --git a/93_nei_core/Getf_Service_Transfer_Client_Service_HttpHandler/BodyEntity.cs b/93_nei_core/Getf_Service_Transfer_Client_Service_HttpHandler/BodyEntity.cs new file mode 100644 index 0000000..573be6f --- /dev/null +++ b/93_nei_core/Getf_Service_Transfer_Client_Service_HttpHandler/BodyEntity.cs @@ -0,0 +1,24 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Getf_Service_Transfer_Client_Service_HttpHandler +{ + public class BodyEntity + { + /// + /// + /// + public string commond { get; set; } + /// + /// + /// + public byte[] bytes { get; set; } + /// + /// + /// + public string FileName { get; set; } + } +} diff --git a/93_nei_core/Getf_Service_Transfer_Client_Service_HttpHandler/Getf_Service_Transfer_Client_Service_HttpHandler.csproj b/93_nei_core/Getf_Service_Transfer_Client_Service_HttpHandler/Getf_Service_Transfer_Client_Service_HttpHandler.csproj index 1d6724d..e13c10c 100644 --- a/93_nei_core/Getf_Service_Transfer_Client_Service_HttpHandler/Getf_Service_Transfer_Client_Service_HttpHandler.csproj +++ b/93_nei_core/Getf_Service_Transfer_Client_Service_HttpHandler/Getf_Service_Transfer_Client_Service_HttpHandler.csproj @@ -1,7 +1,7 @@ - net5.0 + net6.0 diff --git a/93_nei_core/Getf_Service_Transfer_Client_Service_HttpHandler/HttpWebService.cs b/93_nei_core/Getf_Service_Transfer_Client_Service_HttpHandler/HttpWebService.cs index 75bdad5..ed38dcf 100644 --- a/93_nei_core/Getf_Service_Transfer_Client_Service_HttpHandler/HttpWebService.cs +++ b/93_nei_core/Getf_Service_Transfer_Client_Service_HttpHandler/HttpWebService.cs @@ -16,6 +16,7 @@ using System.Reflection; using System.Net.Http; using Furion.RemoteRequest.Extensions; using Furion.RemoteRequest; +using System.Security.Policy; namespace Getf_Service_Transfer_Client_Service_HttpHandler { @@ -51,13 +52,31 @@ namespace Getf_Service_Transfer_Client_Service_HttpHandler } object r; SetHead(httpRequst, jObject["Head"]); - httpRequst.SetBody(jObject["Data"].ToString()); - if (data.Length > 0) + var bodyData = jObject["Data"]; + var bodyParam = jObject["Param"]; + if (data != null && data.Length > 0) { httpRequst.SetRequestUrl(url + "byte"); - httpRequst.SetBody(new { FileName = jObject["Data"]["fileName"].ToString(), bytes = data }); + BodyEntity be = new(); + if (bodyData != null) + { + if (bodyData["commond"] != null) + be.commond = bodyData["commond"].ToString(); + if (bodyData["fileName"] != null) + be.FileName = bodyData["fileName"].ToString(); + be.bytes = data; + } + httpRequst.SetBody(be); + _LogHelper.Info($"body:{Newtonsoft.Json.JsonConvert.SerializeObject(be)}"); } - var response = httpRequst.SendAsync().Result; + else + { + if (bodyParam != null) + httpRequst.SetBody(bodyParam.ToString()); + if (bodyData != null) + httpRequst.SetBody(bodyData.ToString()); + } + var response = httpRequst.SendAsync()?.Result; if (IsTextContentType(response.Content.Headers.ContentType.MediaType)) { r = response.Content.ReadAsStringAsync().Result; @@ -102,7 +121,8 @@ namespace Getf_Service_Transfer_Client_Service_HttpHandler catch (Exception e) { msg = e.Message; - _LogHelper.Info("3:请求错误原因为:" + msg); + _LogHelper.Info($"3:请求错误原因为:93段接口:url:{url},参数:{jObject["Data"]},结果:{msg},{e.StackTrace}"); + //_LogHelper.Info("3:请求错误原因为:" + msg + "," + e.StackTrace); } return null; } @@ -200,12 +220,14 @@ namespace Getf_Service_Transfer_Client_Service_HttpHandler { foreach (JProperty elem in head) { - var name = elem.Name; - var value = elem.Value.ToString(); - dic.Add(name, value); + var name = elem?.Name; + var value = elem?.Value?.ToString(); + if (!string.IsNullOrEmpty(name)) + dic.Add(name, value); } } httprequest.SetHeaders(dic); + _LogHelper.Info($"6:请求header:{dic}"); } private void SetHead(HttpWebRequest httpWebRequest, string method, string headStr) @@ -282,7 +304,8 @@ namespace Getf_Service_Transfer_Client_Service_HttpHandler { if (contentType == null) return true; contentType = contentType.ToLower(); - var list = new string[] { "text/", "application/json", "application/xml" }; + //"text/", + var list = new string[] { "application/json", "application/xml" }; return list.Any(m => contentType.Contains(m)); } } diff --git a/93_nei_core/Getf_Service_Transfer_Client_coreService/Getf_Service_Transfer_Client_coreService.csproj b/93_nei_core/Getf_Service_Transfer_Client_coreService/Getf_Service_Transfer_Client_coreService.csproj index eb6cb5a..2683bbe 100644 --- a/93_nei_core/Getf_Service_Transfer_Client_coreService/Getf_Service_Transfer_Client_coreService.csproj +++ b/93_nei_core/Getf_Service_Transfer_Client_coreService/Getf_Service_Transfer_Client_coreService.csproj @@ -1,7 +1,7 @@  - net5.0 + net6.0 diff --git a/93_nei_core/Getf_Service_Transfer_core_client/Getf_Service_Transfer_core_client.csproj b/93_nei_core/Getf_Service_Transfer_core_client/Getf_Service_Transfer_core_client.csproj index 01a88b0..e97f9c9 100644 --- a/93_nei_core/Getf_Service_Transfer_core_client/Getf_Service_Transfer_core_client.csproj +++ b/93_nei_core/Getf_Service_Transfer_core_client/Getf_Service_Transfer_core_client.csproj @@ -1,7 +1,7 @@  - net5.0 + net6.0 dotnet-Getf_Service_Transfer_core_client-A49AB986-D7BC-4882-BAB1-48CAF75741A2