发布日志 增加lili 版本

IRaCIS.Core.Application/Service/Common/DTO/PublishLogViewModel.cs

@@ -13,6 +13,8 @@ namespace IRaCIS.Core.Application.ViewModel
         public Guid CreateUserId { get; set; }
         public Guid UpdateUserId { get; set; }
         public DateTime UpdateTime { get; set; }
+
+        public string IsEnv_US { get; set; }
     }
 
     ///<summary>PublishLogQuery  列表查询参数模型</summary>
@@ -32,6 +34,8 @@ namespace IRaCIS.Core.Application.ViewModel
     {
         public Guid? Id { get; set; }
         public string Version { get; set; }
+
+        public string Version_US { get; set; }
         public DateTime? PublishTime { get; set; }
         public string UpdateContent { get; set; }
 
@@ -47,6 +51,7 @@ namespace IRaCIS.Core.Application.ViewModel
     {
         public Guid Id { get; set; }
         public string Version { get; set; }
+        public string Version_US { get; set; }
         public int State { get; set; }
         public DateTime? PublishTime { get; set; }
         public bool IsCurrentVersion { get; set; }

IRaCIS.Core.Application/Service/Common/PublishLogService.cs

@@ -6,8 +6,10 @@
 
 using IRaCIS.Core.Application.Interfaces;
 using IRaCIS.Core.Application.ViewModel;
+using IRaCIS.Core.Domain.Share;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
+using Microsoft.Extensions.Options;
 
 namespace IRaCIS.Core.Application.Service
 {
@@ -40,7 +42,7 @@ namespace IRaCIS.Core.Application.Service
         {
             Version version;
 
-            if (!Version.TryParse(addOrEditPublishLog.Version, out version))
+            if (!Version.TryParse(addOrEditPublishLog.Version, out version)|| !Version.TryParse(addOrEditPublishLog.Version_US, out version))
             {
                 //"版本号不符合要求"
                 return ResponseOutput.NotOk(_localizer["PublishLog_NotValidVersion"]);
@@ -48,7 +50,7 @@ namespace IRaCIS.Core.Application.Service
 
             var verifyExp1 = new EntityVerifyExp<PublishLog>()
             {
-                VerifyExp = u => u.Version == addOrEditPublishLog.Version,
+                VerifyExp = u => u.Version == addOrEditPublishLog.Version || u.Version_US == addOrEditPublishLog.Version_US,
 
                 //"发布编号不能重复"
                 VerifyMsg = _localizer["PublishLog_RepeatVersion"]
@@ -79,7 +81,7 @@ namespace IRaCIS.Core.Application.Service
         }
 
         [AllowAnonymous]
-        public async Task<PublishLogView> GetCurrentPublishInfo()
+        public async Task<PublishLogView> GetCurrentPublishInfo([FromServices] IOptionsMonitor<SystemEmailSendConfig> _sysEmialConfigOPtion)
         {
             var result = await _publishLogRepository.Where(t => t.IsCurrentVersion == true).ProjectTo<PublishLogView>(_mapper.ConfigurationProvider).FirstOrDefaultAsync();
 
@@ -89,6 +91,7 @@ namespace IRaCIS.Core.Application.Service
                 throw new QueryBusinessObjectNotExistException(_localizer["PublishLog_NoCurrentVersion"]);
             }
 
+            result.IsEnv_US = _sysEmialConfigOPtion.CurrentValue.IsEnv_US;
             return result;
         }