修正Startup对.exe不扫描的问题

Author: 邹嵩

src/DotnetSpider.Core/DotnetSpider.Core.csproj

@@ -3,7 +3,7 @@
     <TargetFrameworks>net40;net45;netstandard2.0</TargetFrameworks>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
     <PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
-    <Version>3.0.0</Version>
+    <Version>3.0.1</Version>
     <Authors>[email protected];</Authors>
     <AssemblyName>DotnetSpider.Core</AssemblyName>
     <Copyright>Copyright 2018 Lewis Zou</Copyright>

src/DotnetSpider.Core/Startup.cs

@@ -247,7 +247,18 @@ public static Dictionary<string, Type> DetectSpiders()
 		public static List<string> DetectDlls()
 		{
 			var path = Path.Combine(AppDomain.CurrentDomain.BaseDirectory);
-			return Directory.GetFiles(path).Where(f => f.EndsWith(".dll")).Select(f => Path.GetFileName(f).Replace(".dll", "")).Where(f => !f.EndsWith("DotnetSpider.HtmlAgilityPack.Css") && !f.EndsWith("DotnetSpider.Extension") && !f.EndsWith("DotnetSpider2.Extension") && !f.EndsWith("DotnetSpider.Core") && !f.EndsWith("DotnetSpider2.Core") && DetectNames.Any(n => f.ToLower().Contains(n))).ToList();
+			var files = Directory.GetFiles(path)
+				.Where(f => f.EndsWith(".dll") || f.EndsWith(".exe"))
+				.Select(f => Path.GetFileName(f).Replace(".dll", "").Replace(".exe", "")).ToList();
+			return
+				files.Where(f => !f.EndsWith("DotnetSpider.HtmlAgilityPack.Css")
+				&& !f.EndsWith("DotnetSpider.Common")
+				&& !f.EndsWith("DotnetSpider.Proxy")
+				&& !f.EndsWith("DotnetSpider.Downloader")
+				&& !f.EndsWith("DotnetSpider.Extraction")
+				&& !f.EndsWith("DotnetSpider.Extension")
+				&& !f.EndsWith("DotnetSpider.Core")
+				&& DetectNames.Any(n => f.ToLower().Contains(n))).ToList();
 		}
 
 		/// <summary>

src/DotnetSpider.Sample/Program.cs

@@ -1,4 +1,5 @@
-using System.Threading;
+using DotnetSpider.Core;
+using System.Threading;
 
 namespace DotnetSpider.Sample
 {
@@ -11,10 +12,7 @@ static void Main(string[] args)
 #else
 			ThreadPool.SetMinThreads(256, 256);
 #endif
-			TestSpider spider = new TestSpider();
-			spider.Run();
-
-
+			Startup.Run(args);
 		}
 
 		/// <summary>

src/DotnetSpider.Sample/Properties/launchSettings.json

@@ -0,0 +1,8 @@
+{
+  "profiles": {
+    "DotnetSpider.Sample": {
+      "commandName": "Project",
+      "commandLineArgs": "-s:TestSpider -c:app.config --tid:fea52169bc754231a840767c6a30341f -i:92dcf0251f594f77a17f036f503a5493"
+    }
+  }
+}

src/DotnetSpider.Sample/TestSpider.cs

@@ -21,7 +21,7 @@ protected override void OnInit(params string[] arguments)
 			var word = "可乐|雪碧";
 			AddStartUrl(string.Format("http://news.baidu.com/ns?word={0}&tn=news&from=news&cl=2&pn=0&rn=20&ct=1", word), new Dictionary<string, dynamic> { { "Keyword", word } });
 			AddEntityType<BaiduSearchEntry>();
-			AddPipeline(new SqlServerEntityPipeline("Server=.\\SQLEXPRESS;Database=master;Trusted_Connection=True;MultipleActiveResultSets=true"));
+			AddPipeline(new MySqlEntityPipeline("Database='mysql';Data Source=localhost;User ID=root;Port=3306;SslMode=None;"));
 		}
 
 		[TableInfo("baidu", "baidu_search_entity_model")]
@@ -43,16 +43,16 @@ class BaiduSearchEntry : BaseEntity
 			[ReplaceFormatter(NewValue = "-", OldValue = "&nbsp;")]
 			public string Website { get; set; }
 
-			[FieldSelector(Expression = ".//div/span/a[@class='c-cache']/@href", Length = 0)]
+			[FieldSelector(Expression = ".//div/span/a[@class='c-cache']/@href")]
 			public string Snapshot { get; set; }
 
-			[FieldSelector(Expression = ".//div[@class='c-summary c-row ']", Option = FieldOptions.InnerText, Length = 0)]
+			[FieldSelector(Expression = ".//div[@class='c-summary c-row ']", Option = FieldOptions.InnerText)]
 			[ReplaceFormatter(NewValue = "", OldValue = "<em>")]
 			[ReplaceFormatter(NewValue = "", OldValue = "</em>")]
 			[ReplaceFormatter(NewValue = " ", OldValue = "&nbsp;")]
 			public string Details { get; set; }
 
-			[FieldSelector(Expression = ".", Option = FieldOptions.InnerText, Length = 0)]
+			[FieldSelector(Expression = ".", Option = FieldOptions.InnerText)]
 			[ReplaceFormatter(NewValue = "", OldValue = "<em>")]
 			[ReplaceFormatter(NewValue = "", OldValue = "</em>")]
 			[ReplaceFormatter(NewValue = " ", OldValue = "&nbsp;")]

src/DotnetSpider.Sample/app.config

@@ -1,17 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <configuration>
   <connectionStrings>
-    <add name="DataConnection" connectionString="Database='mysql';Data Source=localhost;User ID=root;Port=3306;SslMode=None;"
-      providerName="MySql.Data.MySqlClient" />
+    <add name="DataConnection" connectionString="Database='mysql';Data Source=localhost;password=;User ID=root;Port=3306;SslMode=None" providerName="MySql.Data.MySqlClient" />
   </connectionStrings>
   <appSettings>
-    <add key="redisConnectString" value=""/>
-    <add key="emailHost" value=""/>
-    <add key="emailPort" value=""/>
-    <add key="emailAccount" value=""/>
-    <add key="emailPassword" value=""/>
-    <add key="emailDisplayName" value=""/>
-    <!--<add key="hub" value="http://localhost:30013/"/>
-    <add key="hubToken" value="23D6BA4FE4C2485FA0471E2727E7EAA4"/>-->
+    <add key="emailHost" value="" />
+    <add key="emailPort" value="25" />
+    <add key="emailAccount" value="" />
+    <add key="emailPassword" value="" />
+    <add key="emailDisplayName" value="Fintech Alert" />
+    <!--<add key="hub" value="http://localhost:60001/"/>
+    <add key="hubToken" value="7676B334FFB34354953FC04D691A60C3"/>-->
   </appSettings>
-</configuration>
+</configuration>