Update CultureDto and SettingService

luoyunchong · Mar 17, 2024 · eec3688 · eec3688
1 parent ad10856
commit eec3688
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 9 deletions.
diff --git a/src/LinCms.Application.Contracts/Base/Localizations/CultureDto.cs b/src/LinCms.Application.Contracts/Base/Localizations/CultureDto.cs
@@ -6,10 +6,10 @@ namespace LinCms.Base.Localizations;
 public class CultureDto : EntityDto<long>
 {
     [Required]
-    [StringLength(10)]
+    [StringLength(50,ErrorMessage = "名称最大长度为50")]
     public string Name { get; set; }
 
     [Required]
-    [StringLength(10)]
+    [StringLength(50,ErrorMessage = "显示名称最大长度为50")]
     public string DisplayName { get; set; }
 }
diff --git a/src/LinCms.Application/Cms/Settings/SettingService.cs b/src/LinCms.Application/Cms/Settings/SettingService.cs
@@ -45,8 +45,9 @@ public async Task<string> GetOrNullAsync(string name, string providerName, strin
 
     public async Task SetAsync(CreateUpdateSettingDto createSetting)
     {
-        LinSetting setting = await _settingRepository.FindAsync(createSetting.Name, createSetting.ProviderName,createSetting.ProviderKey);
-
+        LinSetting setting = await _settingRepository.FindAsync(createSetting.Name, createSetting.ProviderName,
+            createSetting.ProviderKey);
+
         if (setting == null)
         {
             await _settingRepository.InsertAsync(Mapper.Map<LinSetting>(createSetting));
@@ -65,7 +66,9 @@ public async Task<SettingDto> GetAsync(Guid id)
 
     public async Task<PagedResultDto<SettingDto>> GetPagedListAsync(PageDto pageDto)
     {
-        List<SettingDto> list = (await _settingRepository.Select.ToPagerListAsync(pageDto, out long totalCount))
+        List<SettingDto> list =
+            (await _settingRepository.Select.OrderByDescending(r => r.CreateTime)
+                .ToPagerListAsync(pageDto, out long totalCount))
             .Select(r => Mapper.Map<SettingDto>(r)).ToList();
 
         return new PagedResultDto<SettingDto>(list, totalCount);
@@ -75,7 +78,7 @@ public async Task CreateAsync(CreateUpdateSettingDto createSettingDto)
     {
         LinSetting setting = await _settingRepository.FindAsync(createSettingDto.Name,
             createSettingDto.ProviderName, createSettingDto.ProviderKey);
-        ;
+
         if (setting != null)
         {
             throw new LinCmsException("该配置已存在");

diff --git a/src/LinCms.Infrastructure/Repositories/SettingRepository.cs b/src/LinCms.Infrastructure/Repositories/SettingRepository.cs
@@ -9,9 +9,10 @@
 
 namespace LinCms.Repositories;
 
-public class SettingRepository : AuditDefaultRepository<LinSetting,Guid,long>, ISettingRepository
+public class SettingRepository : AuditDefaultRepository<LinSetting, Guid, Guid>, ISettingRepository
 {
-    public SettingRepository(UnitOfWorkManager unitOfWorkManager, ICurrentUser currentUser) : base(unitOfWorkManager, currentUser)
+    public SettingRepository(UnitOfWorkManager unitOfWorkManager, ICurrentUser currentUser) : base(unitOfWorkManager,
+        currentUser)
     {
     }
 
@@ -26,6 +27,8 @@ public async Task<List<LinSetting>> GetListAsync(string providerName, string pro
         return await Select
             .Where(
                 s => s.ProviderName == providerName && s.ProviderKey == providerKey
-            ).ToListAsync();
+            )
+            .OrderByDescending(r => r.CreateTime)
+            .ToListAsync();
     }
 }