Yxw/Atomx
1
0
Fork 0
Code Issues 24 Pull Requests Actions Packages Projects Releases Wiki Activity

新增国家、州省地区的API

Browse Source
This commit is contained in:
Seany
2025-12-25 00:59:03 +08:00
parent e396e66959
commit 53b6ceaa69
45 changed files with 669 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Atomx.Admin/Atomx.Admin.Client/Models/AreaModel.cs Normal file
View File

@@ -0,0 +1,8 @@
using Atomx.Common.Entities;
namespace Atomx.Admin.Client.Models
{
public class AreaModel:Area
{
}
}

9
Atomx.Admin/Atomx.Admin.Client/Models/AreaSearch.cs Normal file
View File

@@ -0,0 +1,9 @@
namespace Atomx.Admin.Client.Models
{
public class AreaSearch : BaseSearch
{
public long CountryId { get; set; }
public long StateProvinceId { get; set; }
public string Name { get; set; } = string.Empty;
}
}

8
Atomx.Admin/Atomx.Admin.Client/Models/CountryModel.cs Normal file
View File

@@ -0,0 +1,8 @@
using Atomx.Common.Entities;
namespace Atomx.Admin.Client.Models
{
public class CountryModel:Country
{
}
}

7
Atomx.Admin/Atomx.Admin.Client/Models/CountrySearch.cs Normal file
View File

@@ -0,0 +1,7 @@
namespace Atomx.Admin.Client.Models
{
public class CountrySearch
{
public string Name { get; set; } = string.Empty;
}
}

8
Atomx.Admin/Atomx.Admin.Client/Models/StateProvinceModel.cs Normal file
View File

@@ -0,0 +1,8 @@
using Atomx.Common.Entities;
namespace Atomx.Admin.Client.Models
{
public class StateProvinceModel: StateProvince
{
}
}

8
Atomx.Admin/Atomx.Admin.Client/Models/StateProvinceSearch.cs Normal file
View File

@@ -0,0 +1,8 @@
namespace Atomx.Admin.Client.Models
{
public class StateProvinceSearch
{
public long CountryId { get; set; }
public string Name { get; set; } = string.Empty;
}
}

2
Atomx.Admin/Atomx.Admin.Client/Pages/Products/PredefinedSpecificationList.razor
View File

@@ -120,8 +120,6 @@
bool searchExpand { get; set; } = false;
private bool drawerVisible;
SpecificationAttributeOptionModelValidator validator = new();
protected override void OnInitialized()
{
base.OnInitialized();

3
Atomx.Admin/Atomx.Admin.Client/Validators/AddressModelValidator.cs
View File

@@ -1,11 +1,12 @@
using Atomx.Admin.Client.Models;
using FluentValidation;
using Microsoft.Extensions.Localization;
namespace Atomx.Admin.Client.Validators
{
public class AddressModelValidator : AbstractValidator<AddressModel>
{
public AddressModelValidator()
public AddressModelValidator(IStringLocalizer<AddressModelValidator> localizer)
{
RuleFor(p => p.Name).NotEmpty().WithMessage("请填写收件人信息");
RuleFor(p => p.Email).EmailAddress().When(p => !string.IsNullOrEmpty(p.Email)).WithMessage("请填写你常用的邮箱地址");

3
Atomx.Admin/Atomx.Admin.Client/Validators/AdminModelValidator.cs
View File

@@ -1,11 +1,12 @@
using Atomx.Admin.Client.Models;
using FluentValidation;
using Microsoft.Extensions.Localization;
namespace Atomx.Admin.Client.Validators
{
public class AdminModelValidator : AbstractValidator<AdminModel>
{
public AdminModelValidator()
public AdminModelValidator(IStringLocalizer<AdminModelValidator> localizer)
{
RuleFor(p => p.Username).NotEmpty().WithMessage("用户名不能为空");
RuleFor(p => p.Username).Length(2, 64).When(p => !string.IsNullOrEmpty(p.Username)).WithMessage("用户名长度必须再2-64个字符之间");

14
Atomx.Admin/Atomx.Admin.Client/Validators/AreaModelValidator.cs Normal file
View File

@@ -0,0 +1,14 @@
using Atomx.Admin.Client.Models;
using FluentValidation;
using Microsoft.Extensions.Localization;
namespace Atomx.Admin.Client.Validators
{
public class AreaModelValidator : AbstractValidator<AreaModel>
{
public AreaModelValidator(IStringLocalizer<AreaModelValidator> localizer)
{
RuleFor(p => p.Name).NotEmpty().WithMessage("请填名称信息");
}
}
}

4
Atomx.Admin/Atomx.Admin.Client/Validators/CategoryModelValidator.cs
View File

@@ -1,12 +1,12 @@
using Atomx.Admin.Client.Models;
using Atomx.Common.Enums;
using FluentValidation;
using Microsoft.Extensions.Localization;
namespace Atomx.Admin.Client.Validators
{
public class CategoryModelValidator : AbstractValidator<CategoryModel>
{
public CategoryModelValidator()
public CategoryModelValidator(IStringLocalizer<CategoryModelValidator> localizer)
{
RuleFor(p => p.Name).NotEmpty().WithMessage("名称不能为空");
RuleFor(p => p.ParentId).Must((p,id)=> ValidateParent(id,p)).WithMessage("不能选择自己做上级分类");

3
Atomx.Admin/Atomx.Admin.Client/Validators/CorporationModelValidator.cs
View File

@@ -1,11 +1,12 @@
using Atomx.Admin.Client.Models;
using FluentValidation;
using Microsoft.Extensions.Localization;
namespace Atomx.Admin.Client.Validators
{
public class CorporationModelValidator : AbstractValidator<CorporationModel>
{
public CorporationModelValidator()
public CorporationModelValidator(IStringLocalizer<CorporationModelValidator> localizer)
{
RuleFor(p => p.Name).NotEmpty().WithMessage("公司名称不能为空");
}

3
Atomx.Admin/Atomx.Admin.Client/Validators/CorporationStaffModelValidator.cs
View File

@@ -1,11 +1,12 @@
using Atomx.Admin.Client.Models;
using FluentValidation;
using Microsoft.Extensions.Localization;
namespace Atomx.Admin.Client.Validators
{
public class CorporationStaffModelValidator : AbstractValidator<CorporationStaffModel>
{
public CorporationStaffModelValidator()
public CorporationStaffModelValidator(IStringLocalizer<CorporationStaffModelValidator> localizer)
{
RuleFor(p => p.Username).NotEmpty().WithMessage("用户名不能为空");
RuleFor(p => p.Username).Length(2, 64).When(p => !string.IsNullOrEmpty(p.Username)).WithMessage("用户名长度必须再2-64个字符之间");

14
Atomx.Admin/Atomx.Admin.Client/Validators/CountryModelValidator.cs Normal file
View File

@@ -0,0 +1,14 @@
using Atomx.Admin.Client.Models;
using FluentValidation;
using Microsoft.Extensions.Localization;
namespace Atomx.Admin.Client.Validators
{
public class CountryModelValidator : AbstractValidator<CountryModel>
{
public CountryModelValidator(IStringLocalizer<CountryModelValidator> localizer)
{
RuleFor(p => p.Name).NotEmpty().WithMessage("请填名称信息");
}
}
}

3
Atomx.Admin/Atomx.Admin.Client/Validators/CurrencyModelValidator.cs
View File

@@ -1,11 +1,12 @@
using Atomx.Admin.Client.Models;
using FluentValidation;
using Microsoft.Extensions.Localization;
namespace Atomx.Admin.Client.Validators
{
public class CurrencyModelValidator : AbstractValidator<CurrencyModel>
{
public CurrencyModelValidator()
public CurrencyModelValidator(IStringLocalizer<CurrencyModelValidator> localizer)
{
RuleFor(p => p.Name).NotEmpty().WithMessage("请填写货币名称");
}

3
Atomx.Admin/Atomx.Admin.Client/Validators/GeneralConfigValidator.cs
View File

@@ -1,11 +1,12 @@
using Atomx.Common.Configuration;
using FluentValidation;
using Microsoft.Extensions.Localization;
namespace Atomx.Admin.Client.Validators
{
public class GeneralConfigValidator : AbstractValidator<GeneralConfig>
{
public GeneralConfigValidator()
public GeneralConfigValidator(IStringLocalizer<GeneralConfigValidator> localizer)
{
RuleFor(p => p.Name).NotEmpty().WithMessage("网站名称不能为空");
}

3
Atomx.Admin/Atomx.Admin.Client/Validators/LanguageModelValidator.cs
View File

@@ -1,11 +1,12 @@
using Atomx.Admin.Client.Models;
using FluentValidation;
using Microsoft.Extensions.Localization;
namespace Atomx.Admin.Client.Validators
{
public class LanguageModelValidator : AbstractValidator<LanguageModel>
{
public LanguageModelValidator()
public LanguageModelValidator(IStringLocalizer<LanguageModelValidator> localizer)
{
RuleFor(p => p.Title).NotEmpty().WithMessage("请填写语言标题");
RuleFor(p => p.Name).NotEmpty().WithMessage("请填写语言名称");

3
Atomx.Admin/Atomx.Admin.Client/Validators/LocaleResourceModelValidator.cs
View File

@@ -1,11 +1,12 @@
using Atomx.Admin.Client.Models;
using FluentValidation;
using Microsoft.Extensions.Localization;
namespace Atomx.Admin.Client.Validators
{
public class LocaleResourceModelValidator : AbstractValidator<LocaleResourceModel>
{
public LocaleResourceModelValidator()
public LocaleResourceModelValidator(IStringLocalizer<LocaleResourceModelValidator> localizer)
{
RuleFor(p => p.Name).NotEmpty().WithMessage("本地化多语言信息不能为空");
}

3
Atomx.Admin/Atomx.Admin.Client/Validators/ManufacturerModelValidator.cs
View File

@@ -1,11 +1,12 @@
using Atomx.Admin.Client.Models;
using FluentValidation;
using Microsoft.Extensions.Localization;
namespace Atomx.Admin.Client.Validators
{
public class ManufacturerModelValidator : AbstractValidator<ManufacturerModel>
{
public ManufacturerModelValidator()
public ManufacturerModelValidator(IStringLocalizer<ManufacturerModelValidator> localizer)
{
RuleFor(p => p.Name).NotEmpty().WithMessage("名称不能为空");
}

3
Atomx.Admin/Atomx.Admin.Client/Validators/MenuModelValidator.cs
View File

@@ -1,12 +1,13 @@
using Atomx.Admin.Client.Models;
using Atomx.Common.Models;
using FluentValidation;
using Microsoft.Extensions.Localization;
namespace Atomx.Admin.Client.Validators
{
public class MenuModelValidator : AbstractValidator<MenuModel>
{
public MenuModelValidator()
public MenuModelValidator(IStringLocalizer<MenuModelValidator> localizer)
{
RuleFor(p => p.Name).NotEmpty().WithMessage("名称不能为空");
}

3
Atomx.Admin/Atomx.Admin.Client/Validators/ProductAddStockModelValidator.cs
View File

@@ -1,11 +1,12 @@
using Atomx.Admin.Client.Models;
using FluentValidation;
using Microsoft.Extensions.Localization;
namespace Atomx.Admin.Client.Validators
{
public class ProductAddStockModelValidator : AbstractValidator<ProductAddStockModel>
{
public ProductAddStockModelValidator()
public ProductAddStockModelValidator(IStringLocalizer<ProductAddStockModelValidator> localizer)
{
//RuleFor(p => p.Username).NotEmpty().WithMessage("用户名不能为空");
//RuleFor(p => p.Username).Length(2, 64).When(p => !string.IsNullOrEmpty(p.Username)).WithMessage("用户名长度必须再2-64个字符之间");

3
Atomx.Admin/Atomx.Admin.Client/Validators/ProductAttributeModelValidator.cs
View File

@@ -1,11 +1,12 @@
using Atomx.Admin.Client.Models;
using FluentValidation;
using Microsoft.Extensions.Localization;
namespace Atomx.Admin.Client.Validators
{
public class ProductAttributeModelValidator : AbstractValidator<ProductAttributeModel>
{
public ProductAttributeModelValidator()
public ProductAttributeModelValidator(IStringLocalizer<ProductAttributeModelValidator> localizer)
{
RuleFor(p => p.Name).NotEmpty().WithMessage("名称不能为空");
RuleFor(p => p.Status).GreaterThan(0).WithMessage("请设置正确的状态");

3
Atomx.Admin/Atomx.Admin.Client/Validators/ProductAttributeOptionModelValidator.cs
View File

@@ -1,11 +1,12 @@
using Atomx.Admin.Client.Models;
using FluentValidation;
using Microsoft.Extensions.Localization;
namespace Atomx.Admin.Client.Validators
{
public class ProductAttributeOptionModelValidator : AbstractValidator<ProductAttributeOptionModel>
{
public ProductAttributeOptionModelValidator()
public ProductAttributeOptionModelValidator(IStringLocalizer<ProductAttributeOptionModelValidator> localizer)
{
RuleFor(p => p.Value).NotEmpty().WithMessage("数值不能为空");
RuleFor(p => p.Status).GreaterThan(0).WithMessage("请设置正确的状态");

3
Atomx.Admin/Atomx.Admin.Client/Validators/ProductModelValidator.cs
View File

@@ -1,11 +1,12 @@
using Atomx.Admin.Client.Models;
using FluentValidation;
using Microsoft.Extensions.Localization;
namespace Atomx.Admin.Client.Validators
{
public class ProductModelValidator : AbstractValidator<ProductModel>
{
public ProductModelValidator()
public ProductModelValidator(IStringLocalizer<ProductModelValidator> localizer)
{
RuleFor(p => p.Title).NotEmpty().WithMessage("商品标题不能为空");
}

3
Atomx.Admin/Atomx.Admin.Client/Validators/RoleModelValidator.cs
View File

@@ -1,11 +1,12 @@
using Atomx.Admin.Client.Models;
using FluentValidation;
using Microsoft.Extensions.Localization;
namespace Atomx.Admin.Client.Validators
{
public class RoleModelValidator : AbstractValidator<RoleModel>
{
public RoleModelValidator()
public RoleModelValidator(IStringLocalizer<RoleModelValidator> localizer)
{
RuleFor(p => p.Name).NotEmpty().WithMessage("角色名称不能为空");
}

3
Atomx.Admin/Atomx.Admin.Client/Validators/RoleValidator.cs
View File

@@ -1,11 +1,12 @@
using Atomx.Common.Entities;
using FluentValidation;
using Microsoft.Extensions.Localization;
namespace Atomx.Admin.Client.Validators
{
public class RoleValidator : AbstractValidator<Role>
{
public RoleValidator()
public RoleValidator(IStringLocalizer<RoleValidator> localizer)
{
RuleFor(p => p.Name).NotEmpty().WithMessage("角色名称不能为空");
}

3
Atomx.Admin/Atomx.Admin.Client/Validators/SiteAppModelValidator.cs
View File

@@ -1,11 +1,12 @@
using Atomx.Admin.Client.Models;
using FluentValidation;
using Microsoft.Extensions.Localization;
namespace Atomx.Admin.Client.Validators
{
public class SiteAppModelValidator : AbstractValidator<SiteAppModel>
{
public SiteAppModelValidator()
public SiteAppModelValidator(IStringLocalizer<SiteAppModelValidator> localizer)
{
RuleFor(p => p.Name).NotEmpty().WithMessage("请填写网站应用名称");
}

3
Atomx.Admin/Atomx.Admin.Client/Validators/SpecificationAttributeModelValidator.cs
View File

@@ -1,11 +1,12 @@
using Atomx.Admin.Client.Models;
using FluentValidation;
using Microsoft.Extensions.Localization;
namespace Atomx.Admin.Client.Validators
{
public class SpecificationAttributeModelValidator : AbstractValidator<SpecificationAttributeModel>
{
public SpecificationAttributeModelValidator()
public SpecificationAttributeModelValidator(IStringLocalizer<SpecificationAttributeModelValidator> localizer)
{
RuleFor(p => p.Name).NotEmpty().WithMessage("名称不能为空");
RuleFor(p => p.Status).GreaterThan(0).WithMessage("请设置正确的状态");

3
Atomx.Admin/Atomx.Admin.Client/Validators/SpecificationAttributeOptionModelValidator.cs
View File

@@ -1,11 +1,12 @@
using Atomx.Admin.Client.Models;
using FluentValidation;
using Microsoft.Extensions.Localization;
namespace Atomx.Admin.Client.Validators
{
public class SpecificationAttributeOptionModelValidator : AbstractValidator<SpecificationAttributeOptionModel>
{
public SpecificationAttributeOptionModelValidator()
public SpecificationAttributeOptionModelValidator(IStringLocalizer<SpecificationAttributeOptionModelValidator> localizer)
{
RuleFor(p => p.Value).NotEmpty().WithMessage("数值不能为空");
RuleFor(p => p.Status).GreaterThan(0).WithMessage("请设置正确的状态");

14
Atomx.Admin/Atomx.Admin.Client/Validators/StateProvinceValidator.cs Normal file
View File

@@ -0,0 +1,14 @@
using Atomx.Admin.Client.Models;
using FluentValidation;
using Microsoft.Extensions.Localization;
namespace Atomx.Admin.Client.Validators
{
public class StateProvinceValidator : AbstractValidator<StateProvinceModel>
{
public StateProvinceValidator(IStringLocalizer<StateProvinceValidator> localizer)
{
RuleFor(p => p.Name).NotEmpty().WithMessage("请填名称信息");
}
}
}

3
Atomx.Admin/Atomx.Admin.Client/Validators/UploadFileModelValidator.cs
View File

@@ -1,11 +1,12 @@
using Atomx.Admin.Client.Models;
using FluentValidation;
using Microsoft.Extensions.Localization;
namespace Atomx.Admin.Client.Validators
{
public class UploadFileModelValidator : AbstractValidator<UploadFileModel>
{
public UploadFileModelValidator()
public UploadFileModelValidator(IStringLocalizer<UploadFileModelValidator> localizer)
{
RuleFor(p => p.Name).NotEmpty().WithMessage("文件名称不能为空");
}

3
Atomx.Admin/Atomx.Admin.Client/Validators/UserValidator.cs
View File

@@ -1,11 +1,12 @@
using Atomx.Common.Entities;
using FluentValidation;
using Microsoft.Extensions.Localization;
namespace Atomx.Admin.Client.Validators
{
public class UserValidator : AbstractValidator<User>
{
public UserValidator()
public UserValidator(IStringLocalizer<UserValidator> localizer)
{
RuleFor(p => p.Name).NotEmpty().WithMessage("名称不能为空");
}

3
Atomx.Admin/Atomx.Admin.Client/Validators/WarehouseModelValidator.cs
View File

@@ -1,11 +1,12 @@
using Atomx.Admin.Client.Models;
using FluentValidation;
using Microsoft.Extensions.Localization;
namespace Atomx.Admin.Client.Validators
{
public class WarehouseModelValidator : AbstractValidator<WarehouseModel>
{
public WarehouseModelValidator()
public WarehouseModelValidator(IStringLocalizer<WarehouseModelValidator> localizer)
{
RuleFor(p => p.Name).NotEmpty().WithMessage("用户名不能为空");
}