From 06230bb14bfc2d88665552bf31feca50039ac7d1 Mon Sep 17 00:00:00 2001 From: hang <872297557@qq.com> Date: Mon, 4 Dec 2023 18:03:01 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E4=BC=A0=E9=80=92=E6=9E=84=E5=BB=BA?= =?UTF-8?q?=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- irc_api.drone.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/irc_api.drone.yml b/irc_api.drone.yml index eb2c4cc29..ed19a470a 100644 --- a/irc_api.drone.yml +++ b/irc_api.drone.yml @@ -100,7 +100,7 @@ steps: commands: - echo start publish test-irc-api - cd /opt/cicd/irc-test - - sh test-irc.sh + - sh test-irc.sh v${DRONE_BUILD_NUMBER} trigger: branch: From 5109e84fcb818dac925e9f8140da3c38733ed50e Mon Sep 17 00:00:00 2001 From: hang <872297557@qq.com> Date: Tue, 5 Dec 2023 09:38:47 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E6=B8=85=E7=90=86+=E9=85=8D=E7=BD=AE=20?= =?UTF-8?q?=E7=8E=AF=E5=A2=83=E5=8F=98=E9=87=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...lopment.json => appsettings.Test_IRC.json} | 0 IRaCIS.Core.API/appsettings.Uat_IRC.json | 12 -------- irc_api.drone.yml | 29 +------------------ 3 files changed, 1 insertion(+), 40 deletions(-) rename IRaCIS.Core.API/{appsettings.Development.json => appsettings.Test_IRC.json} (100%) diff --git a/IRaCIS.Core.API/appsettings.Development.json b/IRaCIS.Core.API/appsettings.Test_IRC.json similarity index 100% rename from IRaCIS.Core.API/appsettings.Development.json rename to IRaCIS.Core.API/appsettings.Test_IRC.json diff --git a/IRaCIS.Core.API/appsettings.Uat_IRC.json b/IRaCIS.Core.API/appsettings.Uat_IRC.json index f5ccb5824..2a2ec0e51 100644 --- a/IRaCIS.Core.API/appsettings.Uat_IRC.json +++ b/IRaCIS.Core.API/appsettings.Uat_IRC.json @@ -10,18 +10,6 @@ "RemoteNew": "Server=47.117.164.182,1434;Database=Uat_IRC;User ID=sa;Password=xc@123456;TrustServerCertificate=true", "Hangfire": "Server=47.117.164.182,1434;Database=Uat_IRC.Hangfire;User ID=sa;Password=xc@123456;TrustServerCertificate=true" }, - - "AliyunOSS": { - "RegionId": "cn-shanghai", - "Endpoint": "https://oss-cn-shanghai.aliyuncs.com", - "AccessKeyId": "LTAI5tKvzs7ed3UfSpNk3xwQ", - "AccessKeySecret": "zTIceGEShlZDGnLrCFfIGFE7TXVRio", - "BucketName": "zy-irc-uat-store", - "RoleArn": "acs:ram::1899121822495495:role/oss-upload", - "ViewEndpoint": "https://zy-irc-uat-store.oss-cn-shanghai.aliyuncs.com", - "Region": "oss-cn-shanghai" - }, - "ObjectStoreService": { "ObjectStoreUse": "AliyunOSS", diff --git a/irc_api.drone.yml b/irc_api.drone.yml index ed19a470a..b24005c63 100644 --- a/irc_api.drone.yml +++ b/irc_api.drone.yml @@ -138,31 +138,4 @@ trigger: branch: - Test.Study - ---- - - -kind: pipeline -type: ssh -name: ssh-windows-test-irc-publish - -platform: - os: windows - arch: amd64 - -clone: - disable: true #禁用默认克隆 - -server: - host: 123.56.94.154 - user: Administrator - password: WHxckj2019 - -steps: -- name: publish-test-irc - commands: - - C:\CICD\Test.IRC\netcore_Publish.ps1 - -trigger: - branch: - - Test.IRC \ No newline at end of file + \ No newline at end of file From 3c031a90654d3d320ae36f9676d209675f1d2ba0 Mon Sep 17 00:00:00 2001 From: hang <872297557@qq.com> Date: Tue, 5 Dec 2023 10:05:12 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AD=A6=E5=91=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controllers/UploadDownLoadController.cs | 13 ++++++++----- IRaCIS.Core.API/IRaCIS.Core.API.xml | 4 ++++ .../Service/TrialSiteUser/_MapConfig2.cs | 2 +- IRaCIS.Core.Application/TestService.cs | 4 ++-- 4 files changed, 15 insertions(+), 8 deletions(-) diff --git a/IRaCIS.Core.API/Controllers/UploadDownLoadController.cs b/IRaCIS.Core.API/Controllers/UploadDownLoadController.cs index 7fe4bd220..34193ceeb 100644 --- a/IRaCIS.Core.API/Controllers/UploadDownLoadController.cs +++ b/IRaCIS.Core.API/Controllers/UploadDownLoadController.cs @@ -483,12 +483,13 @@ namespace IRaCIS.Core.API.Controllers /// /// 上传非Dicom 文件 支持压缩包 多文件上传 /// + /// /// + /// /// - //[DisableRequestSizeLimit] [HttpPost("NoneDicomStudy/UploadNoneDicomFile")] [TypeFilter(typeof(TrialResourceFilter), Arguments = new object[] { "AfterStopCannNotOpt" })] - //[Authorize(Policy = IRaCISPolicy.CRC)] + public async Task UploadNoneDicomFile(UploadNoneDicomFileCommand incommand, [FromServices] IRepository _noneDicomStudyRepository, [FromServices] IRepository _studyMonitorRepository) { @@ -539,10 +540,12 @@ namespace IRaCIS.Core.API.Controllers /// 一致性核查 excel上传 支持三种格式 /// /// + /// /// + /// [HttpPost("QCOperation/UploadVisitCheckExcel/{trialId:guid}")] [TypeFilter(typeof(TrialResourceFilter), Arguments = new object[] { "AfterStopCannNotOpt" })] - //[Authorize(Policy = IRaCISPolicy.PM_APM)] + public async Task UploadVisitCheckExcel(Guid trialId, [FromServices] IOSSService oSSService) { @@ -998,14 +1001,14 @@ namespace IRaCIS.Core.API.Controllers await _inspectionFileRepository.AddAsync(new InspectionFile() { FileName = realFileName, RelativePath = ossRelativePath, TrialId = trialId }); - + return ossRelativePath; }); //去掉空白行 - var excelList = MiniExcel.Query(templateFileStream,excelType:ExcelType.XLSX).ToList() + var excelList = MiniExcel.Query(templateFileStream, excelType: ExcelType.XLSX).ToList() .Where(t => !(string.IsNullOrWhiteSpace(t.TrialSiteCode) && string.IsNullOrWhiteSpace(t.FirstName) && string.IsNullOrWhiteSpace(t.LastName) && string.IsNullOrWhiteSpace(t.Email) && string.IsNullOrWhiteSpace(t.Phone) && string.IsNullOrWhiteSpace(t.UserTypeStr) && string.IsNullOrWhiteSpace(t.OrganizationName))).ToList(); diff --git a/IRaCIS.Core.API/IRaCIS.Core.API.xml b/IRaCIS.Core.API/IRaCIS.Core.API.xml index 82de82eb7..5b5c02b0c 100644 --- a/IRaCIS.Core.API/IRaCIS.Core.API.xml +++ b/IRaCIS.Core.API/IRaCIS.Core.API.xml @@ -272,7 +272,9 @@ 上传非Dicom 文件 支持压缩包 多文件上传 + + @@ -280,7 +282,9 @@ 一致性核查 excel上传 支持三种格式 + + 医生文件上传下载 diff --git a/IRaCIS.Core.Application/Service/TrialSiteUser/_MapConfig2.cs b/IRaCIS.Core.Application/Service/TrialSiteUser/_MapConfig2.cs index 912f5b093..50ef935d3 100644 --- a/IRaCIS.Core.Application/Service/TrialSiteUser/_MapConfig2.cs +++ b/IRaCIS.Core.Application/Service/TrialSiteUser/_MapConfig2.cs @@ -13,7 +13,7 @@ namespace IRaCIS.Core.Application.Service { public PersonalWorkstation() { - var userTypeEnumInt = 0; + //var userTypeEnumInt = 0; var userTypeId = Guid.Empty; diff --git a/IRaCIS.Core.Application/TestService.cs b/IRaCIS.Core.Application/TestService.cs index 051c8868a..8ef812d03 100644 --- a/IRaCIS.Core.Application/TestService.cs +++ b/IRaCIS.Core.Application/TestService.cs @@ -75,8 +75,8 @@ namespace IRaCIS.Application.Services - - return ResponseOutput.Ok(options); + //ResponseOutput.Ok(options) + return await Task.FromResult(ResponseOutput.Ok(options)) ; } [AllowAnonymous] From 495418cac2ba7bb8cf5fcc3210c5f3272a3b74ec Mon Sep 17 00:00:00 2001 From: hang <872297557@qq.com> Date: Tue, 5 Dec 2023 10:19:42 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=90=AF=E5=8A=A8?= =?UTF-8?q?=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- IRaCIS.Core.API/Properties/launchSettings.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/IRaCIS.Core.API/Properties/launchSettings.json b/IRaCIS.Core.API/Properties/launchSettings.json index c4b3f9f6a..01cd73241 100644 --- a/IRaCIS.Core.API/Properties/launchSettings.json +++ b/IRaCIS.Core.API/Properties/launchSettings.json @@ -13,14 +13,14 @@ "commandName": "IISExpress", "launchBrowser": true, "environmentVariables": { - "ASPNETCORE_ENVIRONMENT": "Development" + "ASPNETCORE_ENVIRONMENT": "Test_IRC" } }, - "IRaCIS.Development": { + "IRaCIS.Test_IRC": { "commandName": "Project", "launchBrowser": true, "environmentVariables": { - "ASPNETCORE_ENVIRONMENT": "Development" + "ASPNETCORE_ENVIRONMENT": "Test_IRC" }, "applicationUrl": "http://localhost:6100" }, From b718fcf185ca8fa3de0870501e1bc358accdaf13 Mon Sep 17 00:00:00 2001 From: hang <872297557@qq.com> Date: Tue, 5 Dec 2023 10:33:28 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=82=AE=E4=BB=B6?= =?UTF-8?q?=E6=A8=A1=E6=9D=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- IRaCIS.Core.Application/Service/Common/MailService.cs | 1 + 1 file changed, 1 insertion(+) diff --git a/IRaCIS.Core.Application/Service/Common/MailService.cs b/IRaCIS.Core.Application/Service/Common/MailService.cs index 33f03b975..f663a9205 100644 --- a/IRaCIS.Core.Application/Service/Common/MailService.cs +++ b/IRaCIS.Core.Application/Service/Common/MailService.cs @@ -180,6 +180,7 @@ namespace IRaCIS.Application.Services builder.HtmlBody = string.Format(templateInfo, + "", //---您正在进行邮箱重置密码操作 _localizer["Mail_ResettingPassword "], verificationCode