From 70f22c9c06c7dfe2a2a83c0d2fcc79892dba7d8f Mon Sep 17 00:00:00 2001
From: hutongqing <hutongqing@hnkhzn.com>
Date: 星期三, 18 十二月 2024 17:08:29 +0800
Subject: [PATCH] 1

---
 代码管理/WMS/WIDESEA_WMSServer/WIDESEA_Core/Helper/HttpHelper.cs |   86 ++++++++++++------------------------------
 1 files changed, 25 insertions(+), 61 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 da9e300..ccfdf9b 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"
@@ -20,9 +20,11 @@
                 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;
@@ -44,9 +46,11 @@
                     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();
                 }
@@ -66,9 +70,11 @@
                 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;
@@ -91,8 +97,12 @@
                     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;
                 }
@@ -102,57 +112,11 @@
             {
                 Console.WriteLine(e.Message);
             }
+            finally
+            {
+
+            }
             return null;
-        }
-
-        public static T Post<T>(string url, object parm, string rquestName = "") where T : class
-        {
-            HttpWebResponse response = null;
-            StreamReader resultReader = null;
-            string responseContent = string.Empty;
-            try
-            {
-                HttpWebRequest request = (HttpWebRequest)WebRequest.Create(url);
-                request.Timeout = 10 * 1000;
-                request.Method = "POST";
-                request.ContentType = "application/json; charset=UTF-8";
-                parm = parm ?? "";
-                byte[] data = Encoding.UTF8.GetBytes(JsonConvert.SerializeObject(parm));
-                request.ContentLength = data.Length;
-                using (Stream newStream = request.GetRequestStream())
-                {
-                    newStream.Write(data, 0, data.Length);
-                };
-
-                response = (HttpWebResponse)request.GetResponse();
-                Stream webStream = response.GetResponseStream();
-                if (webStream == null)
-                {
-                    throw new Exception("Network error");
-                }
-
-                int statsCode = (int)response.StatusCode;
-                resultReader = new StreamReader(webStream, Encoding.UTF8);
-                responseContent = resultReader.ReadToEnd();
-
-                if (response != null)
-                    response.Close();
-                if (resultReader != null)
-                    resultReader.Close();
-
-                if (statsCode != 200)
-                {
-                    throw new Exception("寮傚父锛屽搷搴旂爜锛�" + statsCode.ToString());
-                }
-
-                Logger.Write_Log("System/API璇锋眰", rquestName, "璇锋眰鎴愬姛", new { 璇锋眰鎶ユ枃 = parm, 鎺ユ敹鎶ユ枃 = responseContent });
-                return JsonConvert.DeserializeObject<T>(responseContent);
-            }
-            catch (Exception ex)
-            {
-                Logger.Write_Log("System/API璇锋眰", rquestName, "璇锋眰寮傚父", new { 璇锋眰鎶ユ枃 = parm, 鎺ユ敹鎶ユ枃 = responseContent, 閿欒 = ex.Message });
-                throw ex;
-            }
         }
     }
 }

--
Gitblit v1.9.3