From c6fd827a11eda1dcb747b2f48113e074ad13cbf2 Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周六, 23 11月 2024 13:26:34 +0800
Subject: [PATCH] Merge branch 'master' of http://222.71.245.114:9086/r/LA24030-LuLI_PackageLine
---
CC/iWareCommon/Utils/HTTP/HttpHelper.cs | 26 +++++++++++---------------
1 files changed, 11 insertions(+), 15 deletions(-)
diff --git a/CC/iWareCommon/Utils/HTTP/HttpHelper.cs b/CC/iWareCommon/Utils/HTTP/HttpHelper.cs
index 7a3473d..a8cca9f 100644
--- a/CC/iWareCommon/Utils/HTTP/HttpHelper.cs
+++ b/CC/iWareCommon/Utils/HTTP/HttpHelper.cs
@@ -75,34 +75,30 @@
/// <param name="url">璇锋眰鍦板潃</param>
/// <param name="postData">璇锋眰鍙傛暟</param>
/// <param name="timeout">寤惰繜鏃堕棿</param>
- /// <param name="method">POST GET PUT DELETE</param>
/// <returns>璇锋眰鐨剅esponse</returns>
- public static string GetHttpResponse(string url, object postData, int timeout,string method)
+ public static T2 GetHttpResponse<T, T2>(string url, T postData, int timeout)
{
HttpWebRequest request = (HttpWebRequest)WebRequest.Create(url);
- request.Method = method;
+ request.Method = "POST";
request.ContentType = "application/json;charset=UTF-8";
request.UserAgent = null;
request.Timeout = timeout;
-
- if (!"GET".Equals(method))
- {
- var myRequestStream = request.GetRequestStream();
- var json = postData == null ? "" : JsonConvert.SerializeObject(postData);
- var jsonBytes = UTF8Encoding.UTF8.GetBytes(json);
- myRequestStream.Write(jsonBytes, 0, jsonBytes.Length);
- }
-
+ //request.Headers.Add("Authorization", "eyJhbGciOiJIUzM4NCIsInR5cCI6IkpXVCJ9.eyJpYXQiOiIxNTUzNTMwNjAwIiwiZXhwIjoiMTYxNjYwMjYwMCIsImlzcyI6IlNBR1dXSVAiLCJzdWIiOiJ3Y3NpbnRlZ3JhdGVkIiwidXNlcm5hbWUiOiJ3Y3NpbnRlZ3JhdGVkIiwidXNlcmdyb3VwIjpbeyJsb2dpbm5hbWUiOiJ3Y3NpbnRlZ3JhdGVkIiwiZ3JvdXBJZCI6Ijg3YjE1MTQ1LWUwODMtNDM2Ny04ZjdiLTNiNTI3NWJhYzExZSIsImdyb3VwbmFtZSI6IlJDU2ludGVncmF0ZWQiLCJyb2xlSWQiOiI4NjNhMGIxZS0zODAzLTQyNmMtOTRlNC04OTRmNTE1ZWQyYzgiLCJyb2xlbmFtZSI6IlJDU-mbhuaIkCJ9LHsibG9naW5uYW1lIjoid2NzaW50ZWdyYXRlZCIsImdyb3VwSWQiOiI5ZGU3ZjA5Zi05YzhiLTQwNDEtODc0NS1hYjgxNGQ0OTFiODEiLCJncm91cG5hbWUiOiJXQ1NpbnRlZ3JhdGVkIiwicm9sZUlkIjoiNWJhZDE1YTUtOTQ1NC00YTc3LTk0OGYtNzUxMjI2NDdiOTA4Iiwicm9sZW5hbWUiOiJXQ1Ppm4bmiJAifV19.AN9iUPMFZ5w7UW7D5kERV903gPCtyk6o2STZILX7QzkVjKLLSWgpUnQYBBfiSSQk");
+ var myRequestStream = request.GetRequestStream();
+
+ var json = postData == null ? "" : JsonConvert.SerializeObject(postData);
+
+ var jsonBytes = UTF8Encoding.UTF8.GetBytes(json);
+ myRequestStream.Write(jsonBytes, 0, jsonBytes.Length);
HttpWebResponse response = (HttpWebResponse)request.GetResponse();
Stream myResponseStream = response.GetResponseStream();
StreamReader myStreamReader = new StreamReader(myResponseStream, Encoding.GetEncoding("utf-8"));
string retString = myStreamReader.ReadToEnd();
myStreamReader.Close();
myResponseStream.Close();
-
- return retString;
+ T2 result = JsonConvert.DeserializeObject<T2>(retString);
+ return result;
}
-
/// <summary>
/// Http涓婁紶鏂囦欢
/// </summary>
--
Gitblit v1.9.3