From b51a65433d6102f2f8f00226404d9ca3808404af Mon Sep 17 00:00:00 2001
From: hutongqing <hutongqing@hnkhzn.com>
Date: 星期四, 02 一月 2025 22:23:17 +0800
Subject: [PATCH] 打印托盘号
---
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_Core/Helper/HttpHelper.cs | 76 ++++++++++++++++++++++++++------------
1 files changed, 52 insertions(+), 24 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 6c713cf..c020a67 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,40 +13,51 @@
{
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;
try
{
- string result = string.Empty;
using HttpClient httpClient = new HttpClient();
httpClient.Timeout = new TimeSpan(0, 0, 60);
-
- foreach (var header in headers)
- httpClient.DefaultRequestHeaders.Add(header.Key, header.Value);
+
+ if (headers != null)
+ {
+ foreach (var header in headers)
+ httpClient.DefaultRequestHeaders.Add(header.Key, header.Value);
+ }
result = await httpClient.GetAsync(serviceAddress).Result.Content.ReadAsStringAsync();
return result;
}
catch (Exception e)
{
- Console.WriteLine(e.Message);
+ throw new Exception(e.Message);
}
- return null;
+ finally
+ {
+ Logger.Add(serviceAddress, "", result, beginDate);
+ }
}
- 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;
try
{
- string result = string.Empty;
using (HttpContent httpContent = new StringContent(requestJson))
{
httpContent.Headers.ContentType = new MediaTypeHeaderValue("application/json");
using HttpClient httpClient = new HttpClient();
httpClient.Timeout = new TimeSpan(0, 0, 60);
- foreach (var header in headers)
- httpClient.DefaultRequestHeaders.Add(header.Key, header.Value);
+ if (headers != null)
+ {
+ foreach (var header in headers)
+ httpClient.DefaultRequestHeaders.Add(header.Key, header.Value);
+ }
result = await httpClient.PostAsync(serviceAddress, httpContent).Result.Content.ReadAsStringAsync();
}
@@ -54,45 +65,59 @@
}
catch (Exception e)
{
- Console.WriteLine(e.Message);
+ throw new Exception(e.Message);
}
- return null;
+ finally
+ {
+ Logger.Add(serviceAddress, requestJson, result, beginDate);
+ }
}
public static string Get(string serviceAddress, string contentType = "application/json", Dictionary<string, string>? headers = null)
{
+ string result = string.Empty;
+ DateTime beginDate = DateTime.Now;
try
{
- string result = string.Empty;
using HttpClient httpClient = new HttpClient();
httpClient.Timeout = new TimeSpan(0, 0, 60);
- foreach (var header in headers)
- httpClient.DefaultRequestHeaders.Add(header.Key, header.Value);
+ if (headers != null)
+ {
+ foreach (var header in headers)
+ httpClient.DefaultRequestHeaders.Add(header.Key, header.Value);
+ }
result = httpClient.GetStringAsync(serviceAddress).Result;
return result;
}
catch (Exception e)
{
- Console.WriteLine(e.Message);
+ throw new Exception(e.Message);
}
- return null;
+ finally
+ {
+ Logger.Add(serviceAddress, "", result, beginDate);
+ }
}
- 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;
try
{
- string result = string.Empty;
using (HttpContent httpContent = new StringContent(requestJson))
{
httpContent.Headers.ContentType = new MediaTypeHeaderValue("application/json");
using HttpClient httpClient = new HttpClient();
httpClient.Timeout = new TimeSpan(0, 0, 60);
- foreach (var header in headers)
- httpClient.DefaultRequestHeaders.Add(header.Key, header.Value);
+ if (headers != null)
+ {
+ foreach (var header in headers)
+ httpClient.DefaultRequestHeaders.Add(header.Key, header.Value);
+ }
result = httpClient.PostAsync(serviceAddress, httpContent).Result.Content.ReadAsStringAsync().Result;
}
@@ -100,9 +125,12 @@
}
catch (Exception e)
{
- Console.WriteLine(e.Message);
+ throw new Exception(e.Message);
}
- return null;
+ finally
+ {
+ Logger.Add(serviceAddress, requestJson, result, beginDate);
+ }
}
}
}
--
Gitblit v1.9.3