diff --git a/IRaCIS.Core.API/_ServiceExtensions/NewtonsoftJson/JSONTimeZoneConverter.cs b/IRaCIS.Core.API/_ServiceExtensions/NewtonsoftJson/JSONTimeZoneConverter.cs index ce758306c..0fada0af4 100644 --- a/IRaCIS.Core.API/_ServiceExtensions/NewtonsoftJson/JSONTimeZoneConverter.cs +++ b/IRaCIS.Core.API/_ServiceExtensions/NewtonsoftJson/JSONTimeZoneConverter.cs @@ -35,7 +35,9 @@ namespace IRaCIS.Core.API else { // Default or English date format - _dateFormat = "MM/dd/yyyy HH:mm:ss"; + //_dateFormat = "MM/dd/yyyy HH:mm:ss"; + + _dateFormat = "yyyy-MM-dd HH:mm:ss"; } #endregion diff --git a/IRaCIS.Core.API/appsettings.US_Uat_IRC.json b/IRaCIS.Core.API/appsettings.US_Uat_IRC.json index f04b1dfa2..b0d9c7b34 100644 --- a/IRaCIS.Core.API/appsettings.US_Uat_IRC.json +++ b/IRaCIS.Core.API/appsettings.US_Uat_IRC.json @@ -69,7 +69,7 @@ "ChangePassWordDays": 90, - "OpenLoginMFA": true + "OpenLoginMFA": false }, "SystemEmailSendConfig": { diff --git a/IRaCIS.Core.Application/Helper/OSSService.cs b/IRaCIS.Core.Application/Helper/OSSService.cs index 50d346ab3..f4609a16e 100644 --- a/IRaCIS.Core.Application/Helper/OSSService.cs +++ b/IRaCIS.Core.Application/Helper/OSSService.cs @@ -28,6 +28,7 @@ using MassTransit; using AlibabaCloud.SDK.Sts20150401; using Amazon.SecurityToken; using Amazon.SecurityToken.Model; +using Amazon; namespace IRaCIS.Core.Application.Helper { @@ -235,13 +236,15 @@ namespace IRaCIS.Core.Application.Helper { var awsConfig = ObjectStoreServiceOptions.AWS; - // 提供awsAccessKeyId和awsSecretAccessKey构造凭证 - var credentials = new BasicAWSCredentials(AWSTempToken.AccessKeyId, AWSTempToken.SecretAccessKey); + var credentials = new SessionAWSCredentials( AWSTempToken.AccessKeyId, AWSTempToken.SecretAccessKey, AWSTempToken.SessionToken); + + //提供awsEndPoint(域名)进行访问配置 var clientConfig = new AmazonS3Config { - ServiceURL = awsConfig.EndPoint + RegionEndpoint = RegionEndpoint.USEast1, + UseHttp =true, }; var amazonS3Client = new AmazonS3Client(credentials, clientConfig); diff --git a/IRaCIS.Core.Application/Service/QC/ClinicalDataService.cs b/IRaCIS.Core.Application/Service/QC/ClinicalDataService.cs index 6ac863684..c4c186183 100644 --- a/IRaCIS.Core.Application/Service/QC/ClinicalDataService.cs +++ b/IRaCIS.Core.Application/Service/QC/ClinicalDataService.cs @@ -51,7 +51,7 @@ namespace IRaCIS.Core.Application.Contracts return await previousHistoryQueryable.ToListAsync(); } - [HttpPost("{trialId:guid}")] + [HttpPost] public async Task> AddOrUpdatePreviousHistory(PreviousHistoryAddOrEdit addOrEditPreviousHistory) { await _qCCommon.VerifyIsCRCSubmmitAsync(_subjectVisitRepository, _userInfo, addOrEditPreviousHistory.SubjectVisitId); diff --git a/IRaCIS.Core.Domain/QC/ClinicalData/PreviousHistory.cs b/IRaCIS.Core.Domain/QC/ClinicalData/PreviousHistory.cs index 84e40c327..8e57f50bd 100644 --- a/IRaCIS.Core.Domain/QC/ClinicalData/PreviousHistory.cs +++ b/IRaCIS.Core.Domain/QC/ClinicalData/PreviousHistory.cs @@ -12,7 +12,7 @@ namespace IRaCIS.Core.Domain.Models ///PreviousHistory /// [Table("PreviousHistory")] - public class PreviousHistory : BaseAddAuditEntityWithUserName + public class PreviousHistory : BaseAddAuditEntity { #region 导航属性 [JsonIgnore]