From f718ced7e835487e093f482e8a2cd8898759d6be Mon Sep 17 00:00:00 2001
From: chenjianxing <jianxing.chen@fit2cloud.com>
Date: Fri, 21 Oct 2022 17:46:39 +0800
Subject: [PATCH] =?UTF-8?q?refactor(=E6=B5=8B=E8=AF=95=E8=B7=9F=E8=B8=AA):?=
 =?UTF-8?q?=20=E4=BC=98=E5=8C=96=E6=8B=BC=E5=86=99=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../metersphere/commons/utils/CronUtils.java  |  2 +-
 .../xpack/track/dto/PlatformStatusDTO.java    |  2 +-
 .../base/mapper/ext/ExtTestAnalysisMapper.xml |  2 +-
 .../ExtTestCaseReviewScenarioCaseMapper.java  |  5 --
 .../ExtTestCaseReviewScenarioCaseMapper.xml   | 72 -------------------
 .../base/mapper/ext/ExtTestPlanMapper.java    |  2 +-
 .../base/mapper/ext/ExtTestPlanMapper.xml     |  6 +-
 .../mapper/ext/ExtTestPlanTestCaseMapper.java |  4 +-
 .../controller/TestCaseNodeController.java    |  2 +-
 .../controller/TestPlanController.java        | 12 ++--
 .../controller/TestPlanReportController.java  |  2 +-
 .../TestPlanTestCaseController.java           |  8 +--
 .../controller/TrackController.java           |  4 +-
 ...{BugStatustics.java => BugStatistics.java} |  2 +-
 .../AddTestPlanRequest.java                   |  2 +-
 .../{reuest => request}/BatchCondition.java   |  4 +-
 .../QueryTestPlanRequest.java                 |  2 +-
 .../ScheduleInfoRequest.java                  |  2 +-
 .../TestPlanReportSaveRequest.java            |  2 +-
 .../api/ApiPlanReportRequest.java             |  2 +-
 .../api/RunScenarioRequest.java               |  4 +-
 .../SchedulePlanScenarioExecuteRequest.java   |  2 +-
 .../api/TestPlanRunRequest.java               |  4 +-
 .../function/PlanCaseRelevanceRequest.java    |  2 +-
 .../function/QueryTestPlanCaseRequest.java    |  2 +-
 .../function/TestCaseRelevanceRequest.java    |  2 +-
 .../function/TestPlanCaseBatchRequest.java    |  2 +-
 .../TestPlanFuncCaseBatchRequest.java         |  2 +-
 .../function/TestPlanFuncCaseConditions.java  |  2 +-
 .../function/TestPlanFuncCaseEditRequest.java |  2 +-
 .../performance/LoadCaseReportRequest.java    |  2 +-
 .../performance/LoadCaseRequest.java          |  2 +-
 .../performance/LoadPlanReportDTO.java        |  2 +-
 .../PlanPerformanceExecRequest.java           |  2 +-
 .../ui/RunUiScenarioRequest.java              |  4 +-
 .../plan/service/TestPlanProjectService.java  |  2 +-
 .../plan/service/TestPlanReportService.java   |  8 +--
 .../plan/service/TestPlanService.java         | 30 ++++----
 .../plan/service/TestPlanTestCaseService.java |  2 +-
 .../remote/api/PlanApiAutomationService.java  |  2 +-
 .../api/PlanTestPlanScenarioCaseService.java  |  2 +-
 .../remote/performance/PerfExecService.java   |  2 +-
 .../PlanTestPlanLoadCaseService.java          |  6 +-
 .../ui/PlanTestPlanUiScenarioCaseService.java |  2 +-
 .../remote/ui/PlanUiAutomationService.java    |  2 +-
 .../service/TestCaseNodeService.java          |  2 +-
 .../metersphere/service/TestCaseService.java  | 22 +++---
 .../io/metersphere/service/TrackService.java  | 14 ++--
 .../issue/domain/zentao/GetUserResponse.java  | 35 ---------
 .../service/issue/platform/JiraPlatform.java  |  2 +-
 .../service/issue/platform/TapdPlatform.java  |  6 +-
 .../issue/platform/ZentaoPlatform.java        |  4 +-
 .../io/metersphere/xmind/XmindCaseParser.java | 22 +++---
 .../business/case/components/TestCaseEdit.vue |  8 +--
 .../src/business/issue/IssueEditDetail.vue    |  2 +-
 .../src/business/plan/env/EnvGroup.vue        |  6 +-
 .../business/plan/env/EnvGroupWithOption.vue  |  6 +-
 .../report/detail/TestPlanApiReport.vue       |  6 +-
 .../business/review/commom/ReviewComment.vue  |  1 -
 59 files changed, 128 insertions(+), 241 deletions(-)
 rename test-track/backend/src/main/java/io/metersphere/dto/{BugStatustics.java => BugStatistics.java} (90%)
 rename test-track/backend/src/main/java/io/metersphere/plan/{reuest => request}/AddTestPlanRequest.java (89%)
 rename test-track/backend/src/main/java/io/metersphere/plan/{reuest => request}/BatchCondition.java (79%)
 rename test-track/backend/src/main/java/io/metersphere/plan/{reuest => request}/QueryTestPlanRequest.java (96%)
 rename test-track/backend/src/main/java/io/metersphere/plan/{reuest => request}/ScheduleInfoRequest.java (91%)
 rename test-track/backend/src/main/java/io/metersphere/plan/{reuest => request}/TestPlanReportSaveRequest.java (99%)
 rename test-track/backend/src/main/java/io/metersphere/plan/{reuest => request}/api/ApiPlanReportRequest.java (87%)
 rename test-track/backend/src/main/java/io/metersphere/plan/{reuest => request}/api/RunScenarioRequest.java (90%)
 rename test-track/backend/src/main/java/io/metersphere/plan/{reuest => request}/api/SchedulePlanScenarioExecuteRequest.java (95%)
 rename test-track/backend/src/main/java/io/metersphere/plan/{reuest => request}/api/TestPlanRunRequest.java (90%)
 rename test-track/backend/src/main/java/io/metersphere/plan/{reuest => request}/function/PlanCaseRelevanceRequest.java (93%)
 rename test-track/backend/src/main/java/io/metersphere/plan/{reuest => request}/function/QueryTestPlanCaseRequest.java (93%)
 rename test-track/backend/src/main/java/io/metersphere/plan/{reuest => request}/function/TestCaseRelevanceRequest.java (82%)
 rename test-track/backend/src/main/java/io/metersphere/plan/{reuest => request}/function/TestPlanCaseBatchRequest.java (87%)
 rename test-track/backend/src/main/java/io/metersphere/plan/{reuest => request}/function/TestPlanFuncCaseBatchRequest.java (86%)
 rename test-track/backend/src/main/java/io/metersphere/plan/{reuest => request}/function/TestPlanFuncCaseConditions.java (87%)
 rename test-track/backend/src/main/java/io/metersphere/plan/{reuest => request}/function/TestPlanFuncCaseEditRequest.java (83%)
 rename test-track/backend/src/main/java/io/metersphere/plan/{reuest => request}/performance/LoadCaseReportRequest.java (77%)
 rename test-track/backend/src/main/java/io/metersphere/plan/{reuest => request}/performance/LoadCaseRequest.java (93%)
 rename test-track/backend/src/main/java/io/metersphere/plan/{reuest => request}/performance/LoadPlanReportDTO.java (84%)
 rename test-track/backend/src/main/java/io/metersphere/plan/{reuest => request}/performance/PlanPerformanceExecRequest.java (86%)
 rename test-track/backend/src/main/java/io/metersphere/plan/{reuest => request}/ui/RunUiScenarioRequest.java (74%)

diff --git a/framework/sdk-parent/sdk/src/main/java/io/metersphere/commons/utils/CronUtils.java b/framework/sdk-parent/sdk/src/main/java/io/metersphere/commons/utils/CronUtils.java
index a1cda8e843..59050c71a7 100644
--- a/framework/sdk-parent/sdk/src/main/java/io/metersphere/commons/utils/CronUtils.java
+++ b/framework/sdk-parent/sdk/src/main/java/io/metersphere/commons/utils/CronUtils.java
@@ -24,7 +24,7 @@ public class CronUtils {
         if (!CronExpression.isValidExpression(cron)) {
             throw new RuntimeException("cron :" + cron + "表达式解析错误");
         }
-        return TriggerBuilder.newTrigger().withIdentity("Caclulate Date").withSchedule(CronScheduleBuilder.cronSchedule(cron)).build();
+        return TriggerBuilder.newTrigger().withIdentity("Calculate Date").withSchedule(CronScheduleBuilder.cronSchedule(cron)).build();
     }
 
     /**
diff --git a/framework/sdk-parent/xpack-interface/src/main/java/io/metersphere/xpack/track/dto/PlatformStatusDTO.java b/framework/sdk-parent/xpack-interface/src/main/java/io/metersphere/xpack/track/dto/PlatformStatusDTO.java
index de3b29b4bc..1ca74f56de 100644
--- a/framework/sdk-parent/xpack-interface/src/main/java/io/metersphere/xpack/track/dto/PlatformStatusDTO.java
+++ b/framework/sdk-parent/xpack-interface/src/main/java/io/metersphere/xpack/track/dto/PlatformStatusDTO.java
@@ -7,5 +7,5 @@ import lombok.Setter;
 @Getter
 public class PlatformStatusDTO {
     protected String value;
-    protected String lable;
+    protected String label;
 }
diff --git a/test-track/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestAnalysisMapper.xml b/test-track/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestAnalysisMapper.xml
index f1a5779462..53d3ad2c72 100644
--- a/test-track/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestAnalysisMapper.xml
+++ b/test-track/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestAnalysisMapper.xml
@@ -110,4 +110,4 @@
         </if>
     </select>
 
-</mapper>
\ No newline at end of file
+</mapper>
diff --git a/test-track/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestCaseReviewScenarioCaseMapper.java b/test-track/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestCaseReviewScenarioCaseMapper.java
index 0fc5722b9b..c751d81322 100644
--- a/test-track/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestCaseReviewScenarioCaseMapper.java
+++ b/test-track/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestCaseReviewScenarioCaseMapper.java
@@ -1,8 +1,6 @@
 package io.metersphere.base.mapper.ext;
 
-import io.metersphere.base.domain.ApiScenarioWithBLOBs;
 import io.metersphere.base.domain.TestCaseReviewScenario;
-//import io.metersphere.reuqest.TestPlanScenarioRequest;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -10,9 +8,6 @@ import java.util.List;
 public interface ExtTestCaseReviewScenarioCaseMapper {
     void insertIfNotExists(@Param("request") TestCaseReviewScenario request);
 
-    // todo check
-//    List<ApiScenarioWithBLOBs> list(@Param("request") TestPlanScenarioRequest request);
-
     List<String> getExecResultByReviewId(String reviewId);
 
     List<String> getIdsByReviewId(String reviewId);
diff --git a/test-track/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestCaseReviewScenarioCaseMapper.xml b/test-track/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestCaseReviewScenarioCaseMapper.xml
index 50f4f2b397..9785e661ce 100644
--- a/test-track/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestCaseReviewScenarioCaseMapper.xml
+++ b/test-track/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestCaseReviewScenarioCaseMapper.xml
@@ -13,78 +13,6 @@
             )
     </insert>
 
-<!--    <select id="list" resultType="io.metersphere.api.dto.automation.ApiScenarioDTO">-->
-<!--        select-->
-<!--        t.id, t.environment, t.create_time, t.update_time, t.last_result, t.pass_rate, t.report_id, c.scenario_definition,-->
-<!--        c.id as case_id, c.project_id, c.user_id,c.api_scenario_module_id, c.module_path, c.name, c.level,-->
-<!--        c.status, c.principal, c.step_total, c.schedule, c.description, c.tags, c.num,-->
-<!--        p.name as project_name, p.id as project_id, u.name as user_name-->
-<!--        from-->
-<!--        test_case_review_scenario t-->
-<!--        inner join-->
-<!--        api_scenario c-->
-<!--        on t.api_scenario_id = c.id and c.status != 'Trash'-->
-<!--        <if test="request.reviewId != null and request.reviewId!=''">-->
-<!--            and t.test_case_review_id = #{request.reviewId}-->
-<!--        </if>-->
-<!--        left join project p-->
-<!--        on c.project_id = p.id-->
-<!--        left join user u-->
-<!--        on c.user_id = u.id-->
-<!--        where 1-->
-<!--        <if test="request.ids != null and request.ids.size() > 0">-->
-<!--            <if test="request.projectId != null and request.projectId!=''">-->
-<!--                and-->
-<!--            </if>-->
-<!--            t.id in-->
-<!--            <foreach collection="request.ids" item="caseId" separator="," open="(" close=")">-->
-<!--                #{caseId}-->
-<!--            </foreach>-->
-<!--        </if>-->
-<!--        <if test="request.name != null and request.name!=''">-->
-<!--            and (c.name like CONCAT('%', #{request.name},'%')-->
-<!--            or c.num like CONCAT('%', #{request.name},'%')-->
-<!--            or c.tags like CONCAT('%', #{request.name},'%'))-->
-<!--        </if>-->
-<!--        <if test="request.status != null and request.status!=''">-->
-<!--            and t.last_result like CONCAT('%', #{request.status},'%')-->
-<!--        </if>-->
-
-
-<!--        <if test="request.moduleIds != null and request.moduleIds.size() > 0">-->
-<!--            and c.api_scenario_module_id in-->
-<!--            <foreach collection="request.moduleIds" item="nodeId" separator="," open="(" close=")">-->
-<!--                #{nodeId}-->
-<!--            </foreach>-->
-<!--        </if>-->
-<!--        <if test="request.filters != null and request.filters.size() > 0">-->
-<!--            <foreach collection="request.filters.entrySet()" index="key" item="values">-->
-<!--                <if test="values != null and values.size() > 0">-->
-<!--                    <choose>-->
-<!--                        <when test="key == 'priority'">-->
-<!--                            and c.priority in-->
-<!--                            <foreach collection="values" item="value" separator="," open="(" close=")">-->
-<!--                                #{value}-->
-<!--                            </foreach>-->
-<!--                        </when>-->
-<!--                    </choose>-->
-<!--                </if>-->
-<!--            </foreach>-->
-<!--        </if>-->
-<!--        <if test="request.orders != null and request.orders.size() > 0">-->
-<!--            order by-->
-<!--            <foreach collection="request.orders" separator="," item="order">-->
-<!--                <choose>-->
-<!--                    <when test="order.name == 'update_time'">-->
-<!--                        t.${order.name} ${order.type}-->
-<!--                    </when>-->
-<!--                    <otherwise>-->
-<!--                        ${order.name} ${order.type}-->
-<!--                    </otherwise>-->
-<!--                </choose>-->
-<!--            </foreach>-->
-<!--        </if>-->
-<!--    </select>-->
     <select id="getExecResultByReviewId" resultType="java.lang.String">
         select last_result
         from
diff --git a/test-track/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestPlanMapper.java b/test-track/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestPlanMapper.java
index e7db35ca1c..f32fde8931 100644
--- a/test-track/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestPlanMapper.java
+++ b/test-track/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestPlanMapper.java
@@ -5,7 +5,7 @@ import io.metersphere.base.domain.TestPlan;
 import io.metersphere.dto.ParamsDTO;
 import io.metersphere.dto.TestPlanDTOWithMetric;
 import io.metersphere.plan.dto.TestPlanDTO;
-import io.metersphere.plan.reuest.QueryTestPlanRequest;
+import io.metersphere.plan.request.QueryTestPlanRequest;
 import org.apache.ibatis.annotations.MapKey;
 import org.apache.ibatis.annotations.Param;
 
diff --git a/test-track/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestPlanMapper.xml b/test-track/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestPlanMapper.xml
index 217fd80fe7..bf2152a84c 100644
--- a/test-track/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestPlanMapper.xml
+++ b/test-track/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestPlanMapper.xml
@@ -149,7 +149,7 @@
     </sql>
 
     <select id="list" resultType="io.metersphere.dto.TestPlanDTOWithMetric"
-            parameterType="io.metersphere.plan.reuest.QueryTestPlanRequest">
+            parameterType="io.metersphere.plan.request.QueryTestPlanRequest">
         select DISTINCT test_plan.*, project.name as projectName,schedule.id as scheduleId,
         (select name from user where user.id = test_plan.creator) as createUser,
         IF(schedule.enable = true,true,false) as scheduleOpen
@@ -264,7 +264,7 @@
     </sql>
 
     <select id="planList" resultMap="BaseResultMap"
-            parameterType="io.metersphere.plan.reuest.QueryTestPlanRequest">
+            parameterType="io.metersphere.plan.request.QueryTestPlanRequest">
         SELECT * FROM test_plan p LEFT JOIN test_plan_project t ON t.test_plan_id=p.ID
         <where>
             <if test="request.workspaceId != null">
@@ -307,7 +307,7 @@
     </select>
 
     <select id="selectTestPlanByRelevancy" resultMap="BaseResultMap"
-            parameterType="io.metersphere.plan.reuest.QueryTestPlanRequest">
+            parameterType="io.metersphere.plan.request.QueryTestPlanRequest">
         SELECT * FROM test_plan p
         <where>
             <if test="request.scenarioId != null">
diff --git a/test-track/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestPlanTestCaseMapper.java b/test-track/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestPlanTestCaseMapper.java
index e8832a4ba7..7973bec55b 100644
--- a/test-track/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestPlanTestCaseMapper.java
+++ b/test-track/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestPlanTestCaseMapper.java
@@ -2,10 +2,10 @@ package io.metersphere.base.mapper.ext;
 
 import io.metersphere.dto.PlanReportCaseDTO;
 import io.metersphere.plan.dto.TestCaseReportStatusResultDTO;
-import io.metersphere.plan.reuest.function.QueryTestPlanCaseRequest;
+import io.metersphere.plan.request.function.QueryTestPlanCaseRequest;
 import io.metersphere.request.BaseQueryRequest;
 import io.metersphere.dto.*;
-import io.metersphere.plan.reuest.function.TestPlanFuncCaseConditions;
+import io.metersphere.plan.request.function.TestPlanFuncCaseConditions;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
diff --git a/test-track/backend/src/main/java/io/metersphere/controller/TestCaseNodeController.java b/test-track/backend/src/main/java/io/metersphere/controller/TestCaseNodeController.java
index d551084fc7..c84d6e9d47 100644
--- a/test-track/backend/src/main/java/io/metersphere/controller/TestCaseNodeController.java
+++ b/test-track/backend/src/main/java/io/metersphere/controller/TestCaseNodeController.java
@@ -7,7 +7,7 @@ import io.metersphere.log.annotation.MsAuditLog;
 import io.metersphere.request.testcase.DragNodeRequest;
 import io.metersphere.request.testcase.QueryNodeRequest;
 import io.metersphere.request.testcase.QueryTestCaseRequest;
-import io.metersphere.plan.reuest.function.QueryTestPlanCaseRequest;
+import io.metersphere.plan.request.function.QueryTestPlanCaseRequest;
 import io.metersphere.request.testreview.QueryCaseReviewRequest;
 import io.metersphere.dto.TestCaseNodeDTO;
 import io.metersphere.service.BaseCheckPermissionService;
diff --git a/test-track/backend/src/main/java/io/metersphere/controller/TestPlanController.java b/test-track/backend/src/main/java/io/metersphere/controller/TestPlanController.java
index 4e8732bbc4..9426da3efc 100644
--- a/test-track/backend/src/main/java/io/metersphere/controller/TestPlanController.java
+++ b/test-track/backend/src/main/java/io/metersphere/controller/TestPlanController.java
@@ -14,12 +14,12 @@ import io.metersphere.notice.annotation.SendNotice;
 import io.metersphere.plan.dto.TestCaseReportStatusResultDTO;
 import io.metersphere.plan.dto.TestPlanDTO;
 import io.metersphere.plan.dto.TestPlanSimpleReportDTO;
-import io.metersphere.plan.reuest.AddTestPlanRequest;
-import io.metersphere.plan.reuest.QueryTestPlanRequest;
-import io.metersphere.plan.reuest.ScheduleInfoRequest;
-import io.metersphere.plan.reuest.api.TestPlanRunRequest;
-import io.metersphere.plan.reuest.function.PlanCaseRelevanceRequest;
-import io.metersphere.plan.reuest.function.TestCaseRelevanceRequest;
+import io.metersphere.plan.request.AddTestPlanRequest;
+import io.metersphere.plan.request.QueryTestPlanRequest;
+import io.metersphere.plan.request.ScheduleInfoRequest;
+import io.metersphere.plan.request.api.TestPlanRunRequest;
+import io.metersphere.plan.request.function.PlanCaseRelevanceRequest;
+import io.metersphere.plan.request.function.TestCaseRelevanceRequest;
 import io.metersphere.plan.service.TestPlanProjectService;
 import io.metersphere.plan.service.TestPlanRerunService;
 import io.metersphere.plan.service.TestPlanService;
diff --git a/test-track/backend/src/main/java/io/metersphere/controller/TestPlanReportController.java b/test-track/backend/src/main/java/io/metersphere/controller/TestPlanReportController.java
index 87593af1a3..3067e6a158 100644
--- a/test-track/backend/src/main/java/io/metersphere/controller/TestPlanReportController.java
+++ b/test-track/backend/src/main/java/io/metersphere/controller/TestPlanReportController.java
@@ -14,7 +14,7 @@ import io.metersphere.notice.annotation.SendNotice;
 import io.metersphere.dto.TestPlanReportDTO;
 import io.metersphere.dto.TestPlanScheduleReportInfoDTO;
 import io.metersphere.plan.dto.TestPlanSimpleReportDTO;
-import io.metersphere.plan.reuest.TestPlanReportSaveRequest;
+import io.metersphere.plan.request.TestPlanReportSaveRequest;
 import io.metersphere.request.report.QueryTestPlanReportRequest;
 import io.metersphere.plan.service.TestPlanReportService;
 import org.springframework.web.bind.annotation.*;
diff --git a/test-track/backend/src/main/java/io/metersphere/controller/TestPlanTestCaseController.java b/test-track/backend/src/main/java/io/metersphere/controller/TestPlanTestCaseController.java
index 56e1a5b952..8c6b2dc665 100644
--- a/test-track/backend/src/main/java/io/metersphere/controller/TestPlanTestCaseController.java
+++ b/test-track/backend/src/main/java/io/metersphere/controller/TestPlanTestCaseController.java
@@ -9,10 +9,10 @@ import io.metersphere.commons.utils.PageUtils;
 import io.metersphere.commons.utils.Pager;
 import io.metersphere.dto.TestPlanCaseDTO;
 import io.metersphere.log.annotation.MsAuditLog;
-import io.metersphere.plan.reuest.function.QueryTestPlanCaseRequest;
-import io.metersphere.plan.reuest.function.TestPlanCaseBatchRequest;
-import io.metersphere.plan.reuest.function.TestPlanFuncCaseBatchRequest;
-import io.metersphere.plan.reuest.function.TestPlanFuncCaseEditRequest;
+import io.metersphere.plan.request.function.QueryTestPlanCaseRequest;
+import io.metersphere.plan.request.function.TestPlanCaseBatchRequest;
+import io.metersphere.plan.request.function.TestPlanFuncCaseBatchRequest;
+import io.metersphere.plan.request.function.TestPlanFuncCaseEditRequest;
 import io.metersphere.plan.service.TestPlanTestCaseService;
 import io.metersphere.request.ResetOrderRequest;
 import org.apache.commons.lang3.StringUtils;
diff --git a/test-track/backend/src/main/java/io/metersphere/controller/TrackController.java b/test-track/backend/src/main/java/io/metersphere/controller/TrackController.java
index 138d092bfc..3fd80cddf6 100644
--- a/test-track/backend/src/main/java/io/metersphere/controller/TrackController.java
+++ b/test-track/backend/src/main/java/io/metersphere/controller/TrackController.java
@@ -2,7 +2,7 @@ package io.metersphere.controller;
 
 
 import io.metersphere.base.domain.TestCase;
-import io.metersphere.dto.BugStatustics;
+import io.metersphere.dto.BugStatistics;
 import io.metersphere.dto.TrackCountResult;
 import io.metersphere.dto.TrackStatisticsDTO;
 import io.metersphere.i18n.Translator;
@@ -89,7 +89,7 @@ public class TrackController {
     }
 
     @GetMapping("/bug/count/{projectId}")
-    public BugStatustics getBugStatistics(@PathVariable String projectId) {
+    public BugStatistics getBugStatistics(@PathVariable String projectId) {
         return trackService.getBugStatistics(projectId);
     }
 }
diff --git a/test-track/backend/src/main/java/io/metersphere/dto/BugStatustics.java b/test-track/backend/src/main/java/io/metersphere/dto/BugStatistics.java
similarity index 90%
rename from test-track/backend/src/main/java/io/metersphere/dto/BugStatustics.java
rename to test-track/backend/src/main/java/io/metersphere/dto/BugStatistics.java
index e50d37a4ef..5c58d3e6e7 100644
--- a/test-track/backend/src/main/java/io/metersphere/dto/BugStatustics.java
+++ b/test-track/backend/src/main/java/io/metersphere/dto/BugStatistics.java
@@ -8,7 +8,7 @@ import java.util.List;
 
 @Getter
 @Setter
-public class BugStatustics {
+public class BugStatistics {
 
     private long bugTotalSize;
     private String rage;
diff --git a/test-track/backend/src/main/java/io/metersphere/plan/reuest/AddTestPlanRequest.java b/test-track/backend/src/main/java/io/metersphere/plan/request/AddTestPlanRequest.java
similarity index 89%
rename from test-track/backend/src/main/java/io/metersphere/plan/reuest/AddTestPlanRequest.java
rename to test-track/backend/src/main/java/io/metersphere/plan/request/AddTestPlanRequest.java
index 49a29151f7..a7e666e2e3 100644
--- a/test-track/backend/src/main/java/io/metersphere/plan/reuest/AddTestPlanRequest.java
+++ b/test-track/backend/src/main/java/io/metersphere/plan/request/AddTestPlanRequest.java
@@ -1,4 +1,4 @@
-package io.metersphere.plan.reuest;
+package io.metersphere.plan.request;
 
 import io.metersphere.base.domain.TestPlanWithBLOBs;
 import lombok.Getter;
diff --git a/test-track/backend/src/main/java/io/metersphere/plan/reuest/BatchCondition.java b/test-track/backend/src/main/java/io/metersphere/plan/request/BatchCondition.java
similarity index 79%
rename from test-track/backend/src/main/java/io/metersphere/plan/reuest/BatchCondition.java
rename to test-track/backend/src/main/java/io/metersphere/plan/request/BatchCondition.java
index 8b9a3569a4..15e002f76a 100644
--- a/test-track/backend/src/main/java/io/metersphere/plan/reuest/BatchCondition.java
+++ b/test-track/backend/src/main/java/io/metersphere/plan/request/BatchCondition.java
@@ -1,6 +1,6 @@
-package io.metersphere.plan.reuest;
+package io.metersphere.plan.request;
 
-import io.metersphere.plan.reuest.performance.LoadCaseRequest;
+import io.metersphere.plan.request.performance.LoadCaseRequest;
 import lombok.Getter;
 import lombok.Setter;
 
diff --git a/test-track/backend/src/main/java/io/metersphere/plan/reuest/QueryTestPlanRequest.java b/test-track/backend/src/main/java/io/metersphere/plan/request/QueryTestPlanRequest.java
similarity index 96%
rename from test-track/backend/src/main/java/io/metersphere/plan/reuest/QueryTestPlanRequest.java
rename to test-track/backend/src/main/java/io/metersphere/plan/request/QueryTestPlanRequest.java
index 5c6ea23785..dfb68da180 100644
--- a/test-track/backend/src/main/java/io/metersphere/plan/reuest/QueryTestPlanRequest.java
+++ b/test-track/backend/src/main/java/io/metersphere/plan/request/QueryTestPlanRequest.java
@@ -1,4 +1,4 @@
-package io.metersphere.plan.reuest;
+package io.metersphere.plan.request;
 
 import io.metersphere.base.domain.TestPlan;
 import io.metersphere.request.OrderRequest;
diff --git a/test-track/backend/src/main/java/io/metersphere/plan/reuest/ScheduleInfoRequest.java b/test-track/backend/src/main/java/io/metersphere/plan/request/ScheduleInfoRequest.java
similarity index 91%
rename from test-track/backend/src/main/java/io/metersphere/plan/reuest/ScheduleInfoRequest.java
rename to test-track/backend/src/main/java/io/metersphere/plan/request/ScheduleInfoRequest.java
index d21e668e2f..8ed89ccb66 100644
--- a/test-track/backend/src/main/java/io/metersphere/plan/reuest/ScheduleInfoRequest.java
+++ b/test-track/backend/src/main/java/io/metersphere/plan/request/ScheduleInfoRequest.java
@@ -1,4 +1,4 @@
-package io.metersphere.plan.reuest;
+package io.metersphere.plan.request;
 
 import lombok.Getter;
 import lombok.Setter;
diff --git a/test-track/backend/src/main/java/io/metersphere/plan/reuest/TestPlanReportSaveRequest.java b/test-track/backend/src/main/java/io/metersphere/plan/request/TestPlanReportSaveRequest.java
similarity index 99%
rename from test-track/backend/src/main/java/io/metersphere/plan/reuest/TestPlanReportSaveRequest.java
rename to test-track/backend/src/main/java/io/metersphere/plan/request/TestPlanReportSaveRequest.java
index ccf33d68af..89425c8e2c 100644
--- a/test-track/backend/src/main/java/io/metersphere/plan/reuest/TestPlanReportSaveRequest.java
+++ b/test-track/backend/src/main/java/io/metersphere/plan/request/TestPlanReportSaveRequest.java
@@ -1,4 +1,4 @@
-package io.metersphere.plan.reuest;
+package io.metersphere.plan.request;
 
 import lombok.Getter;
 import lombok.Setter;
diff --git a/test-track/backend/src/main/java/io/metersphere/plan/reuest/api/ApiPlanReportRequest.java b/test-track/backend/src/main/java/io/metersphere/plan/request/api/ApiPlanReportRequest.java
similarity index 87%
rename from test-track/backend/src/main/java/io/metersphere/plan/reuest/api/ApiPlanReportRequest.java
rename to test-track/backend/src/main/java/io/metersphere/plan/request/api/ApiPlanReportRequest.java
index d4b2f979a1..5203b5bb5b 100644
--- a/test-track/backend/src/main/java/io/metersphere/plan/reuest/api/ApiPlanReportRequest.java
+++ b/test-track/backend/src/main/java/io/metersphere/plan/request/api/ApiPlanReportRequest.java
@@ -1,4 +1,4 @@
-package io.metersphere.plan.reuest.api;
+package io.metersphere.plan.request.api;
 
 
 import io.metersphere.dto.TestPlanExecuteReportDTO;
diff --git a/test-track/backend/src/main/java/io/metersphere/plan/reuest/api/RunScenarioRequest.java b/test-track/backend/src/main/java/io/metersphere/plan/request/api/RunScenarioRequest.java
similarity index 90%
rename from test-track/backend/src/main/java/io/metersphere/plan/reuest/api/RunScenarioRequest.java
rename to test-track/backend/src/main/java/io/metersphere/plan/request/api/RunScenarioRequest.java
index 2a9cf318ea..ec911d0fc9 100644
--- a/test-track/backend/src/main/java/io/metersphere/plan/reuest/api/RunScenarioRequest.java
+++ b/test-track/backend/src/main/java/io/metersphere/plan/request/api/RunScenarioRequest.java
@@ -1,4 +1,4 @@
-package io.metersphere.plan.reuest.api;
+package io.metersphere.plan.request.api;
 
 import io.metersphere.dto.RunModeConfigDTO;
 import lombok.Getter;
@@ -43,7 +43,7 @@ public class RunScenarioRequest {
 
     private boolean isTestPlanScheduleJob = false;
 
-    //生成测试报告：当isTestPlanScheduleJob为ture时使用
+    //生成测试报告：当isTestPlanScheduleJob为true时使用
     private String testPlanReportId;
 
     private String requestOriginator;
diff --git a/test-track/backend/src/main/java/io/metersphere/plan/reuest/api/SchedulePlanScenarioExecuteRequest.java b/test-track/backend/src/main/java/io/metersphere/plan/request/api/SchedulePlanScenarioExecuteRequest.java
similarity index 95%
rename from test-track/backend/src/main/java/io/metersphere/plan/reuest/api/SchedulePlanScenarioExecuteRequest.java
rename to test-track/backend/src/main/java/io/metersphere/plan/request/api/SchedulePlanScenarioExecuteRequest.java
index 7f45da5f2a..722308ff43 100644
--- a/test-track/backend/src/main/java/io/metersphere/plan/reuest/api/SchedulePlanScenarioExecuteRequest.java
+++ b/test-track/backend/src/main/java/io/metersphere/plan/request/api/SchedulePlanScenarioExecuteRequest.java
@@ -1,4 +1,4 @@
-package io.metersphere.plan.reuest.api;
+package io.metersphere.plan.request.api;
 
 import io.metersphere.dto.RunModeConfigDTO;
 import lombok.Getter;
diff --git a/test-track/backend/src/main/java/io/metersphere/plan/reuest/api/TestPlanRunRequest.java b/test-track/backend/src/main/java/io/metersphere/plan/request/api/TestPlanRunRequest.java
similarity index 90%
rename from test-track/backend/src/main/java/io/metersphere/plan/reuest/api/TestPlanRunRequest.java
rename to test-track/backend/src/main/java/io/metersphere/plan/request/api/TestPlanRunRequest.java
index 49f498bd86..5868ecac7f 100644
--- a/test-track/backend/src/main/java/io/metersphere/plan/reuest/api/TestPlanRunRequest.java
+++ b/test-track/backend/src/main/java/io/metersphere/plan/request/api/TestPlanRunRequest.java
@@ -1,6 +1,6 @@
-package io.metersphere.plan.reuest.api;
+package io.metersphere.plan.request.api;
 
-import io.metersphere.plan.reuest.QueryTestPlanRequest;
+import io.metersphere.plan.request.QueryTestPlanRequest;
 import lombok.Getter;
 import lombok.Setter;
 
diff --git a/test-track/backend/src/main/java/io/metersphere/plan/reuest/function/PlanCaseRelevanceRequest.java b/test-track/backend/src/main/java/io/metersphere/plan/request/function/PlanCaseRelevanceRequest.java
similarity index 93%
rename from test-track/backend/src/main/java/io/metersphere/plan/reuest/function/PlanCaseRelevanceRequest.java
rename to test-track/backend/src/main/java/io/metersphere/plan/request/function/PlanCaseRelevanceRequest.java
index 7d3b997bf7..92edefa895 100644
--- a/test-track/backend/src/main/java/io/metersphere/plan/reuest/function/PlanCaseRelevanceRequest.java
+++ b/test-track/backend/src/main/java/io/metersphere/plan/request/function/PlanCaseRelevanceRequest.java
@@ -1,4 +1,4 @@
-package io.metersphere.plan.reuest.function;
+package io.metersphere.plan.request.function;
 
 import io.metersphere.request.testcase.QueryTestCaseRequest;
 import lombok.Getter;
diff --git a/test-track/backend/src/main/java/io/metersphere/plan/reuest/function/QueryTestPlanCaseRequest.java b/test-track/backend/src/main/java/io/metersphere/plan/request/function/QueryTestPlanCaseRequest.java
similarity index 93%
rename from test-track/backend/src/main/java/io/metersphere/plan/reuest/function/QueryTestPlanCaseRequest.java
rename to test-track/backend/src/main/java/io/metersphere/plan/request/function/QueryTestPlanCaseRequest.java
index 21191ddbc3..9b4e63acf5 100644
--- a/test-track/backend/src/main/java/io/metersphere/plan/reuest/function/QueryTestPlanCaseRequest.java
+++ b/test-track/backend/src/main/java/io/metersphere/plan/request/function/QueryTestPlanCaseRequest.java
@@ -1,4 +1,4 @@
-package io.metersphere.plan.reuest.function;
+package io.metersphere.plan.request.function;
 
 import io.metersphere.request.BaseQueryRequest;
 import lombok.Getter;
diff --git a/test-track/backend/src/main/java/io/metersphere/plan/reuest/function/TestCaseRelevanceRequest.java b/test-track/backend/src/main/java/io/metersphere/plan/request/function/TestCaseRelevanceRequest.java
similarity index 82%
rename from test-track/backend/src/main/java/io/metersphere/plan/reuest/function/TestCaseRelevanceRequest.java
rename to test-track/backend/src/main/java/io/metersphere/plan/request/function/TestCaseRelevanceRequest.java
index d8aa760980..3331dbd401 100644
--- a/test-track/backend/src/main/java/io/metersphere/plan/reuest/function/TestCaseRelevanceRequest.java
+++ b/test-track/backend/src/main/java/io/metersphere/plan/request/function/TestCaseRelevanceRequest.java
@@ -1,4 +1,4 @@
-package io.metersphere.plan.reuest.function;
+package io.metersphere.plan.request.function;
 
 import lombok.Getter;
 import lombok.Setter;
diff --git a/test-track/backend/src/main/java/io/metersphere/plan/reuest/function/TestPlanCaseBatchRequest.java b/test-track/backend/src/main/java/io/metersphere/plan/request/function/TestPlanCaseBatchRequest.java
similarity index 87%
rename from test-track/backend/src/main/java/io/metersphere/plan/reuest/function/TestPlanCaseBatchRequest.java
rename to test-track/backend/src/main/java/io/metersphere/plan/request/function/TestPlanCaseBatchRequest.java
index 56e979d683..5a3a466dc5 100644
--- a/test-track/backend/src/main/java/io/metersphere/plan/reuest/function/TestPlanCaseBatchRequest.java
+++ b/test-track/backend/src/main/java/io/metersphere/plan/request/function/TestPlanCaseBatchRequest.java
@@ -1,4 +1,4 @@
-package io.metersphere.plan.reuest.function;
+package io.metersphere.plan.request.function;
 
 import io.metersphere.base.domain.TestPlanTestCase;
 import lombok.Getter;
diff --git a/test-track/backend/src/main/java/io/metersphere/plan/reuest/function/TestPlanFuncCaseBatchRequest.java b/test-track/backend/src/main/java/io/metersphere/plan/request/function/TestPlanFuncCaseBatchRequest.java
similarity index 86%
rename from test-track/backend/src/main/java/io/metersphere/plan/reuest/function/TestPlanFuncCaseBatchRequest.java
rename to test-track/backend/src/main/java/io/metersphere/plan/request/function/TestPlanFuncCaseBatchRequest.java
index 04ac9ff420..3e8d664734 100644
--- a/test-track/backend/src/main/java/io/metersphere/plan/reuest/function/TestPlanFuncCaseBatchRequest.java
+++ b/test-track/backend/src/main/java/io/metersphere/plan/request/function/TestPlanFuncCaseBatchRequest.java
@@ -1,4 +1,4 @@
-package io.metersphere.plan.reuest.function;
+package io.metersphere.plan.request.function;
 
 import lombok.Getter;
 import lombok.Setter;
diff --git a/test-track/backend/src/main/java/io/metersphere/plan/reuest/function/TestPlanFuncCaseConditions.java b/test-track/backend/src/main/java/io/metersphere/plan/request/function/TestPlanFuncCaseConditions.java
similarity index 87%
rename from test-track/backend/src/main/java/io/metersphere/plan/reuest/function/TestPlanFuncCaseConditions.java
rename to test-track/backend/src/main/java/io/metersphere/plan/request/function/TestPlanFuncCaseConditions.java
index d2deee09d7..5a83c15bd2 100644
--- a/test-track/backend/src/main/java/io/metersphere/plan/reuest/function/TestPlanFuncCaseConditions.java
+++ b/test-track/backend/src/main/java/io/metersphere/plan/request/function/TestPlanFuncCaseConditions.java
@@ -1,4 +1,4 @@
-package io.metersphere.plan.reuest.function;
+package io.metersphere.plan.request.function;
 
 import lombok.Getter;
 import lombok.Setter;
diff --git a/test-track/backend/src/main/java/io/metersphere/plan/reuest/function/TestPlanFuncCaseEditRequest.java b/test-track/backend/src/main/java/io/metersphere/plan/request/function/TestPlanFuncCaseEditRequest.java
similarity index 83%
rename from test-track/backend/src/main/java/io/metersphere/plan/reuest/function/TestPlanFuncCaseEditRequest.java
rename to test-track/backend/src/main/java/io/metersphere/plan/request/function/TestPlanFuncCaseEditRequest.java
index 34f8be367d..db13d366b9 100644
--- a/test-track/backend/src/main/java/io/metersphere/plan/reuest/function/TestPlanFuncCaseEditRequest.java
+++ b/test-track/backend/src/main/java/io/metersphere/plan/request/function/TestPlanFuncCaseEditRequest.java
@@ -1,4 +1,4 @@
-package io.metersphere.plan.reuest.function;
+package io.metersphere.plan.request.function;
 
 import io.metersphere.base.domain.TestPlanTestCaseWithBLOBs;
 import lombok.Getter;
diff --git a/test-track/backend/src/main/java/io/metersphere/plan/reuest/performance/LoadCaseReportRequest.java b/test-track/backend/src/main/java/io/metersphere/plan/request/performance/LoadCaseReportRequest.java
similarity index 77%
rename from test-track/backend/src/main/java/io/metersphere/plan/reuest/performance/LoadCaseReportRequest.java
rename to test-track/backend/src/main/java/io/metersphere/plan/request/performance/LoadCaseReportRequest.java
index ddd9fecaec..ffb412b47c 100644
--- a/test-track/backend/src/main/java/io/metersphere/plan/reuest/performance/LoadCaseReportRequest.java
+++ b/test-track/backend/src/main/java/io/metersphere/plan/request/performance/LoadCaseReportRequest.java
@@ -1,4 +1,4 @@
-package io.metersphere.plan.reuest.performance;
+package io.metersphere.plan.request.performance;
 
 import lombok.Getter;
 import lombok.Setter;
diff --git a/test-track/backend/src/main/java/io/metersphere/plan/reuest/performance/LoadCaseRequest.java b/test-track/backend/src/main/java/io/metersphere/plan/request/performance/LoadCaseRequest.java
similarity index 93%
rename from test-track/backend/src/main/java/io/metersphere/plan/reuest/performance/LoadCaseRequest.java
rename to test-track/backend/src/main/java/io/metersphere/plan/request/performance/LoadCaseRequest.java
index de91156cf8..a61d4e3599 100644
--- a/test-track/backend/src/main/java/io/metersphere/plan/reuest/performance/LoadCaseRequest.java
+++ b/test-track/backend/src/main/java/io/metersphere/plan/request/performance/LoadCaseRequest.java
@@ -1,4 +1,4 @@
-package io.metersphere.plan.reuest.performance;
+package io.metersphere.plan.request.performance;
 
 import io.metersphere.base.domain.TestPlanLoadCase;
 import io.metersphere.request.OrderRequest;
diff --git a/test-track/backend/src/main/java/io/metersphere/plan/reuest/performance/LoadPlanReportDTO.java b/test-track/backend/src/main/java/io/metersphere/plan/request/performance/LoadPlanReportDTO.java
similarity index 84%
rename from test-track/backend/src/main/java/io/metersphere/plan/reuest/performance/LoadPlanReportDTO.java
rename to test-track/backend/src/main/java/io/metersphere/plan/request/performance/LoadPlanReportDTO.java
index 3b74637149..083a5d316b 100644
--- a/test-track/backend/src/main/java/io/metersphere/plan/reuest/performance/LoadPlanReportDTO.java
+++ b/test-track/backend/src/main/java/io/metersphere/plan/request/performance/LoadPlanReportDTO.java
@@ -1,4 +1,4 @@
-package io.metersphere.plan.reuest.performance;
+package io.metersphere.plan.request.performance;
 
 
 import io.metersphere.dto.TestPlanLoadCaseDTO;
diff --git a/test-track/backend/src/main/java/io/metersphere/plan/reuest/performance/PlanPerformanceExecRequest.java b/test-track/backend/src/main/java/io/metersphere/plan/request/performance/PlanPerformanceExecRequest.java
similarity index 86%
rename from test-track/backend/src/main/java/io/metersphere/plan/reuest/performance/PlanPerformanceExecRequest.java
rename to test-track/backend/src/main/java/io/metersphere/plan/request/performance/PlanPerformanceExecRequest.java
index 10b350e4d6..78fa08f637 100644
--- a/test-track/backend/src/main/java/io/metersphere/plan/reuest/performance/PlanPerformanceExecRequest.java
+++ b/test-track/backend/src/main/java/io/metersphere/plan/request/performance/PlanPerformanceExecRequest.java
@@ -1,4 +1,4 @@
-package io.metersphere.plan.reuest.performance;
+package io.metersphere.plan.request.performance;
 
 
 import io.metersphere.dto.RunModeConfigDTO;
diff --git a/test-track/backend/src/main/java/io/metersphere/plan/reuest/ui/RunUiScenarioRequest.java b/test-track/backend/src/main/java/io/metersphere/plan/request/ui/RunUiScenarioRequest.java
similarity index 74%
rename from test-track/backend/src/main/java/io/metersphere/plan/reuest/ui/RunUiScenarioRequest.java
rename to test-track/backend/src/main/java/io/metersphere/plan/request/ui/RunUiScenarioRequest.java
index a67bf91bad..d3b28652fa 100644
--- a/test-track/backend/src/main/java/io/metersphere/plan/reuest/ui/RunUiScenarioRequest.java
+++ b/test-track/backend/src/main/java/io/metersphere/plan/request/ui/RunUiScenarioRequest.java
@@ -1,7 +1,7 @@
-package io.metersphere.plan.reuest.ui;
+package io.metersphere.plan.request.ui;
 
 import io.metersphere.dto.RunModeConfigDTO;
-import io.metersphere.plan.reuest.api.RunScenarioRequest;
+import io.metersphere.plan.request.api.RunScenarioRequest;
 import lombok.Data;
 
 import java.util.List;
diff --git a/test-track/backend/src/main/java/io/metersphere/plan/service/TestPlanProjectService.java b/test-track/backend/src/main/java/io/metersphere/plan/service/TestPlanProjectService.java
index 2a162d1ca9..1f5d0c836f 100644
--- a/test-track/backend/src/main/java/io/metersphere/plan/service/TestPlanProjectService.java
+++ b/test-track/backend/src/main/java/io/metersphere/plan/service/TestPlanProjectService.java
@@ -4,7 +4,7 @@ import io.metersphere.base.domain.*;
 import io.metersphere.base.mapper.ProjectMapper;
 import io.metersphere.base.mapper.TestPlanMapper;
 import io.metersphere.base.mapper.TestPlanProjectMapper;
-import io.metersphere.plan.reuest.function.TestCaseRelevanceRequest;
+import io.metersphere.plan.request.function.TestCaseRelevanceRequest;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
diff --git a/test-track/backend/src/main/java/io/metersphere/plan/service/TestPlanReportService.java b/test-track/backend/src/main/java/io/metersphere/plan/service/TestPlanReportService.java
index 3779c32b13..40e64d5bc8 100644
--- a/test-track/backend/src/main/java/io/metersphere/plan/service/TestPlanReportService.java
+++ b/test-track/backend/src/main/java/io/metersphere/plan/service/TestPlanReportService.java
@@ -14,9 +14,9 @@ import io.metersphere.excel.constants.TestPlanTestCaseStatus;
 import io.metersphere.log.vo.OperatingLogDetails;
 import io.metersphere.plan.constant.ApiReportStatus;
 import io.metersphere.plan.dto.*;
-import io.metersphere.plan.reuest.QueryTestPlanRequest;
-import io.metersphere.plan.reuest.TestPlanReportSaveRequest;
-import io.metersphere.plan.reuest.api.TestPlanRunRequest;
+import io.metersphere.plan.request.QueryTestPlanRequest;
+import io.metersphere.plan.request.TestPlanReportSaveRequest;
+import io.metersphere.plan.request.api.TestPlanRunRequest;
 import io.metersphere.plan.service.remote.api.*;
 import io.metersphere.plan.service.remote.performance.PlanLoadTestReportService;
 import io.metersphere.plan.service.remote.performance.PlanTestPlanLoadCaseService;
@@ -1301,7 +1301,7 @@ public class TestPlanReportService {
                         }
                     }
                 } catch (Exception e) {
-                    LogUtil.error("Parse test plan report cenario case error!", e);
+                    LogUtil.error("Parse test plan report scenario case error!", e);
                 }
             }
 
diff --git a/test-track/backend/src/main/java/io/metersphere/plan/service/TestPlanService.java b/test-track/backend/src/main/java/io/metersphere/plan/service/TestPlanService.java
index c6b5fb9d50..0f68029d47 100644
--- a/test-track/backend/src/main/java/io/metersphere/plan/service/TestPlanService.java
+++ b/test-track/backend/src/main/java/io/metersphere/plan/service/TestPlanService.java
@@ -22,17 +22,17 @@ import io.metersphere.log.vo.OperatingLogDetails;
 import io.metersphere.log.vo.track.TestPlanReference;
 import io.metersphere.plan.dto.*;
 import io.metersphere.plan.job.TestPlanTestJob;
-import io.metersphere.plan.reuest.AddTestPlanRequest;
-import io.metersphere.plan.reuest.QueryTestPlanRequest;
-import io.metersphere.plan.reuest.ScheduleInfoRequest;
-import io.metersphere.plan.reuest.api.ApiPlanReportRequest;
-import io.metersphere.plan.reuest.api.RunScenarioRequest;
-import io.metersphere.plan.reuest.api.SchedulePlanScenarioExecuteRequest;
-import io.metersphere.plan.reuest.api.TestPlanRunRequest;
-import io.metersphere.plan.reuest.function.PlanCaseRelevanceRequest;
-import io.metersphere.plan.reuest.function.QueryTestPlanCaseRequest;
-import io.metersphere.plan.reuest.performance.LoadPlanReportDTO;
-import io.metersphere.plan.reuest.ui.RunUiScenarioRequest;
+import io.metersphere.plan.request.AddTestPlanRequest;
+import io.metersphere.plan.request.QueryTestPlanRequest;
+import io.metersphere.plan.request.ScheduleInfoRequest;
+import io.metersphere.plan.request.api.ApiPlanReportRequest;
+import io.metersphere.plan.request.api.RunScenarioRequest;
+import io.metersphere.plan.request.api.SchedulePlanScenarioExecuteRequest;
+import io.metersphere.plan.request.api.TestPlanRunRequest;
+import io.metersphere.plan.request.function.PlanCaseRelevanceRequest;
+import io.metersphere.plan.request.function.QueryTestPlanCaseRequest;
+import io.metersphere.plan.request.performance.LoadPlanReportDTO;
+import io.metersphere.plan.request.ui.RunUiScenarioRequest;
 import io.metersphere.plan.service.remote.api.PlanApiAutomationService;
 import io.metersphere.plan.service.remote.api.PlanTestPlanApiCaseService;
 import io.metersphere.plan.service.remote.api.PlanTestPlanScenarioCaseService;
@@ -581,9 +581,9 @@ public class TestPlanService {
             return;
         }
         List<TestCaseTest> list;
-        TestCaseTestExample exam = new TestCaseTestExample();
-        exam.createCriteria().andTestCaseIdIn(testCaseIds);
-        list = testCaseTestMapper.selectByExample(exam);
+        TestCaseTestExample example = new TestCaseTestExample();
+        example.createCriteria().andTestCaseIdIn(testCaseIds);
+        list = testCaseTestMapper.selectByExample(example);
         if (CollectionUtils.isEmpty(list)) {
             return;
         }
@@ -1648,7 +1648,7 @@ public class TestPlanService {
         if (!CronExpression.isValidExpression(cron)) {
             return 0;
         }
-        CronTrigger trigger = TriggerBuilder.newTrigger().withIdentity("Caclulate Date").withSchedule(CronScheduleBuilder.cronSchedule(cron)).build();
+        CronTrigger trigger = TriggerBuilder.newTrigger().withIdentity("Calculate Date").withSchedule(CronScheduleBuilder.cronSchedule(cron)).build();
         Date time0 = trigger.getStartTime();
         Date time1 = trigger.getFireTimeAfter(time0);
         return time1 == null ? 0 : time1.getTime();
diff --git a/test-track/backend/src/main/java/io/metersphere/plan/service/TestPlanTestCaseService.java b/test-track/backend/src/main/java/io/metersphere/plan/service/TestPlanTestCaseService.java
index b04cc1e052..0770533606 100644
--- a/test-track/backend/src/main/java/io/metersphere/plan/service/TestPlanTestCaseService.java
+++ b/test-track/backend/src/main/java/io/metersphere/plan/service/TestPlanTestCaseService.java
@@ -21,7 +21,7 @@ import io.metersphere.plan.dto.TestCaseReportStatusResultDTO;
 import io.metersphere.plan.dto.TestPlanSimpleReportDTO;
 import io.metersphere.log.vo.DetailColumn;
 import io.metersphere.log.vo.OperatingLogDetails;
-import io.metersphere.plan.reuest.function.*;
+import io.metersphere.plan.request.function.*;
 import io.metersphere.plan.service.remote.api.PlanApiAutomationService;
 import io.metersphere.plan.service.remote.api.PlanApiTestCaseService;
 import io.metersphere.plan.service.remote.api.PlanTestPlanApiCaseService;
diff --git a/test-track/backend/src/main/java/io/metersphere/plan/service/remote/api/PlanApiAutomationService.java b/test-track/backend/src/main/java/io/metersphere/plan/service/remote/api/PlanApiAutomationService.java
index fa9d772a36..2f2eea55a8 100644
--- a/test-track/backend/src/main/java/io/metersphere/plan/service/remote/api/PlanApiAutomationService.java
+++ b/test-track/backend/src/main/java/io/metersphere/plan/service/remote/api/PlanApiAutomationService.java
@@ -2,7 +2,7 @@ package io.metersphere.plan.service.remote.api;
 
 import io.metersphere.base.domain.ApiScenarioWithBLOBs;
 import io.metersphere.dto.MsExecResponseDTO;
-import io.metersphere.plan.reuest.api.RunScenarioRequest;
+import io.metersphere.plan.request.api.RunScenarioRequest;
 import org.springframework.stereotype.Service;
 import org.springframework.web.bind.annotation.PathVariable;
 
diff --git a/test-track/backend/src/main/java/io/metersphere/plan/service/remote/api/PlanTestPlanScenarioCaseService.java b/test-track/backend/src/main/java/io/metersphere/plan/service/remote/api/PlanTestPlanScenarioCaseService.java
index 7d6cb9ea47..a0beb0b190 100644
--- a/test-track/backend/src/main/java/io/metersphere/plan/service/remote/api/PlanTestPlanScenarioCaseService.java
+++ b/test-track/backend/src/main/java/io/metersphere/plan/service/remote/api/PlanTestPlanScenarioCaseService.java
@@ -6,7 +6,7 @@ import io.metersphere.commons.utils.LogUtil;
 import io.metersphere.dto.*;
 import io.metersphere.plan.constant.ApiReportStatus;
 import io.metersphere.plan.dto.*;
-import io.metersphere.plan.reuest.api.ApiPlanReportRequest;
+import io.metersphere.plan.request.api.ApiPlanReportRequest;
 import io.metersphere.plan.utils.TestPlanStatusCalculator;
 import org.jetbrains.annotations.NotNull;
 import org.springframework.stereotype.Service;
diff --git a/test-track/backend/src/main/java/io/metersphere/plan/service/remote/performance/PerfExecService.java b/test-track/backend/src/main/java/io/metersphere/plan/service/remote/performance/PerfExecService.java
index 348c7386ee..b2e7b475ae 100644
--- a/test-track/backend/src/main/java/io/metersphere/plan/service/remote/performance/PerfExecService.java
+++ b/test-track/backend/src/main/java/io/metersphere/plan/service/remote/performance/PerfExecService.java
@@ -1,7 +1,7 @@
 package io.metersphere.plan.service.remote.performance;
 
 import io.metersphere.dto.RunModeConfigDTO;
-import io.metersphere.plan.reuest.performance.PlanPerformanceExecRequest;
+import io.metersphere.plan.request.performance.PlanPerformanceExecRequest;
 import org.springframework.stereotype.Service;
 
 import java.util.Map;
diff --git a/test-track/backend/src/main/java/io/metersphere/plan/service/remote/performance/PlanTestPlanLoadCaseService.java b/test-track/backend/src/main/java/io/metersphere/plan/service/remote/performance/PlanTestPlanLoadCaseService.java
index 13b45b7270..ea2451964b 100644
--- a/test-track/backend/src/main/java/io/metersphere/plan/service/remote/performance/PlanTestPlanLoadCaseService.java
+++ b/test-track/backend/src/main/java/io/metersphere/plan/service/remote/performance/PlanTestPlanLoadCaseService.java
@@ -8,9 +8,9 @@ import io.metersphere.dto.TestPlanLoadCaseDTO;
 import io.metersphere.dto.TestPlanLoadResultReportDTO;
 import io.metersphere.plan.dto.TestCaseReportStatusResultDTO;
 import io.metersphere.plan.dto.TestPlanSimpleReportDTO;
-import io.metersphere.plan.reuest.api.ApiPlanReportRequest;
-import io.metersphere.plan.reuest.performance.LoadCaseRequest;
-import io.metersphere.plan.reuest.performance.LoadPlanReportDTO;
+import io.metersphere.plan.request.api.ApiPlanReportRequest;
+import io.metersphere.plan.request.performance.LoadCaseRequest;
+import io.metersphere.plan.request.performance.LoadPlanReportDTO;
 import io.metersphere.plan.utils.TestPlanStatusCalculator;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Propagation;
diff --git a/test-track/backend/src/main/java/io/metersphere/plan/service/remote/ui/PlanTestPlanUiScenarioCaseService.java b/test-track/backend/src/main/java/io/metersphere/plan/service/remote/ui/PlanTestPlanUiScenarioCaseService.java
index 4db9bb436b..e18e5dda72 100644
--- a/test-track/backend/src/main/java/io/metersphere/plan/service/remote/ui/PlanTestPlanUiScenarioCaseService.java
+++ b/test-track/backend/src/main/java/io/metersphere/plan/service/remote/ui/PlanTestPlanUiScenarioCaseService.java
@@ -9,7 +9,7 @@ import io.metersphere.plan.dto.TestCaseReportStatusResultDTO;
 import io.metersphere.plan.dto.TestPlanScenarioStepCountSimpleDTO;
 import io.metersphere.plan.dto.TestPlanSimpleReportDTO;
 import io.metersphere.plan.dto.UiPlanReportDTO;
-import io.metersphere.plan.reuest.api.ApiPlanReportRequest;
+import io.metersphere.plan.request.api.ApiPlanReportRequest;
 import io.metersphere.plan.service.remote.api.PlanTestPlanScenarioCaseService;
 import io.metersphere.plan.service.remote.api.PlanUiScenarioReportService;
 import io.metersphere.plan.utils.TestPlanStatusCalculator;
diff --git a/test-track/backend/src/main/java/io/metersphere/plan/service/remote/ui/PlanUiAutomationService.java b/test-track/backend/src/main/java/io/metersphere/plan/service/remote/ui/PlanUiAutomationService.java
index 01f5ca0672..292f741a51 100644
--- a/test-track/backend/src/main/java/io/metersphere/plan/service/remote/ui/PlanUiAutomationService.java
+++ b/test-track/backend/src/main/java/io/metersphere/plan/service/remote/ui/PlanUiAutomationService.java
@@ -1,7 +1,7 @@
 package io.metersphere.plan.service.remote.ui;
 
 import io.metersphere.dto.MsExecResponseDTO;
-import io.metersphere.plan.reuest.api.RunScenarioRequest;
+import io.metersphere.plan.request.api.RunScenarioRequest;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
diff --git a/test-track/backend/src/main/java/io/metersphere/service/TestCaseNodeService.java b/test-track/backend/src/main/java/io/metersphere/service/TestCaseNodeService.java
index 4bd378e032..34784627f3 100644
--- a/test-track/backend/src/main/java/io/metersphere/service/TestCaseNodeService.java
+++ b/test-track/backend/src/main/java/io/metersphere/service/TestCaseNodeService.java
@@ -28,7 +28,7 @@ import io.metersphere.dto.TestCaseDTO;
 import io.metersphere.dto.TestCaseNodeDTO;
 import io.metersphere.plan.service.TestPlanProjectService;
 import io.metersphere.request.testcase.*;
-import io.metersphere.plan.reuest.function.QueryTestPlanCaseRequest;
+import io.metersphere.plan.request.function.QueryTestPlanCaseRequest;
 import io.metersphere.request.testreview.QueryCaseReviewRequest;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.ibatis.session.ExecutorType;
diff --git a/test-track/backend/src/main/java/io/metersphere/service/TestCaseService.java b/test-track/backend/src/main/java/io/metersphere/service/TestCaseService.java
index 996d471ec9..128d85aa81 100644
--- a/test-track/backend/src/main/java/io/metersphere/service/TestCaseService.java
+++ b/test-track/backend/src/main/java/io/metersphere/service/TestCaseService.java
@@ -438,7 +438,7 @@ public class TestCaseService {
     }
 
     /**
-     * 根据前后端 verionId 判定是编辑旧数据还是创建新版本
+     * 根据前后端 versionId 判定是编辑旧数据还是创建新版本
      *
      * @param testCase
      * @param example
@@ -589,7 +589,7 @@ public class TestCaseService {
     }
 
     /**
-     * 根据id和pojectId查询id是否在数据库中存在。
+     * 根据id和projectId查询id是否在数据库中存在。
      * 在数据库中单id的话是可重复的,id与projectId的组合是唯一的
      */
     public String checkIdExist(Integer id, String projectId) {
@@ -747,7 +747,7 @@ public class TestCaseService {
             if (StringUtils.isNotBlank(request.getProjectId())) {
                 buildProjectInfo(request.getProjectId(), list);
             } else {
-                buildProjectInfoWidthoutProject(list);
+                buildProjectInfoWithoutProject(list);
             }
             buildCustomField(list);
         }
@@ -778,7 +778,7 @@ public class TestCaseService {
         data.setFields(fields);
     }
 
-    private void buildProjectInfoWidthoutProject(List<TestCaseDTO> resList) {
+    private void buildProjectInfoWithoutProject(List<TestCaseDTO> resList) {
         resList.forEach(i -> {
             Project project = projectMapper.selectByPrimaryKey(i.getProjectId());
             i.setProjectName(project.getName());
@@ -2619,19 +2619,19 @@ public class TestCaseService {
             projectVersions = projectVersionMapper.selectByExample(versionExample);
         }
 
-        Map<String, String> verisonNameMap = projectVersions.stream().collect(Collectors.toMap(ProjectVersion::getId, ProjectVersion::getName));
+        Map<String, String> versionNameMap = projectVersions.stream().collect(Collectors.toMap(ProjectVersion::getId, ProjectVersion::getName));
 
         List<TestCaseTestDao> testCaseTestList = new ArrayList<>();
         apiCases.forEach(item -> {
-            getTestCaseTestDaoList(TestCaseTestType.testcase.name(), item.getNum(), item.getName(), item.getId(), projectNameMap.get(item.getProjectId()), verisonNameMap.get(item.getVersionId()),
+            getTestCaseTestDaoList(TestCaseTestType.testcase.name(), item.getNum(), item.getName(), item.getId(), projectNameMap.get(item.getProjectId()), versionNameMap.get(item.getVersionId()),
                     testCaseTestList, testCaseTestsMap);
         });
         apiScenarios.forEach(item -> {
-            getTestCaseTestDaoList(TestCaseTestType.automation.name(), item.getNum(), item.getName(), item.getId(), projectNameMap.get(item.getProjectId()), verisonNameMap.get(item.getVersionId()),
+            getTestCaseTestDaoList(TestCaseTestType.automation.name(), item.getNum(), item.getName(), item.getId(), projectNameMap.get(item.getProjectId()), versionNameMap.get(item.getVersionId()),
                     testCaseTestList, testCaseTestsMap);
         });
         apiLoadTests.forEach(item -> {
-            getTestCaseTestDaoList(TestCaseTestType.performance.name(), item.getNum(), item.getName(), item.getId(), projectNameMap.get(item.getProjectId()), verisonNameMap.get(item.getVersionId()),
+            getTestCaseTestDaoList(TestCaseTestType.performance.name(), item.getNum(), item.getName(), item.getId(), projectNameMap.get(item.getProjectId()), versionNameMap.get(item.getVersionId()),
                     testCaseTestList, testCaseTestsMap);
         });
         return testCaseTestList;
@@ -2782,13 +2782,13 @@ public class TestCaseService {
 
             Map<String, String> userNameMap = ServiceUtils.getUserNameMap(testCaseList.stream().map(TestCaseWithBLOBs::getCreateUser).collect(Collectors.toList()));
 
-            Map<String, String> verionNameMap = new HashMap<>();
+            Map<String, String> versionNameMap = new HashMap<>();
             List<String> versionIds = testCaseList.stream().map(TestCase::getVersionId).collect(Collectors.toList());
             if (CollectionUtils.isNotEmpty(versionIds)) {
                 ProjectVersionRequest pvr = new ProjectVersionRequest();
                 pvr.setProjectId(testCaseList.get(0).getProjectId());
                 List<ProjectVersionDTO> projectVersions = baseProjectVersionMapper.selectProjectVersionList(pvr);
-                verionNameMap = projectVersions.stream().collect(Collectors.toMap(ProjectVersionDTO::getId, ProjectVersionDTO::getName));
+                versionNameMap = projectVersions.stream().collect(Collectors.toMap(ProjectVersionDTO::getId, ProjectVersionDTO::getName));
             }
             Map<String, TestCase> caseMap = testCaseList.stream().collect(Collectors.toMap(TestCase::getId, i -> i));
             List<RelationshipEdgeDTO> results = new ArrayList<>();
@@ -2809,7 +2809,7 @@ public class TestCaseService {
                 relationshipEdgeDTO.setTargetNum(testCase.getNum());
                 relationshipEdgeDTO.setTargetCustomNum(testCase.getCustomNum());
                 relationshipEdgeDTO.setStatus(testCase.getStatus());
-                relationshipEdgeDTO.setVersionName(verionNameMap.get(testCase.getVersionId()));
+                relationshipEdgeDTO.setVersionName(versionNameMap.get(testCase.getVersionId()));
                 results.add(relationshipEdgeDTO);
             }
             return results;
diff --git a/test-track/backend/src/main/java/io/metersphere/service/TrackService.java b/test-track/backend/src/main/java/io/metersphere/service/TrackService.java
index 25d9b7b76a..3b7f574998 100644
--- a/test-track/backend/src/main/java/io/metersphere/service/TrackService.java
+++ b/test-track/backend/src/main/java/io/metersphere/service/TrackService.java
@@ -5,7 +5,7 @@ import io.metersphere.base.domain.TestPlanExample;
 import io.metersphere.base.mapper.TestPlanMapper;
 import io.metersphere.base.mapper.ext.ExtTestCaseMapper;
 import io.metersphere.commons.utils.DateUtils;
-import io.metersphere.dto.BugStatustics;
+import io.metersphere.dto.BugStatistics;
 import io.metersphere.dto.TestPlanBugCount;
 import io.metersphere.dto.TestPlanDTOWithMetric;
 import io.metersphere.dto.TrackCountResult;
@@ -104,12 +104,12 @@ public class TrackService {
         return charts;
     }
 
-    public BugStatustics getBugStatistics(String projectId) {
+    public BugStatistics getBugStatistics(String projectId) {
         TestPlanExample example = new TestPlanExample();
         example.createCriteria().andProjectIdEqualTo(projectId);
         List<TestPlan> plans = testPlanMapper.selectByExample(example);
         List<TestPlanBugCount> list = new ArrayList<>();
-        BugStatustics bugStatustics = new BugStatustics();
+        BugStatistics bugStatistics = new BugStatistics();
         int index = 1;
         int totalCaseSize = 0;
         int totalBugSize = 0;
@@ -138,12 +138,12 @@ public class TrackService {
             totalCaseSize += planCaseSize;
 
         }
-        bugStatustics.setList(list);
+        bugStatistics.setList(list);
         float rage = totalCaseSize == 0 ? 0 : (float) totalBugSize * 100 / totalCaseSize;
         DecimalFormat df = new DecimalFormat("0.0");
-        bugStatustics.setRage(df.format(rage) + "%");
-        bugStatustics.setBugTotalSize(totalBugSize);
-        return bugStatustics;
+        bugStatistics.setRage(df.format(rage) + "%");
+        bugStatistics.setBugTotalSize(totalBugSize);
+        return bugStatistics;
     }
 
     private int getPlanCaseSize(String planId) {
diff --git a/test-track/backend/src/main/java/io/metersphere/service/issue/domain/zentao/GetUserResponse.java b/test-track/backend/src/main/java/io/metersphere/service/issue/domain/zentao/GetUserResponse.java
index 68000c2d2f..97f3aa3c77 100644
--- a/test-track/backend/src/main/java/io/metersphere/service/issue/domain/zentao/GetUserResponse.java
+++ b/test-track/backend/src/main/java/io/metersphere/service/issue/domain/zentao/GetUserResponse.java
@@ -14,41 +14,6 @@ public class GetUserResponse {
     @Setter
     public static class User {
         private String id;
-//        private String dept;
         private String account;
-//        private String type;
-//        private String role;
-//        private String realname;
-//        private String nickname;
-//        private String commiter;
-//        private String avatar;
-//        private String birthday;
-//        private String gender;
-//        private String email;
-//        private String skype;
-//        private String qq;
-//        private String mobile;
-//        private String phone;
-//        private String weixin;
-//        private String dingding;
-//        private String slack;
-//        private String whatsapp;
-//        private String address;
-//        private String zipcode;
-//        private String join;
-//        private String visits;
-//        private String ip;
-//        private String last;
-//        private String fails;
-//        private String ranzhi;
-//        private String score;
-//        private String scoreLevel;
-//        private String clientStatus;
-//        private String clientLang;
-//        private String lastTime;
-//        private boolean admin;
-//        private boolean modifyPassword;
-//        private String company;
-//        private String token;
     }
 }
diff --git a/test-track/backend/src/main/java/io/metersphere/service/issue/platform/JiraPlatform.java b/test-track/backend/src/main/java/io/metersphere/service/issue/platform/JiraPlatform.java
index a8a0b85096..5503ac5500 100644
--- a/test-track/backend/src/main/java/io/metersphere/service/issue/platform/JiraPlatform.java
+++ b/test-track/backend/src/main/java/io/metersphere/service/issue/platform/JiraPlatform.java
@@ -622,7 +622,7 @@ public class JiraPlatform extends AbstractIssuePlatform {
         if (CollectionUtils.isNotEmpty(transitions)) {
             transitions.forEach(item -> {
                 PlatformStatusDTO platformStatusDTO = new PlatformStatusDTO();
-                platformStatusDTO.setLable(item.getTo().getName());
+                platformStatusDTO.setLabel(item.getTo().getName());
                 platformStatusDTO.setValue(item.getTo().getName());
                 platformStatusDTOS.add(platformStatusDTO);
             });
diff --git a/test-track/backend/src/main/java/io/metersphere/service/issue/platform/TapdPlatform.java b/test-track/backend/src/main/java/io/metersphere/service/issue/platform/TapdPlatform.java
index 7ec1a1e32a..08a47e80ea 100644
--- a/test-track/backend/src/main/java/io/metersphere/service/issue/platform/TapdPlatform.java
+++ b/test-track/backend/src/main/java/io/metersphere/service/issue/platform/TapdPlatform.java
@@ -206,8 +206,8 @@ public class TapdPlatform extends AbstractIssuePlatform {
         while (index < ids.size()) {
             List<String> subIds = ids.subList(index, (index + limit) > ids.size() ? ids.size() : (index + limit));
             TapdGetIssueResponse result = tapdClient.getIssueForPageByIds(project.getTapdId(), 1, limit, subIds);
-            List<Map> datas = result.getData();
-            datas.forEach(issue -> {
+            List<Map> data = result.getData();
+            data.forEach(issue -> {
                 Map bug = (Map) issue.get("Bug");
                 String platformId = bug.get("id").toString();
                 String id = idMap.get(platformId);
@@ -322,7 +322,7 @@ public class TapdPlatform extends AbstractIssuePlatform {
         for (String key : statusMap.keySet()) {
             PlatformStatusDTO platformStatusDTO = new PlatformStatusDTO();
             platformStatusDTO.setValue(key);
-            platformStatusDTO.setLable(statusMap.get(key));
+            platformStatusDTO.setLabel(statusMap.get(key));
             platformStatusDTOS.add(platformStatusDTO);
         }
 
diff --git a/test-track/backend/src/main/java/io/metersphere/service/issue/platform/ZentaoPlatform.java b/test-track/backend/src/main/java/io/metersphere/service/issue/platform/ZentaoPlatform.java
index 6ae1223f30..f153ab516f 100644
--- a/test-track/backend/src/main/java/io/metersphere/service/issue/platform/ZentaoPlatform.java
+++ b/test-track/backend/src/main/java/io/metersphere/service/issue/platform/ZentaoPlatform.java
@@ -234,7 +234,7 @@ public class ZentaoPlatform extends AbstractIssuePlatform {
             // 用例与第三方缺陷平台中的缺陷关联
             handleTestCaseIssues(issuesRequest);
         } else {
-            MSException.throwException("请确认该Zentao账号是否开启超级modle调用接口权限");
+            MSException.throwException("请确认该Zentao账号是否开启超级model调用接口权限");
         }
 
         // 如果是复制新增, 同步MS附件到Zentao
@@ -645,7 +645,7 @@ public class ZentaoPlatform extends AbstractIssuePlatform {
         for (ZentaoIssuePlatformStatus status : ZentaoIssuePlatformStatus.values()) {
             PlatformStatusDTO platformStatusDTO = new PlatformStatusDTO();
             platformStatusDTO.setValue(status.name());
-            platformStatusDTO.setLable(status.getName());
+            platformStatusDTO.setLabel(status.getName());
 
             platformStatusDTOS.add(platformStatusDTO);
         }
diff --git a/test-track/backend/src/main/java/io/metersphere/xmind/XmindCaseParser.java b/test-track/backend/src/main/java/io/metersphere/xmind/XmindCaseParser.java
index 1df10cf1e2..f00ff8b676 100644
--- a/test-track/backend/src/main/java/io/metersphere/xmind/XmindCaseParser.java
+++ b/test-track/backend/src/main/java/io/metersphere/xmind/XmindCaseParser.java
@@ -48,7 +48,7 @@ public class XmindCaseParser {
     /**
      * 案例详情重写了hashCode方法去重用
      */
-    private List<TestCaseExcelData> compartDatas;
+    private List<TestCaseExcelData> compartData;
     /**
      * 记录没有用例的目录
      */
@@ -65,7 +65,7 @@ public class XmindCaseParser {
         this.request = request;
         testCases = new LinkedList<>();
         updateTestCases = new LinkedList<>();
-        compartDatas = new ArrayList<>();
+        compartData = new ArrayList<>();
         process = new DetailUtil();
         nodePaths = new ArrayList<>();
         continueValidatedCase = new ArrayList<>();
@@ -79,7 +79,7 @@ public class XmindCaseParser {
     private static final String TAG_REGEX = "(?:tag:|tag：)";
 
     public void clear() {
-        compartDatas.clear();
+        compartData.clear();
         testCases.clear();
         updateTestCases.clear();
         request.getTestCaseNames().clear();
@@ -204,13 +204,13 @@ public class XmindCaseParser {
         }
 
         // 重复用例校验
-        TestCaseExcelData compartData = new TestCaseExcelData();
+        TestCaseExcelData dataItem = new TestCaseExcelData();
         BeanUtils.copyBean(compartData, data);
-        if (compartDatas.contains(compartData)) {
+        if (compartData.contains(dataItem)) {
             validatePass = false;
-            process.add(Translator.get("test_case_already_exists_excel"), nodePath + "/" + compartData.getName());
+            process.add(Translator.get("test_case_already_exists_excel"), nodePath + "/" + dataItem.getName());
         }
-        compartDatas.add(compartData);
+        compartData.add(dataItem);
 
 
         String importType = request.getImportType();
@@ -220,11 +220,11 @@ public class XmindCaseParser {
         //自定义ID判断
         if (StringUtils.isEmpty(data.getCustomNum())) {
             if (StringUtils.equals(importType, ExcelImportType.Update.name())) {
-                process.add(Translator.get("id_required"), nodePath + "/" + compartData.getName());
+                process.add(Translator.get("id_required"), nodePath + "/" + dataItem.getName());
                 return false;
             } else {
                 if (isUseCustomId) {
-                    process.add(Translator.get("custom_num_is_not_exist"), nodePath + "/" + compartData.getName());
+                    process.add(Translator.get("custom_num_is_not_exist"), nodePath + "/" + dataItem.getName());
                     return false;
                 }
             }
@@ -247,7 +247,7 @@ public class XmindCaseParser {
                 data.setId(checkResult);
                 updateTestCases.add(data);
             } else {
-                process.add(Translator.get("custom_num_is_not_exist"), nodePath + "/" + compartData.getName());
+                process.add(Translator.get("custom_num_is_not_exist"), nodePath + "/" + dataItem.getName());
                 validatePass = false;
             }
         }
@@ -259,7 +259,7 @@ public class XmindCaseParser {
             if (isUseCustomId) {
                 checkResult = testCaseService.checkCustomIdExist(data.getCustomNum(), projectId);
                 if (null != checkResult) {  //该ID在当前项目中存在
-                    process.add(Translator.get("custom_num_is_exist"), nodePath + "/" + compartData.getName());
+                    process.add(Translator.get("custom_num_is_exist"), nodePath + "/" + dataItem.getName());
                     return false;
                 }
             }
diff --git a/test-track/frontend/src/business/case/components/TestCaseEdit.vue b/test-track/frontend/src/business/case/components/TestCaseEdit.vue
index 78b63c30ae..35bef83018 100644
--- a/test-track/frontend/src/business/case/components/TestCaseEdit.vue
+++ b/test-track/frontend/src/business/case/components/TestCaseEdit.vue
@@ -3,7 +3,7 @@
     <div class="card-content">
       <div class="ms-main-div" @click="showAll">
         <ms-container v-loading="loading" style="overflow: auto">
-          <ms-aside-container :height="pageHight">
+          <ms-aside-container :height="pageHeight">
             <test-case-base-info
               :form="form"
               :is-form-alive="isFormAlive"
@@ -20,7 +20,7 @@
               ref="testCaseBaseInfo"
             />
           </ms-aside-container>
-          <ms-main-container :style="{height: pageHight + 'px'}">
+          <ms-main-container :style="{height: pageHeight + 'px'}">
             <el-form :model="form" :rules="rules" ref="caseFrom" class="case-form">
 
               <!--操作按钮-->
@@ -225,7 +225,7 @@ export default {
       isPublic: false,
       isXpack: false,
       testCaseTemplate: {},
-      pageHight: document.documentElement.clientHeight - 150 + '',
+      pageHeight: document.documentElement.clientHeight - 150 + '',
       projectList: [],
       comments: [],
       loading: false,
@@ -479,7 +479,7 @@ export default {
       return getCurrentUser();
     },
     resizeContainer() {
-      this.pageHight = document.documentElement.clientHeight - 150 + '';
+      this.pageHeight = document.documentElement.clientHeight - 150 + '';
     },
     openHis() {
       this.$refs.changeHistory.open(this.form.id, ["测试用例", "測試用例", "Test case", "TRACK_TEST_CASE"]);
diff --git a/test-track/frontend/src/business/issue/IssueEditDetail.vue b/test-track/frontend/src/business/issue/IssueEditDetail.vue
index b359784d83..e5cecd1deb 100644
--- a/test-track/frontend/src/business/issue/IssueEditDetail.vue
+++ b/test-track/frontend/src/business/issue/IssueEditDetail.vue
@@ -43,7 +43,7 @@
                           prop="platformStatus">
               <el-select v-model="form.platformStatus" filterable
                          :placeholder="$t('test_track.issue.please_choose_platform_status')">
-                <el-option v-for="(transition, index) in platformTransitions" :key="index" :label="transition.lable"
+                <el-option v-for="(transition, index) in platformTransitions" :key="index" :label="transition.label"
                            :value="transition.value"/>
               </el-select>
             </el-form-item>
diff --git a/test-track/frontend/src/business/plan/env/EnvGroup.vue b/test-track/frontend/src/business/plan/env/EnvGroup.vue
index 5c44a1c12e..8b6011928a 100644
--- a/test-track/frontend/src/business/plan/env/EnvGroup.vue
+++ b/test-track/frontend/src/business/plan/env/EnvGroup.vue
@@ -13,7 +13,7 @@
     <el-button type="primary" @click="handleConfirm" size="small" :style="btnStyle" class="env-confirm">
       {{ $t('workspace.env_group.confirm') }}
     </el-button>
-    <el-dialog :visible="visble" append-to-body :title="$t('workspace.env_group.name')" @close="visble = false"
+    <el-dialog :visible="visible" append-to-body :title="$t('workspace.env_group.name')" @close="visible = false"
                style="height: 800px;">
       <template>
         <environment-group style="overflow-y: auto;"
@@ -36,7 +36,7 @@ export default {
     return {
       groups: [],
       envGroupId: this.groupId,
-      visble: false
+      visible: false
     }
   },
   props: {
@@ -73,7 +73,7 @@ export default {
       })
     },
     viewGroup() {
-      this.visble = true;
+      this.visible = true;
     },
     async handleConfirm() {
       const sign = await this.checkEnv();
diff --git a/test-track/frontend/src/business/plan/env/EnvGroupWithOption.vue b/test-track/frontend/src/business/plan/env/EnvGroupWithOption.vue
index d7a5774f87..4fc07113b4 100644
--- a/test-track/frontend/src/business/plan/env/EnvGroupWithOption.vue
+++ b/test-track/frontend/src/business/plan/env/EnvGroupWithOption.vue
@@ -22,7 +22,7 @@
     <el-button type="primary" @click="handleConfirm" size="small" class="env-confirm">
       {{ $t('workspace.env_group.confirm') }}
     </el-button>
-    <el-dialog :visible="visble" append-to-body :title="$t('workspace.env_group.name')" @close="visble = false"
+    <el-dialog :visible="visible" append-to-body :title="$t('workspace.env_group.name')" @close="visible = false"
                style="height: 800px;">
       <template>
         <environment-group style="overflow-y: auto;"
@@ -45,7 +45,7 @@ export default {
     return {
       groups: [],
       envGroupId: this.groupId,
-      visble: false,
+      visible: false,
       disabledGroups: [],
       notDisabledGroups: [],
       result: false
@@ -88,7 +88,7 @@ export default {
       })
     },
     viewGroup() {
-      this.visble = true;
+      this.visible = true;
     },
     async handleConfirm() {
       const sign = await this.checkEnv();
diff --git a/test-track/frontend/src/business/plan/view/comonents/report/detail/TestPlanApiReport.vue b/test-track/frontend/src/business/plan/view/comonents/report/detail/TestPlanApiReport.vue
index 9d40e60b2d..55861231ff 100644
--- a/test-track/frontend/src/business/plan/view/comonents/report/detail/TestPlanApiReport.vue
+++ b/test-track/frontend/src/business/plan/view/comonents/report/detail/TestPlanApiReport.vue
@@ -198,9 +198,9 @@ export default {
           }
         });
     },
-    format(cases, datas) {
-      if (this.report && datas) {
-        datas.forEach(item => {
+    format(cases, data) {
+      if (this.report && data) {
+        data.forEach(item => {
           if (item) {
             let obj = {id: item.id, reportId: item.reportId, userId: item.createUser};
             cases.push(obj);
diff --git a/test-track/frontend/src/business/review/commom/ReviewComment.vue b/test-track/frontend/src/business/review/commom/ReviewComment.vue
index ed83bbd487..ac428bf2d2 100644
--- a/test-track/frontend/src/business/review/commom/ReviewComment.vue
+++ b/test-track/frontend/src/business/review/commom/ReviewComment.vue
@@ -51,7 +51,6 @@ export default {
   data() {
     return {
       result: {},
-      loadCommenItem: true,
       labelWidth: '120px',
       showEditor: true,
       isReadOnly: false,