From 5eeed44ad21748ed7560a8c688d4e2d2f03555c8 Mon Sep 17 00:00:00 2001
From: 刘磊 <1161824510@qq.com>
Date: 星期二, 05 八月 2025 12:47:13 +0800
Subject: [PATCH] 同步
---
项目代码/WMS/WIDESEA_WMSServer/WIDESEA_Common/HttpClient/HttpsClient.cs | 274 +++++++++++++-----------------------------------------
1 files changed, 68 insertions(+), 206 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Common/HttpClient/HttpsClient.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Common/HttpClient/HttpsClient.cs"
index 9da3ecd..ad54bbe 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Common/HttpClient/HttpsClient.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Common/HttpClient/HttpsClient.cs"
@@ -4,11 +4,7 @@
using System.Collections.Generic;
using System.Linq;
using System.Text;
-using System.Text.RegularExpressions;
using System.Threading.Tasks;
-using System.Xml;
-using WIDESEA.Common;
-using Formatting = System.Xml.Formatting;
namespace WIDESEA_Common;
@@ -51,218 +47,82 @@
// 灏佽涓�涓敤HttpClient鍙戦�丳ost璇锋眰鐨勬柟娉曟湁鍙傛暟
public static async Task<string> PostAsync(string url, Dictionary<string, object> parameters)
{
- // 鍒涘缓涓�涓柊鐨勫瓧鍏革紝鎺掗櫎 RequestTime 鍜� SessionId
- var filteredParameters = parameters.Where(p => p.Key != "RequestTime" && p.Key != "SessionId").ToDictionary(p => p.Key, p => p.Value);
-
- string requestKey = $"{url}:{JsonConvert.SerializeObject(filteredParameters)}";
- // 妫�鏌ヨ姹傛鏁板拰鏃堕棿闄愬埗
- if (requestTracker.TryGetValue(requestKey, out var requestInfo))
+ try
{
- if (requestInfo.Count >= 5 && DateTime.Now < requestInfo.LastRequestTime.AddMinutes(10))
+ // 鍒涘缓涓�涓柊鐨勫瓧鍏革紝鎺掗櫎 RequestTime 鍜� SessionId
+ var filteredParameters = parameters.Where(p => p.Key != "RequestTime" && p.Key != "SessionId").ToDictionary(p => p.Key, p => p.Value);
+
+ string requestKey = $"{url}:{JsonConvert.SerializeObject(filteredParameters)}";
+ // 妫�鏌ヨ姹傛鏁板拰鏃堕棿闄愬埗
+ if (requestTracker.TryGetValue(requestKey, out var requestInfo))
{
- // 濡傛灉璇锋眰娆℃暟瓒呰繃闄愬埗涓旀湭瓒呰繃10鍒嗛挓锛屾姏鍑哄紓甯�
- throw new InvalidOperationException("璇锋眰娆℃暟宸茶揪鍒伴檺鍒讹紝璇风◢鍚庡啀璇曘��");
+ if (requestInfo.Count >= 5 && DateTime.Now < requestInfo.LastRequestTime.AddMinutes(3))
+ {
+ // 濡傛灉璇锋眰娆℃暟瓒呰繃闄愬埗涓旀湭瓒呰繃10鍒嗛挓锛屾姏鍑哄紓甯�
+ throw new InvalidOperationException("璇锋眰娆℃暟宸茶揪鍒伴檺鍒讹紝璇风◢鍚庡啀璇曘��");
+ }
+ }
+
+ // 鏇存柊璇锋眰璺熻釜淇℃伅
+ if (requestTracker.ContainsKey(requestKey))
+ {
+ requestTracker[requestKey] = (requestInfo.Count + 1, DateTime.Now);
+ }
+ else
+ {
+ requestTracker[requestKey] = (1, DateTime.Now);
+ }
+
+
+ // 璁板綍璇锋眰鍙傛暟
+ LogRequestParameters(parameters, url);
+
+ // 鍒涘缓HttpClient瀹炰緥
+ using (HttpClient client = new HttpClient())
+ {
+ // 灏嗗弬鏁拌浆鎹负FormUrlEncodedContent
+ string content = JsonConvert.SerializeObject(parameters);
+
+ //client.Timeout = TimeSpan.from;
+
+ var request = new HttpRequestMessage(HttpMethod.Post, url);
+
+ request.Content = new StringContent(content, Encoding.UTF8, "application/json");
+ //var content = new FormUrlEncodedContent(ConvertToKeyValuePairs(parameters));
+ //// 鍙戦�丳OST璇锋眰骞惰幏鍙栧搷搴�
+ //HttpResponseMessage response = await client.PostAsync(url, content);
+ HttpResponseMessage response = await client.SendAsync(request);
+
+ // 纭繚鍝嶅簲鎴愬姛
+ response.EnsureSuccessStatusCode();
+
+ // 璇诲彇鍝嶅簲鍐呭
+ string responseBody = await response.Content.ReadAsStringAsync();
+
+ // 璁板綍鍝嶅簲鍙傛暟
+ LogResponseParameters(responseBody, url);
+
+ // 杩斿洖鍝嶅簲鍐呭
+ return responseBody;
}
}
-
- // 鏇存柊璇锋眰璺熻釜淇℃伅
- if (requestTracker.ContainsKey(requestKey))
+ catch (Exception ex)
{
- requestTracker[requestKey] = (requestInfo.Count + 1, DateTime.Now);
- }
- else
- {
- requestTracker[requestKey] = (1, DateTime.Now);
+ LogErrorParameters(ex.StackTrace, ex.Message, url);
+ return ex.Message;
}
-
- // 璁板綍璇锋眰鍙傛暟
- LogRequestParameters(parameters, url);
-
- // 鍒涘缓HttpClient瀹炰緥
- using (HttpClient client = new HttpClient())
- {
- // 灏嗗弬鏁拌浆鎹负FormUrlEncodedContent
- //string content = JsonConvert.SerializeObject(parameters);
- var content = new FormUrlEncodedContent(ConvertToKeyValuePairs(parameters));
-
- //client.Timeout = TimeSpan.from;
-
- var request = new HttpRequestMessage(HttpMethod.Post, url);
- request.Content = content;
-
- //request.Content = new StringContent(content, Encoding.UTF8, "application/json");
-
- //// 鍙戦�丳OST璇锋眰骞惰幏鍙栧搷搴�
- //HttpResponseMessage response = await client.PostAsync(url, content);
- HttpResponseMessage response = await client.SendAsync(request);
-
- // 纭繚鍝嶅簲鎴愬姛
- response.EnsureSuccessStatusCode();
-
- // 璇诲彇鍝嶅簲鍐呭
- string responseBody = await response.Content.ReadAsStringAsync();
-
- // 璁板綍鍝嶅簲鍙傛暟
- LogResponseParameters(responseBody, url);
-
- // 杩斿洖鍝嶅簲鍐呭
- return responseBody;
- }
}
-
- // 灏佽涓�涓敤HttpClient鍙戦�丳ost璇锋眰鐨勬柟娉曟湁鍙傛暟
- public static string Post(string url)
+ private static void LogErrorParameters(string errordetail, string error, string url = "")
{
- // 璁板綍璇锋眰鍙傛暟
- //LogRequestParameters(null, url);
-
- // 鍒涘缓HttpClient瀹炰緥
- using (HttpClient client = new HttpClient())
- {
- // 灏嗗弬鏁拌浆鎹负FormUrlEncodedContent
- //string content = JsonConvert.SerializeObject(parameters);
- //var content = new FormUrlEncodedContent(ConvertToKeyValuePairs(parameters));
-
- //client.Timeout = TimeSpan.from;
-
- var request = new HttpRequestMessage(HttpMethod.Post, url);
- //request.Content = content;
-
- //request.Content = new StringContent(content, Encoding.UTF8, "application/json");
-
- //// 鍙戦�丳OST璇锋眰骞惰幏鍙栧搷搴�
- //HttpResponseMessage response = await client.PostAsync(url, content);
- HttpResponseMessage response = client.Send(request);
-
- // 纭繚鍝嶅簲鎴愬姛
- response.EnsureSuccessStatusCode();
- // 璇诲彇鍝嶅簲鍐呭
- Stream stream = response.Content.ReadAsStream();
- StreamReader streamReader = new StreamReader(stream);
- string webResponse = streamReader.ReadToEnd();
-
- // 璁板綍鍝嶅簲鍙傛暟
- LogResponseParameters(webResponse, url);
-
- // 杩斿洖鍝嶅簲鍐呭
- return webResponse;
- }
+ StringBuilder builder = new StringBuilder();
+ builder.Append(Environment.NewLine);
+ builder.Append("---------------------------------------------");
+ builder.Append(Environment.NewLine);
+ builder.Append("url:" + url + "寮傚父璇︾粏淇℃伅: " + JsonConvert.SerializeObject(error));
+ builder.Append("url:" + url + "寮傚父淇℃伅: " + JsonConvert.SerializeObject(error));
+ LogFactory.GetLog("API鎺ュ彛寮傚父").Error(true, builder);
}
-
- public static string PostXml(string url, Dictionary<string, object> parameters)
- {
- // 璁板綍璇锋眰鍙傛暟
- LogRequestParameters(parameters, url);
-
- // 鍒涘缓HttpClient瀹炰緥
- using (HttpClient client = new HttpClient())
- {
- // 灏嗗弬鏁拌浆鎹负FormUrlEncodedContent
- //string content = JsonConvert.SerializeObject(parameters);
- var content = new FormUrlEncodedContent(ConvertToKeyValuePairs(parameters));
-
- //鍗佺瓒呮椂
- client.Timeout = new TimeSpan(0, 0, 10);
-
- var request = new HttpRequestMessage(HttpMethod.Post, url);
- request.Content = content;
-
- //request.Content = new StringContent(content, Encoding.UTF8, "application/json");
-
- //// 鍙戦�丳OST璇锋眰骞惰幏鍙栧搷搴�
- //HttpResponseMessage response = await client.PostAsync(url, content);
- HttpResponseMessage response = client.Send(request);
-
- // 纭繚鍝嶅簲鎴愬姛
- response.EnsureSuccessStatusCode();
- //string xmlContent = await response.Content.ReadAsStringAsync();
-
- // 璇诲彇鍝嶅簲鍐呭
- Stream stream = response.Content.ReadAsStream();
- StreamReader streamReader = new StreamReader(stream);
- string respon = streamReader.ReadToEnd();
-
- //string webResponse = XmlToJson(respon);
-
- string webResponse = ReplaceXmlStyle(respon);
-
- // 璇诲彇鍝嶅簲鍐呭
- //Stream stream = response.Content.ReadAsStream();
- //StreamReader streamReader = new StreamReader(stream);
- //string webResponse = streamReader.ReadToEnd();
-
- // 璁板綍鍝嶅簲鍙傛暟
- LogResponseParameters(webResponse, url);
-
- // 杩斿洖鍝嶅簲鍐呭
- return webResponse;
- }
- }
-
- static string XmlToJson(string xmlContent)
- {
- // 鎻愬彇鍐呭眰 XML 鍐呭
- int startIndex = xmlContent.IndexOf("<?xml");
- string innerXml = xmlContent.Substring(startIndex);
- // 鍘婚櫎澶栧眰澶氫綑鐨勫唴瀹癸紙鍋囪澶栧眰鍙湁 <string> 鐩稿叧鍐呭锛�
- innerXml = Regex.Replace(innerXml, @"^.*?<ROOT>", "<ROOT>");
-
- // 鍘婚櫎鍐呭眰 XML 澹版槑
- innerXml = innerXml.Replace("<?xml version=\"1.0\" encoding=\"utf-8\"?>", "");
- innerXml = innerXml.Replace("<string xmlns=\"http://tempuri.org/\">", "");
-
- innerXml = innerXml.Replace("<?xml version=\"1.0\" encoding=\"GB2312\"?>", "");
- // 澶勭悊杞箟瀛楃
- innerXml = innerXml.Replace("<", "<");
- innerXml = innerXml.Replace(">", ">");
- innerXml = innerXml.Replace("</string>", "");
-
- innerXml = innerXml.Replace("<?xml version=\"1.0\" encoding=\"GB2312\"?>", "");
-
- //innerXml = innerXml.Replace("<ROOT>", "");
- //innerXml = innerXml.Replace("</ROOT>", "");
-
- XmlDocument xmlDoc = new XmlDocument();
- xmlDoc.LoadXml(innerXml);
-
- // 灏哫ML杞崲涓篔SON
- string json = JsonConvert.SerializeXmlNode(xmlDoc);
-
- return json;
- }
-
- static string ReplaceXmlStyle(string xmlContent)
- {
- // 鎻愬彇鍐呭眰 XML 鍐呭
- int startIndex = xmlContent.IndexOf("<?xml");
- string innerXml = xmlContent.Substring(startIndex);
- // 鍘婚櫎澶栧眰澶氫綑鐨勫唴瀹癸紙鍋囪澶栧眰鍙湁 <string> 鐩稿叧鍐呭锛�
- innerXml = Regex.Replace(innerXml, @"^.*?<ROOT>", "<ROOT>");
-
- // 鍘婚櫎鍐呭眰 XML 澹版槑
- innerXml = innerXml.Replace("<?xml version=\"1.0\" encoding=\"utf-8\"?>", "");
- innerXml = innerXml.Replace("<string xmlns=\"http://tempuri.org/\">", "");
-
- innerXml = innerXml.Replace("<?xml version=\"1.0\" encoding=\"GB2312\"?>", "");
- // 澶勭悊杞箟瀛楃
- innerXml = innerXml.Replace("<", "<");
- innerXml = innerXml.Replace(">", ">");
- innerXml = innerXml.Replace("</string>", "");
-
- innerXml = innerXml.Replace("<?xml version=\"1.0\" encoding=\"GB2312\"?>", "");
-
- //innerXml = innerXml.Replace("<ROOT>", "");
- //innerXml = innerXml.Replace("</ROOT>", "");
-
- XmlDocument xmlDoc = new XmlDocument();
- xmlDoc.LoadXml(innerXml);
-
- return xmlDoc.InnerXml;
- //return xmlContent;
- }
-
-
private static void LogRequestParameters(Dictionary<string, object> parameters, string url = "")
{
StringBuilder builder = new StringBuilder();
@@ -284,6 +144,8 @@
LogFactory.GetLog("API鎺ュ彛").Info(true, builder);
}
+
+
private static IEnumerable<KeyValuePair<string, string>> ConvertToKeyValuePairs(Dictionary<string, object> parameters)
{
foreach (var kvp in parameters)
--
Gitblit v1.9.3