Merge remote-tracking branch 'origin/master'

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

@@ -1,8 +1,9 @@
 package io.metersphere.base.domain;
 
-import java.io.Serializable;
 import lombok.Data;
 
+import java.io.Serializable;
+
 @Data
 public class MessageTask implements Serializable {
     private String id;
@@ -27,5 +28,7 @@ public class MessageTask implements Serializable {
 
     private Long createTime;
 
+    private String template;
+
     private static final long serialVersionUID = 1L;
 }

backend/src/main/java/io/metersphere/base/mapper/MessageTaskMapper.java

@@ -2,9 +2,10 @@ package io.metersphere.base.mapper;
 
 import io.metersphere.base.domain.MessageTask;
 import io.metersphere.base.domain.MessageTaskExample;
-import java.util.List;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
+
 public interface MessageTaskMapper {
     long countByExample(MessageTaskExample example);
 
@@ -16,15 +17,21 @@ public interface MessageTaskMapper {
 
     int insertSelective(MessageTask record);
 
+    List<MessageTask> selectByExampleWithBLOBs(MessageTaskExample example);
+
     List<MessageTask> selectByExample(MessageTaskExample example);
 
     MessageTask selectByPrimaryKey(String id);
 
     int updateByExampleSelective(@Param("record") MessageTask record, @Param("example") MessageTaskExample example);
 
+    int updateByExampleWithBLOBs(@Param("record") MessageTask record, @Param("example") MessageTaskExample example);
+
     int updateByExample(@Param("record") MessageTask record, @Param("example") MessageTaskExample example);
 
     int updateByPrimaryKeySelective(MessageTask record);
 
+    int updateByPrimaryKeyWithBLOBs(MessageTask record);
+
     int updateByPrimaryKey(MessageTask record);
 }

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

@@ -2,17 +2,20 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="io.metersphere.base.mapper.MessageTaskMapper">
   <resultMap id="BaseResultMap" type="io.metersphere.base.domain.MessageTask">
-    <id column="id" jdbcType="VARCHAR" property="id"/>
-    <result column="type" jdbcType="VARCHAR" property="type"/>
-    <result column="event" jdbcType="VARCHAR" property="event"/>
-    <result column="user_id" jdbcType="VARCHAR" property="userId"/>
-    <result column="task_type" jdbcType="VARCHAR" property="taskType"/>
-    <result column="webhook" jdbcType="VARCHAR" property="webhook"/>
-    <result column="identification" jdbcType="VARCHAR" property="identification"/>
-    <result column="is_set" jdbcType="BIT" property="isSet"/>
-    <result column="organization_id" jdbcType="VARCHAR" property="organizationId"/>
-    <result column="test_id" jdbcType="VARCHAR" property="testId"/>
-    <result column="create_time" jdbcType="BIGINT" property="createTime"/>
+    <id column="id" jdbcType="VARCHAR" property="id" />
+    <result column="type" jdbcType="VARCHAR" property="type" />
+    <result column="event" jdbcType="VARCHAR" property="event" />
+    <result column="user_id" jdbcType="VARCHAR" property="userId" />
+    <result column="task_type" jdbcType="VARCHAR" property="taskType" />
+    <result column="webhook" jdbcType="VARCHAR" property="webhook" />
+    <result column="identification" jdbcType="VARCHAR" property="identification" />
+    <result column="is_set" jdbcType="BIT" property="isSet" />
+    <result column="organization_id" jdbcType="VARCHAR" property="organizationId" />
+    <result column="test_id" jdbcType="VARCHAR" property="testId" />
+    <result column="create_time" jdbcType="BIGINT" property="createTime" />
+  </resultMap>
+  <resultMap extends="BaseResultMap" id="ResultMapWithBLOBs" type="io.metersphere.base.domain.MessageTask">
+    <result column="template" jdbcType="LONGVARCHAR" property="template" />
   </resultMap>
   <sql id="Example_Where_Clause">
     <where>
@@ -25,13 +28,13 @@
                   and ${criterion.condition}
                 </when>
                 <when test="criterion.singleValue">
-                  and ${criterion.condition} #{criterion.value}
+                  AND ${criterion.condition} #{criterion.value}
                 </when>
                 <when test="criterion.betweenValue">
-                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                  AND ${criterion.condition} #{criterion.value} AND #{criterion.secondValue}
                 </when>
                 <when test="criterion.listValue">
-                  and ${criterion.condition}
+                  AND ${criterion.condition}
                   <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
                     #{listItem}
                   </foreach>
@@ -76,6 +79,25 @@
     id, `type`, event, user_id, task_type, webhook, identification, is_set, organization_id, 
     test_id, create_time
   </sql>
+  <sql id="Blob_Column_List">
+    `template`
+  </sql>
+  <select id="selectByExampleWithBLOBs" parameterType="io.metersphere.base.domain.MessageTaskExample" resultMap="ResultMapWithBLOBs">
+    SELECT
+    <if test="distinct">
+      DISTINCT
+    </if>
+    <include refid="Base_Column_List" />
+    ,
+    <include refid="Blob_Column_List" />
+    FROM message_task
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+    <if test="orderByClause != null">
+      ORDER BY ${orderByClause}
+    </if>
+  </select>
   <select id="selectByExample" parameterType="io.metersphere.base.domain.MessageTaskExample" resultMap="BaseResultMap">
     select
     <if test="distinct">
@@ -90,9 +112,11 @@
       order by ${orderByClause}
     </if>
   </select>
-  <select id="selectByPrimaryKey" parameterType="java.lang.String" resultMap="BaseResultMap">
+  <select id="selectByPrimaryKey" parameterType="java.lang.String" resultMap="ResultMapWithBLOBs">
     select 
     <include refid="Base_Column_List" />
+    ,
+    <include refid="Blob_Column_List" />
     from message_task
     where id = #{id,jdbcType=VARCHAR}
   </select>
@@ -107,14 +131,16 @@
     </if>
   </delete>
   <insert id="insert" parameterType="io.metersphere.base.domain.MessageTask">
-    insert into message_task (id, `type`, event,
-                              user_id, task_type, webhook,
-                              identification, is_set, organization_id,
-                              test_id, create_time)
-    values (#{id,jdbcType=VARCHAR}, #{type,jdbcType=VARCHAR}, #{event,jdbcType=VARCHAR},
-            #{userId,jdbcType=VARCHAR}, #{taskType,jdbcType=VARCHAR}, #{webhook,jdbcType=VARCHAR},
-            #{identification,jdbcType=VARCHAR}, #{isSet,jdbcType=BIT}, #{organizationId,jdbcType=VARCHAR},
-            #{testId,jdbcType=VARCHAR}, #{createTime,jdbcType=BIGINT})
+    INSERT INTO message_task (id, `type`, event,
+      user_id, task_type, webhook, 
+      identification, is_set, organization_id, 
+      test_id, create_time, `template`
+      )
+    VALUES (#{id,jdbcType=VARCHAR}, #{type,jdbcType=VARCHAR}, #{event,jdbcType=VARCHAR},
+      #{userId,jdbcType=VARCHAR}, #{taskType,jdbcType=VARCHAR}, #{webhook,jdbcType=VARCHAR}, 
+      #{identification,jdbcType=VARCHAR}, #{isSet,jdbcType=BIT}, #{organizationId,jdbcType=VARCHAR}, 
+      #{testId,jdbcType=VARCHAR}, #{createTime,jdbcType=BIGINT}, #{template,jdbcType=LONGVARCHAR}
+      )
   </insert>
   <insert id="insertSelective" parameterType="io.metersphere.base.domain.MessageTask">
     insert into message_task
@@ -152,6 +178,9 @@
       <if test="createTime != null">
         create_time,
       </if>
+      <if test="template != null">
+        `template`,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="id != null">
@@ -187,6 +216,9 @@
       <if test="createTime != null">
         #{createTime,jdbcType=BIGINT},
       </if>
+      <if test="template != null">
+        #{template,jdbcType=LONGVARCHAR},
+      </if>
     </trim>
   </insert>
   <select id="countByExample" parameterType="io.metersphere.base.domain.MessageTaskExample" resultType="java.lang.Long">
@@ -231,24 +263,45 @@
       <if test="record.createTime != null">
         create_time = #{record.createTime,jdbcType=BIGINT},
       </if>
+      <if test="record.template != null">
+        `template` = #{record.template,jdbcType=LONGVARCHAR},
+      </if>
     </set>
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
   </update>
+  <update id="updateByExampleWithBLOBs" parameterType="map">
+    UPDATE message_task
+    SET id = #{record.id,jdbcType=VARCHAR},
+      `type` = #{record.type,jdbcType=VARCHAR},
+      event = #{record.event,jdbcType=VARCHAR},
+      user_id = #{record.userId,jdbcType=VARCHAR},
+      task_type = #{record.taskType,jdbcType=VARCHAR},
+      webhook = #{record.webhook,jdbcType=VARCHAR},
+      identification = #{record.identification,jdbcType=VARCHAR},
+      is_set = #{record.isSet,jdbcType=BIT},
+      organization_id = #{record.organizationId,jdbcType=VARCHAR},
+      test_id = #{record.testId,jdbcType=VARCHAR},
+      create_time = #{record.createTime,jdbcType=BIGINT},
+      `template` = #{record.template,jdbcType=LONGVARCHAR}
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
   <update id="updateByExample" parameterType="map">
     update message_task
     set id = #{record.id,jdbcType=VARCHAR},
-    `type` = #{record.type,jdbcType=VARCHAR},
-    event = #{record.event,jdbcType=VARCHAR},
-    user_id = #{record.userId,jdbcType=VARCHAR},
-    task_type = #{record.taskType,jdbcType=VARCHAR},
-    webhook = #{record.webhook,jdbcType=VARCHAR},
-    identification = #{record.identification,jdbcType=VARCHAR},
-    is_set = #{record.isSet,jdbcType=BIT},
-    organization_id = #{record.organizationId,jdbcType=VARCHAR},
-    test_id = #{record.testId,jdbcType=VARCHAR},
-    create_time = #{record.createTime,jdbcType=BIGINT}
+      `type` = #{record.type,jdbcType=VARCHAR},
+      event = #{record.event,jdbcType=VARCHAR},
+      user_id = #{record.userId,jdbcType=VARCHAR},
+      task_type = #{record.taskType,jdbcType=VARCHAR},
+      webhook = #{record.webhook,jdbcType=VARCHAR},
+      identification = #{record.identification,jdbcType=VARCHAR},
+      is_set = #{record.isSet,jdbcType=BIT},
+      organization_id = #{record.organizationId,jdbcType=VARCHAR},
+      test_id = #{record.testId,jdbcType=VARCHAR},
+      create_time = #{record.createTime,jdbcType=BIGINT}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -286,21 +339,39 @@
       <if test="createTime != null">
         create_time = #{createTime,jdbcType=BIGINT},
       </if>
+      <if test="template != null">
+        `template` = #{template,jdbcType=LONGVARCHAR},
+      </if>
     </set>
     where id = #{id,jdbcType=VARCHAR}
   </update>
+  <update id="updateByPrimaryKeyWithBLOBs" parameterType="io.metersphere.base.domain.MessageTask">
+    UPDATE message_task
+    SET `type` = #{type,jdbcType=VARCHAR},
+      event = #{event,jdbcType=VARCHAR},
+      user_id = #{userId,jdbcType=VARCHAR},
+      task_type = #{taskType,jdbcType=VARCHAR},
+      webhook = #{webhook,jdbcType=VARCHAR},
+      identification = #{identification,jdbcType=VARCHAR},
+      is_set = #{isSet,jdbcType=BIT},
+      organization_id = #{organizationId,jdbcType=VARCHAR},
+      test_id = #{testId,jdbcType=VARCHAR},
+      create_time = #{createTime,jdbcType=BIGINT},
+      `template` = #{template,jdbcType=LONGVARCHAR}
+    WHERE id = #{id,jdbcType=VARCHAR}
+  </update>
   <update id="updateByPrimaryKey" parameterType="io.metersphere.base.domain.MessageTask">
-    update message_task
-    set `type`          = #{type,jdbcType=VARCHAR},
-        event           = #{event,jdbcType=VARCHAR},
-        user_id         = #{userId,jdbcType=VARCHAR},
-        task_type       = #{taskType,jdbcType=VARCHAR},
-        webhook         = #{webhook,jdbcType=VARCHAR},
-        identification  = #{identification,jdbcType=VARCHAR},
-        is_set          = #{isSet,jdbcType=BIT},
-        organization_id = #{organizationId,jdbcType=VARCHAR},
-        test_id         = #{testId,jdbcType=VARCHAR},
-        create_time     = #{createTime,jdbcType=BIGINT}
-    where id = #{id,jdbcType=VARCHAR}
+    UPDATE message_task
+    SET `type` = #{type,jdbcType=VARCHAR},
+      event = #{event,jdbcType=VARCHAR},
+      user_id = #{userId,jdbcType=VARCHAR},
+      task_type = #{taskType,jdbcType=VARCHAR},
+      webhook = #{webhook,jdbcType=VARCHAR},
+      identification = #{identification,jdbcType=VARCHAR},
+      is_set = #{isSet,jdbcType=BIT},
+      organization_id = #{organizationId,jdbcType=VARCHAR},
+      test_id = #{testId,jdbcType=VARCHAR},
+      create_time = #{createTime,jdbcType=BIGINT}
+    WHERE id = #{id,jdbcType=VARCHAR}
   </update>
 </mapper>

backend/src/main/java/io/metersphere/notice/domain/MessageDetail.java

@@ -17,4 +17,5 @@ public class MessageDetail {
     private Boolean isSet;
     private String testId;
     private Long createTime;
+    private String template;
 }

backend/src/main/java/io/metersphere/notice/sender/AbstractNoticeSender.java

@@ -5,7 +5,9 @@ import io.metersphere.commons.utils.LogUtil;
 import io.metersphere.notice.domain.MessageDetail;
 import io.metersphere.notice.domain.UserDetail;
 import io.metersphere.service.UserService;
+import org.apache.commons.collections4.MapUtils;
 import org.apache.commons.io.IOUtils;
+import org.apache.commons.lang3.RegExUtils;
 import org.apache.commons.lang3.StringUtils;
 
 import javax.annotation.Resource;
@@ -14,6 +16,7 @@ import java.net.URL;
 import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
 import java.util.stream.Collectors;
 
 public abstract class AbstractNoticeSender implements NoticeSender {
@@ -21,13 +24,16 @@ public abstract class AbstractNoticeSender implements NoticeSender {
     private UserService userService;
 
     protected String getContext(MessageDetail messageDetail, NoticeModel noticeModel) {
+        // 如果配置了模版就直接使用模版
+        if (StringUtils.isNotBlank(messageDetail.getTemplate())) {
+            return getContent(messageDetail.getTemplate(), noticeModel.getParamMap());
+        }
         // 处理 userIds 中包含的特殊值
         List<String> realUserIds = getRealUserIds(messageDetail.getUserIds(), noticeModel.getRelatedUsers(), messageDetail.getEvent());
         messageDetail.setUserIds(realUserIds);
 
         // 处理 WeCom Ding context
         String context = "";
-        String status = noticeModel.getStatus();
         switch (messageDetail.getEvent()) {
             case NoticeConstants.Event.CREATE:
             case NoticeConstants.Event.UPDATE:
@@ -48,6 +54,10 @@ public abstract class AbstractNoticeSender implements NoticeSender {
     }
 
     protected String getHtmlContext(MessageDetail messageDetail, NoticeModel noticeModel) {
+        // 如果配置了模版就直接使用模版
+        if (StringUtils.isNotBlank(messageDetail.getTemplate())) {
+            return getContent(messageDetail.getTemplate(), noticeModel.getParamMap());
+        }
         // 处理 userIds 中包含的特殊值
         List<String> realUserIds = getRealUserIds(messageDetail.getUserIds(), noticeModel.getRelatedUsers(), messageDetail.getEvent());
         messageDetail.setUserIds(realUserIds);
@@ -77,7 +87,20 @@ public abstract class AbstractNoticeSender implements NoticeSender {
         } catch (IOException e) {
             LogUtil.error(e);
         }
-        return context;
+        return getContent(context, noticeModel.getParamMap());
+    }
+
+    protected String getContent(String template, Map<String, Object> context) {
+        if (MapUtils.isNotEmpty(context)) {
+            for (String k : context.keySet()) {
+                if (context.get(k) != null) {
+                    template = RegExUtils.replaceAll(template, "\\$\\{" + k + "}", context.get(k).toString());
+                } else {
+                    template = RegExUtils.replaceAll(template, "\\$\\{" + k + "}", "未设置");
+                }
+            }
+        }
+        return template;
     }
 
     protected List<String> getUserPhones(List<String> userIds) {

backend/src/main/java/io/metersphere/notice/sender/impl/MailNoticeSender.java

@@ -5,8 +5,6 @@ import io.metersphere.notice.domain.MessageDetail;
 import io.metersphere.notice.sender.AbstractNoticeSender;
 import io.metersphere.notice.sender.NoticeModel;
 import io.metersphere.notice.service.MailService;
-import org.apache.commons.collections4.MapUtils;
-import org.apache.commons.lang3.RegExUtils;
 import org.springframework.mail.javamail.JavaMailSenderImpl;
 import org.springframework.mail.javamail.MimeMessageHelper;
 import org.springframework.stereotype.Component;
@@ -15,14 +13,13 @@ import javax.annotation.Resource;
 import javax.mail.MessagingException;
 import javax.mail.internet.MimeMessage;
 import java.util.List;
-import java.util.Map;
 
 @Component
 public class MailNoticeSender extends AbstractNoticeSender {
     @Resource
     private MailService mailService;
 
-    private void sendMail(MessageDetail messageDetail, String template, NoticeModel noticeModel) throws MessagingException {
+    private void sendMail(MessageDetail messageDetail, String context, NoticeModel noticeModel) throws MessagingException {
         JavaMailSenderImpl javaMailSender = mailService.getMailSender();
         MimeMessage mimeMessage = javaMailSender.createMimeMessage();
         MimeMessageHelper helper = new MimeMessageHelper(mimeMessage, true);
@@ -31,25 +28,11 @@ public class MailNoticeSender extends AbstractNoticeSender {
         List<String> emails = super.getUserEmails(messageDetail.getUserIds());
         String[] users = emails.toArray(new String[0]);
         LogUtil.info("收件人地址: " + emails);
-        helper.setText(this.getContent(template, noticeModel.getParamMap()), true);
+        helper.setText(context, true);
         helper.setTo(users);
         javaMailSender.send(mimeMessage);
     }
 
-
-    public String getContent(String template, Map<String, Object> context) {
-        if (MapUtils.isNotEmpty(context)) {
-            for (String k : context.keySet()) {
-                if (context.get(k) != null) {
-                    template = RegExUtils.replaceAll(template, "\\$\\{" + k + "}", context.get(k).toString());
-                } else {
-                    template = RegExUtils.replaceAll(template, "\\$\\{" + k + "}", "未设置");
-                }
-            }
-        }
-        return template;
-    }
-
     @Override
     public void send(MessageDetail messageDetail, NoticeModel noticeModel) {
         String context = super.getHtmlContext(messageDetail, noticeModel);

backend/src/main/java/io/metersphere/notice/service/NoticeSendService.java

@@ -2,7 +2,6 @@ package io.metersphere.notice.service;
 
 import com.alibaba.nacos.client.utils.StringUtils;
 import io.metersphere.commons.constants.NoticeConstants;
-import io.metersphere.commons.utils.CommonBeanFactory;
 import io.metersphere.notice.domain.MessageDetail;
 import io.metersphere.notice.sender.NoticeModel;
 import io.metersphere.notice.sender.NoticeSender;
@@ -22,10 +21,8 @@ public class NoticeSendService {
     private WeComNoticeSender weComNoticeSender;
     @Resource
     private DingNoticeSender dingNoticeSender;
-
-    private void event(String event) {
-
-    }
+    @Resource
+    private NoticeService noticeService;
 
     private NoticeSender getNoticeSender(MessageDetail messageDetail) {
         NoticeSender noticeSender = null;
@@ -47,8 +44,6 @@ public class NoticeSendService {
     }
 
     public void send(String taskType, NoticeModel noticeModel) {
-        NoticeService noticeService = CommonBeanFactory.getBean(NoticeService.class);
-        assert noticeService != null;
         List<MessageDetail> messageDetails;
         switch (taskType) {
             case NoticeConstants.Mode.API:

backend/src/main/java/io/metersphere/notice/service/NoticeService.java

@@ -33,14 +33,17 @@ public class NoticeService {
         SessionUser user = SessionUtils.getUser();
         String orgId = user.getLastOrganizationId();
         long time = System.currentTimeMillis();
-        String identification = UUID.randomUUID().toString();
-        messageDetail.getUserIds().forEach(m -> {
-            checkUserIdExist(m, messageDetail, orgId);
+        String identification = messageDetail.getIdentification();
+        if (StringUtils.isBlank(identification)) {
+            identification = UUID.randomUUID().toString();
+        }
+        for (String userId : messageDetail.getUserIds()) {
+            checkUserIdExist(userId, messageDetail, orgId);
             MessageTask messageTask = new MessageTask();
             messageTask.setId(UUID.randomUUID().toString());
             messageTask.setEvent(messageDetail.getEvent());
             messageTask.setTaskType(messageDetail.getTaskType());
-            messageTask.setUserId(m);
+            messageTask.setUserId(userId);
             messageTask.setType(messageDetail.getType());
             messageTask.setWebhook(messageDetail.getWebhook());
             messageTask.setIdentification(identification);
@@ -48,8 +51,15 @@ public class NoticeService {
             messageTask.setOrganizationId(orgId);
             messageTask.setTestId(messageDetail.getTestId());
             messageTask.setCreateTime(time);
+            setTemplate(messageDetail, messageTask);
             messageTaskMapper.insert(messageTask);
-        });
+        }
+    }
+
+    private void setTemplate(MessageDetail messageDetail, MessageTask messageTask) {
+        if (StringUtils.isNotBlank(messageDetail.getTemplate())) {
+            messageTask.setTemplate(messageDetail.getTemplate());
+        }
     }
 
     private void checkUserIdExist(String userId, MessageDetail list, String orgId) {
@@ -80,7 +90,7 @@ public class NoticeService {
     public List<MessageDetail> searchMessageByTestId(String testId) {
         MessageTaskExample example = new MessageTaskExample();
         example.createCriteria().andTestIdEqualTo(testId);
-        List<MessageTask> messageTaskLists = messageTaskMapper.selectByExample(example);
+        List<MessageTask> messageTaskLists = messageTaskMapper.selectByExampleWithBLOBs(example);
         List<MessageDetail> scheduleMessageTask = new ArrayList<>();
         Map<String, List<MessageTask>> MessageTaskMap = messageTaskLists.stream().collect(Collectors.groupingBy(MessageTask::getIdentification));
         MessageTaskMap.forEach((k, v) -> {
@@ -100,7 +110,7 @@ public class NoticeService {
         example.createCriteria()
                 .andTaskTypeEqualTo(type)
                 .andOrganizationIdEqualTo(orgId);
-        List<MessageTask> messageTaskLists = messageTaskMapper.selectByExample(example);
+        List<MessageTask> messageTaskLists = messageTaskMapper.selectByExampleWithBLOBs(example);
 
         Map<String, List<MessageTask>> messageTaskMap = messageTaskLists.stream()
                 .collect(Collectors.groupingBy(NoticeService::fetchGroupKey));
@@ -130,6 +140,7 @@ public class NoticeService {
             messageDetail.setType(m.getType());
             messageDetail.setIsSet(m.getIsSet());
             messageDetail.setCreateTime(m.getCreateTime());
+            messageDetail.setTemplate(m.getTemplate());
         }
         if (CollectionUtils.isNotEmpty(userIds)) {
             messageDetail.setUserIds(new ArrayList<>(userIds));

backend/src/main/java/io/metersphere/xpack

@@ -1 +1 @@
-Subproject commit bb494fc68a2367359c9048fa7250c7618de4afb6
+Subproject commit 905ca8af61ce966d26109e9c5c8c0aee3ca1324e

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

@@ -0,0 +1,13 @@
+ALTER TABLE message_task
+    MODIFY identification varchar(50) NOT NULL;
+
+ALTER TABLE message_task
+    MODIFY organization_id varchar(50) NULL;
+
+ALTER TABLE message_task
+    MODIFY test_id varchar(50) NULL;
+
+ALTER TABLE message_task
+    ADD template TEXT NULL;
+
+DROP TABLE IF EXISTS notice;

frontend/src/business/components/common/components/MsScheduleEdit.vue

@@ -213,10 +213,4 @@ export default {
   margin-bottom: 10px;
 }
 
-/deep/ .el-select__tags {
-  flex-wrap: unset;
-  overflow: auto;
-}
-
-
 </style>

frontend/src/business/components/settings/organization/components/DefectTaskNotification.vue

@@ -17,7 +17,7 @@
           :cell-style="rowClass"
           :header-cell-style="headClass"
         >
-          <el-table-column :label="$t('schedule.event')" min-width="20%" prop="events">
+          <el-table-column :label="$t('schedule.event')" min-width="15%" prop="events">
             <template slot-scope="scope">
               <el-select v-model="scope.row.event" :placeholder="$t('organization.message.select_events')" size="mini"
                          prop="event" :disabled="!scope.row.isSet">
@@ -64,8 +64,16 @@
                         :disabled="!scope.row.isSet||!scope.row.isReadOnly"></el-input>
             </template>
           </el-table-column>
-          <el-table-column :label="$t('commons.operating')" min-width="20%" prop="result">
+          <el-table-column :label="$t('commons.operating')" min-width="25%" prop="result">
             <template v-slot:default="scope">
+              <el-button
+                type="success"
+                size="mini"
+                v-if="scope.row.isSet"
+                v-xpack
+                @click="handleTemplate(scope.$index,scope.row)"
+              >{{ $t('organization.message.template') }}
+              </el-button>
               <el-button
                 type="primary"
                 size="mini"
@@ -98,14 +106,22 @@
         </el-table>
       </el-col>
     </el-row>
+    <notice-template v-xpack ref="noticeTemplate"/>
   </div>
 </template>
 
 <script>
+import {hasLicense} from "@/common/js/utils";
+
 const TASK_TYPE = 'DEFECT_TASK';
+const requireComponent = require.context('@/business/components/xpack/', true, /\.vue$/);
+const noticeTemplate = requireComponent.keys().length > 0 ? requireComponent("./notice/NoticeTemplate.vue") : {};
 
 export default {
   name: "DefectTaskNotification",
+  components: {
+    "NoticeTemplate": noticeTemplate.default
+  },
   props: {
     defectReceiverOptions: {
       type: Array
@@ -211,6 +227,11 @@ export default {
     },
     headClass() {
       return "text-align:center;background:'#ededed'"
+    },
+    handleTemplate(index, row) {
+      if (hasLicense()) {
+        this.$refs.noticeTemplate.open(row);
+      }
     }
   }
 }

frontend/src/business/components/settings/organization/components/JenkinsNotification.vue

@@ -11,22 +11,22 @@
     <el-row>
       <el-col :span="24">
         <el-table
-            :data="jenkinsTask"
-            class="tb-edit"
-            border
-            :cell-style="rowClass"
-            :header-cell-style="headClass">
-          <el-table-column :label="$t('schedule.event')" min-width="20%" prop="events">
+          :data="jenkinsTask"
+          class="tb-edit"
+          border
+          :cell-style="rowClass"
+          :header-cell-style="headClass">
+          <el-table-column :label="$t('schedule.event')" min-width="15%" prop="events">
             <template slot-scope="scope">
               <el-select v-model="scope.row.event"
                          :placeholder="$t('organization.message.select_events')"
                          size="mini"
                          prop="events" :disabled="!scope.row.isSet">
                 <el-option
-                    v-for="item in jenkinsEventOptions"
-                    :key="item.value"
-                    :label="item.label"
-                    :value="item.value">
+                  v-for="item in jenkinsEventOptions"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value">
                 </el-option>
               </el-select>
             </template>
@@ -36,10 +36,10 @@
               <el-select v-model="row.userIds" filterable multiple size="mini"
                          :placeholder="$t('commons.please_select')" style="width: 100%;" :disabled="!row.isSet">
                 <el-option
-                    v-for="item in jenkinsReceiverOptions"
-                    :key="item.id"
-                    :label="item.name"
-                    :value="item.id">
+                  v-for="item in jenkinsReceiverOptions"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.id">
                 </el-option>
               </el-select>
             </template>
@@ -51,10 +51,10 @@
                          :disabled="!scope.row.isSet" @change="handleEdit(scope.$index, scope.row)"
               >
                 <el-option
-                    v-for="item in receiveTypeOptions"
-                    :key="item.value"
-                    :label="item.label"
-                    :value="item.value">
+                  v-for="item in receiveTypeOptions"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value">
                 </el-option>
               </el-select>
             </template>
@@ -66,48 +66,65 @@
                         :disabled="!scope.row.isSet||!scope.row.isReadOnly"></el-input>
             </template>
           </el-table-column>
-          <el-table-column :label="$t('commons.operating')" min-width="20%" prop="result">
+          <el-table-column :label="$t('commons.operating')" min-width="25%" prop="result">
             <template v-slot:default="scope">
               <el-button
-                  type="primary"
-                  size="mini"
-                  v-show="scope.row.isSet"
-                  @click="handleAddTask(scope.$index,scope.row)"
+                type="success"
+                size="mini"
+                v-if="scope.row.isSet"
+                v-xpack
+                @click="handleTemplate(scope.$index,scope.row)"
+              >{{ $t('organization.message.template') }}
+              </el-button>
+              <el-button
+                type="primary"
+                size="mini"
+                v-if="scope.row.isSet"
+                @click="handleAddTask(scope.$index,scope.row)"
               >{{ $t('commons.add') }}
               </el-button>
               <el-button
-                  size="mini"
-                  v-show="scope.row.isSet"
-                  @click.native.prevent="removeRowTask(scope.$index,jenkinsTask)"
+                size="mini"
+                v-if="scope.row.isSet"
+                @click.native.prevent="removeRowTask(scope.$index,jenkinsTask)"
               >{{ $t('commons.cancel') }}
               </el-button>
               <el-button
-                  type="primary"
-                  size="mini"
-                  v-show="!scope.row.isSet"
-                  @click="handleEditTask(scope.$index,scope.row)"
+                type="primary"
+                size="mini"
+                v-if="!scope.row.isSet"
+                @click="handleEditTask(scope.$index,scope.row)"
               >{{ $t('commons.edit') }}
               </el-button>
               <el-button
-                  type="danger"
-                  icon="el-icon-delete"
-                  size="mini"
-                  v-show="!scope.row.isSet"
-                  @click.native.prevent="deleteRowTask(scope.$index,scope.row)"
+                type="danger"
+                icon="el-icon-delete"
+                size="mini"
+                v-show="!scope.row.isSet"
+                @click.native.prevent="deleteRowTask(scope.$index,scope.row)"
               ></el-button>
             </template>
           </el-table-column>
         </el-table>
       </el-col>
     </el-row>
+    <notice-template v-xpack ref="noticeTemplate"/>
   </div>
 </template>
 
 <script>
+import {hasLicense} from "@/common/js/utils";
+
 const TASK_TYPE = 'JENKINS_TASK';
 
+const requireComponent = require.context('@/business/components/xpack/', true, /\.vue$/);
+const noticeTemplate = requireComponent.keys().length > 0 ? requireComponent("./notice/NoticeTemplate.vue") : {};
+
 export default {
   name: "JenkinsNotification",
+  components: {
+    "NoticeTemplate": noticeTemplate.default
+  },
   props: {
     jenkinsReceiverOptions: {
       type: Array
@@ -187,7 +204,6 @@ export default {
       } else {
         data.isReadOnly = true;
       }
-
     },
     addTask(data) {
       this.result = this.$post("/notice/save/message/task", data, () => {
@@ -215,6 +231,11 @@ export default {
     headClass() {
       return "text-align:center;background:'#ededed'"
     },
+    handleTemplate(index, row) {
+      if (hasLicense()) {
+        this.$refs.noticeTemplate.open(row);
+      }
+    }
   }
 }
 </script>

frontend/src/business/components/settings/organization/components/ScheduleTaskNotification.vue

@@ -14,12 +14,11 @@
           :data="scheduleTask"
           class="tb-edit"
           border
-          size="mini"
           :cell-style="rowClass"
           :header-cell-style="headClass">
-          <el-table-column :label="$t('schedule.event')" min-width="20%" prop="events">
+          <el-table-column :label="$t('schedule.event')" prop="events" min-width="15%">
             <template slot-scope="scope">
-              <el-select v-model="scope.row.event"
+              <el-select v-model="scope.row.event" size="mini"
                          :placeholder="$t('organization.message.select_events')"
                          prop="events" :disabled="!scope.row.isSet">
                 <el-option
@@ -33,7 +32,7 @@
           </el-table-column>
           <el-table-column :label="$t('schedule.receiver')" prop="userIds" min-width="20%">
             <template v-slot:default="{row}">
-              <el-select v-model="row.userIds" filterable multiple
+              <el-select v-model="row.userIds" filterable multiple size="mini"
                          :placeholder="$t('commons.please_select')" style="width: 100%;" :disabled="!row.isSet">
                 <el-option
                   v-for="item in scheduleReceiverOptions"
@@ -44,9 +43,10 @@
               </el-select>
             </template>
           </el-table-column>
-          <el-table-column :label="$t('schedule.receiving_mode')" min-width="20%" prop="type">
+          <el-table-column :label="$t('schedule.receiving_mode')" prop="type" min-width="15%">
             <template slot-scope="scope">
               <el-select v-model="scope.row.type" :placeholder="$t('organization.message.select_receiving_method')"
+                         size="mini"
                          :disabled="!scope.row.isSet" @change="handleEdit(scope.$index, scope.row)"
               >
                 <el-option
@@ -60,12 +60,20 @@
           </el-table-column>
           <el-table-column label="webhook" min-width="20%" prop="webhook">
             <template v-slot:default="scope">
-              <el-input v-model="scope.row.webhook" placeholder="webhook地址"
+              <el-input v-model="scope.row.webhook" placeholder="webhook地址" size="mini"
                         :disabled="!scope.row.isSet||!scope.row.isReadOnly"></el-input>
             </template>
           </el-table-column>
-          <el-table-column :label="$t('commons.operating')" min-width="20%" prop="result">
+          <el-table-column :label="$t('commons.operating')" prop="result" min-width="20%">
             <template v-slot:default="scope">
+              <el-button
+                type="success"
+                size="mini"
+                v-if="scope.row.isSet"
+                v-xpack
+                @click="handleTemplate(scope.$index,scope.row)"
+              >{{ $t('organization.message.template') }}
+              </el-button>
               <el-button
                 type="primary"
                 size="mini"
@@ -102,13 +110,21 @@
         </el-table>
       </el-col>
     </el-row>
+    <notice-template v-xpack ref="noticeTemplate"/>
   </div>
 </template>
 
 <script>
+import {hasLicense} from "@/common/js/utils";
+
+const requireComponent = require.context('@/business/components/xpack/', true, /\.vue$/);
+const noticeTemplate = requireComponent.keys().length > 0 ? requireComponent("./notice/NoticeTemplate.vue") : {};
 
 export default {
   name: "ScheduleTaskNotification",
+  components: {
+    "NoticeTemplate": noticeTemplate.default
+  },
   props: {
     testId: String,
     scheduleReceiverOptions: Array,
@@ -226,6 +242,11 @@ export default {
     headClass() {
       return "text-align:center;background:'#ededed'"
     },
+    handleTemplate(index, row) {
+      if (hasLicense()) {
+        this.$refs.noticeTemplate.open(row);
+      }
+    }
   }
 }
 </script>

frontend/src/business/components/settings/organization/components/TestPlanTaskNotification.vue

@@ -17,7 +17,7 @@
           :cell-style="rowClass"
           :header-cell-style="headClass"
         >
-          <el-table-column :label="$t('schedule.event')" min-width="20%" prop="events">
+          <el-table-column :label="$t('schedule.event')" min-width="15%" prop="events">
             <template slot-scope="scope">
               <el-select v-model="scope.row.event" :placeholder="$t('organization.message.select_events')"
                          @change="handleTestPlanReceivers(scope.row)" size="mini"
@@ -64,8 +64,16 @@
                         :disabled="!scope.row.isSet||!scope.row.isReadOnly"></el-input>
             </template>
           </el-table-column>
-          <el-table-column :label="$t('commons.operating')" min-width="20%" prop="result">
+          <el-table-column :label="$t('commons.operating')" min-width="25%" prop="result">
             <template v-slot:default="scope">
+              <el-button
+                type="success"
+                size="mini"
+                v-if="scope.row.isSet"
+                v-xpack
+                @click="handleTemplate(scope.$index,scope.row)"
+              >{{ $t('organization.message.template') }}
+              </el-button>
               <el-button
                 type="primary"
                 size="mini"
@@ -98,15 +106,23 @@
         </el-table>
       </el-col>
     </el-row>
+    <notice-template v-xpack ref="noticeTemplate"/>
   </div>
 
 </template>
 
 <script>
+import {hasLicense} from "@/common/js/utils";
+
 const TASK_TYPE = 'TEST_PLAN_TASK';
+const requireComponent = require.context('@/business/components/xpack/', true, /\.vue$/);
+const noticeTemplate = requireComponent.keys().length > 0 ? requireComponent("./notice/NoticeTemplate.vue") : {};
 
 export default {
   name: "TestPlanTaskNotification",
+  components: {
+    "NoticeTemplate": noticeTemplate.default
+  },
   props: {
     testPlanReceiverOptions: {
       type: Array
@@ -231,6 +247,11 @@ export default {
       }
       row.testPlanReceiverOptions = testPlanReceivers;
     },
+    handleTemplate(index, row) {
+      if (hasLicense()) {
+        this.$refs.noticeTemplate.open(row);
+      }
+    }
   },
   watch: {
     testPlanReceiverOptions(value) {

frontend/src/business/components/settings/organization/components/TestReviewNotification.vue

@@ -17,7 +17,7 @@
           :cell-style="rowClass"
           :header-cell-style="headClass"
         >
-          <el-table-column :label="$t('schedule.event')" min-width="20%" prop="events">
+          <el-table-column :label="$t('schedule.event')" min-width="15%" prop="events">
             <template slot-scope="scope">
               <el-select v-model="scope.row.event" :placeholder="$t('organization.message.select_events')" size="mini"
                          @change="handleReviewReceivers(scope.row)"
@@ -65,8 +65,16 @@
                         :disabled="!scope.row.isSet||!scope.row.isReadOnly"></el-input>
             </template>
           </el-table-column>
-          <el-table-column :label="$t('commons.operating')" min-width="20%" prop="result">
+          <el-table-column :label="$t('commons.operating')" min-width="25%" prop="result">
             <template v-slot:default="scope">
+              <el-button
+                type="success"
+                size="mini"
+                v-if="scope.row.isSet"
+                v-xpack
+                @click="handleTemplate(scope.$index,scope.row)"
+              >{{ $t('organization.message.template') }}
+              </el-button>
               <el-button
                 type="primary"
                 size="mini"
@@ -99,14 +107,22 @@
         </el-table>
       </el-col>
     </el-row>
+    <notice-template v-xpack ref="noticeTemplate"/>
   </div>
 </template>
 
 <script>
+import {hasLicense} from "@/common/js/utils";
+
 const TASK_TYPE = 'REVIEW_TASK';
+const requireComponent = require.context('@/business/components/xpack/', true, /\.vue$/);
+const noticeTemplate = requireComponent.keys().length > 0 ? requireComponent("./notice/NoticeTemplate.vue") : {};
 
 export default {
   name: "TestReviewNotification",
+  components: {
+    "NoticeTemplate": noticeTemplate.default
+  },
   props: {
     reviewReceiverOptions: {
       type: Array
@@ -236,6 +252,11 @@ export default {
           break;
       }
       row.reviewReceiverOptions = reviewReceiverOptions;
+    },
+    handleTemplate(index, row) {
+      if (hasLicense()) {
+        this.$refs.noticeTemplate.open(row);
+      }
     }
   },
   watch: {

frontend/src/business/components/xpack

@@ -1 +1 @@
-Subproject commit a22a3005d9bd254793fcf634d72539cbdf31be3a
+Subproject commit 29a8fc09602fde5708af06582ac972d98eb69836

frontend/src/i18n/en-US.js

@@ -244,7 +244,8 @@ export default {
         '3. When selecting the receiver, it must be the person included in the group you created. The mobile phone number of the receiver is required and it is the mobile phone number used by the nailing enterprise,',
       message: 'Event, receiver and receiving method are required\n' +
         '\n',
-      message_webhook: 'Webhook is required when the receiving mode is nail or enterprise robot'
+      message_webhook: 'Webhook is required when the receiving mode is nail or enterprise robot',
+      template: "Template"
     },
     integration: {
       select_defect_platform: 'Please select the defect management platform to be integrated:',

frontend/src/i18n/zh-CN.js

@@ -242,9 +242,8 @@ export default {
         '       2.机器人选择为群机器人，安全验证选择“自定义关键词” ："任务通知";\n' +
         '       3.选择接收人时必须是你所建的群里包含的人,接收人手机号为必填项且为钉钉企业所使用的手机号,',
       message: '事件，接收人，接收方式为必填项',
-      message_webhook: '接收方式为钉钉和企业机器人时，webhook为必填项'
-
-
+      message_webhook: '接收方式为钉钉和企业机器人时，webhook为必填项',
+      template: "模版"
     },
     integration: {
       select_defect_platform: '请选择要集成的缺陷管理平台：',

frontend/src/i18n/zh-TW.js

@@ -242,9 +242,8 @@ export default {
         '         2.接收方式除郵件外webhook為必填；\n' +
         '         3.機器人選擇為群機器人，安全驗證選擇“自定義關鍵詞” ："任務通知"',
       message: '事件，接收人，接收方式為必填項',
-      message_webhook: '接收方式為釘釘和企業機器人時，webhook為必填項'
-
-
+      message_webhook: '接收方式為釘釘和企業機器人時，webhook為必填項',
+      template: "模版"
     },
     integration: {
       select_defect_platform: '請選擇要集成的缺陷管理平臺：',