From 87cc1c0d71fe6c6000ac6523bbb367d5ac29b5d2 Mon Sep 17 00:00:00 2001
From: 肖洋 <cathay_xy@163.com>
Date: 星期六, 11 一月 2025 16:40:51 +0800
Subject: [PATCH] 更新设备通讯超时设置及优化代码结构
---
Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Core/Helper/HttpHelper.cs | 44 ++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 42 insertions(+), 2 deletions(-)
diff --git a/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Core/Helper/HttpHelper.cs b/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Core/Helper/HttpHelper.cs
index 91d5f89..8b31e8c 100644
--- a/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Core/Helper/HttpHelper.cs
+++ b/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Core/Helper/HttpHelper.cs
@@ -1,7 +1,10 @@
-锘縰sing System;
+锘縰sing AngleSharp.Dom;
+using Newtonsoft.Json;
+using System;
using System.Collections.Generic;
using System.Linq;
using System.Net.Http.Headers;
+using System.Security.Policy;
using System.Text;
using System.Threading.Tasks;
@@ -9,13 +12,16 @@
{
public class HttpHelper
{
- public static async Task<string> GetAsync(string serviceAddress, string contentType = "application/json", Dictionary<string, string>? headers = null)
+ public static async Task<string> GetAsync(string serviceAddress, Dictionary<string, object> parameters, string contentType = "application/json", Dictionary<string, string>? headers = null)
{
try
{
string result = string.Empty;
using HttpClient httpClient = new HttpClient();
httpClient.Timeout = new TimeSpan(0, 0, 60);
+ // 灏嗗弬鏁版嫾鎺ュ埌URL涓�
+ string queryString = string.Join("&", parameters.Select(x => $"{x.Key}={x.Value}"));
+ serviceAddress += "?" + queryString;
if (headers != null)
{
@@ -33,10 +39,44 @@
return null;
}
+
+ // 鐢ㄤ簬杩借釜姣忎釜璇锋眰鐨勮皟鐢ㄦ鏁板拰鏈�鍚庤姹傛椂闂淬��
+ private static readonly Dictionary<string, (int Count, DateTime LastRequestTime)> requestTracker = new();
+
public static async Task<string> PostAsync(string serviceAddress, string requestJson = null, string contentType = "application/json", Dictionary<string, string>? headers = null)
{
try
{
+ if (serviceAddress.Contains("http://c24-cellmi3:12020"))
+ {
+ // 灏� JSON 瀛楃涓茶浆鎹负瀛楀吀
+ var parameters = JsonConvert.DeserializeObject<Dictionary<string, object>>(requestJson);
+
+ // 鍒涘缓涓�涓柊鐨勫瓧鍏革紝鎺掗櫎 RequestTime 鍜� SessionId
+ var filteredParameters = parameters.Where(p => p.Key != "RequestTime" && p.Key != "SessionId").ToDictionary(p => p.Key, p => p.Value);
+
+ string requestKey = $"{serviceAddress}:{JsonConvert.SerializeObject(filteredParameters)}";
+
+ // 妫�鏌ヨ姹傛鏁板拰鏃堕棿闄愬埗
+ if (requestTracker.TryGetValue(requestKey, out var requestInfo))
+ {
+ if (requestInfo.Count >= 5 && DateTime.Now < requestInfo.LastRequestTime.AddMinutes(10))
+ {
+ // 濡傛灉璇锋眰娆℃暟瓒呰繃闄愬埗涓旀湭瓒呰繃10鍒嗛挓锛屾姏鍑哄紓甯�
+ throw new InvalidOperationException("璇锋眰娆℃暟宸茶揪鍒伴檺鍒讹紝璇风◢鍚庡啀璇曘��");
+ }
+ }
+
+ // 鏇存柊璇锋眰璺熻釜淇℃伅
+ if (requestTracker.ContainsKey(requestKey))
+ {
+ requestTracker[requestKey] = (requestInfo.Count + 1, DateTime.Now);
+ }
+ else
+ {
+ requestTracker[requestKey] = (1, DateTime.Now);
+ }
+ }
string result = string.Empty;
using (HttpContent httpContent = new StringContent(requestJson))
{
--
Gitblit v1.9.3