From 7b6ec9c1d8a704f8af53278e0675d78a997caa22 Mon Sep 17 00:00:00 2001
From: Seany <17074267@qq.com>
Date: Thu, 25 Dec 2025 01:08:36 +0800
Subject: [PATCH] chore

---
 .../ProductAttributeOptionController.cs          | 15 ++++++++++-----
 .../Atomx.Admin/Controllers/ProductController.cs | 15 ++++++++++-----
 .../Atomx.Admin/Controllers/SiteAppController.cs | 16 ++++++++++------
 .../SpecificationAttributeController.cs          | 14 +++++++++-----
 .../SpecificationAttributeOptionController.cs    | 15 ++++++++++-----
 .../Controllers/UploadFileController.cs          | 13 ++++++++-----
 Atomx.Admin/Atomx.Admin/Program.cs               |  1 -
 7 files changed, 57 insertions(+), 32 deletions(-)

diff --git a/Atomx.Admin/Atomx.Admin/Controllers/ProductAttributeOptionController.cs b/Atomx.Admin/Atomx.Admin/Controllers/ProductAttributeOptionController.cs
index c96f66d..54bc82b 100644
--- a/Atomx.Admin/Atomx.Admin/Controllers/ProductAttributeOptionController.cs
+++ b/Atomx.Admin/Atomx.Admin/Controllers/ProductAttributeOptionController.cs
@@ -5,9 +5,11 @@ using Atomx.Common.Entities;
 using Atomx.Common.Models;
 using Atomx.Data;
 using Atomx.Data.Services;
+using FluentValidation;
 using MapsterMapper;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.EntityFrameworkCore;
+using Microsoft.Extensions.Localization;
 
 namespace Atomx.Admin.Controllers
 {
@@ -20,6 +22,8 @@ namespace Atomx.Admin.Controllers
         readonly IIdCreatorService _idCreator;
         readonly IMapper _mapper;
         readonly DataContext _dbContext;
+        readonly IValidator<ProductAttributeOptionModel> _validator;
+        readonly IStringLocalizer<ProductAttributeOptionController> _localizer;
 
         /// <summary>
         /// 
@@ -29,13 +33,16 @@ namespace Atomx.Admin.Controllers
         /// <param name="idCreator"></param>
         /// <param name="adminService"></param>
         /// <param name="mapper"></param>
-        public ProductAttributeOptionController(ILogger<ProductAttributeOptionController> logger, IIdentityService identityService, IIdCreatorService idCreator, IMapper mapper, DataContext dataContext)
+        public ProductAttributeOptionController(ILogger<ProductAttributeOptionController> logger, IIdentityService identityService, IIdCreatorService idCreator, IMapper mapper, DataContext dataContext,
+            IValidator<ProductAttributeOptionModel> validator, IStringLocalizer<ProductAttributeOptionController> localizer)
         {
             _logger = logger;
             _identityService = identityService;
             _idCreator = idCreator;
             _mapper = mapper;
             _dbContext = dataContext;
+            _validator = validator;
+            _localizer = localizer;
         }
 
         /// <summary>
@@ -107,8 +114,7 @@ namespace Atomx.Admin.Controllers
         public IActionResult Add(ProductAttributeOptionModel model)
         {
             var result = new ApiResult<string>();
-            var validator = new ProductAttributeOptionModelValidator();
-            var validation = validator.Validate(model);
+            var validation = _validator.Validate(model);
             if (!validation.IsValid)
             {
                 var message = validation.Errors.FirstOrDefault()?.ErrorMessage ?? string.Empty;
@@ -150,8 +156,7 @@ namespace Atomx.Admin.Controllers
         public IActionResult Edit(ProductAttributeOptionModel model)
         {
             var result = new ApiResult<string>();
-            var validator = new ProductAttributeOptionModelValidator();
-            var validation = validator.Validate(model);
+            var validation = _validator.Validate(model);
             if (!validation.IsValid)
             {
                 var message = validation.Errors.FirstOrDefault()?.ErrorMessage;
diff --git a/Atomx.Admin/Atomx.Admin/Controllers/ProductController.cs b/Atomx.Admin/Atomx.Admin/Controllers/ProductController.cs
index 3630ad8..384808d 100644
--- a/Atomx.Admin/Atomx.Admin/Controllers/ProductController.cs
+++ b/Atomx.Admin/Atomx.Admin/Controllers/ProductController.cs
@@ -8,10 +8,12 @@ using Atomx.Data;
 using Atomx.Data.Services;
 using Atomx.Utils.Extension;
 using Atomx.Utils.Json;
+using FluentValidation;
 using Mapster;
 using MapsterMapper;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.EntityFrameworkCore;
+using Microsoft.Extensions.Localization;
 
 namespace Atomx.Admin.Controllers
 {
@@ -24,6 +26,8 @@ namespace Atomx.Admin.Controllers
         readonly IIdCreatorService _idCreator;
         readonly IMapper _mapper;
         readonly DataContext _dbContext;
+        readonly IValidator<ProductModel> _validator;
+        readonly IStringLocalizer<ProductController> _localizer;
 
         /// <summary>
         /// 
@@ -33,13 +37,16 @@ namespace Atomx.Admin.Controllers
         /// <param name="idCreator"></param>
         /// <param name="adminService"></param>
         /// <param name="mapper"></param>
-        public ProductController(ILogger<ProductController> logger, IIdentityService identityService, IIdCreatorService idCreator, IMapper mapper, DataContext dataContext)
+        public ProductController(ILogger<ProductController> logger, IIdentityService identityService, IIdCreatorService idCreator, IMapper mapper, DataContext dataContext,
+           IValidator<ProductModel> validator, IStringLocalizer<ProductController> localizer )
         {
             _logger = logger;
             _identityService = identityService;
             _idCreator = idCreator;
             _mapper = mapper;
             _dbContext = dataContext;
+            _validator = validator;
+            _localizer = localizer;
         }
 
         /// <summary>
@@ -338,8 +345,7 @@ namespace Atomx.Admin.Controllers
         {
 
             var result = new ApiResult<string>();
-            var validator = new ProductModelValidator();
-            var validation = validator.Validate(model);
+            var validation = _validator.Validate(model);
             if (!validation.IsValid)
             {
                 var message = validation.Errors.FirstOrDefault()?.ErrorMessage ?? string.Empty;
@@ -538,8 +544,7 @@ namespace Atomx.Admin.Controllers
             Console.WriteLine(model.ToJson());
 
             var result = new ApiResult<string>();
-            var validator = new ProductModelValidator();
-            var validation = validator.Validate(model);
+            var validation = _validator.Validate(model);
             if (!validation.IsValid)
             {
                 var message = validation.Errors.FirstOrDefault()?.ErrorMessage ?? string.Empty;
diff --git a/Atomx.Admin/Atomx.Admin/Controllers/SiteAppController.cs b/Atomx.Admin/Atomx.Admin/Controllers/SiteAppController.cs
index e798b5a..990f21a 100644
--- a/Atomx.Admin/Atomx.Admin/Controllers/SiteAppController.cs
+++ b/Atomx.Admin/Atomx.Admin/Controllers/SiteAppController.cs
@@ -6,9 +6,11 @@ using Atomx.Common.Models;
 using Atomx.Data;
 using Atomx.Data.CacheServices;
 using Atomx.Data.Services;
+using FluentValidation;
 using MapsterMapper;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.EntityFrameworkCore;
+using Microsoft.Extensions.Localization;
 
 namespace Atomx.Admin.Controllers
 {
@@ -22,7 +24,8 @@ namespace Atomx.Admin.Controllers
         readonly IMapper _mapper;
         readonly DataContext _dbContext;
         readonly ICacheService _cacheService;
-
+        private readonly IValidator<SiteAppModel> _validator;
+        private readonly IStringLocalizer<SiteAppController> _localizer;
         /// <summary>
         /// 
         /// </summary>
@@ -31,7 +34,8 @@ namespace Atomx.Admin.Controllers
         /// <param name="idCreator"></param>
         /// <param name="messageTemplateService"></param>
         /// <param name="mapper"></param>
-        public SiteAppController(ILogger<SiteAppController> logger, IIdentityService identityService, IIdCreatorService idCreator, IMapper mapper, DataContext dataContext, ICacheService cacheService)
+        public SiteAppController(ILogger<SiteAppController> logger, IIdentityService identityService, IIdCreatorService idCreator, IMapper mapper, DataContext dataContext, ICacheService cacheService,
+            IValidator<SiteAppModel> validator, IStringLocalizer<SiteAppController> localizer)
         {
             _logger = logger;
             _identityService = identityService;
@@ -39,6 +43,8 @@ namespace Atomx.Admin.Controllers
             _mapper = mapper;
             _dbContext = dataContext;
             _cacheService = cacheService;
+            _validator = validator;
+            _localizer = localizer;
 
         }
 
@@ -115,8 +121,7 @@ namespace Atomx.Admin.Controllers
         public IActionResult Add(SiteAppModel model)
         {
             var result = new ApiResult<string>();
-            var validator = new SiteAppModelValidator();
-            var validation = validator.Validate(model);
+            var validation = _validator.Validate(model);
             if (!validation.IsValid)
             {
                 var message = validation.Errors.FirstOrDefault()?.ErrorMessage;
@@ -151,8 +156,7 @@ namespace Atomx.Admin.Controllers
         public IActionResult Edit(SiteAppModel model)
         {
             var result = new ApiResult<string>();
-            var validator = new SiteAppModelValidator();
-            var validation = validator.Validate(model);
+            var validation = _validator.Validate(model);
             if (!validation.IsValid)
             {
                 var message = validation.Errors.FirstOrDefault()?.ErrorMessage;
diff --git a/Atomx.Admin/Atomx.Admin/Controllers/SpecificationAttributeController.cs b/Atomx.Admin/Atomx.Admin/Controllers/SpecificationAttributeController.cs
index fcc8979..f2aa40d 100644
--- a/Atomx.Admin/Atomx.Admin/Controllers/SpecificationAttributeController.cs
+++ b/Atomx.Admin/Atomx.Admin/Controllers/SpecificationAttributeController.cs
@@ -5,10 +5,12 @@ using Atomx.Common.Entities;
 using Atomx.Common.Models;
 using Atomx.Data;
 using Atomx.Data.Services;
+using FluentValidation;
 using Mapster;
 using MapsterMapper;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.EntityFrameworkCore;
+using Microsoft.Extensions.Localization;
 
 namespace Atomx.Admin.Controllers
 {
@@ -21,6 +23,8 @@ namespace Atomx.Admin.Controllers
         readonly IIdCreatorService _idCreator;
         readonly IMapper _mapper;
         readonly DataContext _dbContext;
+        private readonly IValidator<SpecificationAttributeModel> _validator;
+        private readonly IStringLocalizer<SpecificationAttributeController> _localizer;
 
         /// <summary>
         /// 
@@ -30,13 +34,15 @@ namespace Atomx.Admin.Controllers
         /// <param name="idCreator"></param>
         /// <param name="adminService"></param>
         /// <param name="mapper"></param>
-        public SpecificationAttributeController(ILogger<SpecificationAttributeController> logger, IIdentityService identityService, IIdCreatorService idCreator, IMapper mapper, DataContext dataContext)
+        public SpecificationAttributeController(ILogger<SpecificationAttributeController> logger, IIdentityService identityService, IIdCreatorService idCreator, IMapper mapper, DataContext dataContext, IValidator<SpecificationAttributeModel> validator, IStringLocalizer<SpecificationAttributeController> localizer)
         {
             _logger = logger;
             _identityService = identityService;
             _idCreator = idCreator;
             _mapper = mapper;
             _dbContext = dataContext;
+            _validator = validator;
+            _localizer = localizer;
         }
 
         /// <summary>
@@ -125,8 +131,7 @@ namespace Atomx.Admin.Controllers
         public IActionResult Add(SpecificationAttributeModel model)
         {
             var result = new ApiResult<string>();
-            var validator = new SpecificationAttributeModelValidator();
-            var validation = validator.Validate(model);
+            var validation = _validator.Validate(model);
             if (!validation.IsValid)
             {
                 var message = validation.Errors.FirstOrDefault()?.ErrorMessage ?? string.Empty;
@@ -169,8 +174,7 @@ namespace Atomx.Admin.Controllers
         public IActionResult Edit(SpecificationAttributeModel model)
         {
             var result = new ApiResult<string>();
-            var validator = new SpecificationAttributeModelValidator();
-            var validation = validator.Validate(model);
+            var validation = _validator.Validate(model);
             if (!validation.IsValid)
             {
                 var message = validation.Errors.FirstOrDefault()?.ErrorMessage;
diff --git a/Atomx.Admin/Atomx.Admin/Controllers/SpecificationAttributeOptionController.cs b/Atomx.Admin/Atomx.Admin/Controllers/SpecificationAttributeOptionController.cs
index d503037..ced6b70 100644
--- a/Atomx.Admin/Atomx.Admin/Controllers/SpecificationAttributeOptionController.cs
+++ b/Atomx.Admin/Atomx.Admin/Controllers/SpecificationAttributeOptionController.cs
@@ -6,9 +6,11 @@ using Atomx.Common.Entities;
 using Atomx.Common.Models;
 using Atomx.Data;
 using Atomx.Data.Services;
+using FluentValidation;
 using MapsterMapper;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.EntityFrameworkCore;
+using Microsoft.Extensions.Localization;
 
 namespace Atomx.Admin.Controllers
 {
@@ -21,6 +23,8 @@ namespace Atomx.Admin.Controllers
         readonly IIdCreatorService _idCreator;
         readonly IMapper _mapper;
         readonly DataContext _dbContext;
+        private readonly IValidator<SpecificationAttributeOptionModel> _validator;
+        private readonly IStringLocalizer<SpecificationAttributeOptionController> _localizer;
 
         /// <summary>
         /// 
@@ -30,13 +34,16 @@ namespace Atomx.Admin.Controllers
         /// <param name="idCreator"></param>
         /// <param name="adminService"></param>
         /// <param name="mapper"></param>
-        public SpecificationAttributeOptionController(ILogger<SpecificationAttributeOptionController> logger, IIdentityService identityService, IIdCreatorService idCreator, IMapper mapper, DataContext dataContext)
+        public SpecificationAttributeOptionController(ILogger<SpecificationAttributeOptionController> logger, IIdentityService identityService, IIdCreatorService idCreator, IMapper mapper, DataContext dataContext,
+            IValidator<SpecificationAttributeOptionModel> validator, IStringLocalizer<SpecificationAttributeOptionController> localizer)
         {
             _logger = logger;
             _identityService = identityService;
             _idCreator = idCreator;
             _mapper = mapper;
             _dbContext = dataContext;
+            _validator = validator;
+            _localizer = localizer;
         }
 
         /// <summary>
@@ -115,8 +122,7 @@ namespace Atomx.Admin.Controllers
         public IActionResult Add(SpecificationAttributeOptionModel model)
         {
             var result = new ApiResult<string>();
-            var validator = new SpecificationAttributeOptionModelValidator();
-            var validation = validator.Validate(model);
+            var validation = _validator.Validate(model);
             if (!validation.IsValid)
             {
                 var message = validation.Errors.FirstOrDefault()?.ErrorMessage ?? string.Empty;
@@ -159,8 +165,7 @@ namespace Atomx.Admin.Controllers
         public IActionResult Edit(SpecificationAttributeOptionModel model)
         {
             var result = new ApiResult<string>();
-            var validator = new SpecificationAttributeOptionModelValidator();
-            var validation = validator.Validate(model);
+            var validation = _validator.Validate(model);
             if (!validation.IsValid)
             {
                 var message = validation.Errors.FirstOrDefault()?.ErrorMessage;
diff --git a/Atomx.Admin/Atomx.Admin/Controllers/UploadFileController.cs b/Atomx.Admin/Atomx.Admin/Controllers/UploadFileController.cs
index 5f85c61..75aa16e 100644
--- a/Atomx.Admin/Atomx.Admin/Controllers/UploadFileController.cs
+++ b/Atomx.Admin/Atomx.Admin/Controllers/UploadFileController.cs
@@ -5,9 +5,11 @@ using Atomx.Common.Entities;
 using Atomx.Common.Models;
 using Atomx.Data;
 using Atomx.Data.Services;
+using FluentValidation;
 using MapsterMapper;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.EntityFrameworkCore;
+using Microsoft.Extensions.Localization;
 
 namespace Atomx.Admin.Controllers
 {
@@ -20,6 +22,8 @@ namespace Atomx.Admin.Controllers
         readonly IIdCreatorService _idCreator;
         readonly IMapper _mapper;
         readonly DataContext _dbContext;
+        readonly IValidator<UploadFileModel> _validator;
+        readonly IStringLocalizer<UploadFileController> _localizer;
 
         /// <summary>
         /// 
@@ -29,7 +33,8 @@ namespace Atomx.Admin.Controllers
         /// <param name="idCreator"></param>
         /// <param name="adminService"></param>
         /// <param name="mapper"></param>
-        public UploadFileController(ILogger<UploadFileController> logger, IIdentityService identityService, IIdCreatorService idCreator, IMapper mapper, DataContext dataContext)
+        public UploadFileController(ILogger<UploadFileController> logger, IIdentityService identityService, IIdCreatorService idCreator, IMapper mapper, DataContext dataContext,
+            IValidator<StateProvinceModel> validator, IStringLocalizer<StateProvinceController> localizer)
         {
             _logger = logger;
             _identityService = identityService;
@@ -111,8 +116,7 @@ namespace Atomx.Admin.Controllers
         public IActionResult Add(UploadFileModel model)
         {
             var result = new ApiResult<string>();
-            var validator = new UploadFileModelValidator();
-            var validation = validator.Validate(model);
+            var validation = _validator.Validate(model);
             if (!validation.IsValid)
             {
                 var message = validation.Errors.FirstOrDefault()?.ErrorMessage;
@@ -147,8 +151,7 @@ namespace Atomx.Admin.Controllers
         public IActionResult Edit(UploadFileModel model)
         {
             var result = new ApiResult<string>();
-            var validator = new UploadFileModelValidator();
-            var validation = validator.Validate(model);
+            var validation = _validator.Validate(model);
             if (!validation.IsValid)
             {
                 var message = validation.Errors.FirstOrDefault()?.ErrorMessage;
diff --git a/Atomx.Admin/Atomx.Admin/Program.cs b/Atomx.Admin/Atomx.Admin/Program.cs
index c463fc6..560b14f 100644
--- a/Atomx.Admin/Atomx.Admin/Program.cs
+++ b/Atomx.Admin/Atomx.Admin/Program.cs
@@ -83,7 +83,6 @@ builder.Services.AddScoped<PersistentAuthenticationStateProvider>();
 // 基本工具服务
 builder.Services.AddScoped<IIdCreatorService, IdCreatorService>();
 builder.Services.AddScoped<IIdentityService, IdentityService>();
-builder.Services.AddScoped<LocalizationFile, LocalizationFile>();
 
 builder.Services.AddScoped<AuthHeaderHandler>();