resolved #160

Author: ymh199478

src/CatLib.Core/CatLib/App.cs

@@ -649,6 +649,16 @@ public static IContainer OnRelease(Action<IBindData, object> action)
             return Handler.OnRelease(action);
         }
 
+        /// <summary>
+        /// 当服务被解决事件之后的回调
+        /// </summary>
+        /// <param name="closure">闭包</param>
+        /// <returns>当前容器</returns>
+        public static IContainer OnAfterResolving(Action<IBindData, object> closure)
+        {
+            return Handler.OnAfterResolving(closure);
+        }
+
         /// <summary>
         /// 当查找类型无法找到时会尝试去调用开发者提供的查找类型函数
         /// </summary>
@@ -1408,16 +1418,6 @@ public static IContainer OnResolving<TWhere>(Action<IBindData, TWhere> closure)
             return Handler.OnResolving(closure);
         }
 
-        /// <summary>
-        /// 当服务被解决事件之后的回调
-        /// </summary>
-        /// <param name="closure">闭包</param>
-        /// <returns>当前容器</returns>
-        public static IContainer OnAfterResolving(Action<IBindData, object> closure)
-        {
-            return Handler.OnAfterResolving(closure);
-        }
-
         /// <summary>
         /// 当服务被解决事件之后的回调
         /// </summary>

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

@@ -29,6 +29,21 @@ public static IBindData Alias<TAlias>(this IBindData bindData)
             return bindData.Alias(bindData.Container.Type2Service(typeof(TAlias)));
         }
 
+        /// <summary>
+        /// 解决服务时触发的回调
+        /// </summary>
+        /// <param name="bindData">绑定数据</param>
+        /// <param name="action">解决事件</param>
+        /// <returns>服务绑定数据</returns>
+        public static IBindData OnResolving(this IBindData bindData, Action action)
+        {
+            Guard.Requires<ArgumentNullException>(action != null);
+            return bindData.OnResolving((_, instance) =>
+            {
+                action();
+            });
+        }
+
         /// <summary>
         /// 解决服务时触发的回调
         /// </summary>
@@ -83,15 +98,15 @@ public static IBindData OnResolving<T>(this IBindData bindData, Action<IBindData
         }
 
         /// <summary>
-        /// 解决服务时触发的回调
+        /// 解决服务事件之后的回调
         /// </summary>
         /// <param name="bindData">绑定数据</param>
         /// <param name="action">解决事件</param>
         /// <returns>服务绑定数据</returns>
-        public static IBindData OnResolving(this IBindData bindData, Action action)
+        public static IBindData OnAfterResolving(this IBindData bindData, Action action)
         {
             Guard.Requires<ArgumentNullException>(action != null);
-            return bindData.OnResolving((_, instance) =>
+            return bindData.OnAfterResolving((_, instance) =>
             {
                 action();
             });
@@ -149,15 +164,15 @@ public static IBindData OnAfterResolving<T>(this IBindData bindData, Action<IBin
         }
 
         /// <summary>
-        /// 解决服务事件之后的回调
+        /// 当静态服务被释放时
         /// </summary>
         /// <param name="bindData">绑定数据</param>
-        /// <param name="action">解决事件</param>
+        /// <param name="action">处理事件</param>
         /// <returns>服务绑定数据</returns>
-        public static IBindData OnAfterResolving(this IBindData bindData, Action action)
+        public static IBindData OnRelease(this IBindData bindData, Action action)
         {
             Guard.Requires<ArgumentNullException>(action != null);
-            return bindData.OnAfterResolving((_, instance) =>
+            return bindData.OnRelease((_, __) =>
             {
                 action();
             });
@@ -213,20 +228,5 @@ public static IBindData OnRelease<T>(this IBindData bindData, Action<IBindData,
                 }
             });
         }
-
-        /// <summary>
-        /// 当静态服务被释放时
-        /// </summary>
-        /// <param name="bindData">绑定数据</param>
-        /// <param name="action">处理事件</param>
-        /// <returns>服务绑定数据</returns>
-        public static IBindData OnRelease(this IBindData bindData, Action action)
-        {
-            Guard.Requires<ArgumentNullException>(action != null);
-            return bindData.OnRelease((_, __) =>
-            {
-                action();
-            });
-        }
     }
 }