diff --git a/IRaCIS.Core.API/IRaCIS.Core.API.csproj b/IRaCIS.Core.API/IRaCIS.Core.API.csproj index 2fb16ca58..011a7b74c 100644 --- a/IRaCIS.Core.API/IRaCIS.Core.API.csproj +++ b/IRaCIS.Core.API/IRaCIS.Core.API.csproj @@ -69,6 +69,7 @@ + all @@ -79,8 +80,6 @@ - - diff --git a/IRaCIS.Core.API/Progranm.cs b/IRaCIS.Core.API/Progranm.cs index 532873b62..278484648 100644 --- a/IRaCIS.Core.API/Progranm.cs +++ b/IRaCIS.Core.API/Progranm.cs @@ -7,7 +7,6 @@ using IRaCIS.Core.Application.Service; using IRaCIS.Core.Application.Service.BusinessFilter; using IRaCIS.Core.Infra.EFCore; using IRaCIS.Core.Infrastructure.Extention; -using LogDashboard; using MassTransit; using MassTransit.NewIdProviders; using Microsoft.AspNetCore.Builder; diff --git a/IRaCIS.Core.API/_PipelineExtensions/LogDashboard/LogDashBoardAuthFilter.cs b/IRaCIS.Core.API/_PipelineExtensions/LogDashboard/LogDashBoardAuthFilter.cs deleted file mode 100644 index b644df0e3..000000000 --- a/IRaCIS.Core.API/_PipelineExtensions/LogDashboard/LogDashBoardAuthFilter.cs +++ /dev/null @@ -1,15 +0,0 @@ -using LogDashboard; -using LogDashboard.Authorization; - -namespace IRaCIS.Core.API.Filter -{ - - public class LogDashBoardAuthFilter : ILogDashboardAuthorizationFilter - { - //在此可以利用 本系统的UerTypeEnum 判断 - public bool Authorization(LogDashboardContext context) - { - return context.HttpContext.User.Identity.IsAuthenticated; - } - } -} \ No newline at end of file diff --git a/IRaCIS.Core.API/_ServiceExtensions/Authorization/JWTAuthSetup.cs b/IRaCIS.Core.API/_ServiceExtensions/Authorization/JWTAuthSetup.cs index b6e6c509b..696c2da6d 100644 --- a/IRaCIS.Core.API/_ServiceExtensions/Authorization/JWTAuthSetup.cs +++ b/IRaCIS.Core.API/_ServiceExtensions/Authorization/JWTAuthSetup.cs @@ -46,6 +46,8 @@ namespace IRaCIS.Core.API OnMessageReceived = (context) => { + + if (context.Request.Query.TryGetValue("access_token", out StringValues values)) { var queryToken = values.FirstOrDefault(); diff --git a/IRaCIS.Core.API/_ServiceExtensions/LogDashboardSetup.cs b/IRaCIS.Core.API/_ServiceExtensions/LogDashboardSetup.cs deleted file mode 100644 index 208d0672b..000000000 --- a/IRaCIS.Core.API/_ServiceExtensions/LogDashboardSetup.cs +++ /dev/null @@ -1,25 +0,0 @@ - -using LogDashboard; -using Microsoft.Extensions.DependencyInjection; - -namespace IRaCIS.Core.API -{ - public static class LogDashboardSetup - { - public static void AddLogDashboardSetup(this IServiceCollection services) - { - //IIS 配置虚拟路径部署，会出现IIS静态文件404 - services.AddLogDashboard(opt => - { - //opt.PathMatch = "/api/LogDashboard"; - opt.PathMatch = "/LogDashboard"; - - //opt.AddAuthorizationFilter(new LogDashboardBasicAuthFilter("admin", "zhizhun2018")); - - //opt.AddAuthorizationFilter(new LogDashBoardAuthFilter()); - - }); - - } - } -} diff --git a/IRaCIS.Core.API/appsettings.json b/IRaCIS.Core.API/appsettings.json index c575d4113..54112c6ae 100644 --- a/IRaCIS.Core.API/appsettings.json +++ b/IRaCIS.Core.API/appsettings.json @@ -3,7 +3,7 @@ "SecurityKey": "ShangHaiZhanYing_SecurityKey_SHzyyl@2021", "Issuer": "Extimaging", "Audience": "EICS", - "TokenExpireDays": "7" + "TokenExpireMinute": "10080" //7天 }, "IpRateLimiting": { "EnableEndpointRateLimiting": true, diff --git a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml index 43b70bb67..0bdeb936a 100644 --- a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml +++ b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml @@ -11851,7 +11851,7 @@ 阅片医学审核 - + 阅片医学审核 @@ -12622,7 +12622,7 @@ - + IR影像阅片 diff --git a/IRaCIS.Core.Application/Service/MinimalApiService/FileToPDFService.cs b/IRaCIS.Core.Application/Service/MinimalApiService/FileToPDFService.cs index 1a899fbc6..bb087173f 100644 --- a/IRaCIS.Core.Application/Service/MinimalApiService/FileToPDFService.cs +++ b/IRaCIS.Core.Application/Service/MinimalApiService/FileToPDFService.cs @@ -16,6 +16,12 @@ using System.Threading.Tasks; namespace IRaCIS.Core.Application.Service.MinimalApiService { + public class UploadFileRequest + { + public IFormFile File { get; set; } + } + + /// /// 上传文件转PDF 或者给url 这边下载然后转PDF /// @@ -27,8 +33,9 @@ namespace IRaCIS.Core.Application.Service.MinimalApiService [AllowAnonymous] [RoutePattern(HttpMethod = "Post")] - public async Task UploadFileAsync([FromForm] IFormFile file) + public async Task UploadFileAsync([FromForm] UploadFileRequest request) { + var file = request.File; var tempFileName = NewId.NextGuid() + file.FileName; var tempPDFName = Path.GetFileNameWithoutExtension(tempFileName) + ".pdf"; diff --git a/IRaCIS.Core.Application/Service/Reading/MedicalAudit/ReadingMedicalReviewService.cs b/IRaCIS.Core.Application/Service/Reading/MedicalAudit/ReadingMedicalReviewService.cs index 2ca4eb1bb..73bf9a7b3 100644 --- a/IRaCIS.Core.Application/Service/Reading/MedicalAudit/ReadingMedicalReviewService.cs +++ b/IRaCIS.Core.Application/Service/Reading/MedicalAudit/ReadingMedicalReviewService.cs @@ -29,7 +29,7 @@ namespace IRaCIS.Core.Application.Service IRepository _readingMedicalReviewDialogRepository, IRepository _readingQuestionCriterionTrial, IRepository _readingMedicineQuestionAnswerRepository, - ITrialEmailNoticeConfigService _trialEmailNoticeConfigService, IMapper _mapper, IUserInfo _userInfo, IStringLocalizer _localizer) : BaseService, IReadingMedicalReviewService + IMapper _mapper, IUserInfo _userInfo, IStringLocalizer _localizer) : BaseService, IReadingMedicalReviewService { @@ -681,7 +681,6 @@ namespace IRaCIS.Core.Application.Service if (allMedicalAuditList.All(t => t.IsApplyHeavyReading == false && t.AuditSignTime != null && t.AuditState == MedicalReviewAuditState.HaveSigned)) { //自动发送 - await _trialEmailNoticeConfigService.BaseBusinessScenarioSendEmailAsync(medicalReviewInfo.VisitTaskId, false); } diff --git a/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs b/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs index b4177a46b..0ee271d36 100644 --- a/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs +++ b/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs @@ -61,7 +61,6 @@ namespace IRaCIS.Core.Application.Service IRepository _readingQuestionTrialRepository, IRepository _taskStudyRepository, IDownloadAndUploadService _downloadAndUploadService, - ITrialEmailNoticeConfigService _trialEmailNoticeConfigService, IMapper _mapper, IUserInfo _userInfo, IStringLocalizer _localizer, IFusionCache _fusionCache) : BaseService, IReadingImageTaskService { diff --git a/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingJudgeTaskService.cs b/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingJudgeTaskService.cs index 6a5a598f3..9d74a496c 100644 --- a/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingJudgeTaskService.cs +++ b/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingJudgeTaskService.cs @@ -501,7 +501,6 @@ namespace IRaCIS.Core.Application.Service // 创建任务关联关系 await this.CreateTaskRelated(inDto.VisitTaskId); - await _trialEmailNoticeConfigService.BaseBusinessScenarioSendEmailAsync(inDto.VisitTaskId); return ResponseOutput.Ok(result); }