Merge branch 'Test_IRC_Net8' of http://192.168.3.68:2000/XCKJ/irc-netcore-api into Test_IRC_Net8

IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs

@@ -2703,7 +2703,7 @@ namespace IRaCIS.Core.Application.Service.Allocation
 
                     //throw new BusinessValidationFailedException("仅允许PM 同意 IR 申请的任务");
                 }
-                //PM     影响所有阅片人 仅仅针对访视   SPM  CPM  掉用
+                //PM     影响所有阅片人 仅仅针对访视   SPM  CPM  调用
 
                 else if (((_userInfo.UserTypeEnumInt == (int)UserTypeEnum.SPM || _userInfo.UserTypeEnumInt == (int)UserTypeEnum.CPM) && applyId != null && await _visitTaskReReadingRepository.AnyAsync(t => t.Id == applyId && t.CreateUser.UserTypeEnum == UserTypeEnum.ProjectManager) && filterObj.IsAnalysisCreate == false && filterObj.ReadingCategory == ReadingCategory.Visit)
                        || (_userInfo.UserTypeEnumInt == (int)UserTypeEnum.ProjectManager && applyId == null))

irc_api.drone.yml

@@ -1,9 +1,10 @@
+---
 kind: pipeline
 type: docker
 name: irc-netcore-api
 
 clone:
-  disable: true  #禁用默认克隆
+  disable: true
 
 steps:
 - name: clone-repo
@@ -46,7 +47,6 @@ steps:
     - cd  /work/netcore-repo/IRaCIS.Core.API
     - dotnet publish ./IRaCIS.Core.API.csproj -c Release --no-restore -o /work/publish
 
-
 - name: docker-build
   image: docker
   pull: if-not-exists
@@ -77,6 +77,7 @@ trigger:
     - master   
     
 ---
+
 kind: pipeline
 type: ssh
 name: ssh-linux-test-irc-publish
@@ -86,15 +87,13 @@ platform:
   arch: 386
   
 clone:
-  disable: true  #禁用默认克隆
-  
+  disable: true
+
 server:
   host: 123.56.94.154
   user: root
   password:
     from_secret: test_ssh_pwd
-# ssh_key:
-#   from_secret: rsa_key
 
 steps:
 - name: publish-test-irc
@@ -109,7 +108,35 @@ trigger:
        
 ---
 
-      
+kind: pipeline
+type: ssh
+name: test-irc-publish-image-push-aliyun
+
+platform:
+  os: Linux
+  arch: 386
+  
+clone:
+  disable: true
+
+server:
+  host: 192.168.3.68
+  user: root
+  password:
+    from_secret: local_pwd
+
+steps:
+- name: build-and-push-image
+  commands:
+  - cd /opt/hang/netcore/irc-test
+  - sh test-irc.sh v${DRONE_BUILD_NUMBER}
+  
+trigger:
+  branch:
+    - Test_IRC_Net8    
+       
+---
+
 kind: pipeline
 type: ssh
 name: ssh-linux-test-study-publish
@@ -119,8 +146,8 @@ platform:
   arch: 386
 
 clone:
-  disable: true  #禁用默认克隆
-  
+  disable: true
+
 server:
   host: 123.56.94.154
   user: root
@@ -136,6 +163,4 @@ steps:
   
 trigger:
   branch:
-    - Test.Study  
-    
-    
+    - Test.Study