From b34e27926976591b134b59acc06dfd3da52995bd Mon Sep 17 00:00:00 2001
From: q4speed <kun@fit2cloud.com>
Date: Wed, 23 Sep 2020 16:49:10 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E6=8E=A5=E5=8F=A3=E6=B5=8B=E8=AF=95):=20?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8Ddubbo=E5=92=8Csql=E8=AF=B7=E6=B1=82=E4=B8=8D?=
 =?UTF-8?q?=E8=83=BD=E6=B7=BB=E5=8A=A0=E6=8E=A7=E5=88=B6=E5=99=A8=E7=9A=84?=
 =?UTF-8?q?bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../metersphere/api/dto/scenario/request/SqlRequest.java   | 6 ++++++
 backend/src/main/java/io/metersphere/xpack                 | 2 +-
 .../business/components/api/test/model/ScenarioModel.js    | 7 +++----
 frontend/src/business/components/xpack                     | 2 +-
 4 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/backend/src/main/java/io/metersphere/api/dto/scenario/request/SqlRequest.java b/backend/src/main/java/io/metersphere/api/dto/scenario/request/SqlRequest.java
index d05a479328..b46dfb6ac0 100644
--- a/backend/src/main/java/io/metersphere/api/dto/scenario/request/SqlRequest.java
+++ b/backend/src/main/java/io/metersphere/api/dto/scenario/request/SqlRequest.java
@@ -3,9 +3,11 @@ package io.metersphere.api.dto.scenario.request;
 import com.alibaba.fastjson.annotation.JSONField;
 import com.alibaba.fastjson.annotation.JSONType;
 import io.metersphere.api.dto.scenario.assertions.Assertions;
+import io.metersphere.api.dto.scenario.controller.IfController;
 import io.metersphere.api.dto.scenario.extract.Extract;
 import io.metersphere.api.dto.scenario.processor.JSR223PostProcessor;
 import io.metersphere.api.dto.scenario.processor.JSR223PreProcessor;
+import io.metersphere.api.dto.scenario.timer.ConstantTimer;
 import lombok.Data;
 
 @Data
@@ -41,4 +43,8 @@ public class SqlRequest implements Request {
     private String resultVariable;
     @JSONField(ordinal = 14)
     private String variableNames;
+    @JSONField(ordinal = 15)
+    private IfController controller;
+    @JSONField(ordinal = 16)
+    private ConstantTimer timer;
 }
diff --git a/backend/src/main/java/io/metersphere/xpack b/backend/src/main/java/io/metersphere/xpack
index 141ee64787..cf6b065263 160000
--- a/backend/src/main/java/io/metersphere/xpack
+++ b/backend/src/main/java/io/metersphere/xpack
@@ -1 +1 @@
-Subproject commit 141ee64787b4a28ef108c5fa4dde90446de01887
+Subproject commit cf6b06526324326a563d933e07118fac014a63b4
diff --git a/frontend/src/business/components/api/test/model/ScenarioModel.js b/frontend/src/business/components/api/test/model/ScenarioModel.js
index 33a53a7983..bd1fbb83de 100644
--- a/frontend/src/business/components/api/test/model/ScenarioModel.js
+++ b/frontend/src/business/components/api/test/model/ScenarioModel.js
@@ -306,8 +306,8 @@ export class Request extends BaseConfig {
     super();
     this.type = type;
     options.id = options.id || uuid();
-    options.timer = new ConstantTimer(options.timer);
-    options.controller = new IfController(options.controller);
+    this.timer = options.timer = new ConstantTimer(options.timer);
+    this.controller = options.controller = new IfController(options.controller);
   }
 
   showType() {
@@ -478,7 +478,7 @@ export class DubboRequest extends Request {
 export class SqlRequest extends Request {
 
   constructor(options = {}) {
-    super(RequestFactory.TYPES.SQL);
+    super(RequestFactory.TYPES.SQL, options);
     this.id = options.id || uuid();
     this.name = options.name;
     this.useEnvironment = options.useEnvironment;
@@ -496,7 +496,6 @@ export class SqlRequest extends Request {
     this.jsr223PostProcessor = new JSR223Processor(options.jsr223PostProcessor);
 
     this.sets({args: KeyValue, attachmentArgs: KeyValue}, options);
-
   }
 
   isValid() {
diff --git a/frontend/src/business/components/xpack b/frontend/src/business/components/xpack
index 06d935cd1d..17422063ac 160000
--- a/frontend/src/business/components/xpack
+++ b/frontend/src/business/components/xpack
@@ -1 +1 @@
-Subproject commit 06d935cd1d22ab36f09763745c2aff8ad3fb08c1
+Subproject commit 17422063acb5936497660a35675e88eba997e767