From 08f768ab01d21807e4f4c00d515b949d560adc85 Mon Sep 17 00:00:00 2001
From: guoyuqi <xiaomeinvG@126.com>
Date: Mon, 4 Jul 2022 15:55:02 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E6=8E=A5=E5=8F=A3=E6=B5=8B=E8=AF=95):=20?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AF=BC=E5=85=A5=E6=8E=A5=E5=8F=A3=E5=AF=B9?=
 =?UTF-8?q?ref=E7=9A=84=E6=A3=80=E6=9F=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

--user=郭雨琦
---
 .../api/service/ApiDefinitionService.java     |   8 +-
 .../mapper/ext/ExtApiDefinitionMapper.xml     |   2 +-
 .../base/mapper/ext/ExtLoadTestMapper.xml     | 102 +++++++++---------
 .../ext/ExtSwaggerUrlScheduleMapper.xml       |   2 +-
 4 files changed, 62 insertions(+), 52 deletions(-)

diff --git a/backend/src/main/java/io/metersphere/api/service/ApiDefinitionService.java b/backend/src/main/java/io/metersphere/api/service/ApiDefinitionService.java
index d6f0465d24..03bc72c181 100644
--- a/backend/src/main/java/io/metersphere/api/service/ApiDefinitionService.java
+++ b/backend/src/main/java/io/metersphere/api/service/ApiDefinitionService.java
@@ -1335,6 +1335,10 @@ public class ApiDefinitionService {
                 MSException.throwException(Translator.get("connection_timeout"));
             }
         }
+        Project project = projectMapper.selectByPrimaryKey(request.getProjectId());
+        if (StringUtils.equals(request.getType(), "schedule")) {
+            request.setProtocol("HTTP");
+        }
         try {
             apiImport = (ApiDefinitionImport) Objects.requireNonNull(runService).parse(file == null ? null : file.getInputStream(), request);
             if (apiImport.getMocks() == null) {
@@ -1356,7 +1360,7 @@ public class ApiDefinitionService {
                 paramMap.put("url", request.getSwaggerUrl());
                 paramMap.put("projectId", request.getProjectId());
                 NoticeModel noticeModel = NoticeModel.builder()
-                        .operator(SessionUtils.getUserId())
+                        .operator(project.getCreateUser())
                         .context(context)
                         .testId(scheduleId)
                         .subject(Translator.get("swagger_url_scheduled_import_notification"))
@@ -1381,7 +1385,7 @@ public class ApiDefinitionService {
                 Map<String, Object> paramMap = new HashMap<>();
                 paramMap.put("url", request.getSwaggerUrl());
                 NoticeModel noticeModel = NoticeModel.builder()
-                        .operator(SessionUtils.getUserId())
+                        .operator(project.getCreateUser())
                         .context(context)
                         .testId(scheduleId)
                         .subject(Translator.get("swagger_url_scheduled_import_notification"))
diff --git a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiDefinitionMapper.xml b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiDefinitionMapper.xml
index d55958ef5a..c80b596b07 100644
--- a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiDefinitionMapper.xml
+++ b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiDefinitionMapper.xml
@@ -1018,7 +1018,7 @@
     <update id="clearLatestVersion">
         UPDATE api_definition
         SET latest = 0
-            and ref_id = #{refId}
+        where ref_id = #{refId}
     </update>
 
     <update id="addLatestVersion">
diff --git a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtLoadTestMapper.xml b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtLoadTestMapper.xml
index 499b415dc9..c948c73e18 100644
--- a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtLoadTestMapper.xml
+++ b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtLoadTestMapper.xml
@@ -109,9 +109,10 @@
             parameterType="io.metersphere.performance.request.QueryTestPlanRequest">
         SELECT load_test.*, project.name AS project_name, user.name AS user_name, project_version.name as version_name
         FROM load_test
-                     LEFT JOIN project ON load_test.project_id = project.id
-                     LEFT JOIN user ON load_test.user_id = user.id
-        LEFT JOIN project_version on project.id = project_version.project_id AND project_version.id = load_test.version_id
+        LEFT JOIN project ON load_test.project_id = project.id
+        LEFT JOIN user ON load_test.user_id = user.id
+        LEFT JOIN project_version on project.id = project_version.project_id AND project_version.id =
+        load_test.version_id
         <where>
             <if test="request.combine != null">
                 <include refid="combine">
@@ -197,7 +198,7 @@
     <select id="checkLoadTestOwner" resultType="int">
         SELECT COUNT(1)
         FROM load_test
-                     LEFT JOIN project ON load_test.project_id = project.id
+        LEFT JOIN project ON load_test.project_id = project.id
         <where>
             <if test="testId != null">
                 and load_test.id = #{testId}
@@ -211,7 +212,10 @@
         </where>
     </select>
     <select id="getNextNum" resultType="io.metersphere.base.domain.LoadTest">
-        select * from load_test lt where lt.project_id = #{projectId} ORDER BY num DESC LIMIT 1;
+        select *
+        from load_test lt
+        where lt.project_id = #{projectId}
+        ORDER BY num DESC LIMIT 1;
     </select>
 
     <select id="moduleCount" resultType="java.lang.Integer">
@@ -277,7 +281,7 @@
             </foreach>
         </if>
     </sql>
-    
+
     <sql id="queryWhereCondition">
         <where>
             <if test="request.combine != null">
@@ -322,7 +326,6 @@
     </sql>
 
 
-
     <select id="getProjectFiles" resultType="io.metersphere.base.domain.FileMetadata">
         SELECT file_metadata.*
         FROM file_metadata
@@ -338,10 +341,14 @@
     </select>
 
     <select id="selectProjectIds" resultType="java.lang.String">
-        select DISTINCT project_id from load_test;
+        select DISTINCT project_id
+        from load_test;
     </select>
     <select id="getIdsOrderByUpdateTime" resultType="java.lang.String">
-        select id from load_test where project_id = #{projectId} order by update_time ASC;
+        select id
+        from load_test
+        where project_id = #{projectId}
+        order by update_time ASC;
     </select>
 
     <select id="getLastOrder" resultType="java.lang.Long">
@@ -374,62 +381,61 @@
 
     <update id="addLatestVersion">
         UPDATE load_test
-                INNER JOIN ((
-                                    SELECT tmp.id
-                                    FROM load_test tmp
-                                                 JOIN project_version
-                                            ON tmp.project_id = project_version.project_id AND
-                                               tmp.version_id = project_version.id AND project_version.latest = TRUE
-                                    WHERE ref_id = #{refId,jdbcType=VARCHAR}
-                                    LIMIT 1
-                                    )
-                            UNION ALL
-                            (
-                                    SELECT tmp.id
-                                    FROM load_test tmp
-                                                 JOIN project_version
-                                            ON tmp.project_id = project_version.project_id AND
-                                               tmp.version_id = project_version.id
-                                                    AND NOT EXISTS(SELECT ref_id
-                                                                   FROM load_test tmp2
-                                                                                JOIN project_version
-                                                                           ON tmp2.project_id =
-                                                                              project_version.project_id AND
-                                                                              version_id =
-                                                                              project_version.id AND
-                                                                              project_version.latest = TRUE
-                                                                   WHERE tmp.ref_id = tmp2.ref_id)
-                                    WHERE tmp.ref_id = #{refId,jdbcType=VARCHAR}
-                                    ORDER BY tmp.update_time DESC
-                                    LIMIT 1)) AS t ON load_test.id = t.id
-        SET load_test.latest = TRUE
+            INNER JOIN ((
+            SELECT tmp.id
+            FROM load_test tmp
+            JOIN project_version
+            ON tmp.project_id = project_version.project_id AND
+            tmp.version_id = project_version.id AND project_version.latest = TRUE
+            WHERE ref_id = #{refId,jdbcType=VARCHAR}
+            LIMIT 1
+            )
+            UNION ALL
+            (
+            SELECT tmp.id
+            FROM load_test tmp
+            JOIN project_version
+            ON tmp.project_id = project_version.project_id AND
+            tmp.version_id = project_version.id
+            AND NOT EXISTS (SELECT ref_id
+            FROM load_test tmp2
+            JOIN project_version
+            ON tmp2.project_id =
+            project_version.project_id AND
+            version_id =
+            project_version.id AND
+            project_version.latest = TRUE
+            WHERE tmp.ref_id = tmp2.ref_id)
+            WHERE tmp.ref_id = #{refId,jdbcType=VARCHAR}
+            ORDER BY tmp.update_time DESC
+            LIMIT 1)) AS t
+        ON load_test.id = t.id
+            SET load_test.latest = TRUE
         WHERE ref_id = #{refId,jdbcType=VARCHAR}
     </update>
 
     <update id="clearLatestVersion">
         UPDATE load_test
         SET latest = 0
-        <where>
-            <if test="refId != null">
-                and ref_id = #{refId}
-            </if>
-        </where>
+        where ref_id = #{refId}
     </update>
 
     <select id="selectRefIdsForVersionChange" resultType="java.lang.String">
         SELECT DISTINCT ref_id
         FROM load_test
         WHERE ref_id NOT IN (
-        SELECT DISTINCT ref_id
-        FROM load_test
-        WHERE version_id = #{versionId} AND project_id = #{projectId}
-        ) AND project_id = #{projectId}
+            SELECT DISTINCT ref_id
+            FROM load_test
+            WHERE version_id = #{versionId}
+              AND project_id = #{projectId}
+        )
+          AND project_id = #{projectId}
     </select>
 
     <select id="getFileMetadataByIds" resultType="io.metersphere.base.domain.FileMetadata">
         SELECT file_metadata.*
         FROM load_test_file
-                     JOIN file_metadata ON file_id = file_metadata.id
+                 JOIN file_metadata ON file_id = file_metadata.id
         WHERE test_id = #{testId}
         ORDER BY sort
     </select>
diff --git a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtSwaggerUrlScheduleMapper.xml b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtSwaggerUrlScheduleMapper.xml
index e803a7256b..60b6707435 100644
--- a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtSwaggerUrlScheduleMapper.xml
+++ b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtSwaggerUrlScheduleMapper.xml
@@ -12,7 +12,7 @@
                sup.config,
                sch.value as rule,
                sch.enable,
-               sch.id as taskId
+               sch.id    as taskId
         FROM swagger_url_project sup
                  INNER JOIN schedule sch ON sup.id = sch.resource_id
         WHERE sup.project_id = #{projectId}