diff --git a/.gitignore b/.gitignore index 719c85b..0e845a7 100644 --- a/.gitignore +++ b/.gitignore @@ -33,3 +33,4 @@ _ReSharper*/ [Tt]est[Rr]esult* .vs/ #Nuget packages folder +/ICSSoft.Test/Program.cs diff --git a/.vs/ICSSoft.FromERP/v16/.suo b/.vs/ICSSoft.FromERP/v16/.suo index c690b7a..8cbbe04 100644 Binary files a/.vs/ICSSoft.FromERP/v16/.suo and b/.vs/ICSSoft.FromERP/v16/.suo differ diff --git a/ICSSoft.FromERP/HttpHelper.cs b/ICSSoft.FromERP/HttpHelper.cs index 2c2ebea..87a2309 100644 --- a/ICSSoft.FromERP/HttpHelper.cs +++ b/ICSSoft.FromERP/HttpHelper.cs @@ -13,66 +13,7 @@ namespace ICSSoft.FromERP { public class HttpHelper { - #region Get请求 - ///// - ///// 发送http Get请求 - ///// - ///// - ///// - //public static string GetRequest(string url) - //{ - // HttpWebRequest request = WebRequest.Create(url) as HttpWebRequest; - // request.Method = "GET"; - // request.ContentType = "application/x-www-form-urlencoded";//链接类型 - // string result = GetResponseString(request.GetResponse() as HttpWebResponse); - // return result; - //} - /// - /// 从HttpWebResponse对象中提取响应的数据转换为字符串 - /// - /// - /// - public static string GetResponseString(HttpWebResponse webresponse) - { - using (Stream s = webresponse.GetResponseStream()) - { - StreamReader reader = new StreamReader(s, Encoding.UTF8); - return reader.ReadToEnd(); - } - } - #endregion - - public static bool PingTest(string ip) - { - System.Net.NetworkInformation.Ping ping = new System.Net.NetworkInformation.Ping(); - - System.Net.NetworkInformation.PingReply pingStatus = - ping.Send(IPAddress.Parse(ip), 1000); - - if (pingStatus.Status == System.Net.NetworkInformation.IPStatus.Success) - { - return true; - } - else - { - return false; - } - } - - public static bool WebRequestTest(string url) - { - try - { - System.Net.WebRequest myRequest = System.Net.WebRequest.Create(url); - System.Net.WebResponse myResponse = myRequest.GetResponse(); - } - catch (System.Net.WebException) - { - return false; - } - return true; - } - + /// /// POST请求 /// diff --git a/ICSSoft.FromERP/ICSSoft.FromERP.csproj b/ICSSoft.FromERP/ICSSoft.FromERP.csproj index d3752b6..fa28fc5 100644 --- a/ICSSoft.FromERP/ICSSoft.FromERP.csproj +++ b/ICSSoft.FromERP/ICSSoft.FromERP.csproj @@ -137,6 +137,8 @@ + + diff --git a/ICSSoft.FromERP/Model/ApiResult/AbpResultDto.cs b/ICSSoft.FromERP/Model/ApiResult/AbpResultDto.cs new file mode 100644 index 0000000..7c5eead --- /dev/null +++ b/ICSSoft.FromERP/Model/ApiResult/AbpResultDto.cs @@ -0,0 +1,15 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace ICSSoft.FromERP.Model +{ + public class AbpResultDto + { + public object Result { get; set; } + public bool Success { get; set; } + public ErrorDto Error { get; set; } + } +} diff --git a/ICSSoft.FromERP/Model/ApiResult/ErrorDto.cs b/ICSSoft.FromERP/Model/ApiResult/ErrorDto.cs new file mode 100644 index 0000000..330dc6a --- /dev/null +++ b/ICSSoft.FromERP/Model/ApiResult/ErrorDto.cs @@ -0,0 +1,15 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace ICSSoft.FromERP.Model +{ + public class ErrorDto + { + public int Code { get; set; } + public string Message { get; set; } + public string Details { get; set; } + } +} diff --git a/ICSSoft.Test/ICSSoft.Test.csproj b/ICSSoft.Test/ICSSoft.Test.csproj index 6b67a8a..90f471d 100644 --- a/ICSSoft.Test/ICSSoft.Test.csproj +++ b/ICSSoft.Test/ICSSoft.Test.csproj @@ -80,12 +80,6 @@ Designer - - - {71be770c-f5be-46c8-a81c-1897e28db761} - ICSSoft.FromERP - - False @@ -98,6 +92,12 @@ false + + + {71BE770C-F5BE-46C8-A81C-1897E28DB761} + ICSSoft.FromERP + +