修复派生Pack类型时无法自动排除原Pack，会导致同一模块出现两个Pack的问题，自动排除基类中Pack类 fixed dotnetco…

…re#72
LenkasetSong · Apr 25, 2019 · 73a7470 · 73a7470
1 parent 01ec995
commit 73a7470
Show file tree

Hide file tree

Showing 9 changed files with 27 additions and 15 deletions.
diff --git a/build/build-docs.bat b/build/build-docs.bat
@@ -1,4 +1,4 @@
-docfx metadata ../osharp-ns20.sln
+docfx metadata ../osharp.sln
 apicleaner.exe _api
 docfx docfx.json
 docfx serve _site
diff --git a/docs/build-docs.bat b/docs/build-docs.bat
@@ -1,4 +1,4 @@
-docfx metadata ../osharp-ns20.sln
+docfx metadata ../osharp.sln
 apicleaner.exe _api
 docfx docfx.json
 docfx serve _site
diff --git a/docs/docfx.json b/docs/docfx.json
@@ -24,7 +24,6 @@
         "files": [
           "articles/**.md",
           "articles/**/toc.yml",
-          "toc.yml",
           "*.md"
         ]
       }

diff --git a/docs/toc.yml b/docs/toc.yml
diff --git a/docs/toc.yml.bak b/docs/toc.yml.bak
@@ -0,0 +1,5 @@
+- name: 返回文档中心
+  href: /
+- name: API文档
+  href: api/
+  homepage: api/index.md
diff --git a/src/OSharp/Core/Packs/OSharpPackTypeFinder.cs b/src/OSharp/Core/Packs/OSharpPackTypeFinder.cs
@@ -7,6 +7,11 @@
 //  <last-date>2018-08-09 22:22</last-date>
 // -----------------------------------------------------------------------
 
+using System;
+using System.Collections.Generic;
+using System.Linq;
+
+using OSharp.Collections;
 using OSharp.Reflection;
 
 
@@ -23,5 +28,17 @@ public class OsharpPackTypeFinder : BaseTypeFinderBase<OsharpPack>, IOsharpPackT
         public OsharpPackTypeFinder(IAllAssemblyFinder allAssemblyFinder)
             : base(allAssemblyFinder)
         { }
+
+        /// <summary>
+        /// 重写以实现所有项的查找
+        /// </summary>
+        /// <returns></returns>
+        protected override Type[] FindAllItems()
+        {
+            //排除被继承的Pack实类
+            Type[] types = base.FindAllItems();
+            Type[] basePackTypes = types.Select(m => m.BaseType).Where(m => m != null && m.IsClass && !m.IsAbstract).ToArray();
+            return types.Except(basePackTypes).ToArray();
+        }
     }
 }
diff --git a/src/OSharp/EventBuses/EventHandlerBase.cs b/src/OSharp/EventBuses/EventHandlerBase.cs
@@ -47,7 +47,7 @@ public virtual void Handle(IEventData eventData)
         /// <param name="eventData">事件源数据</param>
         /// <param name="cancelToken">异步取消标识</param>
         /// <returns></returns>
-        public virtual Task HandleAsync(IEventData eventData, CancellationToken cancelToken = default)
+        public virtual Task HandleAsync(IEventData eventData, CancellationToken cancelToken = default(CancellationToken))
         {
             if (!CanHandle(eventData))
             {
@@ -68,7 +68,7 @@ public virtual Task HandleAsync(IEventData eventData, CancellationToken cancelTo
         /// <param name="eventData">事件源数据</param>
         /// <param name="cancelToken">异步取消标识</param>
         /// <returns>是否成功</returns>
-        public virtual Task HandleAsync(TEventData eventData, CancellationToken cancelToken = default)
+        public virtual Task HandleAsync(TEventData eventData, CancellationToken cancelToken = default(CancellationToken))
         {
             return Task.Run(() => Handle(eventData), cancelToken);
         }

diff --git a/tests/web/Liuliu.Demo.Web/Startups/SignalrPack.cs b/tests/web/Liuliu.Demo.Web/Startups/SignalrPack.cs
@@ -21,8 +21,6 @@ namespace Liuliu.Demo.Web.Startups
     [Description("SignalR模块")]
     public class SignalRPack : SignalRPackBase
     {
-        #region Overrides of SignalRPackBase
-
         /// <summary>
         /// 重写以获取Hub路由创建委托
         /// </summary>
@@ -36,7 +34,5 @@ protected override Action<HubRouteBuilder> GetHubRouteBuildAction(IServiceProvid
                 // 例如：builder.MapHub<MyHub>();
             });
         }
-
-        #endregion
     }
 }
diff --git a/tests/web/Liuliu.Demo.Web/appsettings.Development.json b/tests/web/Liuliu.Demo.Web/appsettings.Development.json
@@ -88,7 +88,7 @@
     },
     "Redis": {
       "Configuration": "localhost",
-      "InstanceName": "OSharpDemo",
+      "InstanceName": "OSharpDemo:",
       "Enabled": false
     },
     "Swagger": {