修改代码

增加云商品数据

Modules/CloudProduct/Services/GoodsIndexJob.cs

@@ -0,0 +1,32 @@
+using Microsoft.Extensions.Configuration;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Logging;
+
+namespace Store.Modules.CloudProduct.Services
+{
+	/// <summary>
+	/// Hangfire 定时任务：把数据库中未同步（IndexStatus=0）的商品写入 OpenSearch 分词索引。
+	/// </summary>
+	public class GoodsIndexJob
+	{
+		private readonly IServiceScopeFactory _scopeFactory;
+		private readonly IConfiguration _configuration;
+		private readonly ILogger<GoodsIndexJob> _logger;
+
+		public GoodsIndexJob(IServiceScopeFactory scopeFactory, IConfiguration configuration,ILogger<GoodsIndexJob> logger)
+		{
+			_scopeFactory = scopeFactory;
+			_configuration = configuration;
+			_logger = logger;
+		}
+
+		public async Task ProcessPendingAsync()
+		{
+			var batchSize = _configuration.GetValue<int?>("Indexing:BatchSize") ?? 1000;
+			using var scope = _scopeFactory.CreateScope();
+			var service = scope.ServiceProvider.GetRequiredService<GoodsService>();
+			var count = await service.IndexPendingGoodsAsync(batchSize);
+			_logger.LogInformation($"[Hangfire] 商品分词定时任务完成，本次同步 {count} 条");
+		}
+	}
+}

Modules/CloudProduct/Services/GoodsService.cs

@@ -0,0 +1,402 @@
+using MAX.Core.DependencyInjection;
+using Microsoft.Extensions.Configuration;
+using Store.Modules.CloudProduct.Dtos;
+using Store.Modules.CloudProduct.Entities;
+using Store.Modules.CloudProduct.Repositorys;
+
+namespace Store.Modules.CloudProduct.Services
+{
+	public interface IGoodsService : IScopedDependency
+	{
+		Task<int> DeleteGoodsAsync(IEnumerable<long> ids);
+		Task<List<GoodsEntity>> GetGoodsByGoodsIdsAsync(IEnumerable<long> goodsIds);
+		Task<GoodsImportResult> ImportGoodsAsync(IEnumerable<GoodsImportItem> items);
+		Task<int> IndexPendingGoodsAsync(int batchSize);
+		Task<long> RebuildSearchIndexAsync(IEnumerable<long>? ids = null);
+		Task<(List<GoodsEntity> List, long Total)> SearchGoodsAsync(GoodsSearchRequest request);
+		Task<int> UpdateThumbUrlAsync(IEnumerable<GoodsEntity> goodsList);
+	}
+
+	internal class GoodsService : IGoodsService
+	{
+		private readonly GoodsRepository _repository;
+		private readonly IOpenSearchService _searchService;
+		private readonly IRawDataStorage _rawDataStorage;
+		private readonly IConfiguration _configuration;
+
+		public GoodsService(GoodsRepository repository, IOpenSearchService searchService, IRawDataStorage rawDataStorage, IConfiguration configuration)
+		{
+			_repository = repository;
+			_searchService = searchService;
+			_rawDataStorage = rawDataStorage;
+			_configuration = configuration;
+		}
+
+		public async Task<(List<GoodsEntity> List, long Total)> SearchGoodsAsync(GoodsSearchRequest request)
+		{
+			// 1. 从搜索引擎获取标题匹配的商品
+			var searchResult = await _searchService.SearchByTitleAsync(request);
+
+			var goodsList = searchResult.Documents.Select(a => new GoodsEntity
+			{
+				Platform = a.Platform,
+				GoodsId = a.Id,
+				Title = a.Title,
+				CatId1 = a.CatId1,
+				CatId2 = a.CatId2,
+				CatId3 = a.CatId3,
+				CatId4 = a.CatId4,
+				MinPrice = a.MinPrice,
+				MaxPrice = 0,
+				SoldQuantity = a.SoldQuantity,
+				ThumbUrl = a.ThumbUrl,
+			}).ToList();
+
+			return (goodsList, searchResult.Total);
+
+			//// 2. 构建数据库查询（只查正常状态，排除软删除）
+			//var query = _repository.Select.Where(x => x.Status == 0);
+
+			//// 如果有标题搜索，先用ID过滤
+			//if (goodsIds.Any())
+			//{
+			//	query = query.Where(x => goodsIds.Contains(x.GoodsId));
+			//}
+
+			//// 3. 价格区间查询
+			//if (request.MinPrice.HasValue)
+			//{
+			//	query = query.Where(x => x.MinPrice >= request.MinPrice.Value);
+			//}
+			//if (request.MaxPrice.HasValue)
+			//{
+			//	query = query.Where(x => x.MaxPrice <= request.MaxPrice.Value);
+			//}
+
+			//// 4. 类目查询
+			//if (request.CatId1.HasValue)
+			//{
+			//	query = query.Where(x => x.CatId1 == request.CatId1);
+			//}
+			//if (request.CatId2.HasValue)
+			//{
+			//	query = query.Where(x => x.CatId2 == request.CatId2);
+			//}
+			//if (request.CatId3.HasValue)
+			//{
+			//	query = query.Where(x => x.CatId3 == request.CatId3);
+			//}
+			//if (request.CatId4.HasValue)
+			//{
+			//	query = query.Where(x => x.CatId4 == request.CatId4);
+			//}
+
+			//// 5. 销量区间查询
+			//if (request.MinSoldQuantity.HasValue)
+			//{
+			//	query = query.Where(x => x.SoldQuantity >= request.MinSoldQuantity.Value);
+			//}
+			//if (request.MaxSoldQuantity.HasValue)
+			//{
+			//	query = query.Where(x => x.SoldQuantity <= request.MaxSoldQuantity.Value);
+			//}
+
+			//// 6. 平台过滤
+			//if (request.Platform.HasValue)
+			//{
+			//	query = query.Where(x => x.Platform == request.Platform);
+			//}
+
+			//// 8. 获取总数
+			//total = await query.CountAsync();
+
+			//// 9. 排序
+			//if (!string.IsNullOrEmpty(request.SortBy))
+			//{
+			//	var isAsc = request.SortOrder?.ToLower() == "asc";
+			//	query = query.OrderByPropertyName(request.SortBy, isAsc);
+			//}
+			//else
+			//{
+			//	query = query.OrderByDescending(x => x.CreatedTime);
+			//}
+
+			//// 10. 分页查询
+			//var list = await query
+			//	//.Skip((request.PageIndex - 1) * request.PageSize)
+			//	//.Limit(request.PageSize)
+			//	.ToListAsync();
+			////内存排序
+			//var orderMap = goodsIds.Select((id, idx) => new { id, idx })
+			//			.ToDictionary(x => x.id, x => x.idx);
+			//list = list.OrderBy(x => orderMap.TryGetValue(x.GoodsId, out var idx) ? idx : int.MaxValue)
+			//		   .ToList();
+			//return (list, total);
+		}
+
+		/// <summary>
+		/// 批量导入商品：先落库（按平台 + 商品编号去重）+ 保存原始数据，
+		/// 然后根据配置决定“立即分词”还是“标记未同步交给后台任务分词”。
+		/// </summary>
+		public async Task<GoodsImportResult> ImportGoodsAsync(IEnumerable<GoodsImportItem> items)
+		{
+			var result = new GoodsImportResult();
+			if (items == null)
+				return result;
+
+			var indexImmediately = IsImmediateIndexing();
+			var documents = new List<GoodsSearchDocument>();
+			var indexedIds = new List<long>();
+
+			foreach (var item in items)
+			{
+				var goods = item?.Goods;
+				if (goods == null)
+				{
+					result.FailedCount++;
+					result.Errors.Add("商品数据为空");
+					continue;
+				}
+
+				var goodsId = goods.GoodsId;
+				if (goodsId == 0)
+				{
+					result.FailedCount++;
+					result.Errors.Add("商品编号（GoodsId）不能为空");
+					continue;
+				}
+
+				try
+				{
+					// 导入时统一先标记“未同步”；立即分词成功后再置为“已同步”，
+					// 后台模式下保持“未同步”，由 Hangfire 定时任务分词。
+					goods.IsSegmented = 0;
+					var saved = await UpsertGoodsAsync(goods);
+
+					var rawData = item?.RawData ?? string.Empty;
+					if (!string.IsNullOrWhiteSpace(rawData))
+					{
+						await _rawDataStorage.SaveAsync(saved.GoodsId, rawData);
+					}
+
+					if (indexImmediately)
+					{
+						documents.Add(new GoodsSearchDocument
+						{
+							Platform = saved.Platform,
+							Id = saved.GoodsId,
+							Title = saved.Title ?? string.Empty,
+							ThumbUrl = saved.ThumbUrl,
+							CatId1 = saved.CatId1,
+							CatId2 = saved.CatId2,
+							CatId3 = saved.CatId3,
+							CatId4 = saved.CatId4,
+							MinPrice = saved.MinPrice,
+							SoldQuantity = saved.SoldQuantity,
+						});
+						indexedIds.Add(saved.GoodsId);
+					}
+
+					result.SuccessCount++;
+				}
+				catch (Exception ex)
+				{
+					result.FailedCount++;
+					result.Errors.Add($"GoodsId={goodsId}: {ex.Message}");
+				}
+			}
+
+			if (documents.Count > 0)
+			{
+				try
+				{
+					await _searchService.BulkIndexGoodsAsync(documents);
+					await MarkIndexedAsync(indexedIds);
+				}
+				catch (Exception ex)
+				{
+					// 写入失败时保持“未同步”，由后台定时任务重试
+					result.FailedCount += documents.Count;
+					result.SuccessCount -= documents.Count;
+					result.Errors.Add("写入 OpenSearch 失败: " + ex.Message);
+				}
+			}
+
+			return result;
+		}
+
+		/// <summary>
+		/// 后台任务：批量处理未同步（IsSegmented=0）的商品，写入 OpenSearch 后标记为已同步。
+		/// </summary>
+		public async Task<int> IndexPendingGoodsAsync(int batchSize)
+		{
+			if (batchSize <= 0)
+				batchSize = 200;
+
+			var pending = await _repository.Select
+				.Where(x => x.IsSegmented == 0 && x.Status == 0)
+				.OrderBy(x => x.GoodsId)
+				.Limit(batchSize)
+				.ToListAsync();
+
+			if (pending.Count == 0)
+				return 0;
+
+			var documents = pending
+				.Select(x => new GoodsSearchDocument
+				{
+					Platform = x.Platform,
+					Id = x.GoodsId,
+					Title = x.Title ?? string.Empty,
+					ThumbUrl = x.ThumbUrl,
+					CatId1 = x.CatId1,
+					CatId2 = x.CatId2,
+					CatId3 = x.CatId3,
+					CatId4 = x.CatId4,
+					MinPrice = x.MinPrice,
+					SoldQuantity = x.SoldQuantity,
+				})
+				.ToList();
+
+			await _searchService.BulkIndexGoodsAsync(documents);
+
+			await MarkIndexedAsync(pending.Select(x => x.GoodsId));
+			return pending.Count;
+		}
+
+		/// <summary>
+		/// 按平台 + 商品编号查找已存在记录，存在则更新，不存在则新增。
+		/// </summary>
+		private async Task<GoodsEntity> UpsertGoodsAsync(GoodsEntity goods)
+		{
+			var existing = await _repository.Select
+				.Where(x => x.Platform == goods.Platform && x.GoodsId == goods.GoodsId)
+				.FirstAsync();
+
+			if (existing != null)
+			{
+				goods.Id = existing.Id;
+				goods.GoodsId = existing.GoodsId;
+				goods.CreatedTime = existing.CreatedTime;
+				goods.UpdatedTime = DateTime.Now;
+				await _repository.UpdateAsync(goods);
+				return goods;
+			}
+
+			goods.CreatedTime = DateTime.Now;
+			goods.UpdatedTime = DateTime.Now;
+			return await _repository.InsertAsync(goods);
+		}
+
+		/// <summary>
+		/// 根据商品编号（GoodsId）列表读取商品。
+		/// </summary>
+		public async Task<List<GoodsEntity>> GetGoodsByGoodsIdsAsync(IEnumerable<long> goodsIds)
+		{
+			var idList = goodsIds?.ToList();
+			if (idList == null || idList.Count == 0)
+				return new List<GoodsEntity>();
+
+			return await _repository.Select
+				.Where(x => idList.Contains(x.GoodsId))
+				.ToListAsync();
+		}
+
+		/// <summary>
+		/// 重新从数据库读取指定商品，覆盖 OpenSearch 中已有的分词并重新分词。
+		/// ids 为空时重建全部商品。重建成功的记录标记为已同步。
+		/// </summary>
+		public async Task<long> RebuildSearchIndexAsync(IEnumerable<long>? ids = null)
+		{
+			List<GoodsEntity> goodsList;
+
+			var idList = ids?.ToList();
+			if (idList == null || idList.Count == 0)
+			{
+				goodsList = await _repository.Select.ToListAsync();
+			}
+			else
+			{
+				goodsList = await _repository.Select
+					.Where(x => idList.Contains(x.GoodsId))
+					.ToListAsync();
+			}
+
+			var count = await _searchService.RebuildIndexAsync(goodsList);
+			await MarkIndexedAsync(goodsList.Where(x => x.GoodsId > 0).Select(x => x.GoodsId));
+			return count;
+		}
+
+		/// <summary>
+		/// 删除商品：按配置决定软删除（Status=1）还是硬删除（物理删除），
+		/// 两种方式都会删除 OpenSearch 中对应的文档。
+		/// </summary>
+		public async Task<int> DeleteGoodsAsync(IEnumerable<long> ids)
+		{
+			var idList = ids?.Distinct().ToList();
+			if (idList == null || idList.Count == 0)
+				return 0;
+
+			if (IsSoftDelete())
+			{
+				// 软删除：仅用 Status 标记（0正常 1已删除）
+				await _repository.Orm.Update<GoodsEntity>()
+					.Set(x => x.Status, (byte)1)
+					.Where(x => idList.Contains(x.GoodsId))
+					.ExecuteAffrowsAsync();
+			}
+			else
+			{
+				// 硬删除：直接删除数据库记录
+				await _repository.Orm.Delete<GoodsEntity>()
+					.Where(x => idList.Contains(x.GoodsId))
+					.ExecuteAffrowsAsync();
+			}
+
+			// 无论软删除还是硬删除，都要删除 OpenSearch 中的对应文档
+			await _searchService.DeleteDocumentsAsync(idList);
+			return idList.Count;
+		}
+
+		/// <summary>
+		/// 批量更新商品缩略图。
+		/// </summary>
+		public async Task<int> UpdateThumbUrlAsync(IEnumerable<GoodsEntity> goodsList)
+		{
+			//string sql = _repository.Orm.Update<GoodsEntity>().SetSource(goodsList, a => a.GoodsId).UpdateColumns(a => new { a.ThumbUrl }).ToSql();
+			return await _repository.Orm.Update<GoodsEntity>()
+				.SetSource(goodsList, a => a.GoodsId)
+				.UpdateColumns(a => new { a.ThumbUrl })
+				.ExecuteAffrowsAsync();
+		}
+
+		/// <summary>
+		/// 是否导入时立即分词（Indexing:Mode = Immediate）。
+		/// </summary>
+		private bool IsImmediateIndexing()
+		{
+			var mode = _configuration.GetValue<string>("Indexing:Mode");
+			return string.Equals(mode, "Immediate", StringComparison.OrdinalIgnoreCase);
+		}
+
+		/// <summary>
+		/// 是否软删除（Delete:SoftDelete，默认 true）。
+		/// </summary>
+		private bool IsSoftDelete()
+		{
+			return _configuration.GetValue<bool?>("Delete:SoftDelete") ?? true;
+		}
+
+		private async Task MarkIndexedAsync(IEnumerable<long> ids)
+		{
+			var idList = ids?.ToList();
+			if (idList == null || idList.Count == 0)
+				return;
+
+			await _repository.Orm.Update<GoodsEntity>()
+				.Set(x => x.IsSegmented, (byte)1)
+				.Where(x => idList.Contains(x.GoodsId))
+				.ExecuteAffrowsAsync();
+		}
+	}
+}

Modules/CloudProduct/Services/OpenSearchService.cs

@@ -0,0 +1,545 @@
+using System.Diagnostics;
+using MAX.Core.DependencyInjection;
+using MAX.Framework.Commons;
+using Microsoft.Extensions.Configuration;
+using Microsoft.Extensions.Logging;
+using OpenSearch.Client;
+using OpenSearch.Net;
+using Store.Modules.CloudProduct.Dtos;
+using Store.Modules.CloudProduct.Entities;
+using Store.Modules.CloudProduct.Enums;
+
+namespace Store.Modules.CloudProduct.Services
+{
+	public interface IOpenSearchService : ISingletonDependency
+	{
+		Task AddDocumentAsync(GoodsSearchDocument document);
+		Task BulkIndexGoodsAsync(IEnumerable<GoodsSearchDocument> documents);
+		Task<bool> ClearIndexAsync();
+		Task<long> CountDocumentsAsync();
+		Task<bool> CreateIndexAsync();
+		Task DeleteDocumentsAsync(IEnumerable<long> ids);
+		Task DeleteIndexAsync();
+		Task<OpenSearchStatusDto> GetStatusAsync();
+		Task<bool> IndexExistsAsync();
+		Task<bool> IsIndexMappingHealthyAsync();
+		Task RefreshIndexAsync();
+		Task<long> RebuildIndexAsync(IEnumerable<GoodsEntity> goodsList);
+		Task<(long Total, List<GoodsSearchDocument> Documents)> SearchByTitleAsync(GoodsSearchRequest request, GoodsSearchSortBy sortBy = GoodsSearchSortBy.Relevance);
+	}
+
+	internal class OpenSearchService : IOpenSearchService
+	{
+		private readonly string _nodeUrl;
+		private readonly string _indexName;
+		private readonly IOpenSearchClient _client = null!;
+
+		// 查询类操作（search/count/status/ping）统一超时
+		private static readonly TimeSpan QueryTimeout = TimeSpan.FromSeconds(5);
+		// 批量写入/建索引/删除索引等管理类操作超时（数据量大时需要更长，可挪到配置文件）
+		private static readonly TimeSpan AdminTimeout = TimeSpan.FromSeconds(30);
+		private readonly ILogger<OpenSearchService> _logger;
+
+		public OpenSearchService(IConfiguration configuration,ILogger<OpenSearchService> logger)
+		{
+			var config = configuration.GetSection("Search");
+			_nodeUrl = config.GetValue<string>("Url") ?? "";
+			_indexName = config.GetValue<string>("IndexName") ?? "";
+			_client = CreateClient();
+			_logger = logger;
+		}
+
+		private IOpenSearchClient CreateClient()
+		{
+			var pool = new SingleNodeConnectionPool(new Uri(_nodeUrl));
+			var settings = new ConnectionSettings(pool)
+				.DefaultIndex(_indexName)
+				.DefaultMappingFor<GoodsSearchDocument>(m => m.IndexName(_indexName))
+				.RequestTimeout(QueryTimeout)
+				.MaxRetryTimeout(QueryTimeout)
+				.PrettyJson()
+				.DisableDirectStreaming(); // 便于调试打印请求/响应报文
+
+			return new OpenSearchClient(settings);
+		}
+
+		/// <summary>
+		/// ============ 1. 创建索引 ============
+		/// </summary>
+		public async Task<bool> CreateIndexAsync()
+		{
+			var existsResponse = await _client.Indices.ExistsAsync(_indexName, d => d
+				.RequestConfiguration(r => r.RequestTimeout(AdminTimeout)));
+			if (existsResponse.Exists)
+			{
+				if (await IsIndexMappingHealthyAsync())
+				{
+					Console.WriteLine($"索引 [{_indexName}] 已存在且映射正确，无需重复创建。");
+					return true;
+				}
+
+				Console.WriteLine($"索引 [{_indexName}] 的映射不完整（可能由清空索引等操作造成），正在重建...");
+				var deleteResponse = await _client.Indices.DeleteAsync(_indexName, d => d
+					.RequestConfiguration(r => r.RequestTimeout(AdminTimeout)));
+				if (!deleteResponse.IsValid)
+				{
+					throw new AppException("删除损坏索引失败: " + deleteResponse.DebugInformation);
+				}
+			}
+
+			// 优先尝试使用 IK 中文分词（需集群安装 analysis-ik 插件）
+			var createResponse = await TryCreateIndexAsync(useIk: true);
+
+			if (!createResponse.IsValid)
+			{
+				Console.WriteLine("IK 分词插件不可用，已回退到 standard 分析器，中文分词将失效，请检查集群是否安装 analysis-ik 插件。");
+				createResponse = await TryCreateIndexAsync(useIk: false);
+			}
+
+			if (createResponse.IsValid)
+			{
+				Console.WriteLine($"索引 [{_indexName}] 创建成功。");
+				return true;
+			}
+			else
+			{
+				throw new AppException("索引创建失败: " + createResponse.DebugInformation);
+			}
+		}
+
+		public async Task<bool> IsIndexMappingHealthyAsync()
+		{
+			var mappingStatus = await GetIndexMappingStatusAsync();
+			return mappingStatus.Healthy;
+		}
+
+		private async Task<(bool Healthy, string? IndexAnalyzer, string? SearchAnalyzer)> GetIndexMappingStatusAsync()
+		{
+			var getResponse = await _client.Indices.GetAsync(_indexName, d => d
+				.RequestConfiguration(r => r.RequestTimeout(QueryTimeout)));
+			if (!getResponse.IsValid)
+			{
+				throw new AppException("读取索引映射失败: " + getResponse.DebugInformation);
+			}
+			if (!getResponse.Indices.TryGetValue(_indexName, out var indexState))
+			{
+				return (false, null, null);
+			}
+
+			var mapping = indexState.Mappings;
+			if (mapping?.Properties == null
+				|| !mapping.Properties.TryGetValue(new PropertyName("title"), out var property)
+				|| property is not ITextProperty textProperty)
+			{
+				return (false, null, null);
+			}
+
+			var indexAnalyzer = textProperty.Analyzer;
+			var searchAnalyzer = textProperty.SearchAnalyzer;
+			var usesIk = indexAnalyzer == "ik_max_word" && searchAnalyzer == "ik_smart";
+			var usesStandard = indexAnalyzer == "standard" && searchAnalyzer == "standard";
+			return (usesIk || usesStandard, indexAnalyzer, searchAnalyzer);
+		}
+
+		private async Task<CreateIndexResponse> TryCreateIndexAsync(bool useIk)
+		{
+			var indexAnalyzer = useIk ? "ik_max_word" : "standard";
+			var searchAnalyzer = useIk ? "ik_smart" : "standard";
+
+			return await _client.Indices.CreateAsync(_indexName, c => c
+				.Settings(s => s
+					.NumberOfShards(1)
+					.NumberOfReplicas(0)
+				)
+				.Map<GoodsSearchDocument>(m => m
+					.Properties(p => p
+						.Number(n => n.Name(x => x.Id).Type(NumberType.Long))
+						.Text(t => t
+							.Name(x => x.Title)
+							.Analyzer(indexAnalyzer)
+							.SearchAnalyzer(searchAnalyzer)
+						)
+						.Number(n => n.Name(x => x.CatId1).Type(NumberType.Integer))
+						.Number(n => n.Name(x => x.CatId2).Type(NumberType.Integer))
+						.Number(n => n.Name(x => x.CatId3).Type(NumberType.Integer))
+						.Number(n => n.Name(x => x.CatId4).Type(NumberType.Integer))
+						.Number(n => n.Name(x => x.MinPrice).Type(NumberType.Long))
+						.Number(n => n.Name(x => x.SoldQuantity).Type(NumberType.Integer))
+					)
+				)
+				.RequestConfiguration(r => r.RequestTimeout(AdminTimeout))
+			);
+		}
+
+		/// <summary>
+		/// ============ 2. 删除索引 ============
+		/// </summary>
+		public async Task DeleteIndexAsync()
+		{
+			var response = await _client.Indices.DeleteAsync(_indexName, d => d
+				.RequestConfiguration(r => r.RequestTimeout(AdminTimeout)));
+			if (!response.IsValid)
+			{
+				throw new AppException("删除失败: " + response.DebugInformation);
+			}
+		}
+
+		public async Task<bool> IndexExistsAsync()
+		{
+			var response = await _client.Indices.ExistsAsync(_indexName, d => d
+				.RequestConfiguration(r => r.RequestTimeout(QueryTimeout)));
+			return response.Exists;
+		}
+
+		public async Task RefreshIndexAsync()
+		{
+			var response = await _client.Indices.RefreshAsync(_indexName, d => d
+				.RequestConfiguration(r => r.RequestTimeout(AdminTimeout)));
+			if (!response.IsValid)
+			{
+				throw new AppException("刷新索引失败: " + response.DebugInformation);
+			}
+		}
+
+		/// <summary>
+		/// ============ 3.1 批量写入商品搜索文档（存在则覆盖） ============
+		/// </summary>
+		public async Task BulkIndexGoodsAsync(IEnumerable<GoodsSearchDocument> documents)
+		{
+			if (documents == null) throw new ArgumentNullException(nameof(documents));
+
+			var list = documents.ToList();
+			if (list.Count == 0) return;
+
+			// 确保索引已按 IK 分词映射创建，否则中文分词无效
+			await CreateIndexAsync();
+
+			var bulkResponse = await _client.BulkAsync(b => b
+				.Index(_indexName)
+				.IndexMany(list, (descriptor, doc) => descriptor.Id(doc.Id))
+				.RequestConfiguration(r => r.RequestTimeout(AdminTimeout))
+			);
+
+			if (!bulkResponse.IsValid)
+			{
+				throw new AppException("写入 OpenSearch 失败: " + bulkResponse.DebugInformation);
+			}
+
+			// 刷新索引，保证数据立即可搜索（仅用于演示，生产环境不建议频繁 Refresh）
+			await RefreshIndexAsync();
+		}
+
+		/// <summary>
+		/// ============ 3.2 根据数据库商品重建搜索索引 ============
+		/// </summary>
+		public async Task<long> RebuildIndexAsync(IEnumerable<GoodsEntity> goodsList)
+		{
+			if (goodsList == null) throw new ArgumentNullException(nameof(goodsList));
+
+			var documents = goodsList
+				.Where(x => x != null && x.GoodsId > 0)
+				.Select(x => new GoodsSearchDocument
+				{
+					Id = x.GoodsId,
+					Title = x.Title ?? string.Empty,
+					CatId1 = x.CatId1,
+					CatId2 = x.CatId2,
+					CatId3 = x.CatId3,
+					CatId4 = x.CatId4,
+					MinPrice = x.MinPrice,
+					SoldQuantity = x.SoldQuantity
+				})
+				.ToList();
+
+			if (documents.Count == 0) return 0;
+
+			await BulkIndexGoodsAsync(documents);
+			return documents.Count;
+		}
+
+		/// <summary>
+		/// ============ 3.3 按商品编号批量删除 OpenSearch 文档（软/硬删除共用） ============
+		/// </summary>
+		public async Task DeleteDocumentsAsync(IEnumerable<long> ids)
+		{
+			var list = ids?.Distinct().ToList() ?? new List<long>();
+			if (list.Count == 0) return;
+
+			var exists = await _client.Indices.ExistsAsync(_indexName, d => d
+				.RequestConfiguration(r => r.RequestTimeout(QueryTimeout)));
+			if (!exists.Exists)
+			{
+				return;
+			}
+
+			var response = await _client.BulkAsync(b =>
+			{
+				foreach (var id in list)
+				{
+					b.Delete<GoodsSearchDocument>(d => d.Index(_indexName).Id(id));
+				}
+				b.RequestConfiguration(r => r.RequestTimeout(AdminTimeout));
+				return b;
+			});
+
+			if (!response.IsValid)
+			{
+				throw new AppException("删除 OpenSearch 文档失败: " + response.DebugInformation);
+			}
+
+			await RefreshIndexAsync();
+		}
+
+		/// <summary>
+		/// ============ 4. 手动新增一条搜索文档 ============
+		/// </summary>
+		public async Task AddDocumentAsync(GoodsSearchDocument document)
+		{
+			if (document == null) throw new ArgumentNullException(nameof(document));
+
+			var response = await _client.IndexAsync(document, i => i
+				.Index(_indexName)
+				.Id(document.Id)
+				.RequestConfiguration(r => r.RequestTimeout(QueryTimeout))
+			);
+
+			if (response.IsValid)
+			{
+				await RefreshIndexAsync();
+			}
+			else
+			{
+				throw new AppException("新增失败: " + response.DebugInformation);
+			}
+		}
+
+		/// <summary>
+		/// ============ 5. 分词搜索（分页 + 类目/价格/销量/平台过滤 + 排序） ============
+		/// </summary>
+		/// <param name="request">搜索条件（关键词、类目、价格、销量、平台、分页）</param>
+		/// <param name="sortBy">排序方式</param>
+		public async Task<(long Total, List<GoodsSearchDocument> Documents)> SearchByTitleAsync(GoodsSearchRequest request,
+			GoodsSearchSortBy sortBy = GoodsSearchSortBy.Relevance)
+		{
+			var keyword = request.Title;
+			int? catId1 = request.CatId1;
+			int? catId2 = request.CatId2;
+			int? catId3 = request.CatId3;
+			int? catId4 = request.CatId4;
+			long? minPrice = request.MinPrice;
+			long? maxPrice = request.MaxPrice;
+			int? minSoldQuantity = request.MinSoldQuantity;
+			int? maxSoldQuantity = request.MaxSoldQuantity;
+			int? platform = request.Platform;
+			int pageIndex = request.PageIndex;
+			int pageSize = request.PageSize;
+
+			if (pageIndex < 1) pageIndex = 1;
+			if (pageSize < 1) pageSize = 20;
+			if (pageSize > 2000) pageSize = 2000; // 避免深分页/单页过大拖垮性能，按需调整上限
+
+			var from = (pageIndex - 1) * pageSize;
+
+			ISearchResponse<GoodsSearchDocument> searchResponse;
+			try
+			{
+				searchResponse = await _client.SearchAsync<GoodsSearchDocument>(s => s
+					.Index(_indexName)
+					.Query(q => q
+						.Bool(b =>
+						{
+							if (string.IsNullOrWhiteSpace(keyword) == false)
+							{
+								b.Must(m => m.Match(mm => mm.Field(f => f.Title).Query(keyword)));
+							}
+
+							var filters = new List<Func<QueryContainerDescriptor<GoodsSearchDocument>, QueryContainer>>();
+							if (platform.HasValue && platform!.Value > 0) filters.Add(f => f.Term(t => t.Field(x => x.Platform).Value(platform.Value)));
+
+							if (catId1.HasValue) filters.Add(f => f.Term(t => t.Field(x => x.CatId1).Value(catId1.Value)));
+							if (catId2.HasValue) filters.Add(f => f.Term(t => t.Field(x => x.CatId2).Value(catId2.Value)));
+							if (catId3.HasValue) filters.Add(f => f.Term(t => t.Field(x => x.CatId3).Value(catId3.Value)));
+							if (catId4.HasValue) filters.Add(f => f.Term(t => t.Field(x => x.CatId4).Value(catId4.Value)));
+
+							if (minPrice.HasValue || maxPrice.HasValue)
+							{
+								filters.Add(f => f.Range(r =>
+								{
+									var range = r.Field(x => x.MinPrice);
+									if (minPrice.HasValue) range = range.GreaterThanOrEquals(minPrice.Value);
+									if (maxPrice.HasValue) range = range.LessThanOrEquals(maxPrice.Value);
+									return range;
+								}));
+							}
+
+							if (minSoldQuantity.HasValue || maxSoldQuantity.HasValue)
+							{
+								filters.Add(f => f.Range(r =>
+								{
+									var range = r.Field(x => x.SoldQuantity);
+									if (minSoldQuantity.HasValue) range = range.GreaterThanOrEquals(minSoldQuantity.Value);
+									if (maxSoldQuantity.HasValue) range = range.LessThanOrEquals(maxSoldQuantity.Value);
+									return range;
+								}));
+							}
+
+							if (filters.Count > 0) b.Filter(filters.ToArray());
+							return b;
+						})
+					)
+					.Sort(sort => sortBy switch
+					{
+						GoodsSearchSortBy.PriceAsc => sort.Ascending(f => f.MinPrice),
+						GoodsSearchSortBy.PriceDesc => sort.Descending(f => f.MinPrice),
+						GoodsSearchSortBy.SoldDesc => sort.Descending(f => f.SoldQuantity),
+						_ => sort.Descending(SortSpecialField.Score)
+					})
+					.From(from)
+					.Size(pageSize)
+					.TrackTotalHits(true) // 命中数超过 10000 时默认不精确统计，需要显式开启
+					.RequestConfiguration(r => r.RequestTimeout(QueryTimeout))
+				);
+			}
+			catch (OpenSearchClientException ex) when (ex.Response?.Success == false)
+			{
+				throw new AppException($"搜索超时或失败（{QueryTimeout.TotalSeconds}秒）: " + ex.Message);
+			}
+
+			if (!searchResponse.IsValid)
+			{
+				throw new AppException("搜索失败: " + searchResponse.DebugInformation);
+			}
+
+			return (searchResponse.Total, searchResponse.Documents.ToList());
+		}
+
+		/// <summary>
+		/// ============ 6. 统计文档数 ============
+		/// </summary>
+		public async Task<long> CountDocumentsAsync()
+		{
+			var countResponse = await _client.CountAsync<GoodsSearchDocument>(c => c
+				.Index(_indexName)
+				.RequestConfiguration(r => r.RequestTimeout(QueryTimeout))
+			);
+			if (countResponse.IsValid)
+			{
+				Console.WriteLine($"索引 [{_indexName}] 当前文档总数: {countResponse.Count}");
+				return countResponse.Count;
+			}
+			else
+			{
+				Console.WriteLine("统计失败: " + countResponse.DebugInformation);
+				throw new AppException(countResponse.DebugInformation);
+			}
+		}
+
+		/// <summary>
+		/// ============ 7. 查询 OpenSearch 状态 ============
+		/// </summary>
+		public async Task<OpenSearchStatusDto> GetStatusAsync()
+		{
+			var stopwatch = Stopwatch.StartNew();
+			var status = new OpenSearchStatusDto
+			{
+				NodeUrl = _nodeUrl,
+				IndexName = _indexName,
+			};
+
+			try
+			{
+				var ping = await _client.PingAsync(p => p
+					.RequestConfiguration(r => r.RequestTimeout(QueryTimeout)));
+				status.Connected = ping.IsValid;
+				if (!ping.IsValid)
+				{
+					status.Message = ping.DebugInformation;
+					_logger.LogError(ping.DebugInformation);
+					return status;
+				}
+				_logger.LogInformation("OpenSerach 已连接");
+				var clusterHealth = await _client.Cluster.HealthAsync(Indices.All, h => h
+					.RequestConfiguration(r => r.RequestTimeout(QueryTimeout)));
+				if (!clusterHealth.IsValid)
+				{
+					status.Message = clusterHealth.DebugInformation;
+					return status;
+				}
+
+				status.ClusterName = clusterHealth.ClusterName;
+				status.ClusterStatus = clusterHealth.Status.ToString().ToLowerInvariant();
+				status.NumberOfNodes = clusterHealth.NumberOfNodes;
+				status.NumberOfDataNodes = clusterHealth.NumberOfDataNodes;
+				status.ActivePrimaryShards = clusterHealth.ActivePrimaryShards;
+				status.ActiveShards = clusterHealth.ActiveShards;
+				status.RelocatingShards = clusterHealth.RelocatingShards;
+				status.InitializingShards = clusterHealth.InitializingShards;
+				status.UnassignedShards = clusterHealth.UnassignedShards;
+				status.IndexExists = await IndexExistsAsync();
+
+				if (status.IndexExists)
+				{
+					var mappingStatus = await GetIndexMappingStatusAsync();
+					status.MappingHealthy = mappingStatus.Healthy;
+					status.IndexAnalyzer = mappingStatus.IndexAnalyzer;
+					status.SearchAnalyzer = mappingStatus.SearchAnalyzer;
+
+					var count = await _client.CountAsync<GoodsSearchDocument>(c => c
+						.Index(_indexName)
+						.RequestConfiguration(r => r.RequestTimeout(QueryTimeout)));
+					status.DocumentCount = count.IsValid ? count.Count : -1;
+					if (!count.IsValid)
+					{
+						status.Message = count.DebugInformation;
+					}
+				}
+				else
+				{
+					status.Message = $"索引 [{_indexName}] 不存在";
+				}
+
+				status.Healthy = status.IndexExists
+					&& status.MappingHealthy
+					&& status.ClusterStatus != "red"
+					&& status.DocumentCount >= 0;
+			}
+			catch (Exception ex)
+			{
+				status.Healthy = false;
+				status.Message = ex.Message;
+			}
+			finally
+			{
+				stopwatch.Stop();
+				status.ElapsedMilliseconds = stopwatch.ElapsedMilliseconds;
+			}
+
+			return status;
+		}
+
+		/// <summary>
+		/// 清空索引：删除后按统一映射重建，重建期间该索引不可查（由后台定时任务负责回填数据，接受短暂空窗）
+		/// </summary>
+		public async Task<bool> ClearIndexAsync()
+		{
+			var existsResponse = await _client.Indices.ExistsAsync(_indexName, d => d
+				.RequestConfiguration(r => r.RequestTimeout(QueryTimeout)));
+			if (!existsResponse.Exists)
+			{
+				Console.WriteLine($"索引 {_indexName} 不存在");
+				return false;
+			}
+
+			var deleteResponse = await _client.Indices.DeleteAsync(_indexName, d => d
+				.RequestConfiguration(r => r.RequestTimeout(AdminTimeout)));
+			if (!deleteResponse.IsValid)
+			{
+				Console.WriteLine($"删除索引 {_indexName} 失败: {deleteResponse.DebugInformation}");
+				return false;
+			}
+			Console.WriteLine($"索引 {_indexName} 已删除");
+
+			return await CreateIndexAsync();
+		}
+	}
+}

Modules/CloudProduct/Services/RawDataStorage.cs

@@ -0,0 +1,82 @@
+using MAX.Core.DependencyInjection;
+using Microsoft.Extensions.Configuration;
+using System.IO.Compression;
+using System.Text;
+
+namespace Store.Modules.CloudProduct.Services
+{
+	/// <summary>
+	/// 商品原始数据文件存储：按 goodsId % 100 分目录，文件名即商品ID，GZip 压缩保存。
+	/// </summary>
+	public interface IRawDataStorage : IScopedDependency
+	{
+		/// <summary>
+		/// 保存原始数据，返回保存后的完整路径。
+		/// </summary>
+		Task<string> SaveAsync(long goodsId, string rawData);
+
+		/// <summary>
+		/// 读取并解压原始数据；文件不存在时返回 null。
+		/// </summary>
+		Task<string?> ReadAsync(long goodsId);
+
+		/// <summary>
+		/// 判断指定商品的原始数据文件是否存在。
+		/// </summary>
+		bool Exists(long goodsId);
+	}
+
+	internal class RawDataStorage : IRawDataStorage
+	{
+		private readonly string _rootPath;
+
+		public RawDataStorage(IConfiguration configuration)
+		{
+			var configured = configuration.GetValue<string>("RawData:Path");
+			if (string.IsNullOrWhiteSpace(configured))
+				configured = "RawData";
+
+			_rootPath = Path.GetFullPath(configured);
+		}
+
+		/// <inheritdoc />
+		public async Task<string> SaveAsync(long goodsId, string rawData)
+		{
+			var filePath = GetFilePath(goodsId);
+			var dir = Path.GetDirectoryName(filePath)!;
+			Directory.CreateDirectory(dir);
+
+			await using var fileStream = new FileStream(filePath, FileMode.Create, FileAccess.Write, FileShare.None);
+			await using var gzip = new GZipStream(fileStream, CompressionLevel.Fastest);
+			await using var writer = new StreamWriter(gzip, new UTF8Encoding(false));
+			await writer.WriteAsync(rawData);
+
+			return filePath;
+		}
+
+		/// <inheritdoc />
+		public async Task<string?> ReadAsync(long goodsId)
+		{
+			var filePath = GetFilePath(goodsId);
+			if (!File.Exists(filePath))
+				return null;
+
+			await using var fileStream = new FileStream(filePath, FileMode.Open, FileAccess.Read, FileShare.Read);
+			await using var gzip = new GZipStream(fileStream, CompressionMode.Decompress);
+			using var reader = new StreamReader(gzip, new UTF8Encoding(false));
+			return await reader.ReadToEndAsync();
+		}
+
+		/// <inheritdoc />
+		public bool Exists(long goodsId)
+		{
+			return File.Exists(GetFilePath(goodsId));
+		}
+
+		private string GetFilePath(long goodsId)
+		{
+			var subDir = (goodsId % 100).ToString();
+			return Path.Combine(_rootPath, subDir, goodsId.ToString());
+		}
+	}
+}