Merge branch 'Test.IRC' of http://192.168.3.68:2000/XCKJ/irc-netcore-api into Test.IRC

IRaCIS.Core.API/Controllers/UploadDownLoadController.cs

@@ -483,12 +483,13 @@ namespace IRaCIS.Core.API.Controllers
         /// <summary>
         /// 上传非Dicom 文件 支持压缩包 多文件上传
         /// </summary>
+        /// <param name="incommand"></param>
         /// <param name="_noneDicomStudyRepository"></param>
+        /// <param name="_studyMonitorRepository"></param>
         /// <returns></returns>
-        //[DisableRequestSizeLimit]
         [HttpPost("NoneDicomStudy/UploadNoneDicomFile")]
         [TypeFilter(typeof(TrialResourceFilter), Arguments = new object[] { "AfterStopCannNotOpt" })]
-        //[Authorize(Policy = IRaCISPolicy.CRC)]
+
         public async Task<IResponseOutput> UploadNoneDicomFile(UploadNoneDicomFileCommand incommand,
             [FromServices] IRepository<NoneDicomStudy> _noneDicomStudyRepository, [FromServices] IRepository<StudyMonitor> _studyMonitorRepository)
         {
@@ -539,10 +540,12 @@ namespace IRaCIS.Core.API.Controllers
         /// 一致性核查 excel上传 支持三种格式
         /// </summary>
         /// <param name="trialId"></param>
+        /// <param name="oSSService"></param>
         /// <returns></returns>
+        /// <exception cref="BusinessValidationFailedException"></exception>
         [HttpPost("QCOperation/UploadVisitCheckExcel/{trialId:guid}")]
         [TypeFilter(typeof(TrialResourceFilter), Arguments = new object[] { "AfterStopCannNotOpt" })]
-        //[Authorize(Policy = IRaCISPolicy.PM_APM)]
+
         public async Task<IResponseOutput> UploadVisitCheckExcel(Guid trialId, [FromServices] IOSSService oSSService)
         {
 

IRaCIS.Core.API/IRaCIS.Core.API.xml

@@ -272,7 +272,9 @@
             <summary>
             上传非Dicom 文件 支持压缩包 多文件上传
             </summary>
+            <param name="incommand"></param>
             <param name="_noneDicomStudyRepository"></param>
+            <param name="_studyMonitorRepository"></param>
             <returns></returns>
         </member>
         <member name="M:IRaCIS.Core.API.Controllers.StudyController.UploadVisitCheckExcel(System.Guid,IRaCIS.Core.Application.Helper.IOSSService)">
@@ -280,7 +282,9 @@
             一致性核查 excel上传 支持三种格式
             </summary>
             <param name="trialId"></param>
+            <param name="oSSService"></param>
             <returns></returns>
+            <exception cref="T:IRaCIS.Core.Infrastructure.BusinessValidationFailedException"></exception>
         </member>
         <member name="T:IRaCIS.Core.API.Controllers.FileController">
             <summary>医生文件上传下载</summary>

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"
     },

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",

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

@@ -180,6 +180,7 @@ namespace IRaCIS.Application.Services
 
 
                 builder.HtmlBody = string.Format(templateInfo,
+                    "",
                 //---您正在进行邮箱重置密码操作
                    _localizer["Mail_ResettingPassword "],
                     verificationCode

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;
 

IRaCIS.Core.Application/TestService.cs

@@ -75,8 +75,8 @@ namespace IRaCIS.Application.Services
 
 
 
-
+            //ResponseOutput.Ok(options)
-            return ResponseOutput.Ok(options);
+            return  await Task.FromResult<IResponseOutput>(ResponseOutput.Ok(options)) ;
         }
 
         [AllowAnonymous]

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:
@@ -139,30 +139,3 @@ trigger:
     - 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