diff --git a/Docs/update.md b/Docs/update.md
index abf2dbc..4db418b 100644
--- a/Docs/update.md
+++ b/Docs/update.md
@@ -684,9 +684,20 @@ CREATE TABLE DFDSF (diggit_diggnum text,digg_diggit_onclick text,digg_digg_tip_i
 1. 当数据表中已经存在同名数据集时，禁止写入 ok
 2. 数据表双击看不到 ok
 3. mongodb 查看帮助提示，更换链接 ok
-4. wiki更新 
-5. 修复图床
+4. wiki更新  
+5. 修复图床 ok
 6. sqlite写入表失败  ok
 7. 读取文件数据 应当提供图形化界面  ok
 
 
+# 2019年6月8日
+
+1. 连续N次没有获得数据，应该进行诊断，包括子任务
+2. 自动化命令脚本出错
+
+# 2019年7月12日
+
+1. github无法连接n次后直接拒绝
+2. 获取远程响应  bug
+3. 共享源序列化无效
+4. 数据清洗左侧任务列表，限制文本框最大高度
\ No newline at end of file
diff --git a/Hawk.Core/Hawk.Core.csproj b/Hawk.Core/Hawk.Core.csproj
index 5b36434..9972c49 100644
--- a/Hawk.Core/Hawk.Core.csproj
+++ b/Hawk.Core/Hawk.Core.csproj
@@ -12,6 +12,8 @@
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <TargetFrameworkProfile />
+    <NuGetPackageImportStamp>
+    </NuGetPackageImportStamp>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -33,9 +35,8 @@
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="ICSharpCode.SharpZipLib, Version=0.86.0.518, Culture=neutral, PublicKeyToken=1b03e6acf1164f73, processorArchitecture=MSIL">
-      <HintPath>packages\SharpZipLib.0.86.0\lib\20\ICSharpCode.SharpZipLib.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="ICSharpCode.SharpZipLib, Version=1.2.0.246, Culture=neutral, PublicKeyToken=1b03e6acf1164f73, processorArchitecture=MSIL">
+      <HintPath>packages\SharpZipLib.1.2.0\lib\net45\ICSharpCode.SharpZipLib.dll</HintPath>
     </Reference>
     <Reference Include="IronPython, Version=2.7.5.0, Culture=neutral, PublicKeyToken=7f709c5b713576e1, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
@@ -53,6 +54,15 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\Includes\log4net.dll</HintPath>
     </Reference>
+    <Reference Include="Microsoft.AppCenter, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>packages\Microsoft.AppCenter.2.3.0-preview\lib\net45\Microsoft.AppCenter.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.AppCenter.Analytics, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>packages\Microsoft.AppCenter.Analytics.2.3.0-preview\lib\net45\Microsoft.AppCenter.Analytics.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.AppCenter.Crashes, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>packages\Microsoft.AppCenter.Crashes.2.3.0-preview\lib\net45\Microsoft.AppCenter.Crashes.dll</HintPath>
+    </Reference>
     <Reference Include="MongoDB, Version=0.90.0.1, Culture=neutral, PublicKeyToken=f61bd00ba2535278, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\Includes\MongoDB.dll</HintPath>
@@ -60,40 +70,50 @@
     <Reference Include="MySql.Data">
       <HintPath>..\Includes\MySql.Data.dll</HintPath>
     </Reference>
-    <Reference Include="Newtonsoft.Json">
-      <HintPath>..\Includes\Newtonsoft.Json.dll</HintPath>
+    <Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <HintPath>packages\Newtonsoft.Json.6.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
     </Reference>
-    <Reference Include="NPOI, Version=2.3.0.0, Culture=neutral, PublicKeyToken=0df73ec7942b34e1, processorArchitecture=MSIL">
-      <HintPath>packages\NPOI.2.3.0\lib\net40\NPOI.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="NPOI, Version=2.4.1.0, Culture=neutral, PublicKeyToken=0df73ec7942b34e1, processorArchitecture=MSIL">
+      <HintPath>packages\NPOI.2.4.1\lib\net45\NPOI.dll</HintPath>
     </Reference>
-    <Reference Include="NPOI.OOXML, Version=2.3.0.0, Culture=neutral, PublicKeyToken=0df73ec7942b34e1, processorArchitecture=MSIL">
-      <HintPath>packages\NPOI.2.3.0\lib\net40\NPOI.OOXML.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="NPOI.OOXML, Version=2.4.1.0, Culture=neutral, PublicKeyToken=0df73ec7942b34e1, processorArchitecture=MSIL">
+      <HintPath>packages\NPOI.2.4.1\lib\net45\NPOI.OOXML.dll</HintPath>
     </Reference>
-    <Reference Include="NPOI.OpenXml4Net, Version=2.3.0.0, Culture=neutral, PublicKeyToken=0df73ec7942b34e1, processorArchitecture=MSIL">
-      <HintPath>packages\NPOI.2.3.0\lib\net40\NPOI.OpenXml4Net.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="NPOI.OpenXml4Net, Version=2.4.1.0, Culture=neutral, PublicKeyToken=0df73ec7942b34e1, processorArchitecture=MSIL">
+      <HintPath>packages\NPOI.2.4.1\lib\net45\NPOI.OpenXml4Net.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.HockeyApp.Core45, Version=4.1.6.1005, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\Hawk.Core\packages\HockeySDK.WPF.4.1.6\lib\net45\Microsoft.HockeyApp.Core45.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="Microsoft.HockeyApp.Kit, Version=4.1.6.1005, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\Hawk.Core\packages\HockeySDK.WPF.4.1.6\lib\net45\Microsoft.HockeyApp.Kit.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="NPOI.OpenXmlFormats, Version=2.3.0.0, Culture=neutral, PublicKeyToken=0df73ec7942b34e1, processorArchitecture=MSIL">
-      <HintPath>packages\NPOI.2.3.0\lib\net40\NPOI.OpenXmlFormats.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="NPOI.OpenXmlFormats, Version=2.4.1.0, Culture=neutral, PublicKeyToken=0df73ec7942b34e1, processorArchitecture=MSIL">
+      <HintPath>packages\NPOI.2.4.1\lib\net45\NPOI.OpenXmlFormats.dll</HintPath>
     </Reference>
     <Reference Include="PresentationCore" />
     <Reference Include="PresentationFramework" />
+    <Reference Include="SQLite-net, Version=1.1.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>packages\sqlite-net-pcl.1.3.1\lib\netstandard1.1\SQLite-net.dll</HintPath>
+    </Reference>
+    <Reference Include="SQLitePCLRaw.batteries_green, Version=1.0.0.0, Culture=neutral, PublicKeyToken=a84b7dcfb1391f7f, processorArchitecture=MSIL">
+      <HintPath>packages\SQLitePCLRaw.bundle_green.1.1.2\lib\net45\SQLitePCLRaw.batteries_green.dll</HintPath>
+    </Reference>
+    <Reference Include="SQLitePCLRaw.batteries_v2, Version=1.0.0.0, Culture=neutral, PublicKeyToken=8226ea5df37bcae9, processorArchitecture=MSIL">
+      <HintPath>packages\SQLitePCLRaw.bundle_green.1.1.2\lib\net45\SQLitePCLRaw.batteries_v2.dll</HintPath>
+    </Reference>
+    <Reference Include="SQLitePCLRaw.core, Version=1.0.0.0, Culture=neutral, PublicKeyToken=1488e028ca7ab535, processorArchitecture=MSIL">
+      <HintPath>packages\SQLitePCLRaw.core.1.1.2\lib\net45\SQLitePCLRaw.core.dll</HintPath>
+    </Reference>
+    <Reference Include="SQLitePCLRaw.provider.e_sqlite3, Version=1.0.0.0, Culture=neutral, PublicKeyToken=9c301db686d0bd12, processorArchitecture=MSIL">
+      <HintPath>packages\SQLitePCLRaw.provider.e_sqlite3.net45.1.1.2\lib\net45\SQLitePCLRaw.provider.e_sqlite3.dll</HintPath>
+    </Reference>
     <Reference Include="System" />
+    <Reference Include="System.ComponentModel.Composition" />
     <Reference Include="System.Core" />
     <Reference Include="System.Data.SQLite">
       <HintPath>..\Includes\System.Data.SQLite.dll</HintPath>
     </Reference>
+    <Reference Include="System.IO.Compression" />
+    <Reference Include="System.Net.Http" />
+    <Reference Include="System.Numerics" />
+    <Reference Include="System.Runtime.InteropServices.RuntimeInformation, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>packages\System.Runtime.InteropServices.RuntimeInformation.4.0.0\lib\net45\System.Runtime.InteropServices.RuntimeInformation.dll</HintPath>
+    </Reference>
     <Reference Include="System.Web" />
     <Reference Include="System.Windows.Controls.WpfPropertyGrid, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
@@ -107,11 +127,11 @@
     <Reference Include="Microsoft.CSharp" />
     <Reference Include="System.Data" />
     <Reference Include="System.Xml" />
-    <Reference Include="ToastNotifications, Version=2.3.4.0, Culture=neutral, PublicKeyToken=e89d9d7314a7c797, processorArchitecture=MSIL">
-      <HintPath>packages\ToastNotifications.2.3.4\lib\net40\ToastNotifications.dll</HintPath>
+    <Reference Include="ToastNotifications, Version=2.5.1.0, Culture=neutral, PublicKeyToken=e89d9d7314a7c797, processorArchitecture=MSIL">
+      <HintPath>packages\ToastNotifications.2.5.1\lib\net40\ToastNotifications.dll</HintPath>
     </Reference>
-    <Reference Include="ToastNotifications.Messages, Version=2.3.4.0, Culture=neutral, PublicKeyToken=e89d9d7314a7c797, processorArchitecture=MSIL">
-      <HintPath>packages\ToastNotifications.Messages.2.3.4\lib\net40\ToastNotifications.Messages.dll</HintPath>
+    <Reference Include="ToastNotifications.Messages, Version=2.5.1.0, Culture=neutral, PublicKeyToken=e89d9d7314a7c797, processorArchitecture=MSIL">
+      <HintPath>packages\ToastNotifications.Messages.2.5.1\lib\net40\ToastNotifications.Messages.dll</HintPath>
     </Reference>
     <Reference Include="WindowsBase" />
     <Reference Include="Xceed.Wpf.DataGrid">
@@ -215,6 +235,17 @@
     <Folder Include="Themes\" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <Import Project="packages\SQLitePCLRaw.lib.e_sqlite3.linux.1.1.2\build\SQLitePCLRaw.lib.e_sqlite3.linux.targets" Condition="Exists('packages\SQLitePCLRaw.lib.e_sqlite3.linux.1.1.2\build\SQLitePCLRaw.lib.e_sqlite3.linux.targets')" />
+  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
+    <PropertyGroup>
+      <ErrorText>这台计算机上缺少此项目引用的 NuGet 程序包。使用“NuGet 程序包还原”可下载这些程序包。有关更多信息，请参见 http://go.microsoft.com/fwlink/?LinkID=322105。缺少的文件是 {0}。</ErrorText>
+    </PropertyGroup>
+    <Error Condition="!Exists('packages\SQLitePCLRaw.lib.e_sqlite3.linux.1.1.2\build\SQLitePCLRaw.lib.e_sqlite3.linux.targets')" Text="$([System.String]::Format('$(ErrorText)', 'packages\SQLitePCLRaw.lib.e_sqlite3.linux.1.1.2\build\SQLitePCLRaw.lib.e_sqlite3.linux.targets'))" />
+    <Error Condition="!Exists('packages\SQLitePCLRaw.lib.e_sqlite3.osx.1.1.2\build\SQLitePCLRaw.lib.e_sqlite3.osx.targets')" Text="$([System.String]::Format('$(ErrorText)', 'packages\SQLitePCLRaw.lib.e_sqlite3.osx.1.1.2\build\SQLitePCLRaw.lib.e_sqlite3.osx.targets'))" />
+    <Error Condition="!Exists('packages\SQLitePCLRaw.lib.e_sqlite3.v110_xp.1.1.2\build\SQLitePCLRaw.lib.e_sqlite3.v110_xp.targets')" Text="$([System.String]::Format('$(ErrorText)', 'packages\SQLitePCLRaw.lib.e_sqlite3.v110_xp.1.1.2\build\SQLitePCLRaw.lib.e_sqlite3.v110_xp.targets'))" />
+  </Target>
+  <Import Project="packages\SQLitePCLRaw.lib.e_sqlite3.osx.1.1.2\build\SQLitePCLRaw.lib.e_sqlite3.osx.targets" Condition="Exists('packages\SQLitePCLRaw.lib.e_sqlite3.osx.1.1.2\build\SQLitePCLRaw.lib.e_sqlite3.osx.targets')" />
+  <Import Project="packages\SQLitePCLRaw.lib.e_sqlite3.v110_xp.1.1.2\build\SQLitePCLRaw.lib.e_sqlite3.v110_xp.targets" Condition="Exists('packages\SQLitePCLRaw.lib.e_sqlite3.v110_xp.1.1.2\build\SQLitePCLRaw.lib.e_sqlite3.v110_xp.targets')" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
diff --git a/Hawk.Core/Hawk.Core.sln b/Hawk.Core/Hawk.Core.sln
index bd36cd1..a06d479 100644
--- a/Hawk.Core/Hawk.Core.sln
+++ b/Hawk.Core/Hawk.Core.sln
@@ -1,6 +1,6 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Blend for Visual Studio 14
+# Visual Studio 14
 VisualStudioVersion = 14.0.23107.0
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Hawk.Core", "Hawk.Core.csproj", "{B5CCA117-8D77-418B-8B18-D3E64682DD83}"
@@ -22,6 +22,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HawkUnitTest", "..\HawkUnit
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Windows.Controls.WPFPropertyGrid", "..\..\WPFPropertyGrid\System.Windows.Controls.WPFPropertyGrid\System.Windows.Controls.WPFPropertyGrid.csproj", "{384BD3E5-BCC4-4582-9CDC-C927E5E8297B}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HawkTest", "..\HawkTest\HawkTest.csproj", "{9A1333B3-61A9-49F1-96C7-AFADAAFC06D8}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -56,6 +58,10 @@ Global
 		{384BD3E5-BCC4-4582-9CDC-C927E5E8297B}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{384BD3E5-BCC4-4582-9CDC-C927E5E8297B}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{384BD3E5-BCC4-4582-9CDC-C927E5E8297B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{9A1333B3-61A9-49F1-96C7-AFADAAFC06D8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{9A1333B3-61A9-49F1-96C7-AFADAAFC06D8}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{9A1333B3-61A9-49F1-96C7-AFADAAFC06D8}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{9A1333B3-61A9-49F1-96C7-AFADAAFC06D8}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/Hawk.Core/Hawk.Core.suo b/Hawk.Core/Hawk.Core.suo
index 302faa7..2858d1e 100644
Binary files a/Hawk.Core/Hawk.Core.suo and b/Hawk.Core/Hawk.Core.suo differ
diff --git a/Hawk.Core/Utils/App.config b/Hawk.Core/Utils/App.config
index 33d3f19..3024cfd 100644
--- a/Hawk.Core/Utils/App.config
+++ b/Hawk.Core/Utils/App.config
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="utf-8"?>
 <configuration>
   <appSettings>
     <add key="Title" value="Hawk-数据抓取工具" />
@@ -13,6 +13,12 @@
 
   </startup>
   <runtime>
-    <loadFromRemoteSources enabled="true"/>
+    <loadFromRemoteSources enabled="true" />
+    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+      <dependentAssembly>
+        <assemblyIdentity name="ICSharpCode.SharpZipLib" publicKeyToken="1b03e6acf1164f73" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-1.2.0.246" newVersion="1.2.0.246" />
+      </dependentAssembly>
+    </assemblyBinding>
   </runtime>
 </configuration>
\ No newline at end of file
diff --git a/Hawk.Core/Utils/ControlsExtended.cs b/Hawk.Core/Utils/ControlsExtended.cs
index 4ea90c1..973975f 100644
--- a/Hawk.Core/Utils/ControlsExtended.cs
+++ b/Hawk.Core/Utils/ControlsExtended.cs
@@ -8,7 +8,7 @@
 using Hawk.Core.Connectors;
 using Hawk.Core.Utils.Logs;
 using Hawk.Core.Utils.Plugins;
-using Microsoft.HockeyApp;
+
 using Microsoft.Win32;
 
 namespace Hawk.Core.Utils
diff --git a/Hawk.Core/Utils/MVVM/CommandBuilder.cs b/Hawk.Core/Utils/MVVM/CommandBuilder.cs
index a795342..5d8271e 100644
--- a/Hawk.Core/Utils/MVVM/CommandBuilder.cs
+++ b/Hawk.Core/Utils/MVVM/CommandBuilder.cs
@@ -1,10 +1,11 @@
 using System;
-using Hawk.Core.Utils;
+using Hawk.Core.Utils;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Windows.Input;
 using Hawk.Core.Utils.Logs;
-using Microsoft.HockeyApp;
+using Microsoft.AppCenter.Analytics;
+
 
 namespace Hawk.Core.Utils.MVVM
 {
@@ -88,7 +89,11 @@ public event EventHandler CanExecuteChanged
 
         void ICommand.Execute(object parameter)
         {
-           
+            Analytics.TrackEvent(this.Text, new Dictionary<string, string> {
+                { "Parameter", parameter==null?"null":parameter.ToString() },
+                { "Description", Description}
+            });
+
             ControlExtended.SafeInvoke(() => Execute?.Invoke(parameter),LogType.Info,GlobalHelper.Get("key_133")+this.Text);
             //HockeyClient.Current.TrackEvent(this.Text);
         }
diff --git a/Hawk.Core/packages.config b/Hawk.Core/packages.config
index 5e6d8b3..edb00c9 100644
--- a/Hawk.Core/packages.config
+++ b/Hawk.Core/packages.config
@@ -1,7 +1,49 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="NPOI" version="2.3.0" targetFramework="net4" />
-  <package id="SharpZipLib" version="0.86.0" targetFramework="net4" />
-  <package id="ToastNotifications" version="2.3.4" targetFramework="net4" />
-  <package id="ToastNotifications.Messages" version="2.3.4" targetFramework="net4" />
+  <package id="Microsoft.AppCenter" version="2.3.0-preview" targetFramework="net45" />
+  <package id="Microsoft.AppCenter.Analytics" version="2.3.0-preview" targetFramework="net45" />
+  <package id="Microsoft.AppCenter.Crashes" version="2.3.0-preview" targetFramework="net45" />
+  <package id="Microsoft.NETCore.Platforms" version="1.0.1" targetFramework="net45" />
+  <package id="NETStandard.Library" version="1.6.0" targetFramework="net45" />
+  <package id="Newtonsoft.Json" version="6.0.1" targetFramework="net45" />
+  <package id="NPOI" version="2.4.1" targetFramework="net45" />
+  <package id="SharpZipLib" version="1.2.0" targetFramework="net45" />
+  <package id="sqlite-net-pcl" version="1.3.1" targetFramework="net45" />
+  <package id="SQLitePCLRaw.bundle_green" version="1.1.2" targetFramework="net45" />
+  <package id="SQLitePCLRaw.core" version="1.1.2" targetFramework="net45" />
+  <package id="SQLitePCLRaw.lib.e_sqlite3.linux" version="1.1.2" targetFramework="net45" />
+  <package id="SQLitePCLRaw.lib.e_sqlite3.osx" version="1.1.2" targetFramework="net45" />
+  <package id="SQLitePCLRaw.lib.e_sqlite3.v110_xp" version="1.1.2" targetFramework="net45" />
+  <package id="SQLitePCLRaw.provider.e_sqlite3.net45" version="1.1.2" targetFramework="net45" />
+  <package id="System.Collections" version="4.0.11" targetFramework="net45" />
+  <package id="System.Collections.Concurrent" version="4.0.12" targetFramework="net45" />
+  <package id="System.Diagnostics.Debug" version="4.0.11" targetFramework="net45" />
+  <package id="System.Diagnostics.Tools" version="4.0.1" targetFramework="net45" />
+  <package id="System.Diagnostics.Tracing" version="4.1.0" targetFramework="net45" />
+  <package id="System.Globalization" version="4.0.11" targetFramework="net45" />
+  <package id="System.IO" version="4.1.0" targetFramework="net45" />
+  <package id="System.IO.Compression" version="4.1.0" targetFramework="net45" />
+  <package id="System.Linq" version="4.1.0" targetFramework="net45" />
+  <package id="System.Linq.Expressions" version="4.1.0" targetFramework="net45" />
+  <package id="System.Net.Http" version="4.1.0" targetFramework="net45" />
+  <package id="System.Net.Primitives" version="4.0.11" targetFramework="net45" />
+  <package id="System.ObjectModel" version="4.0.12" targetFramework="net45" />
+  <package id="System.Reflection" version="4.1.0" targetFramework="net45" />
+  <package id="System.Reflection.Extensions" version="4.0.1" targetFramework="net45" />
+  <package id="System.Reflection.Primitives" version="4.0.1" targetFramework="net45" />
+  <package id="System.Resources.ResourceManager" version="4.0.1" targetFramework="net45" />
+  <package id="System.Runtime" version="4.1.0" targetFramework="net45" />
+  <package id="System.Runtime.Extensions" version="4.1.0" targetFramework="net45" />
+  <package id="System.Runtime.InteropServices" version="4.1.0" targetFramework="net45" />
+  <package id="System.Runtime.InteropServices.RuntimeInformation" version="4.0.0" targetFramework="net45" />
+  <package id="System.Runtime.Numerics" version="4.0.1" targetFramework="net45" />
+  <package id="System.Text.Encoding" version="4.0.11" targetFramework="net45" />
+  <package id="System.Text.Encoding.Extensions" version="4.0.11" targetFramework="net45" />
+  <package id="System.Text.RegularExpressions" version="4.1.0" targetFramework="net45" />
+  <package id="System.Threading" version="4.0.11" targetFramework="net45" />
+  <package id="System.Threading.Tasks" version="4.0.11" targetFramework="net45" />
+  <package id="System.Xml.ReaderWriter" version="4.0.11" targetFramework="net45" />
+  <package id="System.Xml.XDocument" version="4.0.11" targetFramework="net45" />
+  <package id="ToastNotifications" version="2.5.1" targetFramework="net45" />
+  <package id="ToastNotifications.Messages" version="2.5.1" targetFramework="net45" />
 </packages>
\ No newline at end of file
diff --git a/Hawk.ETL.Controls/Hawk.ETL.Controls.csproj b/Hawk.ETL.Controls/Hawk.ETL.Controls.csproj
index 19811c2..0bd34c6 100644
--- a/Hawk.ETL.Controls/Hawk.ETL.Controls.csproj
+++ b/Hawk.ETL.Controls/Hawk.ETL.Controls.csproj
@@ -37,14 +37,6 @@
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Microsoft.HockeyApp.Core45, Version=4.1.6.1005, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\Hawk.Core\packages\HockeySDK.WPF.4.1.6\lib\net45\Microsoft.HockeyApp.Core45.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="Microsoft.HockeyApp.Kit, Version=4.1.6.1005, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\Hawk.Core\packages\HockeySDK.WPF.4.1.6\lib\net45\Microsoft.HockeyApp.Kit.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
     <Reference Include="PresentationFramework.Aero" />
     <Reference Include="System" />
     <Reference Include="System.Data" />
@@ -198,6 +190,7 @@
       <Generator>ResXFileCodeGenerator</Generator>
       <LastGenOutput>Resources.Designer.cs</LastGenOutput>
     </EmbeddedResource>
+    <None Include="app.config" />
     <None Include="packages.config" />
     <None Include="Properties\Settings.settings">
       <Generator>SettingsSingleFileGenerator</Generator>
diff --git a/Hawk.ETL.Controls/packages.config b/Hawk.ETL.Controls/packages.config
index 3231178..6723831 100644
--- a/Hawk.ETL.Controls/packages.config
+++ b/Hawk.ETL.Controls/packages.config
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="HockeySDK.Core" version="4.1.6" targetFramework="net45" />
-  <package id="HockeySDK.WPF" version="4.1.6" targetFramework="net45" />
+  <package id="HockeySDK.Core" version="4.1.6" targetFramework="net45" requireReinstallation="true" />
+  <package id="HockeySDK.WPF" version="4.1.6" targetFramework="net45" requireReinstallation="true" />
 </packages>
\ No newline at end of file
diff --git a/Hawk.ETL/Crawlers/BuffHelper.cs b/Hawk.ETL/Crawlers/BuffHelper.cs
index abf0a10..97adbd9 100644
--- a/Hawk.ETL/Crawlers/BuffHelper.cs
+++ b/Hawk.ETL/Crawlers/BuffHelper.cs
@@ -67,7 +67,7 @@ public T GetOrCreate(string item,T defaultValue)
         }
         public T Get(string item)
         {
-            if (EnableBuffer == false || bufferDictionary.Count >= maxBufferCount)
+            if (EnableBuffer == false )
                 return default(T);
             if (bufferDictionary.ContainsKey(item))
             {
diff --git a/Hawk.ETL/Crawlers/HttpHelper.cs b/Hawk.ETL/Crawlers/HttpHelper.cs
index 2e0a071..791ccea 100644
--- a/Hawk.ETL/Crawlers/HttpHelper.cs
+++ b/Hawk.ETL/Crawlers/HttpHelper.cs
@@ -347,14 +347,15 @@ public static void SetRequest(HttpItem item, HttpWebRequest request, string dest
             {
                 //设置代理服务器
                 string username, password,url;
-                if (HttpItem.GetProxyInfo(item.ProxyIP, out username, out password, out url))
+                if(!string.IsNullOrWhiteSpace(item.ProxyIP))
                 {
 
 
-                    var myProxy = new WebProxy(url);
+                    var myProxy = new WebProxy(item.ProxyIP,item.ProxyPort);
 
                     //建议连接
-                    myProxy.Credentials = new NetworkCredential(username,password);
+                    if (!string.IsNullOrWhiteSpace(item.UserName))
+                        myProxy.Credentials = new NetworkCredential(item.UserName,item.Password);
                     //给当前请求对象
                     request.Proxy = myProxy;
                     //设置安全凭证
diff --git a/Hawk.ETL/Crawlers/HttpItem.cs b/Hawk.ETL/Crawlers/HttpItem.cs
index cc960ac..21cdfbc 100644
--- a/Hawk.ETL/Crawlers/HttpItem.cs
+++ b/Hawk.ETL/Crawlers/HttpItem.cs
@@ -32,11 +32,23 @@ public HttpItem()
 
         [LocalizedCategory("key_117")]
         [LocalizedDisplayName("key_118")]
+        [LocalizedDescription("proxy_setting")]
         [PropertyOrder(1)]
         public string ProxyIP { get; set; }
 
 
+        [LocalizedCategory("key_117")]
+        [PropertyOrder(2)]
+        public int ProxyPort { get; set; }
+
+
+        [LocalizedCategory("key_117")]
+        [PropertyOrder(3)]
+        public string UserName { get; set; }
 
+        [LocalizedCategory("key_117")]
+        [PropertyOrder(4)]
+        public string Password { get; set; }
         public static bool GetProxyInfo(string proxy,out string url, out string username,out string password)
         {
             username = null;
@@ -222,6 +234,10 @@ public FreeDocument DictSerialize(Scenario scenario = Scenario.Database)
             dict.Add("Method", Method);
             dict.Add("Parameters", Parameters);
             dict.Add("Timeout", Timeout);
+            dict.Add("UserName", UserName);
+            dict.Add("Password", Password);
+            dict.Add("ProxyIP", ProxyIP );
+            dict.Add("ProxyPort", ProxyPort );
             return dict;
         }
 
@@ -233,7 +249,11 @@ public void DictDeserialize(IDictionary<string, object> docu, Scenario scenario
             Encoding = docu.Set("Encoding", Encoding);
             Method = docu.Set("Method", Method);
             Timeout = docu.Set("Timeout", Timeout);
+            UserName = docu.Set("UserName", UserName);
+            Password = docu.Set("Password", Password);
+            ProxyIP = docu.Set("ProxyIP", ProxyIP);
             Parameters = docu.Set("Parameters", Parameters);
+            ProxyPort = docu.Set("ProxyPort", ProxyPort);
            
 
 
diff --git a/Hawk.ETL/Hawk.ETL.csproj b/Hawk.ETL/Hawk.ETL.csproj
index 820be44..d4d5fd1 100644
--- a/Hawk.ETL/Hawk.ETL.csproj
+++ b/Hawk.ETL/Hawk.ETL.csproj
@@ -39,8 +39,41 @@
     </StartupObject>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="AutoUpdater.NET, Version=1.4.11.0, Culture=neutral, PublicKeyToken=501435c91b35f4bc, processorArchitecture=MSIL">
-      <HintPath>..\Hawk.Core\packages\Autoupdater.NET.Official.1.4.11\lib\net40\AutoUpdater.NET.dll</HintPath>
+    <Reference Include="AutoUpdater.NET, Version=1.5.6.0, Culture=neutral, PublicKeyToken=501435c91b35f4bc, processorArchitecture=MSIL">
+      <HintPath>..\Hawk.Core\packages\Autoupdater.NET.Official.1.5.6\lib\net40\AutoUpdater.NET.dll</HintPath>
+    </Reference>
+    <Reference Include="FSharp.Core, Version=4.7.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\Hawk.Core\packages\FSharp.Core.4.7.0\lib\net45\FSharp.Core.dll</HintPath>
+    </Reference>
+    <Reference Include="HtmlAgilityPack, Version=1.11.12.0, Culture=neutral, PublicKeyToken=bd319b19eaf3b43a, processorArchitecture=MSIL">
+      <HintPath>..\Hawk.Core\packages\HtmlAgilityPack.1.11.12\lib\Net45\HtmlAgilityPack.dll</HintPath>
+    </Reference>
+    <Reference Include="ICSharpCode.SharpZipLib, Version=1.2.0.246, Culture=neutral, PublicKeyToken=1b03e6acf1164f73, processorArchitecture=MSIL">
+      <HintPath>..\Hawk.Core\packages\SharpZipLib.1.2.0\lib\net45\ICSharpCode.SharpZipLib.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.AppCenter, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\Hawk.Core\packages\Microsoft.AppCenter.2.3.0-preview\lib\net45\Microsoft.AppCenter.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.AppCenter.Analytics, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\Hawk.Core\packages\Microsoft.AppCenter.Analytics.2.3.0-preview\lib\net45\Microsoft.AppCenter.Analytics.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.Win32.Primitives, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\Hawk.Core\packages\Microsoft.Win32.Primitives.4.0.1\lib\net46\Microsoft.Win32.Primitives.dll</HintPath>
+    </Reference>
+    <Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <HintPath>..\Hawk.Core\packages\Newtonsoft.Json.6.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
+    </Reference>
+    <Reference Include="NPOI, Version=2.4.1.0, Culture=neutral, PublicKeyToken=0df73ec7942b34e1, processorArchitecture=MSIL">
+      <HintPath>..\Hawk.Core\packages\NPOI.2.4.1\lib\net45\NPOI.dll</HintPath>
+    </Reference>
+    <Reference Include="NPOI.OOXML, Version=2.4.1.0, Culture=neutral, PublicKeyToken=0df73ec7942b34e1, processorArchitecture=MSIL">
+      <HintPath>..\Hawk.Core\packages\NPOI.2.4.1\lib\net45\NPOI.OOXML.dll</HintPath>
+    </Reference>
+    <Reference Include="NPOI.OpenXml4Net, Version=2.4.1.0, Culture=neutral, PublicKeyToken=0df73ec7942b34e1, processorArchitecture=MSIL">
+      <HintPath>..\Hawk.Core\packages\NPOI.2.4.1\lib\net45\NPOI.OpenXml4Net.dll</HintPath>
+    </Reference>
+    <Reference Include="NPOI.OpenXmlFormats, Version=2.4.1.0, Culture=neutral, PublicKeyToken=0df73ec7942b34e1, processorArchitecture=MSIL">
+      <HintPath>..\Hawk.Core\packages\NPOI.2.4.1\lib\net45\NPOI.OpenXmlFormats.dll</HintPath>
     </Reference>
     <Reference Include="Octokit, Version=0.32.0.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\Hawk.Core\packages\Octokit.0.32.0\lib\netstandard1.1\Octokit.dll</HintPath>
@@ -49,17 +82,6 @@
     <Reference Include="FiddlerCore4">
       <HintPath>..\Includes\FiddlerCore4.dll</HintPath>
     </Reference>
-    <Reference Include="FSharp.Core, Version=4.4.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\Hawk.Core\packages\FSharp.Core.4.0.0.1\lib\net40\FSharp.Core.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="HtmlAgilityPack, Version=1.8.7.0, Culture=neutral, PublicKeyToken=bd319b19eaf3b43a, processorArchitecture=MSIL">
-      <HintPath>..\Hawk.Core\packages\HtmlAgilityPack.1.8.7\lib\Net45\HtmlAgilityPack.dll</HintPath>
-    </Reference>
-    <Reference Include="ICSharpCode.SharpZipLib, Version=0.86.0.518, Culture=neutral, PublicKeyToken=1b03e6acf1164f73, processorArchitecture=MSIL">
-      <HintPath>..\Hawk.Core\packages\SharpZipLib.0.86.0\lib\20\ICSharpCode.SharpZipLib.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
     <Reference Include="IronPython, Version=2.7.5.0, Culture=neutral, PublicKeyToken=7f709c5b713576e1, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\Includes\IronPython.dll</HintPath>
@@ -86,41 +108,82 @@
       <HintPath>..\Includes\Microsoft.Dynamic.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Scripting, Version=1.1.0.20, Culture=neutral, PublicKeyToken=7f709c5b713576e1, processorArchitecture=MSIL" />
-    <Reference Include="NPOI, Version=2.3.0.0, Culture=neutral, PublicKeyToken=0df73ec7942b34e1, processorArchitecture=MSIL">
-      <HintPath>..\Hawk.Core\packages\NPOI.2.3.0\lib\net40\NPOI.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="NPOI.OOXML, Version=2.3.0.0, Culture=neutral, PublicKeyToken=0df73ec7942b34e1, processorArchitecture=MSIL">
-      <HintPath>..\Hawk.Core\packages\NPOI.2.3.0\lib\net40\NPOI.OOXML.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="NPOI.OpenXml4Net, Version=2.3.0.0, Culture=neutral, PublicKeyToken=0df73ec7942b34e1, processorArchitecture=MSIL">
-      <HintPath>..\Hawk.Core\packages\NPOI.2.3.0\lib\net40\NPOI.OpenXml4Net.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="NPOI.OpenXmlFormats, Version=2.3.0.0, Culture=neutral, PublicKeyToken=0df73ec7942b34e1, processorArchitecture=MSIL">
-      <HintPath>..\Hawk.Core\packages\NPOI.2.3.0\lib\net40\NPOI.OpenXmlFormats.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
     <Reference Include="PresentationCore" />
     <Reference Include="PresentationFramework" />
     <Reference Include="ScrapySharp.Core, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\Hawk.Core\packages\ScrapySharp.2.6.2\lib\net45\ScrapySharp.Core.dll</HintPath>
-      <Private>True</Private>
     </Reference>
     <Reference Include="ScrapySharpAsync, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\Hawk.Core\packages\ScrapySharp.2.6.2\lib\net45\ScrapySharpAsync.dll</HintPath>
-      <Private>True</Private>
+    </Reference>
+    <Reference Include="SQLite-net, Version=1.1.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\Hawk.Core\packages\sqlite-net-pcl.1.3.1\lib\netstandard1.1\SQLite-net.dll</HintPath>
+    </Reference>
+    <Reference Include="SQLitePCLRaw.batteries_green, Version=1.0.0.0, Culture=neutral, PublicKeyToken=a84b7dcfb1391f7f, processorArchitecture=MSIL">
+      <HintPath>..\Hawk.Core\packages\SQLitePCLRaw.bundle_green.1.1.2\lib\net45\SQLitePCLRaw.batteries_green.dll</HintPath>
+    </Reference>
+    <Reference Include="SQLitePCLRaw.batteries_v2, Version=1.0.0.0, Culture=neutral, PublicKeyToken=8226ea5df37bcae9, processorArchitecture=MSIL">
+      <HintPath>..\Hawk.Core\packages\SQLitePCLRaw.bundle_green.1.1.2\lib\net45\SQLitePCLRaw.batteries_v2.dll</HintPath>
+    </Reference>
+    <Reference Include="SQLitePCLRaw.core, Version=1.0.0.0, Culture=neutral, PublicKeyToken=1488e028ca7ab535, processorArchitecture=MSIL">
+      <HintPath>..\Hawk.Core\packages\SQLitePCLRaw.core.1.1.2\lib\net45\SQLitePCLRaw.core.dll</HintPath>
+    </Reference>
+    <Reference Include="SQLitePCLRaw.provider.e_sqlite3, Version=1.0.0.0, Culture=neutral, PublicKeyToken=9c301db686d0bd12, processorArchitecture=MSIL">
+      <HintPath>..\Hawk.Core\packages\SQLitePCLRaw.provider.e_sqlite3.net45.1.1.2\lib\net45\SQLitePCLRaw.provider.e_sqlite3.dll</HintPath>
     </Reference>
     <Reference Include="System" />
+    <Reference Include="System.AppContext, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\Hawk.Core\packages\System.AppContext.4.1.0\lib\net46\System.AppContext.dll</HintPath>
+    </Reference>
+    <Reference Include="System.ComponentModel.Composition" />
     <Reference Include="System.Configuration" />
+    <Reference Include="System.Console, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\Hawk.Core\packages\System.Console.4.0.0\lib\net46\System.Console.dll</HintPath>
+    </Reference>
     <Reference Include="System.Core" />
+    <Reference Include="System.Diagnostics.DiagnosticSource, Version=4.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\Hawk.Core\packages\System.Diagnostics.DiagnosticSource.4.0.0\lib\net46\System.Diagnostics.DiagnosticSource.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Globalization.Calendars, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\Hawk.Core\packages\System.Globalization.Calendars.4.0.1\lib\net46\System.Globalization.Calendars.dll</HintPath>
+    </Reference>
+    <Reference Include="System.IO.Compression, Version=4.1.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
+      <HintPath>..\Hawk.Core\packages\System.IO.Compression.4.1.0\lib\net46\System.IO.Compression.dll</HintPath>
+    </Reference>
+    <Reference Include="System.IO.Compression.FileSystem" />
+    <Reference Include="System.IO.Compression.ZipFile, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
+      <HintPath>..\Hawk.Core\packages\System.IO.Compression.ZipFile.4.0.1\lib\net46\System.IO.Compression.ZipFile.dll</HintPath>
+    </Reference>
+    <Reference Include="System.IO.FileSystem, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\Hawk.Core\packages\System.IO.FileSystem.4.0.1\lib\net46\System.IO.FileSystem.dll</HintPath>
+    </Reference>
+    <Reference Include="System.IO.FileSystem.Primitives, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\Hawk.Core\packages\System.IO.FileSystem.Primitives.4.0.1\lib\net46\System.IO.FileSystem.Primitives.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Net.Http, Version=4.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\Hawk.Core\packages\System.Net.Http.4.1.0\lib\net46\System.Net.Http.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Net.Sockets, Version=4.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\Hawk.Core\packages\System.Net.Sockets.4.1.0\lib\net46\System.Net.Sockets.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Numerics" />
     <Reference Include="System.Runtime.Caching" />
     <Reference Include="System.Runtime.InteropServices.RuntimeInformation, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\Includes\System.Runtime.InteropServices.RuntimeInformation.dll</HintPath>
+      <HintPath>..\Hawk.Core\packages\System.Runtime.InteropServices.RuntimeInformation.4.0.0\lib\net45\System.Runtime.InteropServices.RuntimeInformation.dll</HintPath>
     </Reference>
     <Reference Include="System.Runtime.Serialization" />
+    <Reference Include="System.Security.Cryptography.Algorithms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\Hawk.Core\packages\System.Security.Cryptography.Algorithms.4.2.0\lib\net46\System.Security.Cryptography.Algorithms.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Security.Cryptography.Encoding, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\Hawk.Core\packages\System.Security.Cryptography.Encoding.4.0.0\lib\net46\System.Security.Cryptography.Encoding.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Security.Cryptography.Primitives, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\Hawk.Core\packages\System.Security.Cryptography.Primitives.4.0.0\lib\net46\System.Security.Cryptography.Primitives.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Security.Cryptography.X509Certificates, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\Hawk.Core\packages\System.Security.Cryptography.X509Certificates.4.1.0\lib\net46\System.Security.Cryptography.X509Certificates.dll</HintPath>
+    </Reference>
     <Reference Include="System.Web" />
     <Reference Include="System.Web.Extensions" />
     <Reference Include="System.Windows.Controls.WpfPropertyGrid, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
@@ -133,15 +196,14 @@
     <Reference Include="System.Data.DataSetExtensions" />
     <Reference Include="Microsoft.CSharp" />
     <Reference Include="System.Data" />
-    <Reference Include="System.Net.Http" />
     <Reference Include="System.Xml" />
     <Reference Include="WindowsBase" />
     <Reference Include="Xceed.Wpf.Toolkit, Version=2.0.0.0, Culture=neutral, PublicKeyToken=3e4669d2f30244f4, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\Includes\Xceed.Wpf.Toolkit.dll</HintPath>
     </Reference>
-    <Reference Include="YamlDotNet, Version=5.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\Hawk.Core\packages\YamlDotNet.5.2.0\lib\net45\YamlDotNet.dll</HintPath>
+    <Reference Include="YamlDotNet, Version=6.0.0.0, Culture=neutral, PublicKeyToken=ec19458f3c15af5e, processorArchitecture=MSIL">
+      <HintPath>..\Hawk.Core\packages\YamlDotNet.6.1.2\lib\net45\YamlDotNet.dll</HintPath>
     </Reference>
   </ItemGroup>
   <ItemGroup>
@@ -158,7 +220,6 @@
     <Compile Include="Managements\CommandLineContainer.cs" />
     <Compile Include="Managements\DataMiningConfig.cs" />
     <Compile Include="Market\GitHubAPI.cs" />
-    <Compile Include="Plugins\Generators\ProxyGE.cs" />
     <Compile Include="Crawlers\XPath.cs" />
     <Compile Include="Crawlers\XPathAnalyzer.cs" />
     <Compile Include="Crawlers\XPathTF.cs" />
@@ -254,7 +315,13 @@
       <ErrorText>此项目引用这台计算机上缺少的 NuGet 程序包。使用 NuGet 程序包还原可下载这些程序包。有关详细信息，请参阅 http://go.microsoft.com/fwlink/?LinkID=322105。缺少的文件是 {0}。</ErrorText>
     </PropertyGroup>
     <Error Condition="!Exists('..\Hawk.Core\packages\Microsoft.Net.Compilers.2.9.0\build\Microsoft.Net.Compilers.props')" Text="$([System.String]::Format('$(ErrorText)', '..\Hawk.Core\packages\Microsoft.Net.Compilers.2.9.0\build\Microsoft.Net.Compilers.props'))" />
+    <Error Condition="!Exists('..\Hawk.Core\packages\SQLitePCLRaw.lib.e_sqlite3.linux.1.1.2\build\SQLitePCLRaw.lib.e_sqlite3.linux.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\Hawk.Core\packages\SQLitePCLRaw.lib.e_sqlite3.linux.1.1.2\build\SQLitePCLRaw.lib.e_sqlite3.linux.targets'))" />
+    <Error Condition="!Exists('..\Hawk.Core\packages\SQLitePCLRaw.lib.e_sqlite3.osx.1.1.2\build\SQLitePCLRaw.lib.e_sqlite3.osx.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\Hawk.Core\packages\SQLitePCLRaw.lib.e_sqlite3.osx.1.1.2\build\SQLitePCLRaw.lib.e_sqlite3.osx.targets'))" />
+    <Error Condition="!Exists('..\Hawk.Core\packages\SQLitePCLRaw.lib.e_sqlite3.v110_xp.1.1.2\build\SQLitePCLRaw.lib.e_sqlite3.v110_xp.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\Hawk.Core\packages\SQLitePCLRaw.lib.e_sqlite3.v110_xp.1.1.2\build\SQLitePCLRaw.lib.e_sqlite3.v110_xp.targets'))" />
   </Target>
+  <Import Project="..\Hawk.Core\packages\SQLitePCLRaw.lib.e_sqlite3.linux.1.1.2\build\SQLitePCLRaw.lib.e_sqlite3.linux.targets" Condition="Exists('..\Hawk.Core\packages\SQLitePCLRaw.lib.e_sqlite3.linux.1.1.2\build\SQLitePCLRaw.lib.e_sqlite3.linux.targets')" />
+  <Import Project="..\Hawk.Core\packages\SQLitePCLRaw.lib.e_sqlite3.osx.1.1.2\build\SQLitePCLRaw.lib.e_sqlite3.osx.targets" Condition="Exists('..\Hawk.Core\packages\SQLitePCLRaw.lib.e_sqlite3.osx.1.1.2\build\SQLitePCLRaw.lib.e_sqlite3.osx.targets')" />
+  <Import Project="..\Hawk.Core\packages\SQLitePCLRaw.lib.e_sqlite3.v110_xp.1.1.2\build\SQLitePCLRaw.lib.e_sqlite3.v110_xp.targets" Condition="Exists('..\Hawk.Core\packages\SQLitePCLRaw.lib.e_sqlite3.v110_xp.1.1.2\build\SQLitePCLRaw.lib.e_sqlite3.v110_xp.targets')" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
diff --git a/Hawk.ETL/Interfaces/AppHelper.cs b/Hawk.ETL/Interfaces/AppHelper.cs
index 5149961..5b175cb 100644
--- a/Hawk.ETL/Interfaces/AppHelper.cs
+++ b/Hawk.ETL/Interfaces/AppHelper.cs
@@ -3,6 +3,7 @@
 using Hawk.Core.Utils;
 using System.Collections.Generic;
 using System.Globalization;
+using System.IO;
 using System.Linq;
 using System.Reflection;
 using System.Text.RegularExpressions;
@@ -75,6 +76,10 @@ public static void LoadLanguage(string url = null,bool isload=true)
 
             try
             {
+                if (!File.Exists(url))
+                {
+                    throw  new FileNotFoundException(url,url);
+                }
                 langRd =
                     Application.LoadComponent(
                             new Uri(url, UriKind.RelativeOrAbsolute))
diff --git a/Hawk.ETL/Interfaces/IColumnDataSorter.cs b/Hawk.ETL/Interfaces/IColumnDataSorter.cs
index 9d30088..7801e09 100644
--- a/Hawk.ETL/Interfaces/IColumnDataSorter.cs
+++ b/Hawk.ETL/Interfaces/IColumnDataSorter.cs
@@ -578,7 +578,8 @@ public static IFreeDocument Transform(this IColumnDataTransformer ge,
                 }
                 else
                 {
-                    dict.SetValue(ge.Column, res);
+                    if (res != null)
+                        dict.SetValue(ge.Column, res);
                 }
 
 
diff --git a/Hawk.ETL/Managements/CommandLineContainer.cs b/Hawk.ETL/Managements/CommandLineContainer.cs
index d243599..089dfdb 100644
--- a/Hawk.ETL/Managements/CommandLineContainer.cs
+++ b/Hawk.ETL/Managements/CommandLineContainer.cs
@@ -7,7 +7,7 @@
 using System.Threading.Tasks;
 using Hawk.Core.Utils.MVVM;
 using Hawk.Core.Utils.Plugins;
-
+using System.Diagnostics;
 namespace Hawk.ETL.Managements
 {
     public class CommandLineContainer : IMainFrm, IDockableManager
@@ -18,8 +18,9 @@ public CommandLineContainer()
             MainDescription.IsUIForm = false;
             MainDescription.MainFrm = this;
             PluginManager.MainFrmUI = this;
-            var MainStartUpLocation = @"D:\TopCoder\Hawk\Bin";
-            ;
+            var MainStartUpLocation =Path.GetDirectoryName(System.Diagnostics.Process.GetCurrentProcess().MainModule.FileName);
+            //var MainStartUpLocation = @"D:\TopCoder\Hawk\Bin";
+            MainPluginLocation = MainStartUpLocation;
             PluginManager.Init(new[] { MainStartUpLocation });
             PluginManager.LoadPlugins();
         }
diff --git a/Hawk.ETL/Managements/DataManager.cs b/Hawk.ETL/Managements/DataManager.cs
index 7852d5b..a5c13a9 100644
--- a/Hawk.ETL/Managements/DataManager.cs
+++ b/Hawk.ETL/Managements/DataManager.cs
@@ -18,6 +18,7 @@
 using Hawk.Core.Utils.Plugins;
 using Hawk.ETL.Interfaces;
 using Hawk.ETL.Process;
+using Microsoft.AppCenter.Analytics;
 using Microsoft.Win32;
 
 namespace Hawk.ETL.Managements
@@ -715,7 +716,10 @@ public DataCollection AddDataCollection(
                 return collection;
             }
             var data = new DataCollection(source.ToList()) {Name = collectionName};
-
+            Analytics.TrackEvent( GlobalHelper.Get("key_231"), new Dictionary<string, string> {
+                { "Parameter", collectionName },
+                
+            });
             DataCollections.Add(data);
             return data;
         }
diff --git a/Hawk.ETL/Managements/DataMiningConfig.CS b/Hawk.ETL/Managements/DataMiningConfig.CS
index 01b9020..2a067ed 100644
--- a/Hawk.ETL/Managements/DataMiningConfig.CS
+++ b/Hawk.ETL/Managements/DataMiningConfig.CS
@@ -172,7 +172,16 @@ namespace Hawk.ETL.Managements
               
             }
         }
+        [LocalizedCategory("user_login")]
+        public bool AutoConnectGithub
+        {
+            get { return this.Get<bool>("AutoConnectGithub"); ; }
+            set
+            {
+                this.Set<bool>("AutoConnectGithub", value);
 
+            }
+        }
 
         [LocalizedDisplayName("keep_pass")]
         [LocalizedCategory("user_login")]
@@ -281,22 +290,7 @@ namespace Hawk.ETL.Managements
         }
 
 
-        [PropertyOrder(4)]
-        [LocalizedCategory("http_header")]
-        [LocalizedDisplayName("key_176")]
-        [LocalizedDescription("proxy_setting_desc")]
-        [PropertyEditor("CodeEditor")]
-        public string ProxySetting
-        {
-            get { return this.Get<string>("ProxySetting"); }
-            set
-            {
-                this.Set<string>("ProxySetting", value);
-
-
-            }
-        }
-
+     
         [PropertyOrder(8)]
         [LocalizedCategory("http_header")]
         [LocalizedDisplayName("DisplayPopupMenu")]
diff --git a/Hawk.ETL/Managements/DataProcessManager.cs b/Hawk.ETL/Managements/DataProcessManager.cs
index d186c52..9ea6590 100644
--- a/Hawk.ETL/Managements/DataProcessManager.cs
+++ b/Hawk.ETL/Managements/DataProcessManager.cs
@@ -28,6 +28,7 @@
 using log4net;
 using log4net.Core;
 using log4net.Repository.Hierarchy;
+using Microsoft.AppCenter.Analytics;
 
 namespace Hawk.ETL.Managements
 {
@@ -121,8 +122,15 @@ public async Task<Project> GetRemoteProjectContent(ProjectItem projectItem=null)
             if (projectItem == null)
                 projectItem = SelectedRemoteProject;
             Project project = null;
+
             if (projectItem == null || projectItem.IsRemote == false)
+
+            {
+                if (CurrentProject != null)
+                    return CurrentProject;
                 return null;
+            }
+
             ControlExtended.SetBusy(ProgressBarState.NoProgress);
             Monitor.Enter(RemoteProjectBuff);
             if (RemoteProjectBuff.TryGetValue(projectItem, out project))
@@ -250,6 +258,17 @@ public override bool Init()
             })
             {Description = GlobalHelper.Get("key_268"), Icon = "question"};
 
+
+            var videolink = new BindingAction(GlobalHelper.Get("video_link"), d =>
+                {
+                    var url = "https://space.bilibili.com/312273788";
+                    System.Diagnostics.Process.Start(url);
+                })
+                { Description = GlobalHelper.Get("video_link"), Icon = "question" };
+
+
+
+
             var feedback = new BindingAction(GlobalHelper.Get("key_269"), d =>
             {
                 var url = "https://github.com/ferventdesert/Hawk/issues";
@@ -274,12 +293,13 @@ public override bool Init()
             var update = new BindingAction(GlobalHelper.Get("checkupgrade"),
                 d =>
                 {
-                    AutoUpdater.Start("https://raw.githubusercontent.com/ferventdesert/Hawk/global/Hawk/autoupdate.xml");
+                    AutoUpdater.Start("https://raw.githubusercontent.com/ferventdesert/Hawk/master/Hawk/autoupdate.xml");
                 })
             {Description = GlobalHelper.Get("checkupgrade"), Icon = "arrow_up"};
             var helpCommands = new BindingAction(GlobalHelper.Get("key_275")) {Icon = "magnify"};
             helpCommands.ChildActions.Add(mainlink);
             helpCommands.ChildActions.Add(helplink);
+            helpCommands.ChildActions.Add(videolink);
 
             helpCommands.ChildActions.Add(feedback);
             helpCommands.ChildActions.Add(giveme);
@@ -608,9 +628,15 @@ public override bool Init()
             {
                 GitHubApi.Connect(ConfigFile.GetConfig().Get<string>("Login"), ConfigFile.GetConfig().Get<string>("Password"));
                 MarketProjects.Clear();
+                if (DataMiningConfig.GetConfig<DataMiningConfig>().AutoConnectGithub)
+                {
+                    
+            
                 ControlExtended.SetBusy(ProgressBarState.Indeterminate,message:GlobalHelper.Get("get_remote_projects"));
+                
                 MarketProjects.AddRange(await GitHubApi.GetProjects(ConfigFile.GetConfig().Get<string>("MarketUrl")));
                 ControlExtended.SetBusy(ProgressBarState.NoProgress);
+}
 
             }, icon: "refresh"));
           
@@ -844,6 +870,10 @@ public ListCollectionView MarketProjectList {
             {
                 if (marketCollectionView == null)
                 {
+                    if (!DataMiningConfig.GetConfig<DataMiningConfig>().AutoConnectGithub)
+                    {
+                        return null;
+                    }
                     GitHubApi.Connect(ConfigFile.GetConfig().Get<string>("Login"), ConfigFile.GetConfig().Get<string>("Password"));
                     var result = GitHubApi.GetProjects(ConfigFile.GetConfig().Get<string>("MarketUrl")).Result;
                     ControlExtended.SafeInvoke(
@@ -903,6 +933,10 @@ private Project LoadProject(Project project, bool keepLast = false)
         {
             if (project != null)
             {
+                Analytics.TrackEvent(GlobalHelper.Get("key_307"), new Dictionary<string, string> {
+                    { "Parameter", project.Name },
+
+                });
                 var config = ConfigFile.GetConfig<DataMiningConfig>();
                 config.Projects.RemoveElementsNoReturn(d => string.IsNullOrWhiteSpace(d.SavePath));
                 var first = config.Projects.FirstOrDefault(d => d.SavePath == project.SavePath);
@@ -1059,6 +1093,14 @@ public IDataProcess GetOneInstance(string name, bool isAddToList = true, bool ne
             if (newOne)
             {
                 var process = PluginProvider.GetObjectByType<IDataProcess>(name);
+                Analytics.TrackEvent(GlobalHelper.Get("key_736"), new Dictionary<string, string> {
+                    { "Parameter", name },
+                    { "isAddToList", isAddToList.ToString() },
+                    { "newOne", newOne.ToString() }
+                    }
+                    
+
+                );
                 if (process != null)
                 {
                     if (isAddToList)
diff --git a/Hawk.ETL/Plugins/Generators/ProxyGE.cs b/Hawk.ETL/Plugins/Generators/ProxyGE.cs
deleted file mode 100644
index 9b162e4..0000000
--- a/Hawk.ETL/Plugins/Generators/ProxyGE.cs
+++ /dev/null
@@ -1,98 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.ComponentModel;
-using System.Linq;
-using System.Web.UI.WebControls;
-using System.Windows.Controls.WpfPropertyGrid.Attributes;
-using Hawk.Core.Connectors;
-using Hawk.Core.Utils.Logs;
-using Hawk.Core.Utils.MVVM;
-using Hawk.Core.Utils.Plugins;
-using Hawk.ETL.Interfaces;
-using Hawk.ETL.Managements;
-
-namespace Hawk.ETL.Plugins.Generators
-{
-   
-
-    /// <summary>
-    ///     代理策略
-    /// </summary>
-    public enum ProxyStrategy
-    {
-        /// <summary>
-        ///     不使用代理
-        /// </summary>
-        NoAgent,
-
-        /// <summary>
-        ///     当失败后更换代理
-        /// </summary>
-        FailChanged,
-
-        /// <summary>
-        ///     当达到一定访问次数后更换代理
-        /// </summary>
-        CountChange,
-    }
-
-    /// <summary>
-    ///     Web代理提供器
-    /// </summary>
-
- //   [XFrmWork("proxyge", "proxyge_desc", "database")]
-    public class ProxyGE : GeneratorBase
-    {
-        public ProxyGE()
-        {
-            ProxyStrategy = ProxyStrategy.NoAgent;
-            Column = "__Proxy";
-            MergeType = MergeType.Merge;
-        }
-
-
-        [PropertyOrder(4)]
-        [LocalizedCategory("http_header")]
-        [LocalizedDisplayName("key_176")]
-        [LocalizedDescription("proxy_setting_desc")]
-        [PropertyEditor("CodeEditor")]
-        public string ProxySetting { get; set; }
-
-
-        List<string> argsList = new List<string>();
-        [LocalizedDisplayName("key_179")]
-        public ProxyStrategy ProxyStrategy { get; set; }
-
-        public override bool Init(IEnumerable<IFreeDocument> datas)
-        {
-            var proxy = "";
-            proxy = ProxySetting;
-            if (string.IsNullOrEmpty(proxy))
-                proxy = ConfigFile.GetConfig<DataMiningConfig>().ProxySetting;
-
-            if (string.IsNullOrEmpty(proxy))
-                return base.Init(datas);
-
-                try
-            {
-                argsList = proxy.Split(new[] { "\r\n" }, StringSplitOptions.None).ToList();
-
-            }
-            catch (Exception ex)
-            {
-                XLogSys.Print.Error(ex.Message);
-
-
-            }
-            return base.Init(datas);
-        }
-        public override IEnumerable<IFreeDocument> Generate(IFreeDocument document = null)
-        {
-            return argsList.Select(doc => new FreeDocument { { this.Column, doc } });
-        }
-
-
-
-    }
-}
\ No newline at end of file
diff --git a/Hawk.ETL/Plugins/Transformers/CrawlerTF.cs b/Hawk.ETL/Plugins/Transformers/CrawlerTF.cs
index feb9474..f51cd78 100644
--- a/Hawk.ETL/Plugins/Transformers/CrawlerTF.cs
+++ b/Hawk.ETL/Plugins/Transformers/CrawlerTF.cs
@@ -1,4 +1,5 @@
 using System;
+using System.Collections;
 using System.Collections.Generic;
 using System.ComponentModel;
 using System.Linq;
@@ -14,6 +15,7 @@
 using Hawk.ETL.Managements;
 using Hawk.ETL.Plugins.Generators;
 using Hawk.ETL.Process;
+using HtmlAgilityPack;
 
 namespace Hawk.ETL.Plugins.Transformers
 {
@@ -33,10 +35,7 @@ public CrawlerTF()
         [Browsable(false)]
         public override string HeaderFilter { get; set; }
 
-        [PropertyOrder(1)]
-        [LocalizedDisplayName("key_482")]
-        public string PostData { get; set; }
-
+      
         public override bool Init(IEnumerable<IFreeDocument> datas)
         {
             base.Init(datas);
@@ -48,9 +47,9 @@ public override bool Init(IEnumerable<IFreeDocument> datas)
             }
             return true;
         }
-        [PropertyOrder(2)]
-        [LocalizedDisplayName("key_118")]
-        public string Proxy { get; set; }
+
+        public bool ProcessHtmlOnly { get; set; }
+
         [Browsable(false)]
         public override string KeyConfig => CrawlerSelector.SelectItem;
         private IEnumerable<FreeDocument> GetDatas(IFreeDocument data)
@@ -58,8 +57,8 @@ private IEnumerable<FreeDocument> GetDatas(IFreeDocument data)
             var p = data[Column];
             if (p == null || Crawler == null)
                 return new List<FreeDocument>();
-            var url = p.ToString();
-            var bufkey = url;
+            var urlOrHtml = p.ToString();
+            var bufkey = urlOrHtml;
             var post = data.Query(PostData);
             var crawler = Crawler;
             if (crawler == null)
@@ -74,24 +73,35 @@ private IEnumerable<FreeDocument> GetDatas(IFreeDocument data)
 
             if (htmldoc == null)
             {
+                IEnumerable<FreeDocument> docs = null;
                 HttpStatusCode code;
-                
-                var docs = crawler.CrawlData(url, out htmldoc, out code, post);
-                var any = docs.Any();
-                if (HttpHelper.IsSuccess(code))
+                if (!ProcessHtmlOnly)
                 {
-                    if (!any)
+                    docs = crawler.CrawlData(urlOrHtml, out htmldoc, out code, post);
+                    var any = docs.Any();
+                    if (HttpHelper.IsSuccess(code))
                     {
-                        ConfigFile.GetConfig<DataMiningConfig>().ParseErrorCount++;
-                        throw new Exception(string.Format(GlobalHelper.Get("key_669"), url));
+                        if (!any)
+                        {
+                            ConfigFile.GetConfig<DataMiningConfig>().ParseErrorCount++;
+                            throw new Exception(string.Format(GlobalHelper.Get("key_669"), urlOrHtml));
+                        }
+                        if (this.IsExecute == false)
+                            buffHelper.Set(bufkey, htmldoc);
+                        return docs;
                     }
-                    if(this.IsExecute==false)
-                        buffHelper.Set(bufkey, htmldoc);
+                    throw new Exception("Web Request Error:" + code);
+                }
+                else
+                {
+                    docs = crawler.CrawlHtmlData(urlOrHtml, out htmldoc);
                     return docs;
                 }
-                throw new Exception("Web Request Error:" + code);
+
+
             }
-            return crawler.CrawlData(htmldoc.DocumentNode);
+                return crawler.CrawlData(htmldoc.DocumentNode);
+          
         }
 
         protected override IEnumerable<IFreeDocument> InternalTransformManyData(IFreeDocument data)
diff --git a/Hawk.ETL/Plugins/Transformers/JsonTF.cs b/Hawk.ETL/Plugins/Transformers/JsonTF.cs
index 0ce0b92..be6c7b3 100644
--- a/Hawk.ETL/Plugins/Transformers/JsonTF.cs
+++ b/Hawk.ETL/Plugins/Transformers/JsonTF.cs
@@ -16,6 +16,7 @@
 using Hawk.ETL.Managements;
 using Hawk.ETL.Process;
 using HtmlAgilityPack;
+using Jayrock.Json.Conversion;
 
 namespace Hawk.ETL.Plugins.Transformers
 {
@@ -30,6 +31,7 @@ public JsonTF()
             serialier = new JavaScriptSerializer();
             ScriptWorkMode = ScriptWorkMode.NoTransform;
             OneOutput = false;
+            UseJSEngine = true;
         }
 
         [LocalizedDisplayName("key_188")]
@@ -37,6 +39,8 @@ public JsonTF()
         public ScriptWorkMode ScriptWorkMode { get; set; }
 
 
+        public bool UseJSEngine { get; set; }
+
         [Browsable(false)]
         public override string KeyConfig => ScriptWorkMode.ToString();
 
@@ -55,10 +59,18 @@ public override object TransformData(IFreeDocument datas)
             if (item == null || string.IsNullOrWhiteSpace(item.ToString()))
                 return null;
             
+            
             dynamic d = null;
             try
             {
-                d = serialier.DeserializeObject(item.ToString());
+                if (UseJSEngine)
+                {
+                    d = serialier.DeserializeObject(item.ToString());
+                }
+                else
+                {
+                    d = JsonConvert.Import(item.ToString());
+                }
             }
             catch (Exception ex)
             {
diff --git a/Hawk.ETL/Plugins/Transformers/ResponseTF.cs b/Hawk.ETL/Plugins/Transformers/ResponseTF.cs
index 60fa128..2ff922a 100644
--- a/Hawk.ETL/Plugins/Transformers/ResponseTF.cs
+++ b/Hawk.ETL/Plugins/Transformers/ResponseTF.cs
@@ -25,8 +25,16 @@ public ResponseTF()
         {
             CrawlerSelector = new TextEditSelector();
             CrawlerSelector.GetItems = this.GetAllCrawlerNames();
+            IsMultiYield = false;
         }
 
+        [PropertyOrder(1)]
+        [LocalizedDisplayName("key_482")]
+        public string PostData { get; set; }
+
+        [PropertyOrder(2)]
+        [LocalizedDisplayName("key_118")]
+        public string Proxy { get; set; }
         [LocalizedDisplayName("key_359")]
         [LocalizedDescription("key_360")]
         public TextEditSelector CrawlerSelector { get; set; }
@@ -59,22 +67,28 @@ private void CrawlerPropertyChangedHandler(object sender, PropertyChangedEventAr
         public override bool Init(IEnumerable<IFreeDocument> datas)
         {
             OneOutput = false;
+     
             var name = CrawlerSelector.SelectItem;
             name = AppHelper.Query(name, null);
             Crawler = GetCrawler(name);
             if (string.IsNullOrEmpty(CrawlerSelector.SelectItem) && Crawler != null)
                 CrawlerSelector.SelectItem = Crawler.Name;
+            IsMultiYield = false;
             return  base.Init(datas);
         }
 
         public override
             object TransformData(IFreeDocument datas)
         {
+
+         
             var p = datas[Column];
+            var post = datas.Query(PostData);
             if (p == null)
                 return new List<FreeDocument>();
             var url = p.ToString();
-            var response=  helper.GetHtml(Crawler.Http, url).Result;
+            Crawler.SetCookie(Crawler.Http);
+            var response=  helper.GetHtml(Crawler.Http, url,post).Result;
 
             var content = response.Html;
             var code = response.Code;
diff --git a/Hawk.ETL/Process/SmartCrawler.cs b/Hawk.ETL/Process/SmartCrawler.cs
index ad1136a..b74c008 100644
--- a/Hawk.ETL/Process/SmartCrawler.cs
+++ b/Hawk.ETL/Process/SmartCrawler.cs
@@ -864,6 +864,26 @@ public IEnumerable<FreeDocument> CrawlData(HtmlNode doc)
             return doc.GetDataFromXPath(CrawlItems, IsMultiData, RootXPath, RootFormat);
         }
 
+        public void SetCookie(HttpItem Http)
+        {
+            var crawler = this.SysProcessManager.GetTask<SmartCrawler>(ShareCookie.SelectItem);
+            if (crawler != null)
+            {
+                Http.ProxyIP = crawler.Http.ProxyIP;
+                Http.ProxyPort = crawler.Http.ProxyPort;
+                Http.UserName = crawler.Http.UserName;
+                Http.Password = crawler.Http.Password;
+
+                if (Http.Parameters != crawler.Http.Parameters)
+                {
+                    var cookie = crawler.Http.GetHeaderParameter().Get<string>("Cookie");
+                    if (string.IsNullOrWhiteSpace(cookie) == false)
+                    {
+                        Http.SetValue("Cookie", cookie);
+                    }
+                }
+            }
+        }
         public string GetHtml(string url, out HttpStatusCode code,
             string post = null)
         {
@@ -890,30 +910,18 @@ public string GetHtml(string url, out HttpStatusCode code,
                     code = HttpStatusCode.NoContent;
                     return "";
                 }
-                var crawler = this.SysProcessManager.GetTask<SmartCrawler>( ShareCookie.SelectItem);
-                if (crawler != null)
-                {
-                    Http.ProxyIP = crawler.Http.ProxyIP;
-                    if (Http.Parameters != crawler.Http.Parameters)
-                    {
-                        var cookie = crawler.Http.GetHeaderParameter().Get<string>("Cookie");
-                        if (string.IsNullOrWhiteSpace(cookie) == false)
-                        {
-                            Http.SetValue("Cookie", cookie);
-                        }
-                    }
-                }
-                Dictionary<string, string> paradict = null;
+                SetCookie(Http); 
+                Dictionary<string, string> paramDict = null;
                 foreach (Match m in mc)
                 {
-                    if (paradict == null)
-                        paradict = XPathAnalyzer.ParseUrl(URL);
-                    if (paradict == null)
+                    if (paramDict == null)
+                        paramDict = XPathAnalyzer.ParseUrl(URL);
+                    if (paramDict == null)
                         break;
                     var str = m.Groups[1].Value;
-                    if (paradict.ContainsKey(str))
+                    if (paramDict.ContainsKey(str))
                     {
-                        url = url.Replace(m.Groups[0].Value, paradict[str]);
+                        url = url.Replace(m.Groups[0].Value, paramDict[str]);
                     }
                 }
                  response = helper.GetHtml(Http,  url, post).Result;
diff --git a/Hawk.ETL/Process/SmartETLTool.cs b/Hawk.ETL/Process/SmartETLTool.cs
index fe2b18b..8b448f7 100644
--- a/Hawk.ETL/Process/SmartETLTool.cs
+++ b/Hawk.ETL/Process/SmartETLTool.cs
@@ -26,6 +26,7 @@
 using Hawk.ETL.Plugins.Generators;
 using Hawk.ETL.Plugins.Transformers;
 using Markdown.Xaml;
+using Microsoft.AppCenter.Analytics;
 using Xceed.Wpf.Toolkit;
 using MessageBox = System.Windows.MessageBox;
 
@@ -229,6 +230,15 @@ public ReadOnlyCollection<ICommand> Commands
 
         private void InsertModule(IColumnProcess tool)
         {
+            Analytics.TrackEvent(GlobalHelper.Get("key_692"), new Dictionary<string, string> {
+                    { "Parameter", tool.TypeName },
+                    { "ETLMount", ETLMount.ToString() }
+                  
+                }
+
+
+            );
+
             if (ETLMount < 0 || ETLMount >= CurrentETLTools.Count)
                 CurrentETLTools.Add(tool);
             else
@@ -717,10 +727,10 @@ public void ExecuteDatas(List<TemporaryTask<IFreeDocument>> lastRunningTasks = n
 
             Analyzer.Start(Name);
             Analyzer.Container = this;
-            var timer = new DispatcherTimer();
+
             if (GenerateMode == GenerateMode.SerialMode && DelayTime > 0)
-                etls = etls.AddModule(d => d.GetType() == typeof(CrawlerTF),
-                    d => new DelayTF { DelayTime = DelayTime.ToString() }, true).ToList();
+                etls = etls.AddModule(d => d.GetType() == typeof (CrawlerTF),
+                    d => new DelayTF {DelayTime = DelayTime.ToString()}, true).ToList();
             ToListTF motherListTF;
 
             var taskBuff = new List<IFreeDocument>();
@@ -782,19 +792,19 @@ public void ExecuteDatas(List<TemporaryTask<IFreeDocument>> lastRunningTasks = n
                 }),
                 d =>
                 {
-                taskBuff.Add(d);
-                if (taskBuff.Count < motherListTF?.GroupMount)
-                {
-                    return;
-                }
+                    taskBuff.Add(d);
+                    if (taskBuff.Count < motherListTF?.GroupMount)
+                    {
+                        return;
+                    }
                     PauseCheck(motherTask);
 
-                    AddSubTask(taskBuff.ToList(), mapperFunc1,mapperFunc2,customerFunc3,  motherListTF);
+                    AddSubTask(taskBuff.ToList(), mapperFunc1, mapperFunc2, customerFunc3, motherListTF);
                     taskBuff.Clear();
                 });
             if (lastRunningTasks != null)
                 foreach (var subTask in lastRunningTasks.Where(d => d.Level == 1))
-                    AddSubTask(null, mapperFunc1, mapperFunc2, customerFunc3, 
+                    AddSubTask(null, mapperFunc1, mapperFunc2, customerFunc3,
                         motherListTF, subTask);
             SysProcessManager.CurrentProcessTasks.Add(motherTask);
             motherTask.IsFormal = true;
@@ -809,27 +819,63 @@ public void ExecuteDatas(List<TemporaryTask<IFreeDocument>> lastRunningTasks = n
             }
             motherTask.Level = 0;
             motherTask.Publisher = this;
-            timer.Interval = TimeSpan.FromMilliseconds(100);
-        
 
-            timer.Tick += (s, e) =>
+            if (MainDescription.IsUIForm)
             {
-                if (motherTask.IsCanceled)
-                {
-                    timer.Stop();
-                    return;
-                }
+                var timer_ui = new DispatcherTimer();
+                timer_ui.Interval = TimeSpan.FromMilliseconds(100);
 
-                if (motherTask.IsStart == false)
+                timer_ui.Tick += (s, e) =>
                 {
-                    motherTask.Start();
-                    return;
-                }
+                    if (motherTask.IsCanceled)
+                    {
+                        timer_ui.Stop();
+                        return;
+                    }
+
+                    if (motherTask.IsStart == false)
+                    {
+                        motherTask.Start();
+                        return;
+                    }
+
+                    PauseCheck(motherTask, false);
+                };
+
+                timer_ui.Start();
+            }
+        
+
+            else
+            {
+
+                Timer timer_thread = null;
+               timer_thread = new Timer(obj =>
+              {
+                  if (motherTask.IsCanceled)
+                  {
+                      timer_thread.Dispose();
+                      return;
+                  }
+
+                  if (motherTask.IsStart == false)
+                  {
+                      motherTask.Start();
+                      return;
+                  }
+
+                  PauseCheck(motherTask, false);
+              },null,(int)100,(int)100);
+               
+            }
 
-                PauseCheck(motherTask,false);
-            };
 
-            timer.Start();
+           
+        }
+
+        private void TimerCheck()
+        {
+            
         }
 
         private void PauseCheck(TaskBase motherTask, bool check = true)
diff --git a/Hawk.ETL/app.config b/Hawk.ETL/app.config
index 6e16cf9..9248021 100644
--- a/Hawk.ETL/app.config
+++ b/Hawk.ETL/app.config
@@ -4,7 +4,27 @@
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
       <dependentAssembly>
         <assemblyIdentity name="HtmlAgilityPack" publicKeyToken="bd319b19eaf3b43a" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-1.8.7.0" newVersion="1.8.7.0" />
+        <bindingRedirect oldVersion="0.0.0.0-1.11.12.0" newVersion="1.11.12.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="FSharp.Core" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.7.0.0" newVersion="4.7.0.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="ICSharpCode.SharpZipLib" publicKeyToken="1b03e6acf1164f73" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-1.2.0.246" newVersion="1.2.0.246" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Net.Http" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.1.0.0" newVersion="4.1.0.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.Win32.Primitives" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.0.1.0" newVersion="4.0.1.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.IO.Compression" publicKeyToken="b77a5c561934e089" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.1.0.0" newVersion="4.1.0.0" />
       </dependentAssembly>
     </assemblyBinding>
   </runtime>
diff --git a/Hawk.ETL/packages.config b/Hawk.ETL/packages.config
index 856dd54..393c129 100644
--- a/Hawk.ETL/packages.config
+++ b/Hawk.ETL/packages.config
@@ -1,12 +1,68 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Autoupdater.NET.Official" version="1.4.11" targetFramework="net45" />
-  <package id="FSharp.Core" version="4.0.0.1" targetFramework="net45" />
-  <package id="HtmlAgilityPack" version="1.8.7" targetFramework="net46" />
-  <package id="NPOI" version="2.3.0" targetFramework="net45" />
-  <package id="ScrapySharp" version="2.6.2" targetFramework="net45" />
-  <package id="SharpZipLib" version="0.86.0" targetFramework="net45" />
-  <package id="Octokit" version="0.32.0" targetFramework="net46" />
-  <package id="YamlDotNet" version="5.2.0" targetFramework="net46" />
+  <package id="Autoupdater.NET.Official" version="1.5.6" targetFramework="net46" />
+  <package id="FSharp.Core" version="4.7.0" targetFramework="net46" />
   <package id="HockeySDK.WPF" version="4.1.6" targetFramework="net45" />
+  <package id="HtmlAgilityPack" version="1.11.12" targetFramework="net46" />
+  <package id="Microsoft.AppCenter" version="2.3.0-preview" targetFramework="net46" />
+  <package id="Microsoft.AppCenter.Analytics" version="2.3.0-preview" targetFramework="net46" />
+  <package id="Microsoft.NETCore.Platforms" version="1.0.1" targetFramework="net46" />
+  <package id="Microsoft.Win32.Primitives" version="4.0.1" targetFramework="net46" />
+  <package id="NETStandard.Library" version="1.6.0" targetFramework="net46" />
+  <package id="Newtonsoft.Json" version="6.0.1" targetFramework="net46" />
+  <package id="NPOI" version="2.4.1" targetFramework="net46" />
+  <package id="Octokit" version="0.32.0" targetFramework="net46" />
+  <package id="ScrapySharp" version="2.6.2" targetFramework="net46" />
+  <package id="SharpZipLib" version="1.2.0" targetFramework="net46" />
+  <package id="sqlite-net-pcl" version="1.3.1" targetFramework="net46" />
+  <package id="SQLitePCLRaw.bundle_green" version="1.1.2" targetFramework="net46" />
+  <package id="SQLitePCLRaw.core" version="1.1.2" targetFramework="net46" />
+  <package id="SQLitePCLRaw.lib.e_sqlite3.linux" version="1.1.2" targetFramework="net46" />
+  <package id="SQLitePCLRaw.lib.e_sqlite3.osx" version="1.1.2" targetFramework="net46" />
+  <package id="SQLitePCLRaw.lib.e_sqlite3.v110_xp" version="1.1.2" targetFramework="net46" />
+  <package id="SQLitePCLRaw.provider.e_sqlite3.net45" version="1.1.2" targetFramework="net46" />
+  <package id="System.AppContext" version="4.1.0" targetFramework="net46" />
+  <package id="System.Collections" version="4.0.11" targetFramework="net46" />
+  <package id="System.Collections.Concurrent" version="4.0.12" targetFramework="net46" />
+  <package id="System.Console" version="4.0.0" targetFramework="net46" />
+  <package id="System.Diagnostics.Debug" version="4.0.11" targetFramework="net46" />
+  <package id="System.Diagnostics.DiagnosticSource" version="4.0.0" targetFramework="net46" />
+  <package id="System.Diagnostics.Tools" version="4.0.1" targetFramework="net46" />
+  <package id="System.Diagnostics.Tracing" version="4.1.0" targetFramework="net46" />
+  <package id="System.Globalization" version="4.0.11" targetFramework="net46" />
+  <package id="System.Globalization.Calendars" version="4.0.1" targetFramework="net46" />
+  <package id="System.IO" version="4.1.0" targetFramework="net46" />
+  <package id="System.IO.Compression" version="4.1.0" targetFramework="net46" />
+  <package id="System.IO.Compression.ZipFile" version="4.0.1" targetFramework="net46" />
+  <package id="System.IO.FileSystem" version="4.0.1" targetFramework="net46" />
+  <package id="System.IO.FileSystem.Primitives" version="4.0.1" targetFramework="net46" />
+  <package id="System.Linq" version="4.1.0" targetFramework="net46" />
+  <package id="System.Linq.Expressions" version="4.1.0" targetFramework="net46" />
+  <package id="System.Net.Http" version="4.1.0" targetFramework="net46" />
+  <package id="System.Net.Primitives" version="4.0.11" targetFramework="net46" />
+  <package id="System.Net.Sockets" version="4.1.0" targetFramework="net46" />
+  <package id="System.ObjectModel" version="4.0.12" targetFramework="net46" />
+  <package id="System.Reflection" version="4.1.0" targetFramework="net46" />
+  <package id="System.Reflection.Extensions" version="4.0.1" targetFramework="net46" />
+  <package id="System.Reflection.Primitives" version="4.0.1" targetFramework="net46" />
+  <package id="System.Resources.ResourceManager" version="4.0.1" targetFramework="net46" />
+  <package id="System.Runtime" version="4.1.0" targetFramework="net46" />
+  <package id="System.Runtime.Extensions" version="4.1.0" targetFramework="net46" />
+  <package id="System.Runtime.Handles" version="4.0.1" targetFramework="net46" />
+  <package id="System.Runtime.InteropServices" version="4.1.0" targetFramework="net46" />
+  <package id="System.Runtime.InteropServices.RuntimeInformation" version="4.0.0" targetFramework="net46" />
+  <package id="System.Runtime.Numerics" version="4.0.1" targetFramework="net46" />
+  <package id="System.Security.Cryptography.Algorithms" version="4.2.0" targetFramework="net46" />
+  <package id="System.Security.Cryptography.Encoding" version="4.0.0" targetFramework="net46" />
+  <package id="System.Security.Cryptography.Primitives" version="4.0.0" targetFramework="net46" />
+  <package id="System.Security.Cryptography.X509Certificates" version="4.1.0" targetFramework="net46" />
+  <package id="System.Text.Encoding" version="4.0.11" targetFramework="net46" />
+  <package id="System.Text.Encoding.Extensions" version="4.0.11" targetFramework="net46" />
+  <package id="System.Text.RegularExpressions" version="4.1.0" targetFramework="net46" />
+  <package id="System.Threading" version="4.0.11" targetFramework="net46" />
+  <package id="System.Threading.Tasks" version="4.0.11" targetFramework="net46" />
+  <package id="System.Threading.Timer" version="4.0.1" targetFramework="net46" />
+  <package id="System.Xml.ReaderWriter" version="4.0.11" targetFramework="net46" />
+  <package id="System.Xml.XDocument" version="4.0.11" targetFramework="net46" />
+  <package id="YamlDotNet" version="6.1.2" targetFramework="net46" />
 </packages>
\ No newline at end of file
diff --git a/Hawk/AboutAuthor.xaml b/Hawk/AboutAuthor.xaml
deleted file mode 100644
index b5251a5..0000000
--- a/Hawk/AboutAuthor.xaml
+++ /dev/null
@@ -1,12 +0,0 @@
-<Window x:Class="Hawk.AboutAuthor"
-        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-        xmlns:local="clr-namespace:Hawk"
-        mc:Ignorable="d"
-        Title="AboutAuthor" Height="300" Width="300">
-    <Grid>
-        
-    </Grid>
-</Window>
diff --git a/Hawk/AboutAuthor.xaml.cs b/Hawk/AboutAuthor.xaml.cs
deleted file mode 100644
index 51e884c..0000000
--- a/Hawk/AboutAuthor.xaml.cs
+++ /dev/null
@@ -1,27 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Input;
-using System.Windows.Media;
-using System.Windows.Media.Imaging;
-using System.Windows.Shapes;
-
-namespace Hawk
-{
-    /// <summary>
-    /// AboutAuthor.xaml 的交互逻辑
-    /// </summary>
-    public partial class AboutAuthor : Window
-    {
-        public AboutAuthor()
-        {
-            InitializeComponent();
-        }
-    }
-}
diff --git a/Hawk/App.config b/Hawk/App.config
index cd89f39..d033d76 100644
--- a/Hawk/App.config
+++ b/Hawk/App.config
@@ -1,27 +1,47 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <configuration>
   <appSettings>
-    <add key="Title" value="Hawk"/>
-    <add key="Splash" value="splash.jpg"/>
-    <add key="Icon" value="Hawk.ico"/>
-    <add key="MainPluginLocation" value="\"/>
-    <add key="PluginLocationRelative" value="true"/>
-    <add key="ClientSettingsProvider.ServiceUri" value=""/>
+    <add key="Title" value="Hawk" />
+    <add key="Splash" value="splash.jpg" />
+    <add key="Icon" value="Hawk.ico" />
+    <add key="MainPluginLocation" value="\" />
+    <add key="PluginLocationRelative" value="true" />
+    <add key="ClientSettingsProvider.ServiceUri" value="" />
   </appSettings>
   <startup useLegacyV2RuntimeActivationPolicy="true">
-    <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6"/>
+    <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6" />
 
   </startup>
   <runtime>
-    <loadFromRemoteSources enabled="true"/>
+    <loadFromRemoteSources enabled="true" />
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
       <dependentAssembly>
-        <assemblyIdentity name="HtmlAgilityPack" publicKeyToken="bd319b19eaf3b43a" culture="neutral"/>
-        <bindingRedirect oldVersion="0.0.0.0-1.8.7.0" newVersion="1.8.7.0"/>
+        <assemblyIdentity name="HtmlAgilityPack" publicKeyToken="bd319b19eaf3b43a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-1.11.12.0" newVersion="1.11.12.0" />
       </dependentAssembly>
       <dependentAssembly>
-        <assemblyIdentity name="ToastNotifications" publicKeyToken="e89d9d7314a7c797" culture="neutral"/>
-        <bindingRedirect oldVersion="0.0.0.0-2.3.4.0" newVersion="2.3.4.0"/>
+        <assemblyIdentity name="ToastNotifications" publicKeyToken="e89d9d7314a7c797" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-2.3.4.0" newVersion="2.3.4.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="FSharp.Core" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.7.0.0" newVersion="4.7.0.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="ICSharpCode.SharpZipLib" publicKeyToken="1b03e6acf1164f73" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-1.2.0.246" newVersion="1.2.0.246" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Net.Http" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.1.0.0" newVersion="4.1.0.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.Win32.Primitives" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.0.1.0" newVersion="4.0.1.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.IO.Compression" publicKeyToken="b77a5c561934e089" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.1.0.0" newVersion="4.1.0.0" />
       </dependentAssembly>
     </assemblyBinding>
   </runtime>
diff --git a/Hawk/App.xaml.cs b/Hawk/App.xaml.cs
index d929e0f..50c8d6b 100644
--- a/Hawk/App.xaml.cs
+++ b/Hawk/App.xaml.cs
@@ -1,44 +1,43 @@
-using System;
-using System.Collections.Generic;
-using System.Configuration;
-using System.Data;
-using System.Globalization;
-using System.Linq;
-using System.Threading.Tasks;
+using System.Globalization;
 using System.Windows;
-using Hawk.Core.Connectors;
-using Hawk.Core.Utils;
-using Hawk.ETL.Interfaces;
-using Microsoft.HockeyApp;
+using Microsoft.AppCenter;
+using Microsoft.AppCenter.Analytics;
+using Microsoft.AppCenter.Crashes;
+
+
 namespace Hawk
 {
     /// <summary>
-    /// App.xaml 的交互逻辑
+    ///     App.xaml 的交互逻辑
     /// </summary>
     public partial class App : Application
     {
+        private static void SetCountryCode()
+        {
+            // This fallback country code does not reflect the physical device location, but rather the
+            // country that corresponds to the culture it uses.
+            var countryCode = RegionInfo.CurrentRegion.TwoLetterISORegionName;
+            AppCenter.SetCountryCode(countryCode);
+        }
 
-        protected async override void OnStartup(StartupEventArgs e)
+        protected override async void OnStartup(StartupEventArgs e)
         {
             base.OnStartup(e);
-            Microsoft.HockeyApp.HockeyClient.Current.Configure("2b23e2e4a420438dbfb308d5ddc7d448")
-            .SetContactInfo("Desert", "buptzym@qq.com");
-
-
-            //send crashes to the HockeyApp server
-            await HockeyClient.Current.SendCrashesAsync();
-            await HockeyClient.Current.CheckForUpdatesAsync(true, () =>
+            SetCountryCode();
+            AppCenter.Start("1a85d57d-ef2e-4267-83c7-cdcb19a1392d",
+                typeof(Analytics), typeof(Crashes));
+            bool didAppCrash = await Crashes.HasCrashedInLastSessionAsync();
+            if (didAppCrash)
             {
-                if (Application.Current.MainWindow != null) { Application.Current.MainWindow.Close(); }
-                return true;
-            });
+                ErrorReport crashReport = await Crashes.GetLastSessionCrashReportAsync();
+            }
 
+            Crashes.ShouldProcessErrorReport = (ErrorReport report) => {
+                return true; // return true if the crash report should be processed, otherwise false.
+            };
 
-            AppHelper.LoadLanguage();
+            //AppHelper.LoadLanguage();
+            //TODO: instance is null
         }
-
-
-
-
     }
-}
+}
\ No newline at end of file
diff --git a/Hawk/Hawk.csproj b/Hawk/Hawk.csproj
index 23c11bf..4a21b6a 100644
--- a/Hawk/Hawk.csproj
+++ b/Hawk/Hawk.csproj
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\Hawk.Core\packages\Microsoft.Net.Compilers.2.9.0\build\Microsoft.Net.Compilers.props" Condition="Exists('..\Hawk.Core\packages\Microsoft.Net.Compilers.2.9.0\build\Microsoft.Net.Compilers.props')" />
+  <Import Project="..\Hawk.Core\packages\Microsoft.Net.Compilers.3.2.1\build\Microsoft.Net.Compilers.props" Condition="Exists('..\Hawk.Core\packages\Microsoft.Net.Compilers.3.2.1\build\Microsoft.Net.Compilers.props')" />
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -63,8 +63,8 @@
   </PropertyGroup>
   <PropertyGroup />
   <ItemGroup>
-    <Reference Include="AutoUpdater.NET, Version=1.4.11.0, Culture=neutral, PublicKeyToken=501435c91b35f4bc, processorArchitecture=MSIL">
-      <HintPath>..\Hawk.Core\packages\Autoupdater.NET.Official.1.4.11\lib\net40\AutoUpdater.NET.dll</HintPath>
+    <Reference Include="AutoUpdater.NET, Version=1.5.6.0, Culture=neutral, PublicKeyToken=501435c91b35f4bc, processorArchitecture=MSIL">
+      <HintPath>..\Hawk.Core\packages\Autoupdater.NET.Official.1.5.6\lib\net40\AutoUpdater.NET.dll</HintPath>
     </Reference>
     <Reference Include="AvalonDock">
       <HintPath>..\Includes\AvalonDock.dll</HintPath>
@@ -72,34 +72,40 @@
     <Reference Include="AvalonDock.Themes.Expression">
       <HintPath>..\Includes\AvalonDock.Themes.Expression.dll</HintPath>
     </Reference>
-    <Reference Include="FSharp.Core, Version=4.4.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\Hawk.Core\packages\FSharp.Core.4.0.0.1\lib\net40\FSharp.Core.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="FSharp.Core, Version=4.7.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\Hawk.Core\packages\FSharp.Core.4.7.0\lib\net45\FSharp.Core.dll</HintPath>
     </Reference>
-    <Reference Include="HtmlAgilityPack, Version=1.8.7.0, Culture=neutral, PublicKeyToken=bd319b19eaf3b43a, processorArchitecture=MSIL">
-      <HintPath>..\Hawk.Core\packages\HtmlAgilityPack.1.8.7\lib\Net45\HtmlAgilityPack.dll</HintPath>
+    <Reference Include="HtmlAgilityPack, Version=1.11.12.0, Culture=neutral, PublicKeyToken=bd319b19eaf3b43a, processorArchitecture=MSIL">
+      <HintPath>..\Hawk.Core\packages\HtmlAgilityPack.1.11.12\lib\Net45\HtmlAgilityPack.dll</HintPath>
     </Reference>
     <Reference Include="Jint, Version=2.9.0.0, Culture=neutral, PublicKeyToken=2e92ba9c8d81157f, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\Hawk\Includes\Jint.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.HockeyApp.Core45, Version=4.1.6.1005, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\Hawk.Core\packages\HockeySDK.WPF.4.1.6\lib\net45\Microsoft.HockeyApp.Core45.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="Microsoft.HockeyApp.Kit, Version=4.1.6.1005, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\Hawk.Core\packages\HockeySDK.WPF.4.1.6\lib\net45\Microsoft.HockeyApp.Kit.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
     <Reference Include="log4net">
       <HintPath>..\Includes\log4net.dll</HintPath>
     </Reference>
+    <Reference Include="Microsoft.AppCenter, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\Hawk.Core\packages\Microsoft.AppCenter.2.3.0-preview\lib\net45\Microsoft.AppCenter.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.AppCenter.Analytics, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\Hawk.Core\packages\Microsoft.AppCenter.Analytics.2.3.0-preview\lib\net45\Microsoft.AppCenter.Analytics.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.AppCenter.Crashes, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\Hawk.Core\packages\Microsoft.AppCenter.Crashes.2.3.0-preview\lib\net45\Microsoft.AppCenter.Crashes.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.Win32.Primitives, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\Hawk.Core\packages\Microsoft.Win32.Primitives.4.0.1\lib\net46\Microsoft.Win32.Primitives.dll</HintPath>
+    </Reference>
     <Reference Include="Microsoft.WindowsAPICodePack, Version=1.1.3.3, Culture=neutral, PublicKeyToken=8985beaab7ea3f04, processorArchitecture=MSIL">
       <HintPath>..\Hawk.Core\packages\Microsoft-WindowsAPICodePack-Core.1.1.3.3\lib\net452\Microsoft.WindowsAPICodePack.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.WindowsAPICodePack.Shell, Version=1.1.3.3, Culture=neutral, PublicKeyToken=8985beaab7ea3f04, processorArchitecture=MSIL">
       <HintPath>..\Hawk.Core\packages\Microsoft-WindowsAPICodePack-Shell.1.1.3.3\lib\net452\Microsoft.WindowsAPICodePack.Shell.dll</HintPath>
     </Reference>
+    <Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <HintPath>..\Hawk.Core\packages\Newtonsoft.Json.6.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
+    </Reference>
     <Reference Include="ScrapySharp.Core, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\Hawk.Core\packages\ScrapySharp.2.6.2\lib\net45\ScrapySharp.Core.dll</HintPath>
       <Private>True</Private>
@@ -108,10 +114,73 @@
       <HintPath>..\Hawk.Core\packages\ScrapySharp.2.6.2\lib\net45\ScrapySharpAsync.dll</HintPath>
       <Private>True</Private>
     </Reference>
+    <Reference Include="SQLite-net, Version=1.1.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\Hawk.Core\packages\sqlite-net-pcl.1.3.1\lib\netstandard1.1\SQLite-net.dll</HintPath>
+    </Reference>
+    <Reference Include="SQLitePCLRaw.batteries_green, Version=1.0.0.0, Culture=neutral, PublicKeyToken=a84b7dcfb1391f7f, processorArchitecture=MSIL">
+      <HintPath>..\Hawk.Core\packages\SQLitePCLRaw.bundle_green.1.1.2\lib\net45\SQLitePCLRaw.batteries_green.dll</HintPath>
+    </Reference>
+    <Reference Include="SQLitePCLRaw.batteries_v2, Version=1.0.0.0, Culture=neutral, PublicKeyToken=8226ea5df37bcae9, processorArchitecture=MSIL">
+      <HintPath>..\Hawk.Core\packages\SQLitePCLRaw.bundle_green.1.1.2\lib\net45\SQLitePCLRaw.batteries_v2.dll</HintPath>
+    </Reference>
+    <Reference Include="SQLitePCLRaw.core, Version=1.0.0.0, Culture=neutral, PublicKeyToken=1488e028ca7ab535, processorArchitecture=MSIL">
+      <HintPath>..\Hawk.Core\packages\SQLitePCLRaw.core.1.1.2\lib\net45\SQLitePCLRaw.core.dll</HintPath>
+    </Reference>
+    <Reference Include="SQLitePCLRaw.provider.e_sqlite3, Version=1.0.0.0, Culture=neutral, PublicKeyToken=9c301db686d0bd12, processorArchitecture=MSIL">
+      <HintPath>..\Hawk.Core\packages\SQLitePCLRaw.provider.e_sqlite3.net45.1.1.2\lib\net45\SQLitePCLRaw.provider.e_sqlite3.dll</HintPath>
+    </Reference>
     <Reference Include="System" />
+    <Reference Include="System.AppContext, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\Hawk.Core\packages\System.AppContext.4.1.0\lib\net46\System.AppContext.dll</HintPath>
+    </Reference>
+    <Reference Include="System.ComponentModel.Composition" />
     <Reference Include="System.Configuration" />
+    <Reference Include="System.Console, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\Hawk.Core\packages\System.Console.4.0.0\lib\net46\System.Console.dll</HintPath>
+    </Reference>
     <Reference Include="System.Data" />
+    <Reference Include="System.Diagnostics.DiagnosticSource, Version=4.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\Hawk.Core\packages\System.Diagnostics.DiagnosticSource.4.0.0\lib\net46\System.Diagnostics.DiagnosticSource.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Globalization.Calendars, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\Hawk.Core\packages\System.Globalization.Calendars.4.0.1\lib\net46\System.Globalization.Calendars.dll</HintPath>
+    </Reference>
+    <Reference Include="System.IO.Compression, Version=4.1.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
+      <HintPath>..\Hawk.Core\packages\System.IO.Compression.4.1.0\lib\net46\System.IO.Compression.dll</HintPath>
+    </Reference>
+    <Reference Include="System.IO.Compression.FileSystem" />
+    <Reference Include="System.IO.Compression.ZipFile, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
+      <HintPath>..\Hawk.Core\packages\System.IO.Compression.ZipFile.4.0.1\lib\net46\System.IO.Compression.ZipFile.dll</HintPath>
+    </Reference>
+    <Reference Include="System.IO.FileSystem, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\Hawk.Core\packages\System.IO.FileSystem.4.0.1\lib\net46\System.IO.FileSystem.dll</HintPath>
+    </Reference>
+    <Reference Include="System.IO.FileSystem.Primitives, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\Hawk.Core\packages\System.IO.FileSystem.Primitives.4.0.1\lib\net46\System.IO.FileSystem.Primitives.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Net.Http, Version=4.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\Hawk.Core\packages\System.Net.Http.4.1.0\lib\net46\System.Net.Http.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Net.Sockets, Version=4.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\Hawk.Core\packages\System.Net.Sockets.4.1.0\lib\net46\System.Net.Sockets.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Numerics" />
     <Reference Include="System.Runtime.Caching" />
+    <Reference Include="System.Runtime.InteropServices.RuntimeInformation, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\Hawk.Core\packages\System.Runtime.InteropServices.RuntimeInformation.4.0.0\lib\net45\System.Runtime.InteropServices.RuntimeInformation.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Security.Cryptography.Algorithms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\Hawk.Core\packages\System.Security.Cryptography.Algorithms.4.2.0\lib\net46\System.Security.Cryptography.Algorithms.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Security.Cryptography.Encoding, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\Hawk.Core\packages\System.Security.Cryptography.Encoding.4.0.0\lib\net46\System.Security.Cryptography.Encoding.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Security.Cryptography.Primitives, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\Hawk.Core\packages\System.Security.Cryptography.Primitives.4.0.0\lib\net46\System.Security.Cryptography.Primitives.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Security.Cryptography.X509Certificates, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\Hawk.Core\packages\System.Security.Cryptography.X509Certificates.4.1.0\lib\net46\System.Security.Cryptography.X509Certificates.dll</HintPath>
+    </Reference>
     <Reference Include="System.Web" />
     <Reference Include="System.Web.Extensions" />
     <Reference Include="System.Xml" />
@@ -122,11 +191,11 @@
     <Reference Include="System.Xaml">
       <RequiredTargetFramework>4.0</RequiredTargetFramework>
     </Reference>
-    <Reference Include="ToastNotifications, Version=2.3.4.0, Culture=neutral, PublicKeyToken=e89d9d7314a7c797, processorArchitecture=MSIL">
-      <HintPath>..\Hawk.Core\packages\ToastNotifications.2.3.4\lib\net40\ToastNotifications.dll</HintPath>
+    <Reference Include="ToastNotifications, Version=2.5.1.0, Culture=neutral, PublicKeyToken=e89d9d7314a7c797, processorArchitecture=MSIL">
+      <HintPath>..\Hawk.Core\packages\ToastNotifications.2.5.1\lib\net40\ToastNotifications.dll</HintPath>
     </Reference>
-    <Reference Include="ToastNotifications.Messages, Version=2.3.4.0, Culture=neutral, PublicKeyToken=e89d9d7314a7c797, processorArchitecture=MSIL">
-      <HintPath>..\Hawk.Core\packages\ToastNotifications.Messages.2.3.4\lib\net40\ToastNotifications.Messages.dll</HintPath>
+    <Reference Include="ToastNotifications.Messages, Version=2.5.1.0, Culture=neutral, PublicKeyToken=e89d9d7314a7c797, processorArchitecture=MSIL">
+      <HintPath>..\Hawk.Core\packages\ToastNotifications.Messages.2.5.1\lib\net40\ToastNotifications.Messages.dll</HintPath>
     </Reference>
     <Reference Include="WindowsBase" />
     <Reference Include="PresentationCore" />
@@ -140,10 +209,6 @@
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </ApplicationDefinition>
-    <Page Include="AboutAuthor.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
     <Content Include="Lang\zh-CN.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
@@ -158,9 +223,6 @@
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
-    <Compile Include="AboutAuthor.xaml.cs">
-      <DependentUpon>AboutAuthor.xaml</DependentUpon>
-    </Compile>
     <Compile Include="App.xaml.cs">
       <DependentUpon>App.xaml</DependentUpon>
       <SubType>Code</SubType>
@@ -246,10 +308,16 @@
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
     <PropertyGroup>
-      <ErrorText>此项目引用这台计算机上缺少的 NuGet 程序包。使用 NuGet 程序包还原可下载这些程序包。有关详细信息，请参阅 http://go.microsoft.com/fwlink/?LinkID=322105。缺少的文件是 {0}。</ErrorText>
+      <ErrorText>这台计算机上缺少此项目引用的 NuGet 程序包。使用“NuGet 程序包还原”可下载这些程序包。有关更多信息，请参见 http://go.microsoft.com/fwlink/?LinkID=322105。缺少的文件是 {0}。</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\Hawk.Core\packages\Microsoft.Net.Compilers.2.9.0\build\Microsoft.Net.Compilers.props')" Text="$([System.String]::Format('$(ErrorText)', '..\Hawk.Core\packages\Microsoft.Net.Compilers.2.9.0\build\Microsoft.Net.Compilers.props'))" />
+    <Error Condition="!Exists('..\Hawk.Core\packages\Microsoft.Net.Compilers.3.2.1\build\Microsoft.Net.Compilers.props')" Text="$([System.String]::Format('$(ErrorText)', '..\Hawk.Core\packages\Microsoft.Net.Compilers.3.2.1\build\Microsoft.Net.Compilers.props'))" />
+    <Error Condition="!Exists('..\Hawk.Core\packages\SQLitePCLRaw.lib.e_sqlite3.linux.1.1.2\build\SQLitePCLRaw.lib.e_sqlite3.linux.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\Hawk.Core\packages\SQLitePCLRaw.lib.e_sqlite3.linux.1.1.2\build\SQLitePCLRaw.lib.e_sqlite3.linux.targets'))" />
+    <Error Condition="!Exists('..\Hawk.Core\packages\SQLitePCLRaw.lib.e_sqlite3.osx.1.1.2\build\SQLitePCLRaw.lib.e_sqlite3.osx.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\Hawk.Core\packages\SQLitePCLRaw.lib.e_sqlite3.osx.1.1.2\build\SQLitePCLRaw.lib.e_sqlite3.osx.targets'))" />
+    <Error Condition="!Exists('..\Hawk.Core\packages\SQLitePCLRaw.lib.e_sqlite3.v110_xp.1.1.2\build\SQLitePCLRaw.lib.e_sqlite3.v110_xp.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\Hawk.Core\packages\SQLitePCLRaw.lib.e_sqlite3.v110_xp.1.1.2\build\SQLitePCLRaw.lib.e_sqlite3.v110_xp.targets'))" />
   </Target>
+  <Import Project="..\Hawk.Core\packages\SQLitePCLRaw.lib.e_sqlite3.linux.1.1.2\build\SQLitePCLRaw.lib.e_sqlite3.linux.targets" Condition="Exists('..\Hawk.Core\packages\SQLitePCLRaw.lib.e_sqlite3.linux.1.1.2\build\SQLitePCLRaw.lib.e_sqlite3.linux.targets')" />
+  <Import Project="..\Hawk.Core\packages\SQLitePCLRaw.lib.e_sqlite3.osx.1.1.2\build\SQLitePCLRaw.lib.e_sqlite3.osx.targets" Condition="Exists('..\Hawk.Core\packages\SQLitePCLRaw.lib.e_sqlite3.osx.1.1.2\build\SQLitePCLRaw.lib.e_sqlite3.osx.targets')" />
+  <Import Project="..\Hawk.Core\packages\SQLitePCLRaw.lib.e_sqlite3.v110_xp.1.1.2\build\SQLitePCLRaw.lib.e_sqlite3.v110_xp.targets" Condition="Exists('..\Hawk.Core\packages\SQLitePCLRaw.lib.e_sqlite3.v110_xp.1.1.2\build\SQLitePCLRaw.lib.e_sqlite3.v110_xp.targets')" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
diff --git a/Hawk/Lang/zh-CN.xaml b/Hawk/Lang/zh-CN.xaml
index 6ec97bb..cbb807c 100644
--- a/Hawk/Lang/zh-CN.xaml
+++ b/Hawk/Lang/zh-CN.xaml
@@ -1384,7 +1384,7 @@ X	十六进制	255.ToString("X")	FF
         关于
     </system:String>
     <system:String x:Key="key_805">
-        版本： 5.0
+        版本： 5.2
     </system:String>
     <system:String x:Key="key_529">
         响应头
@@ -1940,6 +1940,8 @@ X	十六进制	255.ToString("X")	FF
         {{CrawlerTF_method_get}}
         
         {{CrawlerTF_method_post}}
+
+        {{proxy_setting}}
     </system:String>
 
     <system:String x:Key="CrawlerTF_method_get" xml:space="preserve">
@@ -2679,7 +2681,21 @@ X	十六进制	255.ToString("X")	FF
         - 【输出列】也需要与之一对应
     </system:String>
     <system:String x:Key="key_118">
-        代理配置
+        代理IP配置
+    </system:String>
+     <system:String x:Key="proxy_setting" xml:space="preserve">
+        ## Hawk代理配置
+        
+        推荐使用快代理设置，可在搜索引擎中搜索“快代理”，找到“隧道代理”即可。 购买链接：
+
+        （Hawk作者仅做友情推荐，与快代理公司无任何利益相关）
+        
+        > https://www.kuaidaili.com/cart?t=tps
+
+    
+        使用隧道代理，可以完全避免代理的重新设置问题，极大地简化了代理使用，而且快代理的可用性和速度，在作者多次比较后，一直处于较优水平。
+        付费后，将用户名，密码，IP和端口填入即可。 
+        
     </system:String>
     <system:String x:Key="key_182">
         当前代理索引
@@ -2876,6 +2892,9 @@ X	十六进制	255.ToString("X")	FF
     </system:String>
     <system:String x:Key="key_267">
         使用文档
+    </system:String>
+     <system:String x:Key="video_link">
+        视频教程
     </system:String>
     <system:String x:Key="key_127">
         禁止数
@@ -3746,11 +3765,7 @@ Hawk除了手工设置并行点，还能自动分析并行点，那么并行点
     <system:String x:Key="merge_outputonly">
         直接输出
     </system:String>
-    <system:String x:Key="proxy_setting_desc" xml:space="preserve">
-        一行一条，参考python proxy代理的设置方法,例如:
-        包含用户名密码：http://username:password@121.193.143.249:80/ 
-        不包含:http://121.193.143.249:80/
-    </system:String>
+ 
 
     <system:String x:Key="proxyge">
         添加代理
diff --git a/Hawk/autoupdate.xml b/Hawk/autoupdate.xml
index d35ee77..31df3fd 100644
--- a/Hawk/autoupdate.xml
+++ b/Hawk/autoupdate.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <item>
-    <version>5.0.0.0</version>
-    <url>https://github.com/ferventdesert/Hawk/releases/download/v5.0-beta/Hawk5.zip</url>
+    <version>5.2.0.0</version>
+    <url>https://github.com/ferventdesert/Hawk/releases/download/v5.2/Hawk5.zip</url>
     <changelog>https://github.com/ferventdesert/Hawk/releases</changelog>
     <mandatory>false</mandatory>
 </item>
\ No newline at end of file
diff --git a/Hawk/packages.config b/Hawk/packages.config
index 34164a8..7ce3b99 100644
--- a/Hawk/packages.config
+++ b/Hawk/packages.config
@@ -1,14 +1,69 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Autoupdater.NET.Official" version="1.4.11" targetFramework="net46" />
-  <package id="FSharp.Core" version="4.0.0.1" targetFramework="net45" />
-  <package id="HockeySDK.Core" version="4.1.6" targetFramework="net45" />
-  <package id="HockeySDK.WPF" version="4.1.6" targetFramework="net45" />
-  <package id="HtmlAgilityPack" version="1.8.7" targetFramework="net46" />
+  <package id="Autoupdater.NET.Official" version="1.5.6" targetFramework="net46" />
+  <package id="FSharp.Core" version="4.7.0" targetFramework="net46" />
+  <package id="HtmlAgilityPack" version="1.11.12" targetFramework="net46" />
+  <package id="Microsoft.AppCenter" version="2.3.0-preview" targetFramework="net46" />
+  <package id="Microsoft.AppCenter.Analytics" version="2.3.0-preview" targetFramework="net46" />
+  <package id="Microsoft.AppCenter.Crashes" version="2.3.0-preview" targetFramework="net46" />
+  <package id="Microsoft.Net.Compilers" version="3.2.1" targetFramework="net46" developmentDependency="true" />
+  <package id="Microsoft.NETCore.Platforms" version="1.0.1" targetFramework="net46" />
+  <package id="Microsoft.Win32.Primitives" version="4.0.1" targetFramework="net46" />
   <package id="Microsoft-WindowsAPICodePack-Core" version="1.1.3.3" targetFramework="net46" />
   <package id="Microsoft-WindowsAPICodePack-Shell" version="1.1.3.3" targetFramework="net46" />
-  <package id="Microsoft.Net.Compilers" version="2.9.0" targetFramework="net46" developmentDependency="true" />
+  <package id="NETStandard.Library" version="1.6.0" targetFramework="net46" />
+  <package id="Newtonsoft.Json" version="6.0.1" targetFramework="net46" />
   <package id="ScrapySharp" version="2.6.2" targetFramework="net45" />
-  <package id="ToastNotifications" version="2.3.4" targetFramework="net46" />
-  <package id="ToastNotifications.Messages" version="2.3.4" targetFramework="net46" />
+  <package id="sqlite-net-pcl" version="1.3.1" targetFramework="net46" />
+  <package id="SQLitePCLRaw.bundle_green" version="1.1.2" targetFramework="net46" />
+  <package id="SQLitePCLRaw.core" version="1.1.2" targetFramework="net46" />
+  <package id="SQLitePCLRaw.lib.e_sqlite3.linux" version="1.1.2" targetFramework="net46" />
+  <package id="SQLitePCLRaw.lib.e_sqlite3.osx" version="1.1.2" targetFramework="net46" />
+  <package id="SQLitePCLRaw.lib.e_sqlite3.v110_xp" version="1.1.2" targetFramework="net46" />
+  <package id="SQLitePCLRaw.provider.e_sqlite3.net45" version="1.1.2" targetFramework="net46" />
+  <package id="System.AppContext" version="4.1.0" targetFramework="net46" />
+  <package id="System.Collections" version="4.0.11" targetFramework="net46" />
+  <package id="System.Collections.Concurrent" version="4.0.12" targetFramework="net46" />
+  <package id="System.Console" version="4.0.0" targetFramework="net46" />
+  <package id="System.Diagnostics.Debug" version="4.0.11" targetFramework="net46" />
+  <package id="System.Diagnostics.DiagnosticSource" version="4.0.0" targetFramework="net46" />
+  <package id="System.Diagnostics.Tools" version="4.0.1" targetFramework="net46" />
+  <package id="System.Diagnostics.Tracing" version="4.1.0" targetFramework="net46" />
+  <package id="System.Globalization" version="4.0.11" targetFramework="net46" />
+  <package id="System.Globalization.Calendars" version="4.0.1" targetFramework="net46" />
+  <package id="System.IO" version="4.1.0" targetFramework="net46" />
+  <package id="System.IO.Compression" version="4.1.0" targetFramework="net46" />
+  <package id="System.IO.Compression.ZipFile" version="4.0.1" targetFramework="net46" />
+  <package id="System.IO.FileSystem" version="4.0.1" targetFramework="net46" />
+  <package id="System.IO.FileSystem.Primitives" version="4.0.1" targetFramework="net46" />
+  <package id="System.Linq" version="4.1.0" targetFramework="net46" />
+  <package id="System.Linq.Expressions" version="4.1.0" targetFramework="net46" />
+  <package id="System.Net.Http" version="4.1.0" targetFramework="net46" />
+  <package id="System.Net.Primitives" version="4.0.11" targetFramework="net46" />
+  <package id="System.Net.Sockets" version="4.1.0" targetFramework="net46" />
+  <package id="System.ObjectModel" version="4.0.12" targetFramework="net46" />
+  <package id="System.Reflection" version="4.1.0" targetFramework="net46" />
+  <package id="System.Reflection.Extensions" version="4.0.1" targetFramework="net46" />
+  <package id="System.Reflection.Primitives" version="4.0.1" targetFramework="net46" />
+  <package id="System.Resources.ResourceManager" version="4.0.1" targetFramework="net46" />
+  <package id="System.Runtime" version="4.1.0" targetFramework="net46" />
+  <package id="System.Runtime.Extensions" version="4.1.0" targetFramework="net46" />
+  <package id="System.Runtime.Handles" version="4.0.1" targetFramework="net46" />
+  <package id="System.Runtime.InteropServices" version="4.1.0" targetFramework="net46" />
+  <package id="System.Runtime.InteropServices.RuntimeInformation" version="4.0.0" targetFramework="net46" />
+  <package id="System.Runtime.Numerics" version="4.0.1" targetFramework="net46" />
+  <package id="System.Security.Cryptography.Algorithms" version="4.2.0" targetFramework="net46" />
+  <package id="System.Security.Cryptography.Encoding" version="4.0.0" targetFramework="net46" />
+  <package id="System.Security.Cryptography.Primitives" version="4.0.0" targetFramework="net46" />
+  <package id="System.Security.Cryptography.X509Certificates" version="4.1.0" targetFramework="net46" />
+  <package id="System.Text.Encoding" version="4.0.11" targetFramework="net46" />
+  <package id="System.Text.Encoding.Extensions" version="4.0.11" targetFramework="net46" />
+  <package id="System.Text.RegularExpressions" version="4.1.0" targetFramework="net46" />
+  <package id="System.Threading" version="4.0.11" targetFramework="net46" />
+  <package id="System.Threading.Tasks" version="4.0.11" targetFramework="net46" />
+  <package id="System.Threading.Timer" version="4.0.1" targetFramework="net46" />
+  <package id="System.Xml.ReaderWriter" version="4.0.11" targetFramework="net46" />
+  <package id="System.Xml.XDocument" version="4.0.11" targetFramework="net46" />
+  <package id="ToastNotifications" version="2.5.1" targetFramework="net46" />
+  <package id="ToastNotifications.Messages" version="2.5.1" targetFramework="net46" />
 </packages>
\ No newline at end of file
diff --git a/HawkScheduler/App.config b/HawkScheduler/App.config
index 9ef335c..6941176 100644
--- a/HawkScheduler/App.config
+++ b/HawkScheduler/App.config
@@ -7,7 +7,27 @@
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
       <dependentAssembly>
         <assemblyIdentity name="HtmlAgilityPack" publicKeyToken="bd319b19eaf3b43a" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-7.0" newVersion="1.8.7.0" />
+        <bindingRedirect oldVersion="0.0.0.0-1.11.12.0" newVersion="1.11.12.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="FSharp.Core" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.7.0.0" newVersion="4.7.0.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="ICSharpCode.SharpZipLib" publicKeyToken="1b03e6acf1164f73" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-1.2.0.246" newVersion="1.2.0.246" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Net.Http" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.1.0.0" newVersion="4.1.0.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.Win32.Primitives" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.0.1.0" newVersion="4.0.1.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.IO.Compression" publicKeyToken="b77a5c561934e089" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.1.0.0" newVersion="4.1.0.0" />
       </dependentAssembly>
     </assemblyBinding>
   </runtime>
diff --git a/HawkScheduler/HawkScheduler.csproj b/HawkScheduler/HawkScheduler.csproj
index 31a218f..8e462ce 100644
--- a/HawkScheduler/HawkScheduler.csproj
+++ b/HawkScheduler/HawkScheduler.csproj
@@ -37,9 +37,8 @@
     <Reference Include="CommandLine">
       <HintPath>..\Includes\CommandLine.dll</HintPath>
     </Reference>
-    <Reference Include="HtmlAgilityPack, Version=1.8.7.0, Culture=neutral, PublicKeyToken=bd319b19eaf3b43a, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\Hawk.Core\packages\HtmlAgilityPack.1.8.7\lib\Net45\HtmlAgilityPack.dll</HintPath>
+    <Reference Include="HtmlAgilityPack, Version=1.11.12.0, Culture=neutral, PublicKeyToken=bd319b19eaf3b43a, processorArchitecture=MSIL">
+      <HintPath>..\Hawk.Core\packages\HtmlAgilityPack.1.11.12\lib\Net45\HtmlAgilityPack.dll</HintPath>
     </Reference>
     <Reference Include="log4net, Version=1.2.11.0, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
@@ -53,6 +52,7 @@
     <Reference Include="System.Data" />
     <Reference Include="System.Net.Http" />
     <Reference Include="System.Xml" />
+    <Reference Include="WindowsBase" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Program.cs" />
@@ -60,6 +60,7 @@
   </ItemGroup>
   <ItemGroup>
     <None Include="App.config" />
+    <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Hawk.Core\Hawk.Core.csproj">
diff --git a/HawkScheduler/HawkScheduler.csproj.user b/HawkScheduler/HawkScheduler.csproj.user
index 36b262c..808eb6f 100644
--- a/HawkScheduler/HawkScheduler.csproj.user
+++ b/HawkScheduler/HawkScheduler.csproj.user
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'">
-    <StartArguments>-p   D:\TopCoder\Hawk-Projects\Hawk3\链家2020.xml -t 链家租房</StartArguments>
+    <StartArguments>-p   D:\TopCoder\Hawk-Projects\Hawk3\链家2020.xml -t 链家在售</StartArguments>
     <StartAction>Project</StartAction>
   </PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/HawkScheduler/Program.cs b/HawkScheduler/Program.cs
index 483b322..0df5665 100644
--- a/HawkScheduler/Program.cs
+++ b/HawkScheduler/Program.cs
@@ -1,15 +1,14 @@
 using System;
-using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Collections.Specialized;
-using System.Diagnostics;
 using System.IO;
 using System.Linq;
+using System.Runtime.InteropServices;
+using System.Windows.Threading;
 using CommandLine;
 using CommandLine.Text;
 using Hawk.Core.Utils;
-using Hawk.Core.Utils.MVVM;
-using Hawk.Core.Utils.Plugins;
+using Hawk.Core.Utils.Logs;
 using Hawk.ETL.Crawlers;
 using Hawk.ETL.Interfaces;
 using Hawk.ETL.Managements;
@@ -54,8 +53,6 @@ public string GetUsage()
         }
     }
 
-  
-
 
     internal class Program
     {
@@ -64,19 +61,19 @@ internal class Program
         private static void unitTest()
         {
             var doc = XPathAnalyzer.GetHtmlDocument(url);
-          
+
             var datas = XPathAnalyzer.GetDataFromURL(url);
-           
+
             var properties = doc.DocumentNode.SearchPropertiesSmartList();
 
-       
+
             var firstOrDefault = properties.FirstOrDefault();
             datas = doc.DocumentNode.GetDataFromXPath(firstOrDefault.CrawItems).ToList();
-         
         }
+
         private static void Main(string[] args)
         {
-            unitTest();
+            //unitTest();
             var options = new Options();
             var parser = new Parser(with => with.HelpWriter = Console.Error);
 
@@ -89,71 +86,97 @@ private static void Main(string[] args)
         private static void Run(Options options)
         {
             Console.WriteLine();
-            Console.WriteLine("project file: {0} ...", options.ProjectFile);
-            var container = new CommandLineContainer();
-           
-            var processManager = container.PluginDictionary["DataProcessManager"] as DataProcessManager;
-            var project = Project.Load(options.ProjectFile);
-            if (project == null)
+            XmlConfigurator.Configure(new FileInfo("log4net_cmd.config"));
+
+            DispatcherTimer timer = new DispatcherTimer();
+            timer.Interval=TimeSpan.FromSeconds(1);
+            timer.Tick += (s, e) => { Console.WriteLine("fuck");};
+            timer.Start();
+
+            try
             {
-                Console.WriteLine($"project {options.ProjectFile} is not exists or format error, exit..." );
-                return;
-            }
-            var dataManager = container.PluginDictionary["DataManager"] as DataManager;
+                XLogSys.Print.Info($"Project file: {options.ProjectFile} ...");
+                var container = new CommandLineContainer();
+
+                var processManager = container.PluginDictionary["DataProcessManager"] as DataProcessManager;
+                if (processManager == null)
+                {
+                    throw new Exception("Plugin System ERROR, DataProcessManager not Found, Reinstall Hawk");
+                }
+            
+                var dataManager = container.PluginDictionary["DataManager"] as DataManager;
 
-         
+                if (dataManager == null)
+                {
+                    throw new Exception("Plugin System ERROR, dataManager not Found, Reinstall Hawk");
+                }
 
-            project.DataCollections.Execute(d=>dataManager.AddDataCollection(d));
-            XmlConfigurator.Configure(new FileInfo("log4net_cmd.config"));
-            processManager.CurrentProject = project;
-            var task = project.Tasks.FirstOrDefault(d => d.Name == options.TaskName);
+                AppHelper.LoadLanguage();
 
-          
-            if (task == null)
-            {
-                
-                Console.WriteLine("task not in project, project task lists:");
-                foreach (var _task in project.Tasks)
+                var project = Project.Load(options.ProjectFile);
+                if (project == null)
                 {
-                    Console.WriteLine(_task.Name);
+                    throw new Exception($"Project {options.ProjectFile} is not exists or format error");
                 }
-                Console.ReadKey();
-            }
-            task.Load(false);
-            Console.WriteLine("project load successful");
-            var realTask =
-                processManager.CurrentProcessCollections.FirstOrDefault(d => d.Name == options.TaskName) as SmartETLTool;
-            var queuelists = processManager.CurrentProcessTasks as ObservableCollection<TaskBase>;
-            queuelists.CollectionChanged += (s, e) =>
-            {
-                if (e.Action == NotifyCollectionChangedAction.Add)
+
+                project.DataCollections?.Execute(d => dataManager.AddDataCollection(d));
+                processManager.CurrentProject = project;
+                var task = project.Tasks.FirstOrDefault(d => d.Name == options.TaskName);
+
+                if (task == null)
                 {
-                    foreach (var item in e.NewItems.OfType<TaskBase>())
+                    foreach (var _task in project.Tasks)
                     {
-                        Console.WriteLine("task add: {0}", item.Name);
-                        item.PropertyChanged += (s2, e2) =>
-                        {
-                            if (e2.PropertyName == "Percent")
-                            {
-                                Console.WriteLine($"task {item.Name}, percent {item.Percent}");
-                            }
-                        };
+                        Console.WriteLine(_task.Name);
                     }
+                    throw  new Exception($"task {options.TaskName} not in project");
+                  
                 }
-                else
+                task.Load(false);
+                XLogSys.Print.Info("project load successful");
+                var realTask =
+                    processManager.CurrentProcessCollections.FirstOrDefault(d => d.Name == options.TaskName) as
+                        SmartETLTool;
+                var queueList = processManager.CurrentProcessTasks as ObservableCollection<TaskBase>;
+                queueList.CollectionChanged += (s, e) =>
                 {
-                    foreach (var item in e.OldItems.OfType<TaskBase>())
+                    if (e.Action == NotifyCollectionChangedAction.Add)
                     {
-                        Console.WriteLine("task finished: {0}", item.Name);
+                        foreach (var item in e.NewItems.OfType<TaskBase>())
+                        {
+                            XLogSys.Print.Info($"task add: {item.Name}");
+                            item.PropertyChanged += (s2, e2) =>
+                            {
+                                if (e2.PropertyName == "Percent")
+                                {
+                                    XLogSys.Print.Info($"task {item.Name}, percent {item.Percent}");
+                                }
+                            };
+                        }
                     }
-                }
-                if (queuelists.Count == 0)
-                {
-                    Console.WriteLine("task all finished: quit");
-                    Environment.Exit(0); //0代表正常退出，非0代表某种错误的退出
-                }
-            };
-            realTask.ExecuteDatas();
+                    else
+                    {
+                        foreach (var item in e.OldItems.OfType<TaskBase>())
+                        {
+                            XLogSys.Print.Info($"task finished: {item.Name}");
+                        }
+                    }
+                    if (queueList.Count == 0)
+                    {
+                        Console.WriteLine("task all finished: quit");
+                        // Environment.Exit(0); //0代表正常退出，非0代表某种错误的退出
+                    }
+                };
+
+
+                realTask.ExecuteDatas();
+            }
+            catch (Exception e)
+            {
+                XLogSys.Print.Error(e.Message, e);
+                Console.ReadKey();
+                Environment.Exit(1);
+            }
             while (true)
             {
                 var key = Console.ReadLine();
diff --git a/HawkUnitTest/HawkUnitTest.csproj b/HawkUnitTest/HawkUnitTest.csproj
index 80632ba..e651378 100644
--- a/HawkUnitTest/HawkUnitTest.csproj
+++ b/HawkUnitTest/HawkUnitTest.csproj
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\Hawk.Core\packages\MSTest.TestAdapter.1.1.11\build\net45\MSTest.TestAdapter.props" Condition="Exists('..\Hawk.Core\packages\MSTest.TestAdapter.1.1.11\build\net45\MSTest.TestAdapter.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -42,12 +41,6 @@
     <Reference Include="HtmlAgilityPack, Version=1.8.7.0, Culture=neutral, PublicKeyToken=bd319b19eaf3b43a, processorArchitecture=MSIL">
       <HintPath>..\Hawk.Core\packages\HtmlAgilityPack.1.8.7\lib\Net45\HtmlAgilityPack.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.VisualStudio.TestPlatform.TestFramework, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\Hawk.Core\packages\MSTest.TestFramework.1.1.11\lib\net45\Microsoft.VisualStudio.TestPlatform.TestFramework.dll</HintPath>
-    </Reference>
-    <Reference Include="Microsoft.VisualStudio.TestPlatform.TestFramework.Extensions, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\Hawk.Core\packages\MSTest.TestFramework.1.1.11\lib\net45\Microsoft.VisualStudio.TestPlatform.TestFramework.Extensions.dll</HintPath>
-    </Reference>
     <Reference Include="Octokit, Version=0.32.0.0, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\Hawk.Core\packages\Octokit.0.32.0\lib\netstandard1.1\Octokit.dll</HintPath>
@@ -79,12 +72,4 @@
   </ItemGroup>
   <Import Project="$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets" Condition="Exists('$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets')" />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
-    <PropertyGroup>
-      <ErrorText>此项目引用这台计算机上缺少的 NuGet 程序包。使用 NuGet 程序包还原可下载这些程序包。有关详细信息，请参阅 http://go.microsoft.com/fwlink/?LinkID=322105。缺少的文件是 {0}。</ErrorText>
-    </PropertyGroup>
-    <Error Condition="!Exists('..\Hawk.Core\packages\MSTest.TestAdapter.1.1.11\build\net45\MSTest.TestAdapter.props')" Text="$([System.String]::Format('$(ErrorText)', '..\Hawk.Core\packages\MSTest.TestAdapter.1.1.11\build\net45\MSTest.TestAdapter.props'))" />
-    <Error Condition="!Exists('..\Hawk.Core\packages\MSTest.TestAdapter.1.1.11\build\net45\MSTest.TestAdapter.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\Hawk.Core\packages\MSTest.TestAdapter.1.1.11\build\net45\MSTest.TestAdapter.targets'))" />
-  </Target>
-  <Import Project="..\Hawk.Core\packages\MSTest.TestAdapter.1.1.11\build\net45\MSTest.TestAdapter.targets" Condition="Exists('..\Hawk.Core\packages\MSTest.TestAdapter.1.1.11\build\net45\MSTest.TestAdapter.targets')" />
 </Project>
\ No newline at end of file
diff --git a/Includes/System.Windows.Controls.WpfPropertyGrid.dll b/Includes/System.Windows.Controls.WpfPropertyGrid.dll
index 0ac064d..82d3f27 100644
Binary files a/Includes/System.Windows.Controls.WpfPropertyGrid.dll and b/Includes/System.Windows.Controls.WpfPropertyGrid.dll differ