Merge branch 'Test_IRC_Net8' of https://gitea.frp.extimaging.com/XCKJ/irc-netcore-api into Test_IRC_Net8

IRC.Core.SCP/Service/CStoreSCPService.cs

@@ -256,8 +256,9 @@ namespace IRaCIS.Core.SCP.Service
             string seriesInstanceUid = request.Dataset.GetString(DicomTag.SeriesInstanceUID);
             string sopInstanceUid = request.Dataset.GetString(DicomTag.SOPInstanceUID);
 
-            Guid seriesId = IdentifierHelper.CreateGuid(studyInstanceUid, seriesInstanceUid);
-            Guid instanceId = IdentifierHelper.CreateGuid(studyInstanceUid, seriesInstanceUid, sopInstanceUid);
+            //Guid studyId = IdentifierHelper.CreateGuid(studyInstanceUid, trialId.ToString());
+            Guid seriesId = IdentifierHelper.CreateGuid(studyInstanceUid, seriesInstanceUid, _trialId.ToString());
+            Guid instanceId = IdentifierHelper.CreateGuid(studyInstanceUid, seriesInstanceUid, sopInstanceUid, _trialId.ToString());
 
 
             var ossService = _serviceProvider.GetService<IOSSService>();
@@ -332,6 +333,7 @@ namespace IRaCIS.Core.SCP.Service
                         }
                     }
 
+
                     await _seriesRepository.SaveChangesAsync();
                 }
                 catch (Exception ex)

IRaCIS.Core.API/IRaCIS.Core.API.csproj

@@ -64,6 +64,7 @@
     <PackageReference Include="aliyun-net-sdk-sts" Version="3.1.2" />
     <PackageReference Include="AspNetCoreRateLimit" Version="5.0.0" />
     <PackageReference Include="Autofac.Extensions.DependencyInjection" Version="9.0.0" />
+    <PackageReference Include="ConfigMapFileProvider" Version="2.0.1" />
 	<PackageReference Include="EasyCaching.Interceptor.Castle" Version="1.9.2" />
 	<PackageReference Include="EasyCaching.Serialization.MessagePack" Version="1.9.2">
 	  <TreatAsUsed>true</TreatAsUsed>

IRaCIS.Core.API/Progranm.cs

@@ -76,8 +76,8 @@ if (urlsIndex > -1)
 
 NewId.SetProcessIdProvider(new CurrentProcessIdProvider());
 
-builder.Configuration.AddJsonFile("appsettings.json", false, true)
-                     .AddJsonFile($"appsettings.{enviromentName}.json", false, true);
+builder.Configuration.AddJsonFile(ConfigMapFileProvider.FromRelativePath(""), "appsettings.json", false, true)
+                     .AddJsonFile(ConfigMapFileProvider.FromRelativePath(""), $"appsettings.{enviromentName}.json", false, true);
 
 builder.Host
             .UseServiceProviderFactory(new AutofacServiceProviderFactory())

IRaCIS.Core.Application/BackGroundJob/IRaCISCHangfireJob.cs

@@ -25,8 +25,6 @@ namespace IRaCIS.Application.Services.BackGroundJob
     {
         public static string JsonFileFolder = Path.Combine(AppContext.BaseDirectory, StaticData.Folder.Resources);
 
-        public static FileSystemWatcher FileSystemWatcher_US { get; set; }
-        public static FileSystemWatcher FileSystemWatcher_CN { get; set; }
         private readonly IRepository<Trial> _trialRepository;
         private readonly IEasyCachingProvider _provider;
         private readonly ILogger<IRaCISCHangfireJob> _logger;
@@ -62,7 +60,7 @@ namespace IRaCIS.Application.Services.BackGroundJob
 
             //初始化
 
-            await InitInternationlizationDataAndWatchJsonFileAsync();
+            await InternationalizationHelper.InitInternationlizationDataAndWatchJsonFileAsync(_internationalizationRepository);
 
             //创建邮件定时任务
             await InitSysAndTrialCronJobAsync();
@@ -96,93 +94,8 @@ namespace IRaCIS.Application.Services.BackGroundJob
         }
 
 
-        #region 国际化 初始化
 
 
-        public async Task InitInternationlizationDataAndWatchJsonFileAsync()
-        {
-            //查询数据库的数据
-            var toJsonList = await _internationalizationRepository.Where(t => t.InternationalizationType == 1).Select(t => new
-            {
-                t.Code,
-                t.Value,
-                t.ValueCN
-            }).ToListAsync();
-
-            //组织成json 文件
-
-            var usJsonPath = Path.Combine(JsonFileFolder, StaticData.En_US_Json);
-            var cnJsonPath = Path.Combine(JsonFileFolder, StaticData.Zh_CN_Json);
-
-
-            //本地静态文件国际化需要
-            foreach (var tojsonItem in toJsonList)
-            {
-                StaticData.En_US_Dic[tojsonItem.Code] = tojsonItem.Value;
-                StaticData.Zh_CN_Dic[tojsonItem.Code] = tojsonItem.ValueCN;
-            }
-
-            File.WriteAllText(usJsonPath, JsonConvert.SerializeObject(StaticData.En_US_Dic));
-            File.WriteAllText(cnJsonPath, JsonConvert.SerializeObject(StaticData.Zh_CN_Dic));
-
-
-            //监测Json文件变更 实时刷新数据
-
-            if (!File.Exists(usJsonPath)|| !File.Exists(cnJsonPath))
-            {
-                throw new BusinessValidationFailedException(StaticData.International("IRaCISCHangfireJob_FileNotFound"));
-            }
-
-            FileSystemWatcher_US = new FileSystemWatcher
-            {
-                Path = Path.GetDirectoryName(usJsonPath)!,
-                NotifyFilter = NotifyFilters.LastWrite | NotifyFilters.Size,
-                Filter = Path.GetFileName(usJsonPath),
-                EnableRaisingEvents = true,
-
-            };
-            // 添加文件更改事件的处理程序
-            FileSystemWatcher_US.Changed += (sender, e) => LoadJsonFile(StaticData.Folder.Resources+"\\"+ StaticData.En_US_Json);
-
-
-            FileSystemWatcher_CN = new FileSystemWatcher
-            {
-                Path = Path.GetDirectoryName(cnJsonPath)!,
-                NotifyFilter = NotifyFilters.LastWrite | NotifyFilters.Size,
-                Filter = Path.GetFileName(cnJsonPath),
-                EnableRaisingEvents = true,
-
-            };
-            FileSystemWatcher_CN.Changed += (sender, e) => LoadJsonFile(StaticData.Folder.Resources + "\\" + StaticData.Zh_CN_Json);
-
-        }
-
-
-
-
-        private void LoadJsonFile(string filePath)
-        {
-            Console.WriteLine("刷新json内存数据");
-            IConfigurationBuilder builder = new ConfigurationBuilder().AddJsonFile(filePath,false,false);
-
-            IConfigurationRoot enConfiguration = builder.Build();
-
-            foreach (IConfigurationSection section in enConfiguration.GetChildren())
-            {
-                if (filePath.Contains(StaticData.En_US_Json))
-                {
-                    StaticData.En_US_Dic[section.Key] = section.Value;
-
-                }
-                else
-                {
-                    StaticData.Zh_CN_Dic[section.Key] = section.Value;
-                }
-            }
-        }
-
-        #endregion
-
         public async Task InitSysAndTrialCronJobAsync()
         {
             //var deleteJobIdList = await _trialEmailNoticeConfigRepository.Where(t => t.Trial.TrialStatusStr != StaticData.TrialState.TrialOngoing && t.EmailCron != string.Empty && t.IsAutoSend)

IRaCIS.Core.Application/Helper/InternationalizationHelper.cs

@@ -18,6 +18,9 @@ namespace IRaCIS.Core.Application.Helper
     {
         public static string JsonFileFolder = Path.Combine(AppContext.BaseDirectory, StaticData.Folder.Resources);
 
+        public static FileSystemWatcher FileSystemWatcher_US { get; set; }
+        public static FileSystemWatcher FileSystemWatcher_CN { get; set; }
+
         private static void VerifyFolder()
         {
             if (!Directory.Exists(JsonFileFolder) ||
@@ -107,10 +110,11 @@ namespace IRaCIS.Core.Application.Helper
 
         }
 
-        public static async Task InitInternationlizationDataAndWatchJsonFileAsync(IRepository _repository)
+
+        public static async Task InitInternationlizationDataAndWatchJsonFileAsync(IRepository<Internationalization> _internationalizationRepository)
         {
             //查询数据库的数据
-            var toJsonList = await _repository.Where<Internationalization>(t => t.InternationalizationType == 1).Select(t => new
+            var toJsonList = await _internationalizationRepository.Where(t => t.InternationalizationType == 1).Select(t => new
             {
                 t.Code,
                 t.Value,
@@ -136,29 +140,45 @@ namespace IRaCIS.Core.Application.Helper
 
             //监测Json文件变更 实时刷新数据
 
-            WatchJsonFile(usJsonPath);
-            WatchJsonFile(cnJsonPath);
-
-        }
-
-        public static void WatchJsonFile(string filePath)
-        {
-            if (!File.Exists(filePath))
+            if (!File.Exists(usJsonPath) || !File.Exists(cnJsonPath))
             {
-                throw new BusinessValidationFailedException("国际化Json文件不存在");
+                throw new BusinessValidationFailedException(StaticData.International("IRaCISCHangfireJob_FileNotFound"));
             }
 
-            FileSystemWatcher watcher = new FileSystemWatcher(Path.GetDirectoryName(filePath), Path.GetFileName(filePath));
-            watcher.Changed += (sender, e) => LoadJsonFile(filePath);
-            watcher.EnableRaisingEvents = true;
+
+            //    //监测Json文件变更 实时刷新数据
+
+
+            FileSystemWatcher_US = new FileSystemWatcher
+            {
+                Path = Path.GetDirectoryName(usJsonPath)!,
+                NotifyFilter = NotifyFilters.LastWrite | NotifyFilters.Size,
+                Filter = Path.GetFileName(usJsonPath),
+                EnableRaisingEvents = true,
+
+            };
+            // 添加文件更改事件的处理程序
+            FileSystemWatcher_US.Changed += (sender, e) => LoadJsonFile(StaticData.Folder.Resources + "\\" + StaticData.En_US_Json);
+
+
+            FileSystemWatcher_CN = new FileSystemWatcher
+            {
+                Path = Path.GetDirectoryName(cnJsonPath)!,
+                NotifyFilter = NotifyFilters.LastWrite | NotifyFilters.Size,
+                Filter = Path.GetFileName(cnJsonPath),
+                EnableRaisingEvents = true,
+
+            };
+            FileSystemWatcher_CN.Changed += (sender, e) => LoadJsonFile(StaticData.Folder.Resources + "\\" + StaticData.Zh_CN_Json);
 
         }
 
 
+
         private static void LoadJsonFile(string filePath)
         {
-
-            IConfigurationBuilder builder = new ConfigurationBuilder().AddJsonFile(filePath);
+            Console.WriteLine("刷新json内存数据");
+            IConfigurationBuilder builder = new ConfigurationBuilder().AddJsonFile(filePath, false, false);
 
             IConfigurationRoot enConfiguration = builder.Build();
 
@@ -175,5 +195,11 @@ namespace IRaCIS.Core.Application.Helper
                 }
             }
         }
+
+
+
+
+
+
     }
 }

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

@@ -190,7 +190,7 @@ namespace IRaCIS.Application.Services
             messageToSend = await GetEmailSubejctAndHtmlInfoAndBuildAsync(mfaType == UserMFAType.Login ? EmailBusinessScenario.MFALogin : EmailBusinessScenario.MFAUnlock, messageToSend, emailConfigFunc);
 
 
-            var sucessHandle = GetEmailSuccessHandle(userId, verificationCode);
+            var sucessHandle = GetEmailSuccessHandle(userId, verificationCode, emailAddress);
 
 
             await SendEmailHelper.SendEmailAsync(messageToSend, _systemEmailConfig, sucessHandle);
@@ -229,7 +229,7 @@ namespace IRaCIS.Application.Services
             messageToSend = await GetEmailSubejctAndHtmlInfoAndBuildAsync(EmailBusinessScenario.UserResetEmail, messageToSend, emailConfigFunc);
 
 
-            var sucessHandle = GetEmailSuccessHandle(userId, verificationCode);
+            var sucessHandle = GetEmailSuccessHandle(userId, verificationCode, emailAddress);
 
             await SendEmailHelper.SendEmailAsync(messageToSend, _systemEmailConfig, sucessHandle);
 
@@ -269,7 +269,7 @@ namespace IRaCIS.Application.Services
             messageToSend = await GetEmailSubejctAndHtmlInfoAndBuildAsync(EmailBusinessScenario.UnloginUseEmailResetPassword, messageToSend, emailConfigFunc);
 
             ////此时不知道用户
-            var sucessHandle = GetEmailSuccessHandle(Guid.Empty, verificationCode);
+            var sucessHandle = GetEmailSuccessHandle(Guid.Empty, verificationCode, emailAddress);
 
 
             await SendEmailHelper.SendEmailAsync(messageToSend, _systemEmailConfig, sucessHandle);
@@ -355,7 +355,7 @@ namespace IRaCIS.Application.Services
             messageToSend = await GetEmailSubejctAndHtmlInfoAndBuildAsync(EmailBusinessScenario.SiteSurveyLogin, messageToSend, emailConfigFunc);
 
             //此时不知道用户
-            var sucessHandle = GetEmailSuccessHandle(Guid.Empty, verificationCode);
+            var sucessHandle = GetEmailSuccessHandle(Guid.Empty, verificationCode, emailAddress);
 
 
             await SendEmailHelper.SendEmailAsync(messageToSend, _systemEmailConfig, sucessHandle);

IRaCIS.Core.Application/Service/Management/UserService.cs

@@ -208,6 +208,11 @@ namespace IRaCIS.Application.Services
                     return ResponseOutput.NotOk(_localizer["User_VerificationCodeExpired"]);
 
                 }
+                else if (verificationRecord.EmailOrPhone.Trim() != newEmail.Trim())
+                {
+                    //发送验证嘛的和提交的邮箱不一致
+                    return ResponseOutput.NotOk(_localizer["User_VerificationEmailNotSameWithBefore"]);
+                }
                 else //验证码正确 并且 没有超时 
                 {
 
@@ -684,7 +689,7 @@ namespace IRaCIS.Application.Services
         [AllowAnonymous]
         public async Task<IResponseOutput> VerifyMFACodeAsync(Guid userId, string Code)
         {
-            var verificationRecord = await _repository.GetQueryable<VerificationCode>().OrderByDescending(x => x.ExpirationTime).Where(t => t.UserId == userId && t.Code == Code && t.CodeType == VerifyType.Email).FirstOrDefaultAsync();
+            var verificationRecord = await _verificationCodeRepository.Where(t => t.UserId == userId && t.Code == Code && t.CodeType == VerifyType.Email).OrderByDescending(x => x.ExpirationTime).FirstOrDefaultAsync();
             VerifyEmialGetDoctorInfoOutDto result = new VerifyEmialGetDoctorInfoOutDto();
 
             //检查数据库是否存在该验证码
@@ -707,6 +712,10 @@ namespace IRaCIS.Application.Services
                 }
                 else //验证码正确 并且 没有超时 
                 {
+
+
+                    //删除验证码历史记录
+                    await _verificationCodeRepository.BatchDeleteNoTrackingAsync(t => t.Id == verificationRecord.Id);
                     await _userLogRepository.AddAsync(new UserLog() { IP = _userInfo.IP, LoginUserId = userId, OptUserId = userId, OptType = UserOptType.MFALogin }, true);
 
                 }

IRaCIS.Core.Application/Service/SiteSurvey/TrialSiteSurveyService.cs

@@ -117,6 +117,10 @@ namespace IRaCIS.Core.Application.Contracts
                 }
                 else //验证码正确 并且 没有超时 
                 {
+
+                    //删除验证码历史记录
+                    await _repository.BatchDeleteAsync<VerificationCode>(t => t.Id == verificationRecord.Id);
+
                     var dockerInfo = await _repository.Where<Doctor>(t => t.EMail == inDto.EmailOrPhone || t.Phone == inDto.EmailOrPhone).FirstOrDefaultAsync();
 
                     if (dockerInfo != null)
@@ -192,6 +196,9 @@ namespace IRaCIS.Core.Application.Contracts
             }
             else
             {
+                //删除验证码历史记录
+                await _repository.BatchDeleteAsync<VerificationCode>(t => t.Id == verifyRecord.Id);
+
                 //验证码正确 不处理
             }