From bfd47a0d95e520a9ac744f99d8b020e8e9850e6e Mon Sep 17 00:00:00 2001
From: fit2-zhao <yong.zhao@fit2cloud.com>
Date: Fri, 21 May 2021 13:48:48 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E7=8E=AF=E5=A2=83=E7=AE=A1=E7=90=86):=20?=
 =?UTF-8?q?=E5=88=A0=E9=99=A4=E5=A4=9A=E4=BD=99=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../base/domain/ApiTestEnvironment.java       |  3 +-
 .../domain/ApiTestEnvironmentWithBLOBs.java   |  2 --
 .../base/mapper/ApiTestEnvironmentMapper.xml  | 29 +++++--------------
 3 files changed, 8 insertions(+), 26 deletions(-)

diff --git a/backend/src/main/java/io/metersphere/base/domain/ApiTestEnvironment.java b/backend/src/main/java/io/metersphere/base/domain/ApiTestEnvironment.java
index 95726d8ad8..009ee18358 100644
--- a/backend/src/main/java/io/metersphere/base/domain/ApiTestEnvironment.java
+++ b/backend/src/main/java/io/metersphere/base/domain/ApiTestEnvironment.java
@@ -1,8 +1,7 @@
 package io.metersphere.base.domain;
 
-import lombok.Data;
-
 import java.io.Serializable;
+import lombok.Data;
 
 @Data
 public class ApiTestEnvironment implements Serializable {
diff --git a/backend/src/main/java/io/metersphere/base/domain/ApiTestEnvironmentWithBLOBs.java b/backend/src/main/java/io/metersphere/base/domain/ApiTestEnvironmentWithBLOBs.java
index 0f20ed5d01..1e00c158a7 100644
--- a/backend/src/main/java/io/metersphere/base/domain/ApiTestEnvironmentWithBLOBs.java
+++ b/backend/src/main/java/io/metersphere/base/domain/ApiTestEnvironmentWithBLOBs.java
@@ -18,7 +18,5 @@ public class ApiTestEnvironmentWithBLOBs extends ApiTestEnvironment implements S
 
     private String hosts;
 
-    private String customData;
-
     private static final long serialVersionUID = 1L;
 }
\ No newline at end of file
diff --git a/backend/src/main/java/io/metersphere/base/mapper/ApiTestEnvironmentMapper.xml b/backend/src/main/java/io/metersphere/base/mapper/ApiTestEnvironmentMapper.xml
index 10c290fa52..a9c923bf3a 100644
--- a/backend/src/main/java/io/metersphere/base/mapper/ApiTestEnvironmentMapper.xml
+++ b/backend/src/main/java/io/metersphere/base/mapper/ApiTestEnvironmentMapper.xml
@@ -16,7 +16,6 @@
     <result column="headers" jdbcType="LONGVARCHAR" property="headers" />
     <result column="config" jdbcType="LONGVARCHAR" property="config" />
     <result column="hosts" jdbcType="LONGVARCHAR" property="hosts" />
-    <result column="custom_data" jdbcType="LONGVARCHAR" property="customData" />
   </resultMap>
   <sql id="Example_Where_Clause">
     <where>
@@ -80,7 +79,7 @@
     id, `name`, project_id, protocol, socket, `domain`, port, create_user
   </sql>
   <sql id="Blob_Column_List">
-    `variables`, headers, config, `hosts`, custom_data
+    `variables`, headers, config, `hosts`
   </sql>
   <select id="selectByExampleWithBLOBs" parameterType="io.metersphere.base.domain.ApiTestEnvironmentExample" resultMap="ResultMapWithBLOBs">
     select
@@ -134,13 +133,13 @@
     insert into api_test_environment (id, `name`, project_id, 
       protocol, socket, `domain`, 
       port, create_user, `variables`, 
-      headers, config, `hosts`, 
-      custom_data)
+      headers, config, `hosts`
+      )
     values (#{id,jdbcType=VARCHAR}, #{name,jdbcType=VARCHAR}, #{projectId,jdbcType=VARCHAR}, 
       #{protocol,jdbcType=VARCHAR}, #{socket,jdbcType=VARCHAR}, #{domain,jdbcType=VARCHAR}, 
       #{port,jdbcType=INTEGER}, #{createUser,jdbcType=VARCHAR}, #{variables,jdbcType=LONGVARCHAR}, 
-      #{headers,jdbcType=LONGVARCHAR}, #{config,jdbcType=LONGVARCHAR}, #{hosts,jdbcType=LONGVARCHAR}, 
-      #{customData,jdbcType=LONGVARCHAR})
+      #{headers,jdbcType=LONGVARCHAR}, #{config,jdbcType=LONGVARCHAR}, #{hosts,jdbcType=LONGVARCHAR}
+      )
   </insert>
   <insert id="insertSelective" parameterType="io.metersphere.base.domain.ApiTestEnvironmentWithBLOBs">
     insert into api_test_environment
@@ -181,9 +180,6 @@
       <if test="hosts != null">
         `hosts`,
       </if>
-      <if test="customData != null">
-        custom_data,
-      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="id != null">
@@ -222,9 +218,6 @@
       <if test="hosts != null">
         #{hosts,jdbcType=LONGVARCHAR},
       </if>
-      <if test="customData != null">
-        #{customData,jdbcType=LONGVARCHAR},
-      </if>
     </trim>
   </insert>
   <select id="countByExample" parameterType="io.metersphere.base.domain.ApiTestEnvironmentExample" resultType="java.lang.Long">
@@ -272,9 +265,6 @@
       <if test="record.hosts != null">
         `hosts` = #{record.hosts,jdbcType=LONGVARCHAR},
       </if>
-      <if test="record.customData != null">
-        custom_data = #{record.customData,jdbcType=LONGVARCHAR},
-      </if>
     </set>
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
@@ -293,8 +283,7 @@
       `variables` = #{record.variables,jdbcType=LONGVARCHAR},
       headers = #{record.headers,jdbcType=LONGVARCHAR},
       config = #{record.config,jdbcType=LONGVARCHAR},
-      `hosts` = #{record.hosts,jdbcType=LONGVARCHAR},
-      custom_data = #{record.customData,jdbcType=LONGVARCHAR}
+      `hosts` = #{record.hosts,jdbcType=LONGVARCHAR}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -349,9 +338,6 @@
       <if test="hosts != null">
         `hosts` = #{hosts,jdbcType=LONGVARCHAR},
       </if>
-      <if test="customData != null">
-        custom_data = #{customData,jdbcType=LONGVARCHAR},
-      </if>
     </set>
     where id = #{id,jdbcType=VARCHAR}
   </update>
@@ -367,8 +353,7 @@
       `variables` = #{variables,jdbcType=LONGVARCHAR},
       headers = #{headers,jdbcType=LONGVARCHAR},
       config = #{config,jdbcType=LONGVARCHAR},
-      `hosts` = #{hosts,jdbcType=LONGVARCHAR},
-      custom_data = #{customData,jdbcType=LONGVARCHAR}
+      `hosts` = #{hosts,jdbcType=LONGVARCHAR}
     where id = #{id,jdbcType=VARCHAR}
   </update>
   <update id="updateByPrimaryKey" parameterType="io.metersphere.base.domain.ApiTestEnvironment">