From da3811eb3c7eacfd1dbd580776efe60eb8617463 Mon Sep 17 00:00:00 2001
From: "Captain.B" <bin@fit2cloud.com>
Date: Mon, 18 Jan 2021 14:35:22 +0800
Subject: [PATCH 1/2] =?UTF-8?q?fix:=20=E5=8E=BB=E6=8E=89=E6=B2=A1=E6=9C=89?=
 =?UTF-8?q?=E7=94=A8=E5=88=B0=E7=9A=84=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../base/domain/LoadTestWithBLOBs.java        |  5 ++--
 .../base/mapper/LoadTestMapper.xml            | 29 +++++--------------
 2 files changed, 9 insertions(+), 25 deletions(-)

diff --git a/backend/src/main/java/io/metersphere/base/domain/LoadTestWithBLOBs.java b/backend/src/main/java/io/metersphere/base/domain/LoadTestWithBLOBs.java
index 5e3c4b20b3..530c5e85e7 100644
--- a/backend/src/main/java/io/metersphere/base/domain/LoadTestWithBLOBs.java
+++ b/backend/src/main/java/io/metersphere/base/domain/LoadTestWithBLOBs.java
@@ -1,10 +1,11 @@
 package io.metersphere.base.domain;
 
-import java.io.Serializable;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.ToString;
 
+import java.io.Serializable;
+
 @Data
 @EqualsAndHashCode(callSuper = true)
 @ToString(callSuper = true)
@@ -13,7 +14,5 @@ public class LoadTestWithBLOBs extends LoadTest implements Serializable {
 
     private String advancedConfiguration;
 
-    private String schedule;
-
     private static final long serialVersionUID = 1L;
 }
\ No newline at end of file
diff --git a/backend/src/main/java/io/metersphere/base/mapper/LoadTestMapper.xml b/backend/src/main/java/io/metersphere/base/mapper/LoadTestMapper.xml
index af5478f5bb..a352071f16 100644
--- a/backend/src/main/java/io/metersphere/base/mapper/LoadTestMapper.xml
+++ b/backend/src/main/java/io/metersphere/base/mapper/LoadTestMapper.xml
@@ -16,7 +16,6 @@
   <resultMap extends="BaseResultMap" id="ResultMapWithBLOBs" type="io.metersphere.base.domain.LoadTestWithBLOBs">
     <result column="load_configuration" jdbcType="LONGVARCHAR" property="loadConfiguration" />
     <result column="advanced_configuration" jdbcType="LONGVARCHAR" property="advancedConfiguration" />
-    <result column="schedule" jdbcType="LONGVARCHAR" property="schedule" />
   </resultMap>
   <sql id="Example_Where_Clause">
     <where>
@@ -81,7 +80,7 @@
     user_id, num
   </sql>
   <sql id="Blob_Column_List">
-    load_configuration, advanced_configuration, schedule
+    load_configuration, advanced_configuration
   </sql>
   <select id="selectByExampleWithBLOBs" parameterType="io.metersphere.base.domain.LoadTestExample" resultMap="ResultMapWithBLOBs">
     select
@@ -135,13 +134,13 @@
     insert into load_test (id, project_id, `name`, 
       description, create_time, update_time, 
       `status`, test_resource_pool_id, user_id, 
-      num, load_configuration, advanced_configuration, 
-      schedule)
+      num, load_configuration, advanced_configuration
+      )
     values (#{id,jdbcType=VARCHAR}, #{projectId,jdbcType=VARCHAR}, #{name,jdbcType=VARCHAR}, 
       #{description,jdbcType=VARCHAR}, #{createTime,jdbcType=BIGINT}, #{updateTime,jdbcType=BIGINT}, 
       #{status,jdbcType=VARCHAR}, #{testResourcePoolId,jdbcType=VARCHAR}, #{userId,jdbcType=VARCHAR}, 
-      #{num,jdbcType=INTEGER}, #{loadConfiguration,jdbcType=LONGVARCHAR}, #{advancedConfiguration,jdbcType=LONGVARCHAR}, 
-      #{schedule,jdbcType=LONGVARCHAR})
+      #{num,jdbcType=INTEGER}, #{loadConfiguration,jdbcType=LONGVARCHAR}, #{advancedConfiguration,jdbcType=LONGVARCHAR}
+      )
   </insert>
   <insert id="insertSelective" parameterType="io.metersphere.base.domain.LoadTestWithBLOBs">
     insert into load_test
@@ -182,9 +181,6 @@
       <if test="advancedConfiguration != null">
         advanced_configuration,
       </if>
-      <if test="schedule != null">
-        schedule,
-      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="id != null">
@@ -223,9 +219,6 @@
       <if test="advancedConfiguration != null">
         #{advancedConfiguration,jdbcType=LONGVARCHAR},
       </if>
-      <if test="schedule != null">
-        #{schedule,jdbcType=LONGVARCHAR},
-      </if>
     </trim>
   </insert>
   <select id="countByExample" parameterType="io.metersphere.base.domain.LoadTestExample" resultType="java.lang.Long">
@@ -273,9 +266,6 @@
       <if test="record.advancedConfiguration != null">
         advanced_configuration = #{record.advancedConfiguration,jdbcType=LONGVARCHAR},
       </if>
-      <if test="record.schedule != null">
-        schedule = #{record.schedule,jdbcType=LONGVARCHAR},
-      </if>
     </set>
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
@@ -294,8 +284,7 @@
       user_id = #{record.userId,jdbcType=VARCHAR},
       num = #{record.num,jdbcType=INTEGER},
       load_configuration = #{record.loadConfiguration,jdbcType=LONGVARCHAR},
-      advanced_configuration = #{record.advancedConfiguration,jdbcType=LONGVARCHAR},
-      schedule = #{record.schedule,jdbcType=LONGVARCHAR}
+      advanced_configuration = #{record.advancedConfiguration,jdbcType=LONGVARCHAR}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -352,9 +341,6 @@
       <if test="advancedConfiguration != null">
         advanced_configuration = #{advancedConfiguration,jdbcType=LONGVARCHAR},
       </if>
-      <if test="schedule != null">
-        schedule = #{schedule,jdbcType=LONGVARCHAR},
-      </if>
     </set>
     where id = #{id,jdbcType=VARCHAR}
   </update>
@@ -370,8 +356,7 @@
       user_id = #{userId,jdbcType=VARCHAR},
       num = #{num,jdbcType=INTEGER},
       load_configuration = #{loadConfiguration,jdbcType=LONGVARCHAR},
-      advanced_configuration = #{advancedConfiguration,jdbcType=LONGVARCHAR},
-      schedule = #{schedule,jdbcType=LONGVARCHAR}
+      advanced_configuration = #{advancedConfiguration,jdbcType=LONGVARCHAR}
     where id = #{id,jdbcType=VARCHAR}
   </update>
   <update id="updateByPrimaryKey" parameterType="io.metersphere.base.domain.LoadTest">

From c4769dbf22ee9e97bd41ca56a6f9f6f5f920968f Mon Sep 17 00:00:00 2001
From: "Captain.B" <bin@fit2cloud.com>
Date: Mon, 18 Jan 2021 14:49:12 +0800
Subject: [PATCH 2/2] =?UTF-8?q?fix:=20=E5=8E=BB=E6=8E=89=E6=B2=A1=E6=9C=89?=
 =?UTF-8?q?=E7=94=A8=E5=88=B0=E7=9A=84=E7=B1=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 backend/src/main/java/io/metersphere/xpack | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/backend/src/main/java/io/metersphere/xpack b/backend/src/main/java/io/metersphere/xpack
index 8d5b1ebeab..36116c1bff 160000
--- a/backend/src/main/java/io/metersphere/xpack
+++ b/backend/src/main/java/io/metersphere/xpack
@@ -1 +1 @@
-Subproject commit 8d5b1ebeabf5ebaee9ca186087ac8a34cf888518
+Subproject commit 36116c1bff736377e6b8a3b828c5fa9bd8b2f2f8