From fbfab6b1f3c18cd453c248d3e73981519ae03f31 Mon Sep 17 00:00:00 2001 From: song-tianyang Date: Thu, 23 Sep 2021 16:22:35 +0800 Subject: [PATCH] =?UTF-8?q?fix(=E6=8E=A5=E5=8F=A3=E6=B5=8B=E8=AF=95):=20#1?= =?UTF-8?q?006851=20#1006860=20#1006703=20=E4=BF=AE=E5=A4=8Djsonschema=20?= =?UTF-8?q?=E5=88=A0=E9=99=A4=E5=AD=90=E9=A1=B9=E6=9C=AA=E5=88=A0=E9=99=A4?= =?UTF-8?q?=E5=80=BC=E3=80=81tcp=20mock=E5=BC=80=E5=90=AF=E7=8A=B6?= =?UTF-8?q?=E6=80=81=E6=9F=A5=E8=AF=A2=E5=87=BA=E9=94=99=E3=80=81=E5=9B=9E?= =?UTF-8?q?=E5=A4=8D=E6=8E=A5=E5=8F=A3=E7=94=A8=E4=BE=8B=E5=A4=B1=E8=B4=A5?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 【【github#6196】恢复接口用例失败】https://www.tapd.cn/55049933/bugtrace/bugs/view?bug_id=1155049933001006703；【【Mock】Mock的Tcp开启后依然提示没开启Mock服务】https://www.tapd.cn/55049933/bugtrace/bugs/view?bug_id=1155049933001006851；【【接口定义】json-schema删除只删了字段名，没删除字段值】https://www.tapd.cn/55049933/bugtrace/bugs/view?bug_id=1155049933001006860； --- .../metersphere/api/tcp/server/TCPServer.java | 2 +- .../base/mapper/ext/ExtApiTestCaseMapper.xml | 2 +- .../components/environment/EnvironmentEdit.vue | 4 ++-- .../common/json-schema/schema/editor/main.vue | 17 ++++++++++++++--- 4 files changed, 18 insertions(+), 7 deletions(-) diff --git a/backend/src/main/java/io/metersphere/api/tcp/server/TCPServer.java b/backend/src/main/java/io/metersphere/api/tcp/server/TCPServer.java index 561e577593..cf60f4509c 100644 --- a/backend/src/main/java/io/metersphere/api/tcp/server/TCPServer.java +++ b/backend/src/main/java/io/metersphere/api/tcp/server/TCPServer.java @@ -34,7 +34,7 @@ public class TCPServer implements Runnable { } public boolean isSocketOpen(){ - if (this.serverSocket != null && !this.serverSocket.isClosed() &&this.servicer != null) { + if (this.serverSocket != null && !this.serverSocket.isClosed()) { return true; }else { return false; diff --git a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiTestCaseMapper.xml b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiTestCaseMapper.xml index 18a4ece5b8..a71e567983 100644 --- a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiTestCaseMapper.xml +++ b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiTestCaseMapper.xml @@ -600,7 +600,7 @@ update api_test_case set original_status=status, status = 'Trash',delete_time = #{deleteTime},delete_user_id = #{deleteUserId} - where id IN + where status != 'Trash' AND id IN #{v} diff --git a/frontend/src/business/components/api/test/components/environment/EnvironmentEdit.vue b/frontend/src/business/components/api/test/components/environment/EnvironmentEdit.vue index 10f024b802..e600ac2fcc 100644 --- a/frontend/src/business/components/api/test/components/environment/EnvironmentEdit.vue +++ b/frontend/src/business/components/api/test/components/environment/EnvironmentEdit.vue @@ -109,7 +109,7 @@ }, created() { if(!this.environment.config.preProcessor){ - this.environment.config.preProcessor = createComponent("JDBCPreProcessor"); + this.environment.config.preProcessor = createComponent("JSR223PreProcessor"); } if(!this.environment.config.postProcessor){ this.environment.config.postProcessor = createComponent("JSR223PostProcessor"); @@ -125,7 +125,7 @@ watch: { environment: function (o) { if(!this.environment.config.preProcessor){ - this.environment.config.preProcessor = createComponent("JDBCPreProcessor"); + this.environment.config.preProcessor = createComponent("JSR223PreProcessor"); if(!this.environment.config.preProcessor.script){ this.environment.config.preProcessor.script = ""; } diff --git a/frontend/src/business/components/common/json-schema/schema/editor/main.vue b/frontend/src/business/components/common/json-schema/schema/editor/main.vue index abc3926b07..433c9f72e3 100644 --- a/frontend/src/business/components/common/json-schema/schema/editor/main.vue +++ b/frontend/src/business/components/common/json-schema/schema/editor/main.vue @@ -39,10 +39,10 @@ -