fixed OnInvokeError error类型不正确

HubCrike · Aug 25, 2020 · bbd6d3d · bbd6d3d
1 parent 24ee95a
commit bbd6d3d
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 2 deletions.
diff --git a/JMS.ServiceProvider/Impls/InvokeRequestHandler.cs b/JMS.ServiceProvider/Impls/InvokeRequestHandler.cs
@@ -8,6 +8,7 @@
 using Microsoft.Extensions.DependencyInjection;
 using JMS.Dtos;
 using System.Linq;
+using System.Reflection;
 
 namespace JMS.Impls
 {
@@ -202,6 +203,9 @@ public void Handle(NetClient netclient, InvokeCommand cmd)
             }
             catch (Exception ex)
             {
+                if (ex is TargetInvocationException && ex.InnerException != null)
+                    ex = ex.InnerException;
+
                 if (transactionDelegate != null)
                 {
                     try
@@ -218,6 +222,7 @@ public void Handle(NetClient netclient, InvokeCommand cmd)
                     }
                     transactionDelegate = null;
                 }
+
                 try
                 {
                     if( controller?.OnInvokeError(cmd.Method, parameters, ex) == false)

diff --git a/JMS.ServiceProvider/JMS.ServiceProvider.csproj b/JMS.ServiceProvider/JMS.ServiceProvider.csproj
@@ -6,7 +6,7 @@
     <AssemblyName>JMS.ServiceProvider</AssemblyName>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
     <RepositoryUrl>https://github.com/simpleway2016/JMS</RepositoryUrl>
-    <Version>1.0.1.2</Version>
+    <Version>1.0.1.3</Version>
     <Authors>Jack.T</Authors>
     <Company>JMS</Company>
     <Product>JMS</Product>

diff --git a/JMS.TestServiceHost/Controller1.cs b/JMS.TestServiceHost/Controller1.cs
@@ -1,6 +1,7 @@
 using Microsoft.Extensions.Logging;
 using System;
 using System.Collections.Generic;
+using System.Security.Authentication;
 using System.Text;
 
 namespace JMS
@@ -59,7 +60,16 @@ public long IntTest()
 
         public string ErrTest()
         {
-            throw new Exception("ErrTest异常啦");
+            throw new AuthenticationException("ErrTest异常啦");
+        }
+
+        public override bool OnInvokeError(string actionName, object[] parameters, Exception error)
+        {
+            if( error is AuthenticationException)
+            {
+                return true;
+            }
+            return false;
         }
     }
 }
diff --git a/TestApplication/Program.cs b/TestApplication/Program.cs
@@ -93,6 +93,7 @@ static void Main(string[] args)
                     Thread.Sleep(1000);
                     controller1 = tran.GetMicroService<Controller1>();
                 }
+
                 var Service2 = tran.GetMicroService("Service2");
 
                 var ret = controller1.Test(123, "Jack.T");