feat: 支持映射配置文件

bing-framework · Apr 12, 2022 · 96afeab · 96afeab
1 parent 430138c
commit 96afeab
Show file tree

Hide file tree

Showing 22 changed files with 904 additions and 62 deletions.
diff --git a/samples/Bing.Elasticsearch.WinformSample/Bing.Elasticsearch.WinformSample.csproj b/samples/Bing.Elasticsearch.WinformSample/Bing.Elasticsearch.WinformSample.csproj
@@ -6,6 +6,10 @@
     <UseWindowsForms>true</UseWindowsForms>
   </PropertyGroup>
 
+  <ItemGroup>
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="5.0.0" />
+  </ItemGroup>
+
   <ItemGroup>
     <ProjectReference Include="..\..\src\Bing.Elasticsearch\Bing.Elasticsearch.csproj" />
   </ItemGroup>

diff --git a/src/Bing.Elasticsearch/Bing.Elasticsearch.xml b/src/Bing.Elasticsearch/Bing.Elasticsearch.xml
diff --git a/src/Bing.Elasticsearch/ElasticsearchContext.cs b/src/Bing.Elasticsearch/ElasticsearchContext.cs
@@ -4,6 +4,7 @@
 using System.Threading;
 using System.Threading.Tasks;
 using Bing.Elasticsearch.Internals;
+using Bing.Elasticsearch.Mapping;
 using Bing.Elasticsearch.Options;
 using Bing.Elasticsearch.Provider;
 using Bing.Elasticsearch.Repositories;
@@ -39,16 +40,23 @@ public class ElasticsearchContext : IElasticsearchContext
         /// </summary>
         private readonly ElasticsearchOptions _options;
 
+        /// <summary>
+        /// ES映射工厂
+        /// </summary>
+        private readonly IElasticMappingFactory _mappingFactory;
+
         /// <summary>
         /// 初始化一个<see cref="ElasticsearchContext"/>类型的实例
         /// </summary>
         /// <param name="provider">ES客户端提供程序</param>
         /// <param name="resolver">索引名称解析器</param>
+        /// <param name="mappingFactory">ES映射工厂</param>
         /// <param name="options">ES选项配置</param>
-        public ElasticsearchContext(IElasticClientProvider provider, IIndexNameResolver resolver, IOptions<ElasticsearchOptions> options)
+        public ElasticsearchContext(IElasticClientProvider provider, IIndexNameResolver resolver, IElasticMappingFactory mappingFactory, IOptions<ElasticsearchOptions> options)
         {
             _provider = provider;
             _resolver = resolver;
+            _mappingFactory = mappingFactory;
             _client = provider.GetClient();
             _options = options.Value;
         }
@@ -117,7 +125,8 @@ public async Task<CreateIndexResponse> CreateIndexAsync(string index, string ali
         /// <param name="cancellationToken">取消令牌</param>
         public async Task CreateIndexAsync<TDocument>(string index, string alias = null, CancellationToken cancellationToken = default) where TDocument : class
         {
-            await _client.CreateIndexAsync<TDocument>(index, _options.NumberOfShards, _options.NumberOfReplicas, cancellationToken);
+            //await _client.CreateIndexAsync<TDocument>(index, _options.NumberOfShards, _options.NumberOfReplicas, cancellationToken);
+            await _client.CreateIndexAsync<TDocument>(_mappingFactory, index, cancellationToken);
             if (alias.IsEmpty() == false)
                 await _client.Indices.PutAliasAsync(index, alias, ct: cancellationToken);
         }

diff --git a/src/Bing.Elasticsearch/Extensions.Service.cs b/src/Bing.Elasticsearch/Extensions.Service.cs
@@ -1,4 +1,5 @@
 using System;
+using Bing.Elasticsearch.Mapping;
 using Bing.Elasticsearch.Options;
 using Bing.Elasticsearch.Provider;
 using Bing.Elasticsearch.Repositories;
@@ -20,9 +21,12 @@ public static partial class Extensions
         public static void AddElasticsearch(this IServiceCollection services, Action<ElasticsearchOptions> setupAction)
         {
             services.Configure(setupAction);
+            services.GetOrAddAllAssemblyFinder();
+            services.GetOrAddTypeFinder<IElasticMappingTypeFinder>(assemblyFinder => new ElasticMappingTypeFinder(assemblyFinder));
             services.TryAddSingleton<IIndexNameResolver, IndexNameResolver>();
             services.TryAddSingleton<IElasticClientProvider, ElasticClientProvider>();
             services.TryAddScoped<IElasticsearchContext, ElasticsearchContext>();
+            services.TryAddSingleton<IElasticMappingFactory, ElasticMappingFactory>();
             services.TryAddScoped(typeof(IEsRepository<>), typeof(EsRepository<>));
         }
     }