|
@@ -12,8 +12,24 @@ namespace D3NsCore.Tools
|
|
|
|
|
|
public string ProxyServer { get; set; }
|
|
|
|
|
|
+ static HttpAccess()
|
|
|
+ {
|
|
|
+ System.Net.ServicePointManager.SecurityProtocol = SecurityProtocolType.Tls12;
|
|
|
+ }
|
|
|
+
|
|
|
public string GetString(string url, params HttpHeader[] headers)
|
|
|
{
|
|
|
+ {
|
|
|
+ //var client = new HttpClient();
|
|
|
+ //client.DefaultRequestHeaders.Add("UserAgent", UserAgent);
|
|
|
+ //foreach (var header in headers)
|
|
|
+ //{
|
|
|
+ // client.DefaultRequestHeaders.Add(header.Name, header.Value);
|
|
|
+ //}
|
|
|
+ //var str = client.GetStringAsync(url).Result;
|
|
|
+ //return str;
|
|
|
+ }
|
|
|
+
|
|
|
var wc = new WebClient { Headers = { ["User-Agent"] = UserAgent } };
|
|
|
wc.Proxy = new WebProxy();
|
|
|
if (ProxyServer != null) wc.Proxy = new WebProxy(new Uri(ProxyServer));
|
|
@@ -24,6 +40,18 @@ namespace D3NsCore.Tools
|
|
|
|
|
|
public string PutString(string url, string content, string contentType = "application/x-www-form-urlencoded;charset=UTF-8", params HttpHeader[] headers)
|
|
|
{
|
|
|
+ {
|
|
|
+ //var client = new HttpClient();
|
|
|
+ //client.DefaultRequestHeaders.Add("UserAgent", UserAgent);
|
|
|
+ //foreach (var header in headers)
|
|
|
+ //{
|
|
|
+ // client.DefaultRequestHeaders.Add(header.Name, header.Value);
|
|
|
+ //}
|
|
|
+ //var r = client.PutAsync(url, new StringContent(content, Encoding.UTF8, contentType));
|
|
|
+ //var str = r.Result.Content.ReadAsStringAsync().Result;
|
|
|
+ //return str;
|
|
|
+ }
|
|
|
+
|
|
|
var wc = new WebClient { Headers = { ["User-Agent"] = UserAgent, ["Content-Type"] = contentType } };
|
|
|
if (ProxyServer != null) wc.Proxy = new WebProxy(new Uri(ProxyServer));
|
|
|
foreach (var header in headers) wc.Headers.Add(header.Name, header.Value);
|
|
@@ -49,4 +77,4 @@ namespace D3NsCore.Tools
|
|
|
return JsonConvert.DeserializeAnonymousType(GetString(url, headers), anon);
|
|
|
}
|
|
|
}
|
|
|
-}
|
|
|
+}
|