From b8cd98f0a2d8a7e644563eb67d4c88371279a729 Mon Sep 17 00:00:00 2001
From: huangxiaoqiang <1247017146@qq.com>
Date: 星期三, 09 四月 2025 10:17:23 +0800
Subject: [PATCH] 1
---
Code Management/WMS/WIDESEA_WMSServer/WIDESEA_Common/HttpClient/HttpsClient.cs | 80 +++++++++++++++++++++++++++++++++------
1 files changed, 67 insertions(+), 13 deletions(-)
diff --git a/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_Common/HttpClient/HttpsClient.cs b/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_Common/HttpClient/HttpsClient.cs
index b06c608..332ae9a 100644
--- a/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_Common/HttpClient/HttpsClient.cs
+++ b/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_Common/HttpClient/HttpsClient.cs
@@ -13,10 +13,10 @@
private static readonly LogFactory LogFactory = new LogFactory();
// 灏佽涓�涓敤HttpClient鍙戦�丟ET璇锋眰鐨勬柟娉曟湁鍙傛暟
- public static async Task<string> GetAsync(string url, Dictionary<string, string> parameters)
+ public static async Task<string> GetAsync(string url, Dictionary<string, object> parameters)
{
// 璁板綍璇锋眰鍙傛暟
- LogRequestParameters(parameters);
+ LogRequestParameters(parameters, url);
// 灏嗗弬鏁版嫾鎺ュ埌URL涓�
string queryString = string.Join("&", parameters.Select(x => $"{x.Key}={x.Value}"));
@@ -35,27 +35,61 @@
string responseBody = await response.Content.ReadAsStringAsync();
// 璁板綍鍝嶅簲鍙傛暟
- LogResponseParameters(responseBody);
+ LogResponseParameters(responseBody, url);
// 杩斿洖鍝嶅簲鍐呭
return responseBody;
}
}
+ // 鐢ㄤ簬杩借釜姣忎釜璇锋眰鐨勮皟鐢ㄦ鏁板拰鏈�鍚庤姹傛椂闂淬��
+ private static readonly Dictionary<string, (int Count, DateTime LastRequestTime)> requestTracker = new();
// 灏佽涓�涓敤HttpClient鍙戦�丳ost璇锋眰鐨勬柟娉曟湁鍙傛暟
- public static async Task<string> PostAsync(string url, Dictionary<string, string> parameters)
+ 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))
+ {
+ 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);
+ LogRequestParameters(parameters, url);
// 鍒涘缓HttpClient瀹炰緥
using (HttpClient client = new HttpClient())
{
// 灏嗗弬鏁拌浆鎹负FormUrlEncodedContent
- FormUrlEncodedContent content = new FormUrlEncodedContent(parameters);
+ string content = JsonConvert.SerializeObject(parameters);
- // 鍙戦�丳OST璇锋眰骞惰幏鍙栧搷搴�
- HttpResponseMessage response = await client.PostAsync(url, content);
+ //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();
@@ -64,20 +98,40 @@
string responseBody = await response.Content.ReadAsStringAsync();
// 璁板綍鍝嶅簲鍙傛暟
- LogResponseParameters(responseBody);
+ LogResponseParameters(responseBody, url);
// 杩斿洖鍝嶅簲鍐呭
return responseBody;
}
}
- private static void LogRequestParameters(Dictionary<string, string> parameters)
+ private static void LogRequestParameters(Dictionary<string, object> parameters, string url = "")
{
- LogFactory.GetLog("API鎺ュ彛").Info(true, "璇锋眰鍙傛暟: " + JsonConvert.SerializeObject(parameters));
+ StringBuilder builder = new StringBuilder();
+ builder.Append(Environment.NewLine);
+ builder.Append("---------------------------------------------");
+ builder.Append(Environment.NewLine);
+ builder.Append("url:" + url + "璇锋眰鍙傛暟: " + JsonConvert.SerializeObject(parameters));
+ LogFactory.GetLog("API鎺ュ彛").Info(true, builder);
}
- private static void LogResponseParameters(string responseBody)
+ private static void LogResponseParameters(string responseBody, string url = "")
{
- LogFactory.GetLog("API鎺ュ彛").Info(true, "鍝嶅簲鍙傛暟: " + responseBody);
+ StringBuilder builder = new StringBuilder();
+ builder.Append(Environment.NewLine);
+ builder.Append("url:" + url + "鍝嶅簲鍙傛暟: " + responseBody);
+ builder.Append(Environment.NewLine);
+ builder.Append("---------------------------------------------");
+ builder.Append(Environment.NewLine);
+ LogFactory.GetLog("API鎺ュ彛").Info(true, builder);
}
+
+ private static IEnumerable<KeyValuePair<string, string>> ConvertToKeyValuePairs(Dictionary<string, object> parameters)
+ {
+ foreach (var kvp in parameters)
+ {
+ yield return new KeyValuePair<string, string>(kvp.Key, kvp.Value?.ToString());
+ }
+ }
+
}
\ No newline at end of file
--
Gitblit v1.9.3