Commit e6994ca2 by mahaisong

fix:通过测试完毕,结束

parent 32cec826
This source diff could not be displayed because it is too large. You can view the blob instead.



using Nest2_5_8;
using Nest;
using System;
using System.Collections.Generic;
using System.Linq;
......
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
......@@ -67,12 +67,8 @@
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
</PropertyGroup>
<ItemGroup>
<Reference Include="Elasticsearch.Net, Version=2.0.0.0, Culture=neutral, PublicKeyToken=96c599bbe3e70f5d, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\includees\Elasticsearch.Net.dll</HintPath>
</Reference>
<Reference Include="Elasticsearch.Net2_5_8">
<HintPath>..\includees\Elasticsearch.Net2_5_8.dll</HintPath>
<Reference Include="Elasticsearch.Net, Version=6.0.0.0, Culture=neutral, PublicKeyToken=96c599bbe3e70f5d, processorArchitecture=MSIL">
<HintPath>..\TestUnit\packages\Elasticsearch.Net.6.1.0\lib\net46\Elasticsearch.Net.dll</HintPath>
</Reference>
<Reference Include="EntityFramework">
<HintPath>..\include\EntityFramework.dll</HintPath>
......@@ -197,12 +193,8 @@
<Reference Include="MongoDB.Bson">
<HintPath>..\include\MongoDB.Bson.dll</HintPath>
</Reference>
<Reference Include="Nest, Version=2.0.0.0, Culture=neutral, PublicKeyToken=96c599bbe3e70f5d, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\includees\Nest.dll</HintPath>
</Reference>
<Reference Include="Nest2_5_8">
<HintPath>..\includees\Nest2_5_8.dll</HintPath>
<Reference Include="Nest, Version=6.0.0.0, Culture=neutral, PublicKeyToken=96c599bbe3e70f5d, processorArchitecture=MSIL">
<HintPath>..\TestUnit\packages\NEST.6.1.0\lib\net46\Nest.dll</HintPath>
</Reference>
<Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
......



注意:此类库不允许TestUnit项目之外的使用,因为大量代码为了测试被改动。
注意:
需要引用,可以参考其他的解决方案中的Common,推荐palas.common
\ No newline at end of file
1.此类库不允许TestUnit项目之外的使用,因为大量代码为了测试被改动。
需要引用,可以参考其他的解决方案中的Common,推荐palas.common
2.为了最终测试,将NEST和ESNET(版本2、版本6)都卸载引用(注释了HTItem2)。重新引用了Nuget上的NEST6.1.0。
如果想恢复之前的测试,请务必引用来自本地的项目((版本2、版本6))、恢复HTItem2
\ No newline at end of file
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<configSections>
<!-- For more information on Entity Framework configuration, visit http://go.microsoft.com/fwlink/?LinkID=237468 -->
<section name="entityFramework" type="System.Data.Entity.Internal.ConfigFile.EntityFrameworkSection, EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false"/>
<section name="entityFramework" type="System.Data.Entity.Internal.ConfigFile.EntityFrameworkSection, EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" />
</configSections>
<appSettings>
<add key="EntityRefreshSeconds" value="600"/>
<add key="EntityRefreshSeconds" value="600" />
</appSettings>
<runtime>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly>
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-11.0.0.0" newVersion="11.0.0.0"/>
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-11.0.0.0" newVersion="11.0.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="IKVM.Runtime" publicKeyToken="13235d27fcbfff58" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-7.2.4630.5" newVersion="7.2.4630.5"/>
<assemblyIdentity name="IKVM.Runtime" publicKeyToken="13235d27fcbfff58" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-7.2.4630.5" newVersion="7.2.4630.5" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="IKVM.OpenJDK.Core" publicKeyToken="13235d27fcbfff58" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-7.2.4630.5" newVersion="7.2.4630.5"/>
<assemblyIdentity name="IKVM.OpenJDK.Core" publicKeyToken="13235d27fcbfff58" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-7.2.4630.5" newVersion="7.2.4630.5" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="IKVM.OpenJDK.Util" publicKeyToken="13235d27fcbfff58" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-7.2.4630.5" newVersion="7.2.4630.5"/>
<assemblyIdentity name="IKVM.OpenJDK.Util" publicKeyToken="13235d27fcbfff58" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-7.2.4630.5" newVersion="7.2.4630.5" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="IKVM.OpenJDK.Text" publicKeyToken="13235d27fcbfff58" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-7.2.4630.5" newVersion="7.2.4630.5"/>
<assemblyIdentity name="IKVM.OpenJDK.Text" publicKeyToken="13235d27fcbfff58" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-7.2.4630.5" newVersion="7.2.4630.5" />
</dependentAssembly>
</assemblyBinding>
</runtime>
<entityFramework>
<defaultConnectionFactory type="System.Data.Entity.Infrastructure.LocalDbConnectionFactory, EntityFramework">
<parameters>
<parameter value="mssqllocaldb"/>
<parameter value="mssqllocaldb" />
</parameters>
</defaultConnectionFactory>
<providers>
<provider invariantName="System.Data.SqlClient" type="System.Data.Entity.SqlServer.SqlProviderServices, EntityFramework.SqlServer"/>
<provider invariantName="System.Data.SqlClient" type="System.Data.Entity.SqlServer.SqlProviderServices, EntityFramework.SqlServer" />
</providers>
</entityFramework>
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1"/></startup></configuration>
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" /></startup></configuration>
This source diff could not be displayed because it is too large. You can view the blob instead.
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<configSections>
<!-- For more information on Entity Framework configuration, visit http://go.microsoft.com/fwlink/?LinkID=237468 -->
<section name="entityFramework" type="System.Data.Entity.Internal.ConfigFile.EntityFrameworkSection, EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false"/>
<section name="entityFramework" type="System.Data.Entity.Internal.ConfigFile.EntityFrameworkSection, EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" />
</configSections>
<appSettings>
<add key="EntityRefreshSeconds" value="600"/>
<add key="EntityRefreshSeconds" value="600" />
</appSettings>
<runtime>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly>
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-11.0.0.0" newVersion="11.0.0.0"/>
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-11.0.0.0" newVersion="11.0.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="IKVM.Runtime" publicKeyToken="13235d27fcbfff58" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-7.2.4630.5" newVersion="7.2.4630.5"/>
<assemblyIdentity name="IKVM.Runtime" publicKeyToken="13235d27fcbfff58" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-7.2.4630.5" newVersion="7.2.4630.5" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="IKVM.OpenJDK.Core" publicKeyToken="13235d27fcbfff58" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-7.2.4630.5" newVersion="7.2.4630.5"/>
<assemblyIdentity name="IKVM.OpenJDK.Core" publicKeyToken="13235d27fcbfff58" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-7.2.4630.5" newVersion="7.2.4630.5" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="IKVM.OpenJDK.Util" publicKeyToken="13235d27fcbfff58" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-7.2.4630.5" newVersion="7.2.4630.5"/>
<assemblyIdentity name="IKVM.OpenJDK.Util" publicKeyToken="13235d27fcbfff58" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-7.2.4630.5" newVersion="7.2.4630.5" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="IKVM.OpenJDK.Text" publicKeyToken="13235d27fcbfff58" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-7.2.4630.5" newVersion="7.2.4630.5"/>
<assemblyIdentity name="IKVM.OpenJDK.Text" publicKeyToken="13235d27fcbfff58" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-7.2.4630.5" newVersion="7.2.4630.5" />
</dependentAssembly>
</assemblyBinding>
</runtime>
<entityFramework>
<defaultConnectionFactory type="System.Data.Entity.Infrastructure.LocalDbConnectionFactory, EntityFramework">
<parameters>
<parameter value="mssqllocaldb"/>
<parameter value="mssqllocaldb" />
</parameters>
</defaultConnectionFactory>
<providers>
<provider invariantName="System.Data.SqlClient" type="System.Data.Entity.SqlServer.SqlProviderServices, EntityFramework.SqlServer"/>
<provider invariantName="System.Data.SqlClient" type="System.Data.Entity.SqlServer.SqlProviderServices, EntityFramework.SqlServer" />
</providers>
</entityFramework>
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1"/></startup></configuration>
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" /></startup></configuration>
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
48864c01262328df7e592ed906ead3990a163517
a77055341682cf980c8a4654bf0ccd294a2cbe0d
48864c01262328df7e592ed906ead3990a163517
a77055341682cf980c8a4654bf0ccd294a2cbe0d
D:\smallproject\10.Paul需求-JSON贝格ES导入本地ES\ImportLocalES\HTCommon\bin\Debug\HTCommon.dll.config
D:\smallproject\10.Paul需求-JSON贝格ES导入本地ES\ImportLocalES\HTCommon\bin\Debug\HTCommon.dll.config
......@@ -264,14 +264,17 @@ D:\网盘下载\MinderES\MinderES\HTCommon\obj\Debug\HTCommon.csproj.CoreCompile
D:\网盘下载\MinderES\MinderES\HTCommon\obj\Debug\HTCommon.dll
D:\网盘下载\MinderES\MinderES\HTCommon\obj\Debug\HTCommon.pdb
D:\smallproject\10.Paul需求-JSON贝格ES导入本地ES\MinderES\HTCommon\obj\Debug\HTCommon.csprojResolveAssemblyReference.cache
D:\smallproject\12.ES支持2-6多版本\TestUnit\HTCommon\bin\Debug\IKVM.OpenJDK.Nashorn.dll
D:\smallproject\12.ES支持2-6多版本\TestUnit\HTCommon\bin\Debug\NPOI.OpenXmlFormats.dll
D:\smallproject\12.ES支持2-6多版本\TestUnit\HTCommon\bin\Debug\NPOI.xml
D:\smallproject\12.ES支持2-6多版本\TestUnit\HTCommon\bin\Debug\IKVM.OpenJDK.Core.dll
D:\smallproject\12.ES支持2-6多版本\TestUnit\HTCommon\bin\Debug\IKVM.OpenJDK.XML.API.dll
D:\smallproject\12.ES支持2-6多版本\TestUnit\HTCommon\bin\Debug\IKVM.OpenJDK.XML.Transform.dll
D:\smallproject\12.ES支持2-6多版本\TestUnit\HTCommon\bin\Debug\Lucene.Net.dll
D:\smallproject\12.ES支持2-6多版本\TestUnit\HTCommon\obj\Debug\HTCommon.csproj.CoreCompileInputs.cache
D:\smallproject\12.ES支持2-6多版本\TestUnit\HTCommon\obj\Debug\HTCommon.dll
D:\smallproject\12.ES支持2-6多版本\TestUnit\HTCommon\obj\Debug\HTCommon.pdb
D:\smallproject\12.ES支持2-6多版本\TestUnit\HTCommon\bin\Debug\HTCommon.dll.config
D:\smallproject\12.ES支持2-6多版本\TestUnit\HTCommon\bin\Debug\HTCommon.dll
D:\smallproject\12.ES支持2-6多版本\TestUnit\HTCommon\bin\Debug\HTCommon.pdb
D:\smallproject\12.ES支持2-6多版本\TestUnit\HTCommon\bin\Debug\Elasticsearch.Net.dll
D:\smallproject\12.ES支持2-6多版本\TestUnit\HTCommon\bin\Debug\Elasticsearch.Net2_5_8.dll
D:\smallproject\12.ES支持2-6多版本\TestUnit\HTCommon\bin\Debug\EntityFramework.dll
D:\smallproject\12.ES支持2-6多版本\TestUnit\HTCommon\bin\Debug\EntityFramework.SqlServer.dll
D:\smallproject\12.ES支持2-6多版本\TestUnit\HTCommon\bin\Debug\hanlp-1.3.1.dll
......@@ -289,35 +292,33 @@ D:\smallproject\12.ES支持2-6多版本\TestUnit\HTCommon\bin\Debug\IKVM.OpenJDK
D:\smallproject\12.ES支持2-6多版本\TestUnit\HTCommon\bin\Debug\IKVM.OpenJDK.Charsets.dll
D:\smallproject\12.ES支持2-6多版本\TestUnit\HTCommon\bin\Debug\IKVM.OpenJDK.Cldrdata.dll
D:\smallproject\12.ES支持2-6多版本\TestUnit\HTCommon\bin\Debug\IKVM.OpenJDK.Corba.dll
D:\smallproject\12.ES支持2-6多版本\TestUnit\HTCommon\bin\Debug\IKVM.OpenJDK.Core.dll
D:\smallproject\12.ES支持2-6多版本\TestUnit\HTCommon\bin\Debug\IKVM.OpenJDK.Jdbc.dll
D:\smallproject\12.ES支持2-6多版本\TestUnit\HTCommon\bin\Debug\IKVM.OpenJDK.Localedata.dll
D:\smallproject\12.ES支持2-6多版本\TestUnit\HTCommon\bin\Debug\IKVM.OpenJDK.Management.dll
D:\smallproject\12.ES支持2-6多版本\TestUnit\HTCommon\bin\Debug\IKVM.OpenJDK.Media.dll
D:\smallproject\12.ES支持2-6多版本\TestUnit\HTCommon\bin\Debug\IKVM.OpenJDK.Misc.dll
D:\smallproject\12.ES支持2-6多版本\TestUnit\HTCommon\bin\Debug\IKVM.OpenJDK.Naming.dll
D:\smallproject\12.ES支持2-6多版本\TestUnit\HTCommon\bin\Debug\IKVM.OpenJDK.Nashorn.dll
D:\smallproject\12.ES支持2-6多版本\TestUnit\HTCommon\bin\Debug\IKVM.OpenJDK.Remoting.dll
D:\smallproject\12.ES支持2-6多版本\TestUnit\HTCommon\bin\Debug\IKVM.OpenJDK.Security.dll
D:\smallproject\12.ES支持2-6多版本\TestUnit\HTCommon\bin\Debug\IKVM.OpenJDK.SwingAWT.dll
D:\smallproject\12.ES支持2-6多版本\TestUnit\HTCommon\bin\Debug\IKVM.OpenJDK.Text.dll
D:\smallproject\12.ES支持2-6多版本\TestUnit\HTCommon\bin\Debug\IKVM.OpenJDK.Tools.dll
D:\smallproject\12.ES支持2-6多版本\TestUnit\HTCommon\bin\Debug\IKVM.OpenJDK.Util.dll
D:\smallproject\12.ES支持2-6多版本\TestUnit\HTCommon\bin\Debug\IKVM.OpenJDK.XML.API.dll
D:\smallproject\12.ES支持2-6多版本\TestUnit\HTCommon\bin\Debug\IKVM.OpenJDK.XML.Bind.dll
D:\smallproject\12.ES支持2-6多版本\TestUnit\HTCommon\bin\Debug\IKVM.OpenJDK.XML.Crypto.dll
D:\smallproject\12.ES支持2-6多版本\TestUnit\HTCommon\bin\Debug\IKVM.OpenJDK.XML.Parse.dll
D:\smallproject\12.ES支持2-6多版本\TestUnit\HTCommon\bin\Debug\IKVM.OpenJDK.XML.Transform.dll
D:\smallproject\12.ES支持2-6多版本\TestUnit\HTCommon\bin\Debug\IKVM.OpenJDK.XML.WebServices.dll
D:\smallproject\12.ES支持2-6多版本\TestUnit\HTCommon\bin\Debug\IKVM.OpenJDK.XML.XPath.dll
D:\smallproject\12.ES支持2-6多版本\TestUnit\HTCommon\bin\Debug\IKVM.Runtime.dll
D:\smallproject\12.ES支持2-6多版本\TestUnit\HTCommon\bin\Debug\IKVM.Runtime.JNI.dll
D:\smallproject\12.ES支持2-6多版本\TestUnit\HTCommon\bin\Debug\MongoDB.Bson.dll
D:\smallproject\12.ES支持2-6多版本\TestUnit\HTCommon\bin\Debug\Nest.dll
D:\smallproject\12.ES支持2-6多版本\TestUnit\HTCommon\bin\Debug\Nest2_5_8.dll
D:\smallproject\12.ES支持2-6多版本\TestUnit\HTCommon\bin\Debug\Newtonsoft.Json.dll
D:\smallproject\12.ES支持2-6多版本\TestUnit\HTCommon\bin\Debug\NPOI.dll
D:\smallproject\12.ES支持2-6多版本\TestUnit\HTCommon\bin\Debug\NPOI.OOXML.dll
D:\smallproject\12.ES支持2-6多版本\TestUnit\HTCommon\bin\Debug\NPOI.OpenXml4Net.dll
D:\smallproject\12.ES支持2-6多版本\TestUnit\HTCommon\bin\Debug\NPOI.OpenXmlFormats.dll
D:\smallproject\12.ES支持2-6多版本\TestUnit\HTCommon\bin\Debug\NPOI.ScratchPad.HWPF.dll
D:\smallproject\12.ES支持2-6多版本\TestUnit\HTCommon\bin\Debug\pdfbox-app-2.0.7.dll
D:\smallproject\12.ES支持2-6多版本\TestUnit\HTCommon\bin\Debug\ServiceStack.Common.dll
......@@ -328,24 +329,16 @@ D:\smallproject\12.ES支持2-6多版本\TestUnit\HTCommon\bin\Debug\ServiceStack
D:\smallproject\12.ES支持2-6多版本\TestUnit\HTCommon\bin\Debug\ServiceStack.Redis.dll
D:\smallproject\12.ES支持2-6多版本\TestUnit\HTCommon\bin\Debug\ServiceStack.ServiceInterface.dll
D:\smallproject\12.ES支持2-6多版本\TestUnit\HTCommon\bin\Debug\ServiceStack.Text.dll
D:\smallproject\12.ES支持2-6多版本\TestUnit\HTCommon\bin\Debug\Lucene.Net.dll
D:\smallproject\12.ES支持2-6多版本\TestUnit\HTCommon\bin\Debug\Elasticsearch.Net.pdb
D:\smallproject\12.ES支持2-6多版本\TestUnit\HTCommon\bin\Debug\Elasticsearch.Net.xml
D:\smallproject\12.ES支持2-6多版本\TestUnit\HTCommon\bin\Debug\Elasticsearch.Net2_5_8.xml
D:\smallproject\12.ES支持2-6多版本\TestUnit\HTCommon\bin\Debug\EntityFramework.xml
D:\smallproject\12.ES支持2-6多版本\TestUnit\HTCommon\bin\Debug\EntityFramework.SqlServer.xml
D:\smallproject\12.ES支持2-6多版本\TestUnit\HTCommon\bin\Debug\HtmlAgilityPack.pdb
D:\smallproject\12.ES支持2-6多版本\TestUnit\HTCommon\bin\Debug\HtmlAgilityPack.xml
D:\smallproject\12.ES支持2-6多版本\TestUnit\HTCommon\bin\Debug\Nest.pdb
D:\smallproject\12.ES支持2-6多版本\TestUnit\HTCommon\bin\Debug\Nest.xml
D:\smallproject\12.ES支持2-6多版本\TestUnit\HTCommon\bin\Debug\Nest2_5_8.xml
D:\smallproject\12.ES支持2-6多版本\TestUnit\HTCommon\bin\Debug\Newtonsoft.Json.xml
D:\smallproject\12.ES支持2-6多版本\TestUnit\HTCommon\bin\Debug\NPOI.xml
D:\smallproject\12.ES支持2-6多版本\TestUnit\HTCommon\bin\Debug\ServiceStack.Common.xml
D:\smallproject\12.ES支持2-6多版本\TestUnit\HTCommon\bin\Debug\ServiceStack.Text.xml
D:\smallproject\12.ES支持2-6多版本\TestUnit\HTCommon\bin\Debug\zh-Hans\EntityFramework.resources.dll
D:\smallproject\12.ES支持2-6多版本\TestUnit\HTCommon\bin\Debug\zh-Hans\EntityFramework.SqlServer.resources.dll
D:\smallproject\12.ES支持2-6多版本\TestUnit\HTCommon\obj\Debug\HTCommon.csprojAssemblyReference.cache
D:\smallproject\12.ES支持2-6多版本\TestUnit\HTCommon\obj\Debug\HTCommon.csproj.CoreCompileInputs.cache
D:\smallproject\12.ES支持2-6多版本\TestUnit\HTCommon\obj\Debug\HTCommon.csproj.CopyComplete
D:\smallproject\12.ES支持2-6多版本\TestUnit\HTCommon\obj\Debug\HTCommon.dll
D:\smallproject\12.ES支持2-6多版本\TestUnit\HTCommon\obj\Debug\HTCommon.pdb
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Elasticsearch.Net" version="6.1.0" targetFramework="net461" />
<package id="EntityFramework" version="6.1.3" targetFramework="net452" />
<package id="HtmlAgilityPack" version="1.8.0" targetFramework="net452" />
<package id="IKVM" version="8.1.5717.0" targetFramework="net452" />
<package id="NEST" version="6.1.0" targetFramework="net461" />
<package id="Newtonsoft.Json" version="11.0.1" targetFramework="net452" />
<package id="NPOI" version="2.3.0" targetFramework="net452" />
<package id="NPOI.HWPF" version="2.3.0" targetFramework="net452" />
......
<?xml version="1.0" encoding="utf-8" ?>
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8" ?>
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<startup>
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" />
......@@ -18,4 +18,19 @@
</connectionStrings>
<runtime>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly>
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-11.0.0.0" newVersion="11.0.0.0" />
</dependentAssembly>
</assemblyBinding>
</runtime>
</configuration>
\ No newline at end of file


......@@ -70,7 +70,7 @@ namespace TestES6_2.ES6
{
bool isOk = false;
isOk = DeleteByID(item.ItemID, index);
isOk = isOk && IndexOrUpdate(item, index);
isOk = isOk && IndexOrUpdate(item,"", index);
return isOk;
}
......@@ -81,7 +81,7 @@ namespace TestES6_2.ES6
[Obsolete("使用ESAccess.IndexOrUpdate代替")]
public static bool IndexOrUpdateItem(Item value, string index = null)
{
return IndexOrUpdate(value, index);
return IndexOrUpdate(value,"", index);
}
/// <summary>
......@@ -193,7 +193,7 @@ namespace TestES6_2.ES6
var isItem = typeof(T) == typeof(Item);
if (isItem)
{
Parallel.ForEach(array, obj => IndexOrUpdate(obj,index));
Parallel.ForEach(array, obj => IndexOrUpdate(obj,"",index));
}
else
......@@ -250,7 +250,14 @@ namespace TestES6_2.ES6
if (LimitTime.isLimit())
{
ElasticClient client2 = new ElasticClient(ESClientConfigureManager2.ConnectSetting);
client2.Bulk(Descriptor);
var Descriptor2 = new BulkDescriptor();
foreach (var Product in array)
{
Descriptor2.Index<T>(op => op.Document(Product));
}
client2.Bulk(Descriptor2);
}
}
catch (Exception ex)
......
using Nest;
using Nest;
......@@ -89,7 +89,7 @@ namespace TestES6_2
[Obsolete("使用ESAccess.IndexOrUpdate代替")]
public static Boolean IndexOrUpdate(Author result, string index = null)
{
return ESAccess.IndexOrUpdate(result, index);
return ESAccess.IndexOrUpdate(result,"", index);
}
public static String SearchAuthorTag(String resultID, string index = null)
......@@ -154,7 +154,7 @@ namespace TestES6_2
else
{
relation.CreateTime = relation.UpdateTime;
return ESAccess.IndexOrUpdate(relation, index);
return ESAccess.IndexOrUpdate(relation,"", index);
}
}
......

 有以下2种使用情况:

\ No newline at end of file
 有以下2种使用情况:
1:ES版本2,配置version=2(配置defaultindex、不允许非defaultindex的操作)
<add name="ESDatabase" connectionString="host=127.0.0.1|localhost;port=9200;defaultindex=test;requesttimeout=0:1:00;version=2;" />
2.ES是版本6,配置version=6.type加前缀indexprefix,(2.1支持index默认拼接(前缀+type)、2.2同时支持 指定index参数)
<add name="ESDatabase" connectionString="host=minder;port=9200;requesttimeout=0:1:00;version=6;indexprefix=test_;" />
注意版本6是可以 跨版本2.6.
说明:之所以保留ES2,是为了兼容旧的调用代码,(1.旧的没有指定index参数。2.可能旧代码上手写了index)。
与当前ES6中 参数为空 自动拼接的规则 相抵触。 所以干脆以版本区分功能。 对应更加方便。
3:(慎用:特殊情况:当NEST6指向了ES2时,希望调用非defaultindex)
代码使用时指定index名称(全名)。
ESAccess.Search(builder6, "other");
迁移时间之前:2018-07-15之前,所有的index,同时插入到ES2的默认defaultindex里面
This source diff could not be displayed because it is too large. You can view the blob instead.
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<configSections>
<!-- For more information on Entity Framework configuration, visit http://go.microsoft.com/fwlink/?LinkID=237468 -->
<section name="entityFramework" type="System.Data.Entity.Internal.ConfigFile.EntityFrameworkSection, EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false"/>
<section name="entityFramework" type="System.Data.Entity.Internal.ConfigFile.EntityFrameworkSection, EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" />
</configSections>
<appSettings>
<add key="EntityRefreshSeconds" value="600"/>
<add key="EntityRefreshSeconds" value="600" />
</appSettings>
<runtime>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly>
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-11.0.0.0" newVersion="11.0.0.0"/>
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-11.0.0.0" newVersion="11.0.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="IKVM.Runtime" publicKeyToken="13235d27fcbfff58" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-7.2.4630.5" newVersion="7.2.4630.5"/>
<assemblyIdentity name="IKVM.Runtime" publicKeyToken="13235d27fcbfff58" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-7.2.4630.5" newVersion="7.2.4630.5" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="IKVM.OpenJDK.Core" publicKeyToken="13235d27fcbfff58" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-7.2.4630.5" newVersion="7.2.4630.5"/>
<assemblyIdentity name="IKVM.OpenJDK.Core" publicKeyToken="13235d27fcbfff58" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-7.2.4630.5" newVersion="7.2.4630.5" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="IKVM.OpenJDK.Util" publicKeyToken="13235d27fcbfff58" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-7.2.4630.5" newVersion="7.2.4630.5"/>
<assemblyIdentity name="IKVM.OpenJDK.Util" publicKeyToken="13235d27fcbfff58" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-7.2.4630.5" newVersion="7.2.4630.5" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="IKVM.OpenJDK.Text" publicKeyToken="13235d27fcbfff58" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-7.2.4630.5" newVersion="7.2.4630.5"/>
<assemblyIdentity name="IKVM.OpenJDK.Text" publicKeyToken="13235d27fcbfff58" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-7.2.4630.5" newVersion="7.2.4630.5" />
</dependentAssembly>
</assemblyBinding>
</runtime>
<entityFramework>
<defaultConnectionFactory type="System.Data.Entity.Infrastructure.LocalDbConnectionFactory, EntityFramework">
<parameters>
<parameter value="mssqllocaldb"/>
<parameter value="mssqllocaldb" />
</parameters>
</defaultConnectionFactory>
<providers>
<provider invariantName="System.Data.SqlClient" type="System.Data.Entity.SqlServer.SqlProviderServices, EntityFramework.SqlServer"/>
<provider invariantName="System.Data.SqlClient" type="System.Data.Entity.SqlServer.SqlProviderServices, EntityFramework.SqlServer" />
</providers>
</entityFramework>
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1"/></startup></configuration>
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" /></startup></configuration>
This source diff could not be displayed because it is too large. You can view the blob instead.
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<startup>
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" />
</startup>
<startup>
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" />
</startup>
<connectionStrings>
<!--20187150点迁移完成前保留-->
<!--
<!--20187150点迁移完成前保留--><!--
<add name="2ESDatabase" connectionString="host=tank.palaspom.com|mech.palaspom.com;port=9200;defaultindex=test_version2;requesttimeout=0:1:00;version=2;" />-->
<add name="2ESDatabase" connectionString="host=127.0.0.1|localhost;port=9200;defaultindex=test;requesttimeout=0:1:00;version=2;" />
<!--(全部小写)6没有defaultindexIndex:palas前缀字符+“_”+type) -->
<add name="ESDatabase" connectionString="host=minder;port=9200;requesttimeout=0:1:00;version=6;indexprefix=palas_;" />
<add name="ESDatabase" connectionString="host=minder;port=9200;requesttimeout=0:1:00;version=6;indexprefix=palas_;" />
</connectionStrings>
<runtime>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly>
<assemblyIdentity name="Elasticsearch.Net" publicKeyToken="96c599bbe3e70f5d" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
</dependentAssembly>
</assemblyBinding>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly>
<assemblyIdentity name="Nest" publicKeyToken="96c599bbe3e70f5d" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
</dependentAssembly>
</assemblyBinding>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly>
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-11.0.0.0" newVersion="11.0.0.0" />
</dependentAssembly>
</assemblyBinding>
</runtime>
</configuration>
\ No newline at end of file
D:\smallproject\12.ES支持2-6多版本\TestUnit\TestUnit\TestES6-2\bin\Debug\TestES6-2.exe.config
D:\smallproject\12.ES支持2-6多版本\TestUnit\TestUnit\TestES6-2\bin\Debug\TestES6-2.exe.config
......@@ -12,7 +12,6 @@ D:\smallproject\12.ES支持2-6多版本\TestUnit\TestUnit\TestES6-2\bin\Debug\IK
D:\smallproject\12.ES支持2-6多版本\TestUnit\TestUnit\TestES6-2\bin\Debug\NPOI.OOXML.dll
D:\smallproject\12.ES支持2-6多版本\TestUnit\TestUnit\TestES6-2\bin\Debug\NPOI.ScratchPad.HWPF.dll
D:\smallproject\12.ES支持2-6多版本\TestUnit\TestUnit\TestES6-2\bin\Debug\HtmlAgilityPack.dll
D:\smallproject\12.ES支持2-6多版本\TestUnit\TestUnit\TestES6-2\bin\Debug\Nest2_5_8.dll
D:\smallproject\12.ES支持2-6多版本\TestUnit\TestUnit\TestES6-2\bin\Debug\HooLab.Runtime.dll
D:\smallproject\12.ES支持2-6多版本\TestUnit\TestUnit\TestES6-2\bin\Debug\IKVM.Runtime.dll
D:\smallproject\12.ES支持2-6多版本\TestUnit\TestUnit\TestES6-2\bin\Debug\IKVM.OpenJDK.Util.dll
......@@ -28,7 +27,6 @@ D:\smallproject\12.ES支持2-6多版本\TestUnit\TestUnit\TestES6-2\bin\Debug\NP
D:\smallproject\12.ES支持2-6多版本\TestUnit\TestUnit\TestES6-2\bin\Debug\NPOI.OpenXmlFormats.dll
D:\smallproject\12.ES支持2-6多版本\TestUnit\TestUnit\TestES6-2\bin\Debug\NPOI.OpenXml4Net.dll
D:\smallproject\12.ES支持2-6多版本\TestUnit\TestUnit\TestES6-2\bin\Debug\ICSharpCode.SharpZipLib.dll
D:\smallproject\12.ES支持2-6多版本\TestUnit\TestUnit\TestES6-2\bin\Debug\Elasticsearch.Net2_5_8.dll
D:\smallproject\12.ES支持2-6多版本\TestUnit\TestUnit\TestES6-2\bin\Debug\IKVM.Runtime.JNI.dll
D:\smallproject\12.ES支持2-6多版本\TestUnit\TestUnit\TestES6-2\bin\Debug\IKVM.OpenJDK.Management.dll
D:\smallproject\12.ES支持2-6多版本\TestUnit\TestUnit\TestES6-2\bin\Debug\IKVM.AWT.WinForms.dll
......@@ -42,10 +40,8 @@ D:\smallproject\12.ES支持2-6多版本\TestUnit\TestUnit\TestES6-2\bin\Debug\Ne
D:\smallproject\12.ES支持2-6多版本\TestUnit\TestUnit\TestES6-2\bin\Debug\Newtonsoft.Json.xml
D:\smallproject\12.ES支持2-6多版本\TestUnit\TestUnit\TestES6-2\bin\Debug\HtmlAgilityPack.pdb
D:\smallproject\12.ES支持2-6多版本\TestUnit\TestUnit\TestES6-2\bin\Debug\HtmlAgilityPack.xml
D:\smallproject\12.ES支持2-6多版本\TestUnit\TestUnit\TestES6-2\bin\Debug\Nest2_5_8.xml
D:\smallproject\12.ES支持2-6多版本\TestUnit\TestUnit\TestES6-2\bin\Debug\NPOI.xml
D:\smallproject\12.ES支持2-6多版本\TestUnit\TestUnit\TestES6-2\bin\Debug\Elasticsearch.Net2_5_8.xml
D:\smallproject\12.ES支持2-6多版本\TestUnit\TestUnit\TestES6-2\obj\Debug\TestES6-2.exe.config
D:\smallproject\12.ES支持2-6多版本\TestUnit\TestUnit\TestES6-2\obj\Debug\TestES6-2.csprojAssemblyReference.cache
D:\smallproject\12.ES支持2-6多版本\TestUnit\TestUnit\TestES6-2\obj\Debug\TestES6-2.csproj.CoreCompileInputs.cache
D:\smallproject\12.ES支持2-6多版本\TestUnit\TestUnit\TestES6-2\obj\Debug\TestES6-2.csproj.CopyComplete
D:\smallproject\12.ES支持2-6多版本\TestUnit\TestUnit\TestES6-2\obj\Debug\TestES6-2.exe
......


......@@ -146,12 +146,12 @@ Global
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(NestedProjects) = preSolution
{A1ECE553-F7F3-4E6A-AD8B-E1E88D2445CC} = {D6483C25-7140-45A8-9C92-9732997D14EB}
{B4E898CD-73D9-4B8B-B7C4-650851B33BF7} = {D6483C25-7140-45A8-9C92-9732997D14EB}
{17B93E80-9267-4F75-8423-63E5291A3A8F} = {D6483C25-7140-45A8-9C92-9732997D14EB}
{B3B09BBA-6F8E-4D12-BDCC-36BD847C730E} = {D6483C25-7140-45A8-9C92-9732997D14EB}
{4E2ECE6B-5527-4BCB-819C-5387FED6DAC3} = {D6483C25-7140-45A8-9C92-9732997D14EB}
{3FF2A03B-8F84-41C9-9888-2923FEB814D0} = {D6483C25-7140-45A8-9C92-9732997D14EB}
{CCBB6A99-9FB1-441C-AE3B-B406A2A26DD9} = {D6483C25-7140-45A8-9C92-9732997D14EB}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {DED7A8C5-FA88-49D7-B047-A0B18BB7D103}
......
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
......@@ -4,25 +4,41 @@
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" />
</startup>
<connectionStrings>
<!--必选:20187150点迁移完成前保留-->
<add name="2ESDatabase" connectionString="host=127.0.0.1|localhost;port=9200;defaultindex=test;requesttimeout=0:1:00;version=2;" />
<!--<add name="2localESDatabase" connectionString="host=127.0.0.1;port=9200;defaultIndex=test_version2;requesttimeout=30000" />-->
<!--必选:(全部小写)6没有defaultindexIndex:palas前缀字符+“_”+type) -->
<add name="ESDatabase" connectionString="host=minder;port=9200;requesttimeout=0:1:00;version=6;indexprefix=test_;" />
<!--<add name="ESDatabase" connectionString="host=127.0.0.1|localhost;port=9200;defaultindex=test;requesttimeout=0:1:00;version=2;" />-->
</connectionStrings>
<!--<connectionStrings>
--><!--<add name="2localESDatabase" connectionString="host=127.0.0.1;port=9200;defaultIndex=test_version2;requesttimeout=30000" />--><!--
<!--<add name="2localESDatabase" connectionString="host=minder;port=9200;defaultIndex=test_version6;requesttimeout=30000" />-->
--><!--<add name="2localESDatabase" connectionString="host=minder;port=9200;defaultIndex=test_version6;requesttimeout=30000" />--><!--
<add name="6MinderESDatabase" connectionString="host=minder;port=9200;defaultIndex=test_version6;requesttimeout=30000" />
<!--<add name="6MinderESDatabase" connectionString="host=127.0.0.1;port=9200;defaultIndex=test_version2;requesttimeout=30000" />-->
--><!--<add name="6MinderESDatabase" connectionString="host=127.0.0.1;port=9200;defaultIndex=test_version2;requesttimeout=30000" />--><!--
</connectionStrings>
</connectionStrings>-->
<runtime>
......@@ -46,6 +62,9 @@
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-11.0.0.0" newVersion="11.0.0.0" />
</dependentAssembly>
......
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
......@@ -38,22 +38,45 @@
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
<Reference Include="Elasticsearch.Net, Version=6.0.0.0, Culture=neutral, PublicKeyToken=96c599bbe3e70f5d, processorArchitecture=MSIL">
<HintPath>..\packages\Elasticsearch.Net.6.1.0\lib\net46\Elasticsearch.Net.dll</HintPath>
</Reference>
<Reference Include="Microsoft.VisualStudio.TestPlatform.TestFramework, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\MSTest.TestFramework.1.2.1\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>..\packages\MSTest.TestFramework.1.2.1\lib\net45\Microsoft.VisualStudio.TestPlatform.TestFramework.Extensions.dll</HintPath>
</Reference>
<Reference Include="Nest, Version=6.0.0.0, Culture=neutral, PublicKeyToken=96c599bbe3e70f5d, processorArchitecture=MSIL">
<HintPath>..\packages\NEST.6.1.0\lib\net46\Nest.dll</HintPath>
</Reference>
<Reference Include="Newtonsoft.Json, Version=11.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<HintPath>..\packages\Newtonsoft.Json.11.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Core" />
</ItemGroup>
<ItemGroup>
<Compile Include="UnitTest1.cs" />
<Compile Include="ES6.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="UnitTestES6-2.cs" />
</ItemGroup>
<ItemGroup>
<None Include="App.config">
<SubType>Designer</SubType>
</None>
<None Include="packages.config" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\HTCommon\HTCommon.csproj">
<Project>{e497051e-61e1-4247-93d3-7929a8c8b7f6}</Project>
<Name>HTCommon</Name>
</ProjectReference>
<ProjectReference Include="..\TestES6-2\TestES6-2.csproj">
<Project>{107f4379-d24e-47d6-b4bf-00d49f8f49b7}</Project>
<Name>TestES6-2</Name>
</ProjectReference>
</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">
......
using System;
++ /dev/null
using System;
using Microsoft.VisualStudio.TestTools.UnitTesting;
namespace TestUnit
{
[TestClass]
public class UnitTest1
{
[TestMethod]
public void TestMethod1()
{
}
}
}
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<configSections>
<!-- For more information on Entity Framework configuration, visit http://go.microsoft.com/fwlink/?LinkID=237468 -->
<section name="entityFramework" type="System.Data.Entity.Internal.ConfigFile.EntityFrameworkSection, EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false"/>
<section name="entityFramework" type="System.Data.Entity.Internal.ConfigFile.EntityFrameworkSection, EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" />
</configSections>
<appSettings>
<add key="EntityRefreshSeconds" value="600"/>
<add key="EntityRefreshSeconds" value="600" />
</appSettings>
<runtime>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly>
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-11.0.0.0" newVersion="11.0.0.0"/>
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-11.0.0.0" newVersion="11.0.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="IKVM.Runtime" publicKeyToken="13235d27fcbfff58" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-7.2.4630.5" newVersion="7.2.4630.5"/>
<assemblyIdentity name="IKVM.Runtime" publicKeyToken="13235d27fcbfff58" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-7.2.4630.5" newVersion="7.2.4630.5" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="IKVM.OpenJDK.Core" publicKeyToken="13235d27fcbfff58" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-7.2.4630.5" newVersion="7.2.4630.5"/>
<assemblyIdentity name="IKVM.OpenJDK.Core" publicKeyToken="13235d27fcbfff58" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-7.2.4630.5" newVersion="7.2.4630.5" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="IKVM.OpenJDK.Util" publicKeyToken="13235d27fcbfff58" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-7.2.4630.5" newVersion="7.2.4630.5"/>
<assemblyIdentity name="IKVM.OpenJDK.Util" publicKeyToken="13235d27fcbfff58" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-7.2.4630.5" newVersion="7.2.4630.5" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="IKVM.OpenJDK.Text" publicKeyToken="13235d27fcbfff58" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-7.2.4630.5" newVersion="7.2.4630.5"/>
<assemblyIdentity name="IKVM.OpenJDK.Text" publicKeyToken="13235d27fcbfff58" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-7.2.4630.5" newVersion="7.2.4630.5" />
</dependentAssembly>
</assemblyBinding>
</runtime>
<entityFramework>
<defaultConnectionFactory type="System.Data.Entity.Infrastructure.LocalDbConnectionFactory, EntityFramework">
<parameters>
<parameter value="mssqllocaldb"/>
<parameter value="mssqllocaldb" />
</parameters>
</defaultConnectionFactory>
<providers>
<provider invariantName="System.Data.SqlClient" type="System.Data.Entity.SqlServer.SqlProviderServices, EntityFramework.SqlServer"/>
<provider invariantName="System.Data.SqlClient" type="System.Data.Entity.SqlServer.SqlProviderServices, EntityFramework.SqlServer" />
</providers>
</entityFramework>
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1"/></startup></configuration>
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" /></startup></configuration>
[2018/6/12 17:07:35][][][TestES6-2.exe][TestES6_2.ES6.ESAccess][Index][@]ES Index Error:System.IO.FileLoadException: 未能加载文件或程序集“Nest, Version=0.0.0.0, Culture=neutral, PublicKeyToken=96c599bbe3e70f5d”或它的某一个依赖项。找到的程序集清单定义与程序集引用不匹配。 (异常来自 HRESULT:0x80131040)
[2018/6/12 17:07:35][][][TestES6-2.exe][TestES6_2.ES6.ESAccess][Index][@]ES Index Error:System.IO.FileLoadException: 未能加载文件或程序集“Nest, Version=0.0.0.0, Culture=neutral, PublicKeyToken=96c599bbe3e70f5d”或它的某一个依赖项。找到的程序集清单定义与程序集引用不匹配。 (异常来自 HRESULT:0x80131040)
文件名:“Nest, Version=0.0.0.0, Culture=neutral, PublicKeyToken=96c599bbe3e70f5d”
在 System.ModuleHandle.ResolveType(RuntimeModule module, Int32 typeToken, IntPtr* typeInstArgs, Int32 typeInstCount, IntPtr* methodInstArgs, Int32 methodInstCount, ObjectHandleOnStack type)
在 System.ModuleHandle.ResolveTypeHandleInternal(RuntimeModule module, Int32 typeToken, RuntimeTypeHandle[] typeInstantiationContext, RuntimeTypeHandle[] methodInstantiationContext)
在 System.Reflection.RuntimeModule.ResolveType(Int32 metadataToken, Type[] genericTypeArguments, Type[] genericMethodArguments)
在 System.Reflection.CustomAttribute.FilterCustomAttributeRecord(CustomAttributeRecord caRecord, MetadataImport scope, Assembly& lastAptcaOkAssembly, RuntimeModule decoratedModule, MetadataToken decoratedToken, RuntimeType attributeFilterType, Boolean mustBeInheritable, Object[] attributes, IList derivedAttributes, RuntimeType& attributeType, IRuntimeMethodInfo& ctor, Boolean& ctorHasParameters, Boolean& isVarArg)
在 System.Reflection.CustomAttribute.GetCustomAttributes(RuntimeModule decoratedModule, Int32 decoratedMetadataToken, Int32 pcaCount, RuntimeType attributeFilterType, Boolean mustBeInheritable, IList derivedAttributes, Boolean isDecoratedTargetSecurityTransparent)
在 System.Reflection.CustomAttribute.GetCustomAttributes(RuntimeType type, RuntimeType caType, Boolean inherit)
在 System.RuntimeType.GetCustomAttributes(Type attributeType, Boolean inherit)
在 TestES6_2.ES6.ESAccess.From(Type type) 位置 D:\smallproject\12.ES支持2-6多版本\TestUnit\TestUnit\TestES6-2\ES6\ESAccess.cs:行号 683
在 TestES6_2.ES6.ESAccess.Index[T](T value, Int64 version, String id, String index) 位置 D:\smallproject\12.ES支持2-6多版本\TestUnit\TestUnit\TestES6-2\ES6\ESAccess.cs:行号 310
=== 预绑定状态信息 ===
日志: DisplayName = Nest, Version=0.0.0.0, Culture=neutral, PublicKeyToken=96c599bbe3e70f5d
(Fully-specified)
日志: Appbase = file:///D:/smallproject/12.ES支持2-6多版本/TestUnit/TestUnit/TestUnit/bin/Debug
日志: 初始 PrivatePath = NULL
调用程序集: HTCommon, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null。
===
日志: 此绑定从 default 加载上下文开始。
日志: 正在使用应用程序配置文件: D:\smallproject\12.ES支持2-6多版本\TestUnit\TestUnit\TestUnit\bin\Debug\TestUnit.dll.config
日志: 使用主机配置文件:
日志: 使用 C:\Windows\Microsoft.NET\Framework\v4.0.30319\config\machine.config 的计算机配置文件。
日志: 策略后引用: Nest, Version=0.0.0.0, Culture=neutral, PublicKeyToken=96c599bbe3e70f5d
日志: 尝试下载新的 URL file:///D:/smallproject/12.ES支持2-6多版本/TestUnit/TestUnit/TestUnit/bin/Debug/Nest.DLL。
警告: 比较程序集名称时发生不匹配: 主版本
错误: 未能完成程序集的安装(hr = 0x80131040)。探测终止。
,value:[ItemID:test1 Url:test],StackTrace: 在 System.ModuleHandle.ResolveType(RuntimeModule module, Int32 typeToken, IntPtr* typeInstArgs, Int32 typeInstCount, IntPtr* methodInstArgs, Int32 methodInstCount, ObjectHandleOnStack type)
在 System.ModuleHandle.ResolveTypeHandleInternal(RuntimeModule module, Int32 typeToken, RuntimeTypeHandle[] typeInstantiationContext, RuntimeTypeHandle[] methodInstantiationContext)
在 System.Reflection.RuntimeModule.ResolveType(Int32 metadataToken, Type[] genericTypeArguments, Type[] genericMethodArguments)
在 System.Reflection.CustomAttribute.FilterCustomAttributeRecord(CustomAttributeRecord caRecord, MetadataImport scope, Assembly& lastAptcaOkAssembly, RuntimeModule decoratedModule, MetadataToken decoratedToken, RuntimeType attributeFilterType, Boolean mustBeInheritable, Object[] attributes, IList derivedAttributes, RuntimeType& attributeType, IRuntimeMethodInfo& ctor, Boolean& ctorHasParameters, Boolean& isVarArg)
在 System.Reflection.CustomAttribute.GetCustomAttributes(RuntimeModule decoratedModule, Int32 decoratedMetadataToken, Int32 pcaCount, RuntimeType attributeFilterType, Boolean mustBeInheritable, IList derivedAttributes, Boolean isDecoratedTargetSecurityTransparent)
在 System.Reflection.CustomAttribute.GetCustomAttributes(RuntimeType type, RuntimeType caType, Boolean inherit)
在 System.RuntimeType.GetCustomAttributes(Type attributeType, Boolean inherit)
在 TestES6_2.ES6.ESAccess.From(Type type) 位置 D:\smallproject\12.ES支持2-6多版本\TestUnit\TestUnit\TestES6-2\ES6\ESAccess.cs:行号 683
在 TestES6_2.ES6.ESAccess.Index[T](T value, Int64 version, String id, String index) 位置 D:\smallproject\12.ES支持2-6多版本\TestUnit\TestUnit\TestES6-2\ES6\ESAccess.cs:行号 310
This source diff could not be displayed because it is too large. You can view the blob instead.
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<startup>
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" />
</startup>
<startup>
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" />
</startup>
<connectionStrings>
<!--20187150点迁移完成前保留-->
<!--
<!--20187150点迁移完成前保留--><!--
<add name="2ESDatabase" connectionString="host=tank.palaspom.com|mech.palaspom.com;port=9200;defaultindex=test_version2;requesttimeout=0:1:00;version=2;" />-->
<add name="2ESDatabase" connectionString="host=127.0.0.1|localhost;port=9200;defaultindex=test;requesttimeout=0:1:00;version=2;" />
<!--(全部小写)6没有defaultindexIndex:palas前缀字符+“_”+type) -->
<add name="ESDatabase" connectionString="host=minder;port=9200;requesttimeout=0:1:00;version=6;indexprefix=palas_;" />
<add name="ESDatabase" connectionString="host=minder;port=9200;requesttimeout=0:1:00;version=6;indexprefix=palas_;" />
</connectionStrings>
<runtime>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly>
<assemblyIdentity name="Elasticsearch.Net" publicKeyToken="96c599bbe3e70f5d" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
</dependentAssembly>
</assemblyBinding>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly>
<assemblyIdentity name="Nest" publicKeyToken="96c599bbe3e70f5d" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
</dependentAssembly>
</assemblyBinding>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly>
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-11.0.0.0" newVersion="11.0.0.0" />
</dependentAssembly>
</assemblyBinding>
</runtime>
</configuration>
\ No newline at end of file
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<startup>
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" />
</startup>
<startup>
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" />
</startup>
<connectionStrings>
<!--必选:20187150点迁移完成前保留-->
<add name="2ESDatabase" connectionString="host=127.0.0.1|localhost;port=9200;defaultindex=test;requesttimeout=0:1:00;version=2;" />
<!--必选:(全部小写)6没有defaultindexIndex:palas前缀字符+“_”+type) -->
<add name="ESDatabase" connectionString="host=test_version;port=9200;defaultIndex=test_version6;requesttimeout=30000;provider=2" />
<add name="ESDatabase" connectionString="host=minder;port=9200;requesttimeout=0:1:00;version=6;indexprefix=test_;" />
<!--<add name="ESDatabase" connectionString="host=127.0.0.1|localhost;port=9200;defaultindex=test;requesttimeout=0:1:00;version=2;" />-->
</connectionStrings>
<!--<connectionStrings>
--><!--<add name="2localESDatabase" connectionString="host=127.0.0.1;port=9200;defaultIndex=test_version2;requesttimeout=30000" />--><!--
<!--<add name="ESDatabase" connectionString="host=test_version;port=9200;defaultIndex=test_version6;requesttimeout=30000" providerName="6" />
--><!--<add name="2localESDatabase" connectionString="host=minder;port=9200;defaultIndex=test_version6;requesttimeout=30000" />--><!--
<add name="6MinderESDatabase" connectionString="host=minder;port=9200;defaultIndex=test_version6;requesttimeout=30000" />
--><!--<add name="6MinderESDatabase" connectionString="host=127.0.0.1;port=9200;defaultIndex=test_version2;requesttimeout=30000" />--><!--
</connectionStrings>-->
<add name="6MinderESDatabase" connectionString="host=test_version;port=9200;defaultIndex=test_version6;requesttimeout=30000" />
<add name="2localESDatabase" connectionString="host=localhost;port=9200;defaultIndex=test_version2;requesttimeout=30000" />-->
</connectionStrings>
<runtime>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly>
<assemblyIdentity name="Elasticsearch.Net" publicKeyToken="96c599bbe3e70f5d" culture="neutral" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
</dependentAssembly>
</assemblyBinding>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly>
<assemblyIdentity name="Elasticsearch.Net" publicKeyToken="96c599bbe3e70f5d" culture="neutral" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-11.0.0.0" newVersion="11.0.0.0" />
</dependentAssembly>
</assemblyBinding>
</runtime>
</configuration>
\ No newline at end of file
48fc688f0ca4c6d2b934b634f3dfe672c27baded
9fc15fed46774ac0d1ca970d3dbe672124b50dd8
48fc688f0ca4c6d2b934b634f3dfe672c27baded
9fc15fed46774ac0d1ca970d3dbe672124b50dd8
D:\smallproject\12.ES支持2-6多版本\TestUnit\TestUnit\TestUnit\bin\Debug\Microsoft.VisualStudio.TestPlatform.MSTest.TestAdapter.dll
D:\smallproject\12.ES支持2-6多版本\TestUnit\TestUnit\TestUnit\bin\Debug\Microsoft.VisualStudio.TestPlatform.MSTest.TestAdapter.dll
......@@ -15,3 +15,47 @@ D:\smallproject\12.ES支持2-6多版本\TestUnit\TestUnit\TestUnit\obj\Debug\Tes
D:\smallproject\12.ES支持2-6多版本\TestUnit\TestUnit\TestUnit\obj\Debug\TestUnit.csproj.CopyComplete
D:\smallproject\12.ES支持2-6多版本\TestUnit\TestUnit\TestUnit\obj\Debug\TestUnit.dll
D:\smallproject\12.ES支持2-6多版本\TestUnit\TestUnit\TestUnit\obj\Debug\TestUnit.pdb
D:\smallproject\12.ES支持2-6多版本\TestUnit\TestUnit\TestUnit\bin\Debug\TestUnit.dll.config
D:\smallproject\12.ES支持2-6多版本\TestUnit\TestUnit\TestUnit\bin\Debug\Elasticsearch.Net.dll
D:\smallproject\12.ES支持2-6多版本\TestUnit\TestUnit\TestUnit\bin\Debug\HTCommon.dll
D:\smallproject\12.ES支持2-6多版本\TestUnit\TestUnit\TestUnit\bin\Debug\Nest.dll
D:\smallproject\12.ES支持2-6多版本\TestUnit\TestUnit\TestUnit\bin\Debug\Newtonsoft.Json.dll
D:\smallproject\12.ES支持2-6多版本\TestUnit\TestUnit\TestUnit\bin\Debug\TestES6-2.exe
D:\smallproject\12.ES支持2-6多版本\TestUnit\TestUnit\TestUnit\bin\Debug\pdfbox-app-2.0.7.dll
D:\smallproject\12.ES支持2-6多版本\TestUnit\TestUnit\TestUnit\bin\Debug\IKVM.OpenJDK.Core.dll
D:\smallproject\12.ES支持2-6多版本\TestUnit\TestUnit\TestUnit\bin\Debug\NPOI.OOXML.dll
D:\smallproject\12.ES支持2-6多版本\TestUnit\TestUnit\TestUnit\bin\Debug\NPOI.ScratchPad.HWPF.dll
D:\smallproject\12.ES支持2-6多版本\TestUnit\TestUnit\TestUnit\bin\Debug\HtmlAgilityPack.dll
D:\smallproject\12.ES支持2-6多版本\TestUnit\TestUnit\TestUnit\bin\Debug\HooLab.Log.dll
D:\smallproject\12.ES支持2-6多版本\TestUnit\TestUnit\TestUnit\bin\Debug\HooLab.Runtime.dll
D:\smallproject\12.ES支持2-6多版本\TestUnit\TestUnit\TestUnit\bin\Debug\HooLab.Config.dll
D:\smallproject\12.ES支持2-6多版本\TestUnit\TestUnit\TestUnit\bin\Debug\IKVM.Runtime.dll
D:\smallproject\12.ES支持2-6多版本\TestUnit\TestUnit\TestUnit\bin\Debug\IKVM.OpenJDK.Util.dll
D:\smallproject\12.ES支持2-6多版本\TestUnit\TestUnit\TestUnit\bin\Debug\IKVM.OpenJDK.Text.dll
D:\smallproject\12.ES支持2-6多版本\TestUnit\TestUnit\TestUnit\bin\Debug\IKVM.OpenJDK.SwingAWT.dll
D:\smallproject\12.ES支持2-6多版本\TestUnit\TestUnit\TestUnit\bin\Debug\IKVM.OpenJDK.Media.dll
D:\smallproject\12.ES支持2-6多版本\TestUnit\TestUnit\TestUnit\bin\Debug\IKVM.OpenJDK.XML.API.dll
D:\smallproject\12.ES支持2-6多版本\TestUnit\TestUnit\TestUnit\bin\Debug\IKVM.OpenJDK.Security.dll
D:\smallproject\12.ES支持2-6多版本\TestUnit\TestUnit\TestUnit\bin\Debug\IKVM.OpenJDK.Naming.dll
D:\smallproject\12.ES支持2-6多版本\TestUnit\TestUnit\TestUnit\bin\Debug\IKVM.OpenJDK.Beans.dll
D:\smallproject\12.ES支持2-6多版本\TestUnit\TestUnit\TestUnit\bin\Debug\IKVM.OpenJDK.Jdbc.dll
D:\smallproject\12.ES支持2-6多版本\TestUnit\TestUnit\TestUnit\bin\Debug\NPOI.dll
D:\smallproject\12.ES支持2-6多版本\TestUnit\TestUnit\TestUnit\bin\Debug\NPOI.OpenXmlFormats.dll
D:\smallproject\12.ES支持2-6多版本\TestUnit\TestUnit\TestUnit\bin\Debug\NPOI.OpenXml4Net.dll
D:\smallproject\12.ES支持2-6多版本\TestUnit\TestUnit\TestUnit\bin\Debug\ICSharpCode.SharpZipLib.dll
D:\smallproject\12.ES支持2-6多版本\TestUnit\TestUnit\TestUnit\bin\Debug\IKVM.Runtime.JNI.dll
D:\smallproject\12.ES支持2-6多版本\TestUnit\TestUnit\TestUnit\bin\Debug\IKVM.OpenJDK.Management.dll
D:\smallproject\12.ES支持2-6多版本\TestUnit\TestUnit\TestUnit\bin\Debug\IKVM.AWT.WinForms.dll
D:\smallproject\12.ES支持2-6多版本\TestUnit\TestUnit\TestUnit\bin\Debug\IKVM.OpenJDK.Charsets.dll
D:\smallproject\12.ES支持2-6多版本\TestUnit\TestUnit\TestUnit\bin\Debug\IKVM.OpenJDK.Corba.dll
D:\smallproject\12.ES支持2-6多版本\TestUnit\TestUnit\TestUnit\bin\Debug\IKVM.OpenJDK.Remoting.dll
D:\smallproject\12.ES支持2-6多版本\TestUnit\TestUnit\TestUnit\bin\Debug\HTCommon.pdb
D:\smallproject\12.ES支持2-6多版本\TestUnit\TestUnit\TestUnit\bin\Debug\HTCommon.dll.config
D:\smallproject\12.ES支持2-6多版本\TestUnit\TestUnit\TestUnit\bin\Debug\TestES6-2.pdb
D:\smallproject\12.ES支持2-6多版本\TestUnit\TestUnit\TestUnit\bin\Debug\TestES6-2.exe.config
D:\smallproject\12.ES支持2-6多版本\TestUnit\TestUnit\TestUnit\bin\Debug\Elasticsearch.Net.xml
D:\smallproject\12.ES支持2-6多版本\TestUnit\TestUnit\TestUnit\bin\Debug\Nest.xml
D:\smallproject\12.ES支持2-6多版本\TestUnit\TestUnit\TestUnit\bin\Debug\Newtonsoft.Json.xml
D:\smallproject\12.ES支持2-6多版本\TestUnit\TestUnit\TestUnit\bin\Debug\HtmlAgilityPack.pdb
D:\smallproject\12.ES支持2-6多版本\TestUnit\TestUnit\TestUnit\bin\Debug\HtmlAgilityPack.xml
D:\smallproject\12.ES支持2-6多版本\TestUnit\TestUnit\TestUnit\bin\Debug\NPOI.xml
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment