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.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"
},
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/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
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]
diff --git a/irc_api.drone.yml b/irc_api.drone.yml
index eb2c4cc29..b24005c63 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:
@@ -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