resolved #79

Author: ymh199478

src/CatLib.Core/CatLib/App.cs

@@ -598,9 +598,9 @@ public static Func<object> Factory(string service)
         /// </summary>
         /// <typeparam name="TService">服务名或别名</typeparam>
         /// <param name="closure">闭包</param>
-        public static void Extend<TService>(Func<object, IContainer, object> closure)
+        public static void Extend<TService>(Func<TService, IContainer, object> closure)
         {
-            Handler.Extend<TService>(closure);
+            Handler.Extend(closure);
         }
 
         /// <summary>
@@ -610,9 +610,9 @@ public static void Extend<TService>(Func<object, IContainer, object> closure)
         /// </summary>
         /// <typeparam name="TService">服务名或别名</typeparam>
         /// <param name="closure">闭包</param>
-        public static void Extend<TService>(Func<object, object> closure)
+        public static void Extend<TService>(Func<TService, object> closure)
         {
-            Handler.Extend<TService>(closure);
+            Handler.Extend(closure);
         }
 
         /// <summary>

src/CatLib.Core/Support/Container/ContainerExtend.cs

@@ -727,9 +727,16 @@ public static Func<TService> Factory<TService>(this IContainer container, params
         /// <typeparam name="TService">服务名或别名</typeparam>
         /// <param name="container">服务容器</param>
         /// <param name="closure">闭包</param>
-        public static void Extend<TService>(this IContainer container, Func<object, IContainer, object> closure)
+        public static void Extend<TService>(this IContainer container, Func<TService, IContainer, object> closure)
         {
-            container.Extend(container.Type2Service(typeof(TService)), closure);
+            container.Extend(container.Type2Service(typeof(TService)), (instance, c) =>
+            {
+                if (instance is TService)
+                {
+                    return closure((TService)instance, c);
+                }
+                return instance;
+            });
         }
 
         /// <summary>
@@ -740,9 +747,16 @@ public static void Extend<TService>(this IContainer container, Func<object, ICon
         /// <typeparam name="TService">服务名或别名</typeparam>
         /// <param name="container">服务容器</param>
         /// <param name="closure">闭包</param>
-        public static void Extend<TService>(this IContainer container, Func<object, object> closure)
+        public static void Extend<TService>(this IContainer container, Func<TService, object> closure)
         {
-            container.Extend(container.Type2Service(typeof(TService)), (instance, _) => closure(instance));
+            container.Extend(container.Type2Service(typeof(TService)), (instance, _) =>
+            {
+                if (instance is TService)
+                {
+                    return closure((TService)instance);
+                }
+                return instance;
+            });
         }
 
         /// <summary>