From 244dedc47c8ee3525aff532d1871761df16932d2 Mon Sep 17 00:00:00 2001
From: shiziyuan9527 <yuhao.li@fit2cloud.com>
Date: Thu, 21 Jan 2021 14:25:41 +0800
Subject: [PATCH 1/4] =?UTF-8?q?feat:=20=E6=8E=A5=E5=8F=A3=E7=94=A8?=
 =?UTF-8?q?=E4=BE=8B=E6=A0=B9=E6=8D=AEtag=E6=90=9C=E7=B4=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../io/metersphere/base/mapper/ext/ExtApiTestCaseMapper.xml     | 2 +-
 .../io/metersphere/base/mapper/ext/ExtTestPlanApiCaseMapper.xml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

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 1ee90b76b7..549f8f016a 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
@@ -279,7 +279,7 @@
                 </foreach>
             </if>
             <if test="request.name != null and request.name!=''">
-                and atc.name like CONCAT('%', #{request.name},'%')
+                and (atc.name like CONCAT('%', #{request.name},'%') or atc.tags like CONCAT('%', #{request.name},'%'))
             </if>
             <if test="request.createTime > 0">
                 and atc.create_time >= #{request.createTime}
diff --git a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestPlanApiCaseMapper.xml b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestPlanApiCaseMapper.xml
index bcd364cd3f..3504ff4684 100644
--- a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestPlanApiCaseMapper.xml
+++ b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestPlanApiCaseMapper.xml
@@ -54,7 +54,7 @@
       </foreach>
     </if>
     <if test="request.name != null and request.name!=''">
-      and c.name like CONCAT('%', #{request.name},'%')
+      and (c.name like CONCAT('%', #{request.name},'%') or c.tags like CONCAT('%', #{request.name},'%'))
     </if>
     <if test="request.moduleIds != null and request.moduleIds.size() > 0">
       and a.module_id in

From 86991876735e778edfbd8d6b133432368dbfd30e Mon Sep 17 00:00:00 2001
From: "Captain.B" <bin@fit2cloud.com>
Date: Thu, 21 Jan 2021 14:54:56 +0800
Subject: [PATCH 2/4] =?UTF-8?q?refactor(=E6=8E=A5=E5=8F=A3=E6=B5=8B?=
 =?UTF-8?q?=E8=AF=95):=20=E6=B5=8B=E8=AF=95=E7=94=A8=E4=BE=8B=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BAtags?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../base/mapper/ext/ExtApiTestCaseMapper.xml  |  2 +-
 .../components/list/ApiCaseSimpleList.vue     | 67 +++++++++++--------
 2 files changed, 41 insertions(+), 28 deletions(-)

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 549f8f016a..62e675723d 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
@@ -238,7 +238,7 @@
     <select id="listSimple" resultType="io.metersphere.api.dto.definition.ApiTestCaseDTO">
         select
           atc.id, atc.project_id, atc.name, atc.api_definition_id, atc.priority, atc.description, atc.create_user_id, atc.update_user_id, atc.create_time, atc.update_time, atc.num,
-          a.module_id, a.path, a.protocol
+          a.module_id, a.path, a.protocol, atc.tags
         from
           api_test_case atc
         inner join
diff --git a/frontend/src/business/components/api/definition/components/list/ApiCaseSimpleList.vue b/frontend/src/business/components/api/definition/components/list/ApiCaseSimpleList.vue
index 5b72cf06d5..65e8dd5b93 100644
--- a/frontend/src/business/components/api/definition/components/list/ApiCaseSimpleList.vue
+++ b/frontend/src/business/components/api/definition/components/list/ApiCaseSimpleList.vue
@@ -51,6 +51,14 @@
           :label="$t('api_test.definition.api_path')"
           show-overflow-tooltip/>
 
+        <el-table-column prop="tags" :label="$t('commons.tag')">
+          <template v-slot:default="scope">
+            <div v-for="(itemName,index)  in scope.row.tags" :key="index">
+              <ms-tag type="success" effect="plain" :content="itemName"/>
+            </div>
+          </template>
+        </el-table-column>
+
         <el-table-column
           prop="createUser"
           :label="'创建人'"
@@ -100,35 +108,34 @@
 
 <script>
 
-  import MsTableOperator from "../../../../common/components/MsTableOperator";
-  import MsTableOperatorButton from "../../../../common/components/MsTableOperatorButton";
-  import {LIST_CHANGE, TrackEvent} from "@/business/components/common/head/ListEvent";
-  import MsTablePagination from "../../../../common/pagination/TablePagination";
-  import MsTag from "../../../../common/components/MsTag";
-  import MsApiCaseList from "../case/ApiCaseList";
-  import MsContainer from "../../../../common/components/MsContainer";
-  import MsBottomContainer from "../BottomContainer";
-  import ShowMoreBtn from "../../../../track/case/components/ShowMoreBtn";
-  import MsBatchEdit from "../basis/BatchEdit";
-  import {API_METHOD_COLOUR, CASE_PRIORITY, REQ_METHOD} from "../../model/JsonData";
+import MsTableOperator from "../../../../common/components/MsTableOperator";
+import MsTableOperatorButton from "../../../../common/components/MsTableOperatorButton";
+import MsTablePagination from "../../../../common/pagination/TablePagination";
+import MsTag from "../../../../common/components/MsTag";
+import MsApiCaseList from "../case/ApiCaseList";
+import ApiCaseList from "../case/ApiCaseList";
+import MsContainer from "../../../../common/components/MsContainer";
+import MsBottomContainer from "../BottomContainer";
+import ShowMoreBtn from "../../../../track/case/components/ShowMoreBtn";
+import MsBatchEdit from "../basis/BatchEdit";
+import {API_METHOD_COLOUR, CASE_PRIORITY, REQ_METHOD} from "../../model/JsonData";
 
-  import {getBodyUploadFiles, getCurrentProjectID} from "@/common/js/utils";
-  import ApiListContainer from "./ApiListContainer";
-  import PriorityTableItem from "../../../../track/common/tableItems/planview/PriorityTableItem";
-  import ApiCaseList from "../case/ApiCaseList";
-  import {_filter, _sort} from "../../../../../../common/js/utils";
-  import {_handleSelect, _handleSelectAll} from "../../../../../../common/js/tableUtils";
-  import MsApiCaseTableExtendBtns from "../reference/ApiCaseTableExtendBtns";
-  import MsReferenceView from "../reference/ReferenceView";
-  import MsSetEnvironment from "@/business/components/api/definition/components/basis/SetEnvironment";
-  import TestPlan from "@/business/components/api/definition/components/jmeter/components/test-plan";
-  import ThreadGroup from "@/business/components/api/definition/components/jmeter/components/thread-group";
-  import {parseEnvironment} from "@/business/components/api/test/model/EnvironmentModel";
-  import MsTableSelectAll from "../../../../common/components/table/MsTableSelectAll";
-  import MsTableAdvSearchBar from "@/business/components/common/components/search/MsTableAdvSearchBar";
-  import {API_CASE_CONFIGS} from "@/business/components/common/components/search/search-components";
+import {getBodyUploadFiles, getCurrentProjectID} from "@/common/js/utils";
+import ApiListContainer from "./ApiListContainer";
+import PriorityTableItem from "../../../../track/common/tableItems/planview/PriorityTableItem";
+import {_filter, _sort} from "../../../../../../common/js/utils";
+import {_handleSelect, _handleSelectAll} from "../../../../../../common/js/tableUtils";
+import MsApiCaseTableExtendBtns from "../reference/ApiCaseTableExtendBtns";
+import MsReferenceView from "../reference/ReferenceView";
+import MsSetEnvironment from "@/business/components/api/definition/components/basis/SetEnvironment";
+import TestPlan from "@/business/components/api/definition/components/jmeter/components/test-plan";
+import ThreadGroup from "@/business/components/api/definition/components/jmeter/components/thread-group";
+import {parseEnvironment} from "@/business/components/api/test/model/EnvironmentModel";
+import MsTableSelectAll from "../../../../common/components/table/MsTableSelectAll";
+import MsTableAdvSearchBar from "@/business/components/common/components/search/MsTableAdvSearchBar";
+import {API_CASE_CONFIGS} from "@/business/components/common/components/search/search-components";
 
-  export default {
+export default {
     name: "ApiCaseSimpleList",
     components: {
       MsTableSelectAll,
@@ -290,6 +297,12 @@
             this.total = response.data.itemCount;
             this.tableData = response.data.listObject;
             this.unSelection = response.data.listObject.map(s => s.id);
+
+            this.tableData.forEach(item => {
+              if (item.tags && item.tags.length > 0) {
+                item.tags = JSON.parse(item.tags);
+              }
+            })
           });
         }
       },

From 44152ef2962df1f0789f4c7db6665f3c6d9ac4e9 Mon Sep 17 00:00:00 2001
From: "Captain.B" <bin@fit2cloud.com>
Date: Thu, 21 Jan 2021 15:15:41 +0800
Subject: [PATCH 3/4] =?UTF-8?q?refactor:=20=E7=94=A8=E6=88=B7=E5=90=8D?=
 =?UTF-8?q?=E6=88=96=E5=AF=86=E7=A0=81=E9=94=99=E8=AF=AF=E7=9A=84=E6=97=B6?=
 =?UTF-8?q?=E5=80=99=E6=98=BE=E7=A4=BA=E4=BF=A1=E6=81=AF=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/io/metersphere/security/realm/ShiroDBRealm.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/backend/src/main/java/io/metersphere/security/realm/ShiroDBRealm.java b/backend/src/main/java/io/metersphere/security/realm/ShiroDBRealm.java
index 6fc4f95698..337e282eb6 100644
--- a/backend/src/main/java/io/metersphere/security/realm/ShiroDBRealm.java
+++ b/backend/src/main/java/io/metersphere/security/realm/ShiroDBRealm.java
@@ -105,7 +105,7 @@ public class ShiroDBRealm extends AuthorizingRealm {
             if (user == null) {
                 msg = "The user does not exist: " + userId;
                 logger.warn(msg);
-                throw new UnknownAccountException(Translator.get("password_is_incorrect") + userId);
+                throw new UnknownAccountException(Translator.get("password_is_incorrect"));
             }
         }
         return user;
@@ -119,7 +119,7 @@ public class ShiroDBRealm extends AuthorizingRealm {
             if (user == null) {
                 msg = "The user does not exist: " + userId;
                 logger.warn(msg);
-                throw new UnknownAccountException(Translator.get("password_is_incorrect") + userId);
+                throw new UnknownAccountException(Translator.get("password_is_incorrect"));
             }
             userId = user.getId();
         }

From 0e3684e6c76b9d1fdb7b489e9f4f40ce0eff365e Mon Sep 17 00:00:00 2001
From: "song.tianyang" <tianyang.song@fit2cloud.com>
Date: Thu, 21 Jan 2021 15:21:53 +0800
Subject: [PATCH 4/4] =?UTF-8?q?fix:=20=E6=8E=A5=E5=8F=A3=E5=AE=9A=E4=B9=89?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E4=B8=AD=E4=B8=8D=E5=90=8C=E5=8D=A1=E7=89=87?=
 =?UTF-8?q?=E9=A1=B5=E7=9A=84=E5=9B=BE=E6=A0=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

修复接口定义页面中不同卡片页的图标与原型图对应不上的问题
---
 .../api/definition/components/list/ApiListContainer.vue       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/frontend/src/business/components/api/definition/components/list/ApiListContainer.vue b/frontend/src/business/components/api/definition/components/list/ApiListContainer.vue
index 50a2716e64..19e19b713f 100644
--- a/frontend/src/business/components/api/definition/components/list/ApiListContainer.vue
+++ b/frontend/src/business/components/api/definition/components/list/ApiListContainer.vue
@@ -4,11 +4,11 @@
     <el-button-group v-if="isShowChangeButton">
 
       <el-tooltip class="item" effect="dark" content="接口列表" placement="left">
-        <el-button plain size="small" icon="el-icon-tickets" :class="{active: isApiListEnable}" @click="apiChange('api')"></el-button>
+        <el-button plain style="width: 44px;height: 32px;padding: 5px 8px;"  :class="{active: isApiListEnable}" @click="apiChange('api')">API</el-button>
       </el-tooltip>
 
       <el-tooltip class="item" effect="dark" content="用例列表" placement="right">
-        <el-button plain class="case-button" size="small" icon="el-icon-paperclip" :class="{active: !isApiListEnable}" @click="caseChange('case')"></el-button>
+        <el-button plain class="case-button" style="width: 44px;height: 32px;padding: 1px;"  :class="{active: !isApiListEnable}" @click="caseChange('case')">CASE</el-button>
       </el-tooltip>
 
     </el-button-group>