Merge branch 'master' of https://github.com/metersphere/metersphere

backend/src/main/java/io/metersphere/api/jmeter/APIBackendListenerClient.java

@@ -229,7 +229,11 @@ public class APIBackendListenerClient extends AbstractBackendListenerClient impl
         if (StringUtils.equals("Error", report.getStatus())) {
             event = NoticeConstants.Event.EXECUTE_FAILED;
         }
-
+        Map<String, Object> paramMap = new HashMap<>();
+        paramMap.put("testName", report.getName());
+        paramMap.put("id", report.getId());
+        paramMap.put("type", "performance");
+        paramMap.put("url", baseSystemConfigDTO.getUrl());
         NoticeModel noticeModel = NoticeModel.builder()
                 .successContext(successContext)
                 .successMailTemplate("ApiSuccessfulNotification")
@@ -239,6 +243,7 @@ public class APIBackendListenerClient extends AbstractBackendListenerClient impl
                 .status(report.getStatus())
                 .event(event)
                 .subject(subject)
+                .paramMap(paramMap)
                 .build();
         noticeSendService.send(report.getTriggerMode(), noticeModel);
     }

backend/src/main/java/io/metersphere/base/domain/User.java

@@ -29,5 +29,7 @@ public class User implements Serializable {
 
     private String source;
 
+    private String lastProjectId;
+
     private static final long serialVersionUID = 1L;
 }

backend/src/main/java/io/metersphere/base/domain/UserExample.java

@@ -923,6 +923,76 @@ public class UserExample {
             addCriterion("`source` not between", value1, value2, "source");
             return (Criteria) this;
         }
+
+        public Criteria andLastProjectIdIsNull() {
+            addCriterion("last_project_id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andLastProjectIdIsNotNull() {
+            addCriterion("last_project_id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andLastProjectIdEqualTo(String value) {
+            addCriterion("last_project_id =", value, "lastProjectId");
+            return (Criteria) this;
+        }
+
+        public Criteria andLastProjectIdNotEqualTo(String value) {
+            addCriterion("last_project_id <>", value, "lastProjectId");
+            return (Criteria) this;
+        }
+
+        public Criteria andLastProjectIdGreaterThan(String value) {
+            addCriterion("last_project_id >", value, "lastProjectId");
+            return (Criteria) this;
+        }
+
+        public Criteria andLastProjectIdGreaterThanOrEqualTo(String value) {
+            addCriterion("last_project_id >=", value, "lastProjectId");
+            return (Criteria) this;
+        }
+
+        public Criteria andLastProjectIdLessThan(String value) {
+            addCriterion("last_project_id <", value, "lastProjectId");
+            return (Criteria) this;
+        }
+
+        public Criteria andLastProjectIdLessThanOrEqualTo(String value) {
+            addCriterion("last_project_id <=", value, "lastProjectId");
+            return (Criteria) this;
+        }
+
+        public Criteria andLastProjectIdLike(String value) {
+            addCriterion("last_project_id like", value, "lastProjectId");
+            return (Criteria) this;
+        }
+
+        public Criteria andLastProjectIdNotLike(String value) {
+            addCriterion("last_project_id not like", value, "lastProjectId");
+            return (Criteria) this;
+        }
+
+        public Criteria andLastProjectIdIn(List<String> values) {
+            addCriterion("last_project_id in", values, "lastProjectId");
+            return (Criteria) this;
+        }
+
+        public Criteria andLastProjectIdNotIn(List<String> values) {
+            addCriterion("last_project_id not in", values, "lastProjectId");
+            return (Criteria) this;
+        }
+
+        public Criteria andLastProjectIdBetween(String value1, String value2) {
+            addCriterion("last_project_id between", value1, value2, "lastProjectId");
+            return (Criteria) this;
+        }
+
+        public Criteria andLastProjectIdNotBetween(String value1, String value2) {
+            addCriterion("last_project_id not between", value1, value2, "lastProjectId");
+            return (Criteria) this;
+        }
     }
 
     public static class Criteria extends GeneratedCriteria {

backend/src/main/java/io/metersphere/base/mapper/UserMapper.xml

@@ -14,6 +14,7 @@
     <result column="last_organization_id" jdbcType="VARCHAR" property="lastOrganizationId" />
     <result column="phone" jdbcType="VARCHAR" property="phone" />
     <result column="source" jdbcType="VARCHAR" property="source" />
+    <result column="last_project_id" jdbcType="VARCHAR" property="lastProjectId" />
   </resultMap>
   <sql id="Example_Where_Clause">
     <where>
@@ -75,7 +76,7 @@
   </sql>
   <sql id="Base_Column_List">
     id, `name`, email, `password`, `status`, create_time, update_time, `language`, last_workspace_id, 
-    last_organization_id, phone, `source`
+    last_organization_id, phone, `source`, last_project_id
   </sql>
   <select id="selectByExample" parameterType="io.metersphere.base.domain.UserExample" resultMap="BaseResultMap">
     select
@@ -111,13 +112,13 @@
     insert into user (id, `name`, email, 
       `password`, `status`, create_time, 
       update_time, `language`, last_workspace_id, 
-      last_organization_id, phone, `source`
+      last_organization_id, phone, `source`, 
-      )
+      last_project_id)
     values (#{id,jdbcType=VARCHAR}, #{name,jdbcType=VARCHAR}, #{email,jdbcType=VARCHAR}, 
       #{password,jdbcType=VARCHAR}, #{status,jdbcType=VARCHAR}, #{createTime,jdbcType=BIGINT}, 
       #{updateTime,jdbcType=BIGINT}, #{language,jdbcType=VARCHAR}, #{lastWorkspaceId,jdbcType=VARCHAR}, 
-      #{lastOrganizationId,jdbcType=VARCHAR}, #{phone,jdbcType=VARCHAR}, #{source,jdbcType=VARCHAR}
+      #{lastOrganizationId,jdbcType=VARCHAR}, #{phone,jdbcType=VARCHAR}, #{source,jdbcType=VARCHAR}, 
-      )
+      #{lastProjectId,jdbcType=VARCHAR})
   </insert>
   <insert id="insertSelective" parameterType="io.metersphere.base.domain.User">
     insert into user
@@ -158,6 +159,9 @@
       <if test="source != null">
         `source`,
       </if>
+      <if test="lastProjectId != null">
+        last_project_id,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="id != null">
@@ -196,6 +200,9 @@
       <if test="source != null">
         #{source,jdbcType=VARCHAR},
       </if>
+      <if test="lastProjectId != null">
+        #{lastProjectId,jdbcType=VARCHAR},
+      </if>
     </trim>
   </insert>
   <select id="countByExample" parameterType="io.metersphere.base.domain.UserExample" resultType="java.lang.Long">
@@ -243,6 +250,9 @@
       <if test="record.source != null">
         `source` = #{record.source,jdbcType=VARCHAR},
       </if>
+      <if test="record.lastProjectId != null">
+        last_project_id = #{record.lastProjectId,jdbcType=VARCHAR},
+      </if>
     </set>
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
@@ -261,7 +271,8 @@
       last_workspace_id = #{record.lastWorkspaceId,jdbcType=VARCHAR},
       last_organization_id = #{record.lastOrganizationId,jdbcType=VARCHAR},
       phone = #{record.phone,jdbcType=VARCHAR},
-      `source` = #{record.source,jdbcType=VARCHAR}
+      `source` = #{record.source,jdbcType=VARCHAR},
+      last_project_id = #{record.lastProjectId,jdbcType=VARCHAR}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -302,6 +313,9 @@
       <if test="source != null">
         `source` = #{source,jdbcType=VARCHAR},
       </if>
+      <if test="lastProjectId != null">
+        last_project_id = #{lastProjectId,jdbcType=VARCHAR},
+      </if>
     </set>
     where id = #{id,jdbcType=VARCHAR}
   </update>
@@ -317,7 +331,8 @@
       last_workspace_id = #{lastWorkspaceId,jdbcType=VARCHAR},
       last_organization_id = #{lastOrganizationId,jdbcType=VARCHAR},
       phone = #{phone,jdbcType=VARCHAR},
-      `source` = #{source,jdbcType=VARCHAR}
+      `source` = #{source,jdbcType=VARCHAR},
+      last_project_id = #{lastProjectId,jdbcType=VARCHAR}
     where id = #{id,jdbcType=VARCHAR}
   </update>
 </mapper>

backend/src/main/java/io/metersphere/performance/notice/PerformanceNoticeTask.java

@@ -15,6 +15,8 @@ import org.springframework.stereotype.Component;
 
 import javax.annotation.PreDestroy;
 import javax.annotation.Resource;
+import java.util.HashMap;
+import java.util.Map;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 
@@ -49,7 +51,7 @@ public class PerformanceNoticeTask {
                 }
                 try {
                     //查询定时任务是否关闭
-                    Thread.sleep(1000 * 30);// 每分钟检查 loadtest 的状态
+                    Thread.sleep(1000 * 10);// 检查 loadtest 的状态
                 } catch (InterruptedException e) {
                     LogUtil.error(e.getMessage(), e);
                 }
@@ -81,7 +83,11 @@ public class PerformanceNoticeTask {
         if (PerformanceTestStatus.Error.name().equals(loadTestReport.getStatus())) {
             event = NoticeConstants.Event.EXECUTE_FAILED;
         }
-
+        Map<String, Object> paramMap = new HashMap<>();
+        paramMap.put("testName", loadTestReport.getName());
+        paramMap.put("id", loadTestReport.getId());
+        paramMap.put("type", "performance");
+        paramMap.put("url", baseSystemConfigDTO.getUrl());
         NoticeModel noticeModel = NoticeModel.builder()
                 .successContext(successContext)
                 .successMailTemplate("PerformanceApiSuccessNotification")
@@ -91,6 +97,7 @@ public class PerformanceNoticeTask {
                 .status(loadTestReport.getStatus())
                 .subject(subject)
                 .event(event)
+                .paramMap(paramMap)
                 .build();
         noticeSendService.send(loadTestReport.getTriggerMode(), noticeModel);
     }

backend/src/main/resources/db/migration/V49__user_add_project_id.sql

@@ -0,0 +1 @@
+alter table user add last_project_id varchar(50) null;

frontend/src/business/components/settings/project/MsProject.vue

@@ -142,25 +142,13 @@ export default {
     if (this.$route.path.split('/')[2] === 'project' &&
       this.$route.path.split('/')[3] === 'create') {
       this.create();
-      // this.$router.push('/setting/project');
+      this.$router.replace('/setting/project/all');
     }
     this.list();
   },
   activated() {
     this.list();
   },
-  watch: {
-    '$route'(to) {
-      if (this.$route.path.split('/')[2] === 'project' &&
-        to.path.split('/')[3] === 'create') {
-        this.create();
-        // this.$router.push('/setting/project');
-      } else if (this.$route.path.split('/')[2] === 'project' &&
-        to.path.split('/')[3] === 'all') {
-        this.list();
-      }
-    }
-  },
   computed: {
     currentUser: () => {
       return getCurrentUser();
@@ -177,7 +165,7 @@ export default {
         return false;
       }
       this.title = this.$t('project.create');
-      listenGoBack(this.handleClose);
+      // listenGoBack(this.handleClose);
       this.createVisible = true;
       this.form = {};
     },
@@ -245,6 +233,9 @@ export default {
     handleClose() {
       removeGoBackListener(this.handleClose);
       this.createVisible = false;
+      this.tapd = false;
+      this.jira = false;
+      this.zentao = false;
     },
     search() {
       this.list();

frontend/src/business/components/xpack

@@ -1 +1 @@
-Subproject commit 8a972a198775b3783ed6e4cef27197e53d1ebdc8
+Subproject commit a22a3005d9bd254793fcf634d72539cbdf31be3a