From 25cb7cd50d12f48e93d6cde47420ca3458e9c47a Mon Sep 17 00:00:00 2001 From: helongyang <647556386@qq.com> Date: 星期四, 12 六月 2025 21:39:43 +0800 Subject: [PATCH] 1 --- 代码管理/WMS/WIDESEA_WMSServer/WIDESEA_Core/Helper/HttpHelper.cs | 17 ++++++++++------- 1 files changed, 10 insertions(+), 7 deletions(-) diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Core/Helper/HttpHelper.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Core/Helper/HttpHelper.cs" index fc1a9f0..91b3d43 100644 --- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Core/Helper/HttpHelper.cs" +++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Core/Helper/HttpHelper.cs" @@ -13,7 +13,7 @@ { 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, string>? headers = null) { string result = string.Empty; DateTime beginDate = DateTime.Now; @@ -21,7 +21,7 @@ { using HttpClient httpClient = new HttpClient(); httpClient.Timeout = new TimeSpan(0, 0, 60); - + if (headers != null) { foreach (var header in headers) @@ -41,7 +41,7 @@ } } - public static async Task<string?> PostAsync(string serviceAddress, string requestJson = null, string contentType = "application/json", Dictionary<string, string>? headers = null) + public static async Task<string?> PostAsync(string serviceAddress, string requestJson = "", string contentType = "application/json", Dictionary<string, string>? headers = null) { string result = string.Empty; DateTime beginDate = DateTime.Now; @@ -69,7 +69,7 @@ } finally { - Logger.Add(serviceAddress, requestJson == null ? "" : requestJson, result, beginDate); + Logger.Add(serviceAddress, requestJson, result, beginDate); } } @@ -101,7 +101,7 @@ } } - public static string Post(string serviceAddress, string requestJson = null, string contentType = "application/json", Dictionary<string, string>? headers = null) + public static string Post(string serviceAddress, string requestJson = "", string contentType = "application/json", Dictionary<string, string>? headers = null) { string result = string.Empty; DateTime beginDate = DateTime.Now; @@ -112,7 +112,10 @@ httpContent.Headers.ContentType = new MediaTypeHeaderValue("application/json"); using HttpClient httpClient = new HttpClient(); httpClient.Timeout = new TimeSpan(0, 0, 60); - + if (serviceAddress.Contains("cimforce/AtomJsonService")) + { + httpClient.Timeout = new TimeSpan(0, 0, 30); + } if (headers != null) { foreach (var header in headers) @@ -129,7 +132,7 @@ } finally { - Logger.Add(serviceAddress, requestJson == null ? "" : requestJson, result, beginDate); + Logger.Add(serviceAddress, requestJson, result, beginDate); } } } -- Gitblit v1.9.3