修复.net core下无法重复读取的问题

Nicholas2014 · Aug 1, 2018 · 7763f0d · 7763f0d
1 parent c7cc70d
commit 7763f0d
Show file tree

Hide file tree

Showing 3 changed files with 44 additions and 17 deletions.
diff --git a/src/PaySharp.Core/Notify/NotifyProcess.cs b/src/PaySharp.Core/Notify/NotifyProcess.cs
@@ -92,11 +92,9 @@ public static GatewayData ReadNotifyData()
             {
                 if (IsXmlData)
                 {
-                    using (var reader = new StreamReader(HttpUtil.Body))
-                    {
-                        string xmlData = reader.ReadToEnd();
-                        gatewayData.FromXml(xmlData);
-                    }
+                    var reader = new StreamReader(HttpUtil.Body);
+                    var xmlData = reader.ReadToEnd();
+                    gatewayData.FromXml(xmlData);
                 }
                 else
                 {

diff --git a/src/PaySharp.Core/PaySharp.Core.csproj b/src/PaySharp.Core/PaySharp.Core.csproj
@@ -6,10 +6,9 @@
     <TargetFrameworks>net45;netstandard2.0</TargetFrameworks>
     <Title>PaySharp.Core</Title>
     <Description>支付核心</Description>
-    <Version>1.0.5</Version>
+    <Version>1.0.6</Version>
     <PackageTags>dotnetcore;pay;</PackageTags>
     <PackageReleaseNotes>
-      修复.Net环境下,ip带端口的问题
     </PackageReleaseNotes>
   </PropertyGroup>
 

diff --git a/src/PaySharp.Core/Utils/HttpUtil.cs b/src/PaySharp.Core/Utils/HttpUtil.cs
@@ -37,10 +37,17 @@ public static string LocalIpAddress
         {
             get
             {
-                var ipAddress = Current.Connection.LocalIpAddress;
-                return IPAddress.IsLoopback(ipAddress) ?
-                       IPAddress.Loopback.ToString() :
-                       ipAddress.MapToIPv4().ToString();
+                try
+                {
+                    var ipAddress = Current.Connection.LocalIpAddress;
+                    return IPAddress.IsLoopback(ipAddress) ?
+                           IPAddress.Loopback.ToString() :
+                           ipAddress.MapToIPv4().ToString();
+                }
+                catch
+                {
+                    return IPAddress.Loopback.ToString();
+                }
             }
         }
 
@@ -51,10 +58,17 @@ public static string RemoteIpAddress
         {
             get
             {
-                var ipAddress = Current.Connection.RemoteIpAddress;
-                return IPAddress.IsLoopback(ipAddress) ?
-                       IPAddress.Loopback.ToString() :
-                       ipAddress.MapToIPv4().ToString();
+                try
+                {
+                    var ipAddress = Current.Connection.RemoteIpAddress;
+                    return IPAddress.IsLoopback(ipAddress) ?
+                           IPAddress.Loopback.ToString() :
+                           ipAddress.MapToIPv4().ToString();
+                }
+                catch
+                {
+                    return IPAddress.Loopback.ToString();
+                }
             }
         }
 
@@ -76,7 +90,16 @@ public static Stream Body
             get
             {
                 var body = Current.Request.Body;
-                body.Position = 0;
+                try
+                {
+                    if (body.CanSeek)
+                    {
+                        body.Position = 0;
+                    }
+                }
+                catch
+                { }
+
                 return body;
             }
         }
@@ -169,7 +192,14 @@ public static Stream Body
             get
             {
                 var inputStream = Current.Request.InputStream;
-                inputStream.Position = 0;
+                try
+                {
+                    if (inputStream.CanSeek)
+                    {
+                        inputStream.Position = 0;
+                    }
+                }
+                catch { }
                 return inputStream;
             }
         }