From cee45b87ee6175d10b8f2abd7890eef5c259c4dd Mon Sep 17 00:00:00 2001
From: hang <872297557@qq.com>
Date: Fri, 1 Dec 2023 13:30:36 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E6=B5=8B=E8=AF=95linux=20=E6=89=93?=
=?UTF-8?q?=E5=8C=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
irc_api.drone.yml | 24 +++++++++++++++++++++++-
1 file changed, 23 insertions(+), 1 deletion(-)
diff --git a/irc_api.drone.yml b/irc_api.drone.yml
index 3ecdcf776..076ac860f 100644
--- a/irc_api.drone.yml
+++ b/irc_api.drone.yml
@@ -74,9 +74,31 @@ volumes:
path: /var/run/docker.sock
trigger:
+ branch:
+ - master
+
+---
+kind: pipeline
+type: ssh
+name: default
+
+server:
+ host: 47.117.164.182
+ user: root
+ password:
+ from_secret: uat_ssh_pwd
+
+steps:
+- name: greeting
+ commands:
+ - echo start publish test-irc-api
+ - cd /opt/cicd/irc-test
+ - sh test-irc.sh
+
+ trigger:
branch:
- Test.IRC
-
+
---
From 6a6a31471883dcfbc3e7ea3382441ed705cdabca Mon Sep 17 00:00:00 2001
From: hang <872297557@qq.com>
Date: Fri, 1 Dec 2023 13:33:34 +0800
Subject: [PATCH 2/3] x
---
irc_api.drone.yml | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/irc_api.drone.yml b/irc_api.drone.yml
index 076ac860f..eb2c4cc29 100644
--- a/irc_api.drone.yml
+++ b/irc_api.drone.yml
@@ -82,6 +82,13 @@ kind: pipeline
type: ssh
name: default
+platform:
+ os: Linux
+ arch: 386
+
+clone:
+ disable: true #禁用默认克隆
+
server:
host: 47.117.164.182
user: root
@@ -95,7 +102,7 @@ steps:
- cd /opt/cicd/irc-test
- sh test-irc.sh
- trigger:
+trigger:
branch:
- Test.IRC
From 79b97f089c82b605aee351f425ee05caae833266 Mon Sep 17 00:00:00 2001
From: hang <872297557@qq.com>
Date: Fri, 1 Dec 2023 14:15:20 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=97=A0=E7=94=A8?=
=?UTF-8?q?=E7=9A=84=E6=9C=8D=E5=8A=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../IRaCIS.Core.Application.xml | 19 ++++++++++++++++---
.../Service/Common/DictionaryService.cs | 5 +----
2 files changed, 17 insertions(+), 7 deletions(-)
diff --git a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
index c3f127a64..67dd0e63f 100644
--- a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
+++ b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
@@ -1077,7 +1077,8 @@
翻译稽查数据
- 传入Dto
+
+
@@ -3090,6 +3091,8 @@
+
+
@@ -12951,11 +12954,12 @@
- 验证计算关系
+ 验证计算关系
+
@@ -13221,6 +13225,8 @@
+
+
@@ -13263,11 +13269,18 @@
- 获取子元素
+ 获取子元素
+
+
+
+
+
+
+
diff --git a/IRaCIS.Core.Application/Service/Common/DictionaryService.cs b/IRaCIS.Core.Application/Service/Common/DictionaryService.cs
index f41b6d3bc..720fd0c02 100644
--- a/IRaCIS.Core.Application/Service/Common/DictionaryService.cs
+++ b/IRaCIS.Core.Application/Service/Common/DictionaryService.cs
@@ -27,7 +27,6 @@ namespace IRaCIS.Application.Services
private readonly IRepository _readingCriterionDictionaryRepository;
private readonly IRepository _readingQuestionCriterionSystem;
private readonly IRepository _readingQuestionCriterionTrial;
- private readonly IReadingQuestionService _readingQuestionService;
public DictionaryService(IRepository sysDicRepository, IRepository doctorDictionaryRepository, IRepository trialDictionaryRepository,
IRepository doctorRepository, IRepository trialRepository,
@@ -37,8 +36,7 @@ namespace IRaCIS.Application.Services
IRepository readingTrialCriterionDictionaryRepository,
IRepository readingCriterionDictionaryRepository,
IRepository readingQuestionCriterionSystem,
- IRepository readingQuestionCriterionTrial,
- IReadingQuestionService readingQuestionService
+ IRepository readingQuestionCriterionTrial
)
@@ -54,7 +52,6 @@ namespace IRaCIS.Application.Services
this._readingCriterionDictionaryRepository = readingCriterionDictionaryRepository;
this._readingQuestionCriterionSystem = readingQuestionCriterionSystem;
this._readingQuestionCriterionTrial = readingQuestionCriterionTrial;
- this._readingQuestionService = readingQuestionService;
}
///