From 70846525bf7746be98e56531ffa5a45acc93103e Mon Sep 17 00:00:00 2001 From: hang <872297557@qq.com> Date: Wed, 31 Jan 2024 13:34:56 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E6=B3=A8=E9=87=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs b/IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs index 863ef4c7e..ce41554fd 100644 --- a/IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs +++ b/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)) From f2afb7ab1a9c1c99b865a7dc5b122b80b380d6f4 Mon Sep 17 00:00:00 2001 From: hang <872297557@qq.com> Date: Wed, 31 Jan 2024 15:48:42 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=9C=AC=E5=9C=B0?= =?UTF-8?q?=E6=89=93=E5=8C=85=E6=8E=A8=E9=80=81=E4=B8=8A=E6=B5=B7=E9=98=BF?= =?UTF-8?q?=E9=87=8C=E4=BA=91=E9=95=9C=E5=83=8F=E4=BB=93=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- irc_api.drone.yml | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/irc_api.drone.yml b/irc_api.drone.yml index 6e76a7b0d..bfbea0941 100644 --- a/irc_api.drone.yml +++ b/irc_api.drone.yml @@ -109,6 +109,38 @@ trigger: --- +--- +kind: pipeline +type: ssh +name: ssh-linux-test-irc-publish + +platform: + os: Linux + arch: 386 + +clone: + disable: true #禁用默认克隆 + +server: + host: 192.168.3.68 + user: root + password: + from_secret: local_pwd +# ssh_key: +# from_secret: rsa_key + +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 From fadd8a7f795c65779f6375372a01d172d0334b04 Mon Sep 17 00:00:00 2001 From: hang <872297557@qq.com> Date: Wed, 31 Jan 2024 15:52:58 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9yml=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- irc_api.drone.yml | 31 ++++++++++++------------------- 1 file changed, 12 insertions(+), 19 deletions(-) diff --git a/irc_api.drone.yml b/irc_api.drone.yml index bfbea0941..62089fa70 100644 --- a/irc_api.drone.yml +++ b/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,28 +108,25 @@ trigger: --- ---- kind: pipeline type: ssh -name: ssh-linux-test-irc-publish +name: test-irc-publish-image-push-aliyun platform: os: Linux arch: 386 clone: - disable: true #禁用默认克隆 - + disable: true + server: host: 192.168.3.68 user: root password: from_secret: local_pwd -# ssh_key: -# from_secret: rsa_key steps: -- name: build and push image +- name: build-and-push-image commands: - cd /opt/hang/netcore/irc-test - sh test-irc.sh v${DRONE_BUILD_NUMBER} @@ -141,7 +137,6 @@ trigger: --- - kind: pipeline type: ssh name: ssh-linux-test-study-publish @@ -151,8 +146,8 @@ platform: arch: 386 clone: - disable: true #禁用默认克隆 - + disable: true + server: host: 123.56.94.154 user: root @@ -168,6 +163,4 @@ steps: trigger: branch: - - Test.Study - - \ No newline at end of file + - Test.Study