fix and add some message feature

2026-05-17 18:25:56 +08:00 · 2021-09-16 16:54:49 +08:00
parent b8a52107a5
commit dbcbc01251
24 changed files with 250 additions and 89 deletions
--- a/app/models/message_template/followed_tip.rb
+++ b/app/models/message_template/followed_tip.rb
@@ -16,7 +16,7 @@ class MessageTemplate::FollowedTip < MessageTemplate

  # MessageTemplate::FollowedTip.get_message_content(User.where(login: 'yystopf'), User.last)
  def self.get_message_content(receivers, followeder)
-    return receivers_string(receivers), sys_notice.gsub('{nickname}', followeder&.nickname), notification_url.gsub('{login}', followeder.login)
+    return receivers_string(receivers), sys_notice.gsub('{nickname}', followeder&.real_name), notification_url.gsub('{login}', followeder.login)
  rescue 
    return '', '', ''
  end
--- a/app/models/message_template/issue_assigned.rb
+++ b/app/models/message_template/issue_assigned.rb
@@ -18,7 +18,7 @@ class MessageTemplate::IssueAssigned < MessageTemplate
  def self.get_message_content(receivers, operator, issue)
    project = issue&.project
    owner = project&.owner 
-    content = sys_notice.gsub('{nickname1}', operator&.nickname).gsub('{nickname2}', owner&.nickname).gsub('{repository}', project&.name).gsub('{title}', issue&.subject)
+    content = sys_notice.gsub('{nickname1}', operator&.real_name).gsub('{nickname2}', owner&.real_name).gsub('{repository}', project&.name).gsub('{title}', issue&.subject)
    url = notification_url.gsub('{owner}', owner&.login).gsub('{identifier}', project&.identifier).gsub('{id}', issue&.id.to_s)
    return receivers_string(receivers), content, url
  rescue => e
--- a/app/models/message_template/issue_atme.rb
+++ b/app/models/message_template/issue_atme.rb
@@ -18,7 +18,7 @@ class MessageTemplate::IssueAtme < MessageTemplate
  def self.get_message_content(receivers, operator, issue)
    project = issue&.project 
    owner = project&.owner 
-    content = sys_notice.gsub('{nickname}', operator&.nickname).gsub('{title}', issue&.subject)
+    content = sys_notice.gsub('{nickname}', operator&.real_name).gsub('{title}', issue&.subject)
    url = notification_url.gsub('{owner}', owner&.login).gsub('{identifier}', project&.identifier).gsub('{id}', issue&.id.to_s)
    return receivers_string(receivers), content, url
  rescue => e
--- a/app/models/message_template/issue_changed.rb
+++ b/app/models/message_template/issue_changed.rb
@@ -19,16 +19,21 @@ class MessageTemplate::IssueChanged < MessageTemplate
    return '', '', '' if change_params.blank?
    project = issue&.project 
    owner = project&.owner 
-    content = MessageTemplate::IssueChanged.sys_notice.gsub('{nickname1}', operator&.nickname).gsub('{nickname2}', owner&.nickname).gsub('{repository}', project&.name).gsub('{title}', issue&.subject)
+    content = MessageTemplate::IssueChanged.sys_notice.gsub('{nickname1}', operator&.real_name).gsub('{nickname2}', owner&.real_name).gsub('{repository}', project&.name).gsub('{title}', issue&.subject)
    url = notification_url.gsub('{owner}', owner&.login).gsub('{identifier}', project&.identifier).gsub('{id}', issue&.id.to_s)
+    change_count = change_params.keys.size
    # 易修负责人修改
    if change_params[:assigned_to_id].present?
      assigner1 = User.find_by_id(change_params[:assigned_to_id][0])
      assigner2 = User.find_by_id(change_params[:assigned_to_id][1])
-      content.sub!('{ifassigner}', '')
+      if change_count > 1
+        content.sub!('{ifassigner}', '<br/>') 
+      else
+        content.sub!('{ifassigner}', '') 
+      end
      content.sub!('{endassigner}', '')
-      content.gsub!('{assigner1}', assigner1.present? ? assigner1&.nickname || assigner1.login : '未指派成员')
-      content.gsub!('{assigner2}', assigner2.present? ? assigner2&.nickname || assigner2.login : '未指派成员')
+      content.gsub!('{assigner1}', assigner1.present? ? assigner1&.real_name : '未指派成员')
+      content.gsub!('{assigner2}', assigner2.present? ? assigner2&.real_name : '未指派成员')
    else
      content.gsub!(/({ifassigner})(.*)({endassigner})/, '') 
    end
@@ -36,7 +41,11 @@ class MessageTemplate::IssueChanged < MessageTemplate
    if change_params[:status_id].present?
      status1 = IssueStatus.find_by_id(change_params[:status_id][0])
      status2 = IssueStatus.find_by_id(change_params[:status_id][1])
-      content.sub!('{ifstatus}', '')
+      if change_count > 1
+        content.sub!('{ifstatus}', '<br/>') 
+      else
+        content.sub!('{ifstatus}', '') 
+      end
      content.sub!('{endstatus}', '')
      content.gsub!('{status1}', status1&.name)
      content.gsub!('{status2}', status2&.name)
@@ -47,7 +56,11 @@ class MessageTemplate::IssueChanged < MessageTemplate
    if change_params[:tracker_id].present?
      tracker1 = Tracker.find_by_id(change_params[:tracker_id][0])
      tracker2 = Tracker.find_by_id(change_params[:tracker_id][1])
-      content.sub!('{iftracker}', '')
+      if change_count > 1
+        content.sub!('{iftracker}', '<br/>')
+      else
+        content.sub!('{iftracker}', '')
+      end
      content.sub!('{endtracker}', '')
      content.gsub!('{tracker1}', tracker1&.name)
      content.gsub!('{tracker2}', tracker2&.name)
@@ -58,7 +71,11 @@ class MessageTemplate::IssueChanged < MessageTemplate
    if change_params[:fixed_version_id].present?
      fix_version1 = Version.find_by_id(change_params[:fixed_version_id][0])
      fix_version2 = Version.find_by_id(change_params[:fixed_version_id][1])
-      content.sub!('{ifmilestone}', '')
+      if change_count > 1
+        content.sub!('{ifmilestone}', '<br/>')
+      else
+        content.sub!('{ifmilestone}', '')
+      end
      content.sub!('{endmilestone}', '')
      content.gsub!('{milestone1}', fix_version1.present? ? fix_version1&.name : '未选择里程碑')
      content.gsub!('{milestone2}', fix_version2.present? ? fix_version2&.name : '未选择里程碑')
@@ -71,8 +88,11 @@ class MessageTemplate::IssueChanged < MessageTemplate
      issue_tags2 = IssueTag.where(id: change_params[:issue_tags_value][1]).distinct
      tag1 = issue_tags1.pluck(:name).join(",").blank? ? '未选择标签' : issue_tags1.pluck(:name).join(",")
      tag2 = issue_tags2.pluck(:name).join(",").blank? ? '未选择标签' : issue_tags2.pluck(:name).join(",")
-      content.sub!('{iftag}', '')
-      content.sub!('{endtag}', '')
+      if change_count > 1
+        content.sub!('{iftag}', '<br/>')
+      else
+        content.sub!('{endtag}', '')
+      end
      content.gsub!('{tag1}', tag1)
      content.gsub!('{tag2}', tag2)
    else
@@ -82,8 +102,11 @@ class MessageTemplate::IssueChanged < MessageTemplate
    if change_params[:priority_id].present?
      priority1 = IssuePriority.find_by_id(change_params[:priority_id][0])
      priority2 = IssuePriority.find_by_id(change_params[:priority_id][1])
-
-      content.sub!('{ifpriority}', '')
+      if change_count > 1
+        content.sub!('{ifpriority}', '<br/>')
+      else
+        content.sub!('{ifpriority}', '')
+      end
      content.sub!('{endpriority}', '')
      content.gsub!('{priority1}', priority1&.name)
      content.gsub!('{priority2}', priority2&.name)
@@ -94,8 +117,11 @@ class MessageTemplate::IssueChanged < MessageTemplate
    if change_params[:done_ratio].present?
      doneratio1 = change_params[:done_ratio][0]
      doneratio2 = change_params[:done_ratio][1]
-
-      content.sub!('{ifdoneratio}', '')
+      if change_count > 1
+        content.sub!('{ifdoneratio}', '<br/>')
+      else
+        content.sub!('{ifdoneratio}', '')
+      end
      content.sub!('{enddoneratio}', '')
      content.gsub!('{doneratio1}', "#{doneratio1}%")
      content.gsub!('{doneratio2}', "#{doneratio2}%")
@@ -106,8 +132,11 @@ class MessageTemplate::IssueChanged < MessageTemplate
    if change_params[:branch_name].present?
      branch1 = change_params[:branch_name][0].blank? ? '分支未指定' : change_params[:branch_name][0]
      branch2 = change_params[:branch_name][1].blank? ? '分支未指定' : change_params[:branch_name][1]
-
-      content.sub!('{ifbranch}', '')
+      if change_count > 1
+        content.sub!('{ifbranch}', '<br/>')
+      else
+        content.sub!('{ifbranch}', '')
+      end
      content.sub!('{endbranch}', '')
      content.gsub!('{branch1}', branch1)
      content.gsub!('{branch2}', branch2)
@@ -118,8 +147,11 @@ class MessageTemplate::IssueChanged < MessageTemplate
    if change_params[:start_date].present?
      startdate1 = change_params[:start_date][0].blank? ? "未选择开始日期" : change_params[:start_date][0]
      startdate2 = change_params[:start_date][1].blank? ? "未选择开始日期" : change_params[:start_date][1]
-
-      content.sub!('{ifstartdate}', '')
+      if change_count > 1
+        content.sub!('{ifstartdate}', '<br/>')
+      else
+        content.sub!('{ifstartdate}', '')
+      end
      content.sub!('{endstartdate}', '')
      content.gsub!('{startdate1}', startdate1 )
      content.gsub!('{startdate2}', startdate2)
@@ -130,7 +162,11 @@ class MessageTemplate::IssueChanged < MessageTemplate
    if change_params[:due_date].present?
      duedate1 = change_params[:due_date][0].blank? ? '未选择结束日期' : change_params[:due_date][0]
      duedate2 = change_params[:due_date][1].blank? ? '未选择结束日期' : change_params[:due_date][1]
-      content.sub!('{ifduedate}', '')
+      if change_count > 1
+        content.sub!('{ifduedate}', '<br/>')
+      else
+        content.sub!('{ifduedate}', '')
+      end
      content.sub!('{endduedate}', '')
      content.gsub!('{duedate1}', duedate1)
      content.gsub!('{duedate2}', duedate2)
--- a/app/models/message_template/issue_deleted.rb
+++ b/app/models/message_template/issue_deleted.rb
@@ -16,7 +16,7 @@ class MessageTemplate::IssueDeleted < MessageTemplate

  # MessageTemplate::IssueDeleted.get_message_content(User.where(login: 'yystopf'), User.last, "hahah")
  def self.get_message_content(receivers, operator, issue_title)
-    content = sys_notice.gsub('{nickname}', operator&.nickname).gsub('{title}', issue_title)
+    content = sys_notice.gsub('{nickname}', operator&.real_name).gsub('{title}', issue_title)
    return receivers_string(receivers), content, notification_url
  rescue => e
    Rails.logger.info("MessageTemplate::IssueAtme.get_message_content [ERROR] #{e}")
--- a/app/models/message_template/organization_joined.rb
+++ b/app/models/message_template/organization_joined.rb
@@ -16,7 +16,7 @@ class MessageTemplate::OrganizationJoined < MessageTemplate

  # MessageTemplate::OrganizationJoined.get_message_content(User.where(login: 'yystopf'), Organization.last)
  def self.get_message_content(receivers, organization)
-    content = sys_notice.gsub('{organization}', organization&.name)
+    content = sys_notice.gsub('{organization}', organization&.real_name)
    url = notification_url.gsub('{login}', organization&.name)
    return receivers_string(receivers), content, url
  rescue => e
--- a/app/models/message_template/organization_left.rb
+++ b/app/models/message_template/organization_left.rb
@@ -16,7 +16,7 @@ class MessageTemplate::OrganizationLeft < MessageTemplate

  # MessageTemplate::OrganizationLeft.get_message_content(User.where(login: 'yystopf'), Organization.last)
  def self.get_message_content(receivers, organization)
-    content = sys_notice.gsub('{organization}', organization&.name)
+    content = sys_notice.gsub('{organization}', organization&.real_name)
    url = notification_url.gsub('{login}', organization&.name)
    return receivers_string(receivers), content, url
  rescue => e
--- a/app/models/message_template/organization_role.rb
+++ b/app/models/message_template/organization_role.rb
@@ -16,7 +16,7 @@ class MessageTemplate::OrganizationRole < MessageTemplate

  # MessageTemplate::OrganizationRole.get_message_content(User.where(login: 'yystopf'), Organization.last, '管理员')
  def self.get_message_content(receivers, organization, role)
-    content = sys_notice.gsub('{organization}', organization&.name).gsub('{role}', role)
+    content = sys_notice.gsub('{organization}', organization&.real_name).gsub('{role}', role)
    url = notification_url.gsub('{login}', organization&.login)
    return receivers_string(receivers), content, url
  rescue => e
--- a/app/models/message_template/project_issue.rb
+++ b/app/models/message_template/project_issue.rb
@@ -14,8 +14,14 @@
 # TODO 我管理/关注的仓库有新的易修
 class MessageTemplate::ProjectIssue < MessageTemplate

-  # MessageTemplate::ProjectIssue.get_message_content(User.where(login: 'yystopf'))
-  def self.get_message_content(receivers)
+  # MessageTemplate::ProjectIssue.get_message_content(User.where(login: 'yystopf'), User.where(login: 'forgetest1'), User.last, Issue.last)
+  def self.get_message_content(managers, followers, operator, issue)
+    project = issue&.project 
+    owner = project&.owner 
+    receivers = managers + followers
+    content = sys_notice.gsub('{nickname1}', operator&.real_name).gsub('{nickname2}', owner&.real_name).gsub('{repository}', project&.name).gsub('{title}', issue&.subject)
+    url = notification_url.gsub('{owner}', owner&.login).gsub('{identifier}', project&.identifier).gsub('{id}', issue&.id.to_s)
+    
    return receivers_string(receivers), content, url
  rescue => e
    Rails.logger.info("MessageTemplate::ProjectIssue.get_message_content [ERROR] #{e}")
--- a/app/models/message_template/project_member_joined.rb
+++ b/app/models/message_template/project_member_joined.rb
@@ -11,11 +11,13 @@
 #  notification_url :string(255)
 #

-# TODO 我管理的仓库有成员加入
+# 我管理的仓库有成员加入
 class MessageTemplate::ProjectMemberJoined < MessageTemplate

  # MessageTemplate::ProjectMemberJoined.get_message_content(User.where(login: 'yystopf'))
-  def self.get_message_content(receivers)
+  def self.get_message_content(receivers, user, project)
+    content = sys_notice.gsub('{nickname1}', user&.real_name).gsub('{nickname2}', project&.owner&.real_name).gsub('{repository}', project&.name)
+    url = notification_url.gsub('{owner}', project&.owner&.login).gsub('{identifier}', project&.identifier)
    return receivers_string(receivers), content, url
  rescue => e
    Rails.logger.info("MessageTemplate::ProjectMemberJoined.get_message_content [ERROR] #{e}")
--- a/app/models/message_template/project_member_left.rb
+++ b/app/models/message_template/project_member_left.rb
@@ -11,11 +11,13 @@
 #  notification_url :string(255)
 #

-# TODO 我管理的仓库有成员移出
+# 我管理的仓库有成员移出
 class MessageTemplate::ProjectMemberLeft < MessageTemplate

-  # MessageTemplate::ProjectMemberLeft.get_message_content(User.where(login: 'yystopf'))
-  def self.get_message_content(receivers)
+  # MessageTemplate::ProjectMemberLeft.get_message_content(User.where(login: 'yystopf'), User.last, Project.last)
+  def self.get_message_content(receivers, user, project)
+    content = sys_notice.gsub('{nickname1}', user&.real_name).gsub('{nickname2}', project&.owner&.real_name).gsub('{repository}', project&.name)
+    url = notification_url.gsub('{owner}', project&.owner&.login).gsub('{identifier}', project&.identifier)
    return receivers_string(receivers), content, url
  rescue => e
    Rails.logger.info("MessageTemplate::ProjectMemberLeft.get_message_content [ERROR] #{e}")
--- a/app/models/message_template/project_pull_request.rb
+++ b/app/models/message_template/project_pull_request.rb
@@ -14,8 +14,14 @@
 # TODO 我管理/关注的仓库有新的合并请求
 class MessageTemplate::ProjectPullRequest < MessageTemplate

-  # MessageTemplate::ProjectPullRequest.get_message_content(User.where(login: 'yystopf'))
-  def self.get_message_content(receivers)
+  # MessageTemplate::ProjectPullRequest.get_message_content(User.where(login: 'yystopf'), User.where(login: 'testforge2'), User.last, PullRequest.last)
+  def self.get_message_content(managers, followers, operator, pull_request)
+    project = pull_request&.project 
+    owner = project&.owner 
+    receivers = managers + followers
+    content = sys_notice.gsub('{nickname1}', operator&.real_name).gsub('{nickname2}', owner&.real_name).gsub('{repository}', project&.name).gsub('{title}', pull_request&.title)
+    url = notification_url.gsub('{owner}', owner&.login).gsub('{identifier}', project&.identifier).gsub('{id}', pull_request&.id.to_s)
+
    return receivers_string(receivers), content, url
  rescue => e
    Rails.logger.info("MessageTemplate::ProjectPullRequest.get_message_content [ERROR] #{e}")
--- a/app/models/message_template/project_setting_changed.rb
+++ b/app/models/message_template/project_setting_changed.rb
@@ -18,11 +18,16 @@ class MessageTemplate::ProjectSettingChanged < MessageTemplate
  def self.get_message_content(receivers, operator, project, change_params)
    return '', '', '' if change_params.blank?
    owner = project&.owner
-    content = sys_notice.gsub('{nickname1}', operator&.nickname).gsub('{nickname2}', owner&.nickname).gsub('{repository}', project&.name)
+    content = sys_notice.gsub('{nickname1}', operator&.real_name).gsub('{nickname2}', owner&.real_name).gsub('{repository}', project&.name)
    url = notification_url.gsub('{owner}', owner&.login).gsub('{identifier}', project&.identifier)
+    change_count = change_params.keys.size
    # 项目名称更改
    if change_params[:name].present?
-      content.sub!('{ifname}', '')
+      if change_count > 1
+        content.sub!('{ifname}', '<br/>') 
+      else
+        content.sub!('{ifname}', '') 
+      end
      content.sub!('{endname}', '')
      content.gsub!('{name}', change_params[:name][1])
    else
@@ -30,7 +35,11 @@ class MessageTemplate::ProjectSettingChanged < MessageTemplate
    end
    # 项目简介更改
    if change_params[:description].present?
-      content.sub!('{ifdescription}', '')
+      if change_count > 1
+        content.sub!('{ifdescription}', '<br/>') 
+      else
+        content.sub!('{ifdescription}', '') 
+      end
      content.sub!('{enddescription}', '')
      content.gsub!('{description}', change_params[:description][1])
    else 
@@ -39,7 +48,11 @@ class MessageTemplate::ProjectSettingChanged < MessageTemplate
    # 项目类别更改
    if change_params[:project_category_id].present?
      category = ProjectCategory.find_by_id(change_params[:project_category_id][1])
-      content.sub!('{ifcategory}', '')
+      if change_count > 1
+        content.sub!('{ifcategory}', '<br/>') 
+      else
+        content.sub!('{ifcategory}', '') 
+      end
      content.sub!('{endcategory}', '')
      content.gsub!('{category}', category&.name)
    else
@@ -48,7 +61,11 @@ class MessageTemplate::ProjectSettingChanged < MessageTemplate
    # 项目语言更改
    if change_params[:project_language_id].present?
      language = ProjectLanguage.find_by_id(change_params[:project_language_id][1])
-      content.sub!('{iflanguage}', '')
+      if change_count > 1
+        content.sub!('{iflanguage}', '<br/>') 
+      else
+        content.sub!('{iflanguage}', '') 
+      end
      content.sub!('{endlanguage}', '')
      content.gsub!('{language}', language&.name)
    else
@@ -57,7 +74,11 @@ class MessageTemplate::ProjectSettingChanged < MessageTemplate
    # 项目公私有更改
    if change_params[:is_public].present?
      permission = change_params[:is_public][1] ? '公有' : '私有'
-      content.sub!('{ifpermission}', '')
+      if change_count > 1
+        content.sub!('{ifpermission}', '<br/>') 
+      else
+        content.sub!('{ifpermission}', '') 
+      end
      content.sub!('{endpermission}', '')
      content.gsub!('{permission}', permission)
    else
@@ -73,16 +94,20 @@ class MessageTemplate::ProjectSettingChanged < MessageTemplate
      navbar.gsub!('devops', '工作流')
      navbar.gsub!('versions', '里程碑')
      navbar.gsub!('resources', '资源库')
-      content.sub!('{ifnavbar}', '')
+      if change_count > 1
+        content.sub!('{ifnavbar}', '<br/>') 
+      else
+        content.sub!('{ifnavbar}', '') 
+      end
      content.sub!('{endnavbar}', '')
      content.gsub!('{navbar}', navbar)
    else
      content.gsub!(/({ifnavbar})(.*)({endnavbar})/, '') 
    end
    
-    return receivers_string(receivers.where.not(id: operator.id)), content, url
-  # rescue => e
-  #   Rails.logger.info("MessageTemplate::ProjectSettingChanged.get_message_content [ERROR] #{e}")
-  #   return '', '', ''
+    return receivers_string(receivers), content, url
+  rescue => e
+    Rails.logger.info("MessageTemplate::ProjectSettingChanged.get_message_content [ERROR] #{e}")
+    return '', '', ''
  end
 end
--- a/app/models/message_template/pull_request_assigned.rb
+++ b/app/models/message_template/pull_request_assigned.rb
@@ -18,7 +18,7 @@ class MessageTemplate::PullRequestAssigned < MessageTemplate
  def self.get_message_content(receivers, operator, pull_request)
    project = pull_request&.project 
    owner = project&.owner 
-    content = sys_notice.gsub('{nickname1}', operator&.nickname).gsub('{nickname2}', owner&.nickname).gsub('{repository}', project&.name).gsub('{title}', pull_request&.title)
+    content = sys_notice.gsub('{nickname1}', operator&.real_name).gsub('{nickname2}', owner&.real_name).gsub('{repository}', project&.name).gsub('{title}', pull_request&.title)
    url = notification_url.gsub('{owner}', owner&.login).gsub('{identifier}', project&.identifier).gsub('{id}', pull_request&.id.to_s)
    return receivers_string(receivers), content, url
  rescue => e
--- a/app/models/message_template/pull_request_atme.rb
+++ b/app/models/message_template/pull_request_atme.rb
@@ -17,7 +17,7 @@ class MessageTemplate::PullRequestAtme < MessageTemplate
  def self.get_message_content(receivers, operator, pull_request)
    project = pull_request&.project 
    owner = project&.owner 
-    content = sys_notice.gsub('{nickname}', operator&.nickname).gsub('{title}', pull_request&.title)
+    content = sys_notice.gsub('{nickname}', operator&.real_name).gsub('{title}', pull_request&.title)
    url = notification_url.gsub('{owner}', owner&.login).gsub('{identifier}', project&.identifier).gsub('{id}', pull_request&.id.to_s)
    return receivers_string(receivers), content, url
  rescue => e
--- a/app/models/message_template/pull_request_changed.rb
+++ b/app/models/message_template/pull_request_changed.rb
@@ -20,16 +20,21 @@ class MessageTemplate::PullRequestChanged < MessageTemplate
    project = pull_request&.project 
    owner = project&.owner 
    issue = pull_request&.issue
-    content = sys_notice.gsub('{nickname1}', operator&.nickname).gsub('{nickname2}', owner&.nickname).gsub('{repository}', project&.name).gsub("{title}", pull_request&.title)
+    content = sys_notice.gsub('{nickname1}', operator&.real_name).gsub('{nickname2}', owner&.real_name).gsub('{repository}', project&.name).gsub("{title}", pull_request&.title)
    url = notification_url.gsub('{owner}', owner&.login).gsub('{identifier}', project&.identifier).gsub('{id}', pull_request&.id.to_s)
+    change_count = change_params.keys.size
    # 合并请求审查成员修改
    if change_params[:assigned_to_id].present?
      assigner1 = User.find_by_id(change_params[:assigned_to_id][0])
      assigner2 = User.find_by_id(change_params[:assigned_to_id][1])      
-      content.sub!('{ifassigner}', '')
+      if change_count > 1
+        content.sub!('{ifassigner}', '<br/>') 
+      else
+        content.sub!('{ifassigner}', '') 
+      end
      content.sub!('{endassigner}', '')
-      content.gsub!('{assigner1}', assigner1.present? ? assigner1&.nickname || assigner1.login : '未指派成员')
-      content.gsub!('{assigner2}', assigner2.present? ? assigner2&.nickname || assigner2.login : '未指派成员')
+      content.gsub!('{assigner1}', assigner1.present? ? assigner1&.real_name : '未指派成员')
+      content.gsub!('{assigner2}', assigner2.present? ? assigner2&.real_name : '未指派成员')
    else
      content.gsub!(/({ifassigner})(.*)({endassigner})/, '') 
    end
@@ -37,7 +42,11 @@ class MessageTemplate::PullRequestChanged < MessageTemplate
    if change_params[:fixed_version_id].present?
      fix_version1 = Version.find_by_id(change_params[:fixed_version_id][0])
      fix_version2 = Version.find_by_id(change_params[:fixed_version_id][1])
-      content.sub!('{ifmilestone}', '')
+      if change_count > 1
+        content.sub!('{ifmilestone}', '<br/>') 
+      else
+        content.sub!('{ifmilestone}', '') 
+      end
      content.sub!('{endmilestone}', '')
      content.gsub!('{milestone1}', fix_version1.present? ? fix_version1&.name : '未选择里程碑')
      content.gsub!('{milestone2}', fix_version2.present? ? fix_version2&.name : '未选择里程碑')
@@ -50,7 +59,11 @@ class MessageTemplate::PullRequestChanged < MessageTemplate
      issue_tags2 = IssueTag.where(id: change_params[:issue_tags_value][1]).distinct
      tag1 = issue_tags1.pluck(:name).join(",").blank? ? '未选择标签' : issue_tags1.pluck(:name).join(",")
      tag2 = issue_tags2.pluck(:name).join(",").blank? ? '未选择标签' : issue_tags2.pluck(:name).join(",")
-      content.sub!('{iftag}', '')
+      if change_count > 1
+        content.sub!('{iftag}', '<br/>') 
+      else
+        content.sub!('{iftag}', '') 
+      end
      content.sub!('{endtag}', '')
      content.gsub!('{tag1}', tag1)
      content.gsub!('{tag2}', tag2)
@@ -61,6 +74,11 @@ class MessageTemplate::PullRequestChanged < MessageTemplate
    if change_params[:priority_id].present?
      priority1 = IssuePriority.find_by_id(change_params[:priority_id][0])
      priority2 = IssuePriority.find_by_id(change_params[:priority_id][1])
+      if change_count > 1
+        content.sub!('{ifpriority}', '<br/>') 
+      else
+        content.sub!('{ifpriority}', '') 
+      end
      content.sub!('{ifpriority}', '')
      content.sub!('{endpriority}', '')
      content.gsub!('{priority1}', priority1&.name)