Merge pull request 'fix mege develop' (#248 ) from develop into master

发布v3.1.1版本
* FIX 修复pulls、issues 搜索数量统计问题 * FIX 解决在线创建文件错误提示信息不准确的问题 * FIX table name bug * FIX 解决applied_projects相关表操作的问题 * FIX 解决排序参数的判断预防SQL注入 * FIX 项目导航栏数量改为开启中的数量 * FIX 解决项目邀请码的索引查询问题 * FIX FIX get readme file bug * FIX sql attack * FIX projects load by invite code slowly
2021-11-14 20:39:31 +08:00 · 2021-06-18 17:09:57 +08:00 · 2021-06-09 09:52:57 +08:00 · 2021-05-24 10:18:03 +08:00 · 2021-05-24 10:10:24 +08:00 · 2021-05-08 17:46:22 +08:00
200 changed files with 2118 additions and 3985 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -23,7 +23,7 @@
  * Fix 版本库中附件下载400(#51625)
  * Fix loading页面优化(#51588)
  * Fix 提交详情页面优化(#51577)
-  * Fix 修复疑修复制功能(#51569)
+  * Fix 修复易修复制功能(#51569)
  * Fix 修复新建发行版用户信息显示错误的问题(#51665)
  * Fix 修复查看文件详细信息报错的问题(#51561)
  * Fix 修复提交记录中时间显示格式问题(#51526)
@ -62,7 +62,7 @@
 ## [v3.0.3](https://forgeplus.trustie.net/projects/jasder/forgeplus/releases) - 2021-05-08

 * BUGFIXES
-  * Fix 解决疑修标题过长导致的排版问题(45469)
+  * Fix 解决易修标题过长导致的排版问题(45469)
  * Fix 解决合并请求详情页面排版错误的问题(45457)
  * FIX 解决转移仓库界面专有名词描述错误的问题(45455)
  * Fix 解决markdown格式文件自动生成数字排序的问题(45454)
--- a/app/controllers/accounts_controller.rb
+++ b/app/controllers/accounts_controller.rb
@ -9,7 +9,6 @@ class AccountsController < ApplicationController

  # 其他平台同步注册的用户
  def remote_register
-    Register::RemoteForm.new(remote_register_params).validate!
    username = params[:username]&.gsub(/\s+/, "")
    tip_exception("无法使用以下关键词：#{username}，请重新命名") if ReversedKeyword.check_exists?(username)
    email = params[:email]&.gsub(/\s+/, "")
@ -192,9 +191,7 @@ class AccountsController < ApplicationController

    sync_params = {
      password: params[:password].to_s,
-      email: @user.mail,
-      login_name: @user.login,
-      source_id: 0
+      email: @user.mail
    }

    interactor = Gitea::User::UpdateInteractor.call(@user.login, sync_params)
@ -370,9 +367,5 @@ class AccountsController < ApplicationController
  def register_params
    params.permit(:login, :namespace, :password, :code)
  end
-
-  def remote_register_params
-    params.permit(:username, :email, :password, :platform)
-  end
  
 end
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@ -709,20 +709,14 @@ class ApplicationController < ActionController::Base
 		Rails.application.config_for(:configuration)['platform_url'] || request.base_url
 	end

-	def image_type?(str)
-    default_type = %w(png jpg gif tif psd svg bmp webp jpeg ico psd)
-    default_type.include?(str&.downcase)
-  end
-
 	def convert_image!
 		@image = params[:image] 
 		@image = @image.nil? && params[:user].present? ? params[:user][:image] : @image
    return unless @image.present?
    max_size = EduSetting.get('upload_avatar_max_size') || 2 * 1024 * 1024 # 2M
    if @image.class == ActionDispatch::Http::UploadedFile
-      return render_error('请上传文件') if @image.size.zero?
-      return render_error('文件大小超过限制') if @image.size > max_size.to_i
-			return render_error('头像格式不正确！') unless image_type?(File.extname(@image.original_filename.to_s)[1..-1])
+      render_error('请上传文件') if @image.size.zero?
+      render_error('文件大小超过限制') if @image.size > max_size.to_i
    else
      image = @image.to_s.strip
      return render_error('请上传正确的图片') if image.blank?
--- a/app/controllers/attachments_controller.rb
+++ b/app/controllers/attachments_controller.rb
@ -217,7 +217,7 @@ class AttachmentsController < ApplicationController
        if @file.container && current_user.logged?
          if @file.container.is_a?(Issue)
            course = @file.container.project
-            candown = course.member?(current_user) || course.is_public
+            candown = course.member?(current_user)
          elsif @file.container.is_a?(Journal)
            course = @file.container.issue.project
            candown = course.member?(current_user)
--- a/app/controllers/ci/base_controller.rb
+++ b/app/controllers/ci/base_controller.rb
@ -8,7 +8,7 @@ class Ci::BaseController < ApplicationController
    namespace = params[:owner]
    id = params[:repo] || params[:id]

-    @ci_user, @repo = Ci::Repo.find_with_namespace(namespace, id, current_user.login)
+    @ci_user, @repo = Ci::Repo.find_with_namespace(namespace, id)
  end

  def load_all_repo
--- a/app/controllers/ci/secrets_controller.rb
+++ b/app/controllers/ci/secrets_controller.rb
@ -46,7 +46,7 @@ class Ci::SecretsController < Ci::BaseController
  end

  def ci_drone_url
-    user = User.find_by(login: params[:owner]) || User.find_by(login: current_user.login)
+    user = User.find_by(login: params[:owner])
    user&.ci_cloud_account.drone_url
  end

--- a/app/controllers/compare_controller.rb
+++ b/app/controllers/compare_controller.rb
@ -16,7 +16,6 @@ class CompareController < ApplicationController
    if @base.blank? || @head.blank?
      return -2, "请选择分支"
    else
-      return -2, "目标仓库未开启合并请求（PR）功能" unless @project.has_menu_permission("pulls")
      if @head.include?(":")
        fork_project = @project.forked_projects.joins(:owner).where(users: {login: @head.to_s.split("/")[0]}).take
        return -2, "请选择正确的仓库" unless fork_project.present?
@ -43,14 +42,12 @@ class CompareController < ApplicationController
  end

  def load_compare_params
-    # @base = Addressable::URI.unescape(params[:base])
-    @base = params[:base].include?(":") ? Addressable::URI.unescape(params[:base].split(":")[0]) + ':' + Base64.decode64(params[:base].split(":")[1]) : Base64.decode64(params[:base])
-    @head = params[:head].include?('.json') ? params[:head][0..-6] : params[:head]
-    # @head = Addressable::URI.unescape(@head)
-    @head = @head.include?(":") ? Addressable::URI.unescape(@head.split(":")[0]) + ':' + Base64.decode64(@head.split(":")[1]) : Base64.decode64(@head)
+    @base = Addressable::URI.unescape(params[:base])
+    @head = params[:head].include?('json') ? params[:head]&.split('.json')[0] : params[:head]
+
  end

  def gitea_compare(base, head)
-    Gitea::Repository::Commits::CompareService.call(@owner.login, @project.identifier, Addressable::URI.escape(base), Addressable::URI.escape(head), current_user.gitea_token)
+    Gitea::Repository::Commits::CompareService.call(@owner.login, @project.identifier, base, head, current_user.gitea_token)
  end
 end
--- a/app/controllers/concerns/ci/cloud_account_manageable.rb
+++ b/app/controllers/concerns/ci/cloud_account_manageable.rb
@ -179,7 +179,7 @@ module Ci::CloudAccountManageable

  def drone_oauth_user!(url, state)
    logger.info "[drone] drone_oauth_user url: #{url}"
-    conn = Faraday.new(url: "#{Gitea.gitea_config[:domain]}#{url}") do |req|
+    conn = Faraday.new(url: url) do |req|
      req.request :url_encoded
      req.adapter Faraday.default_adapter
      req.headers["cookie"] = "_session_=#{SecureRandom.hex(28)}; _oauth_state_=#{state}"
@ -188,8 +188,7 @@ module Ci::CloudAccountManageable
    response = conn.get
    logger.info "[drone] response headers: #{response.headers}"

-    true
-    # response.headers['location'].include?('error') ? false : true
+    response.headers['location'].include?('error') ? false : true
  end

  private
--- a/app/controllers/concerns/login_helper.rb
+++ b/app/controllers/concerns/login_helper.rb
@ -108,11 +108,7 @@ module LoginHelper
  def sync_pwd_to_gitea!(user, hash={})
    return true if user.is_sync_pwd?

-    sync_params = { 
-      login_name: user.name,
-      source_id: 0,
-      email: user.mail 
-    }
+    sync_params = { email: user.mail }
    interactor = Gitea::User::UpdateInteractor.call(user.login, sync_params.merge(hash))
    if interactor.success?
      Rails.logger.info "########_ login is #{user.login} sync_pwd_to_gitea success _########"
--- a/app/controllers/forks_controller.rb
+++ b/app/controllers/forks_controller.rb
@ -13,7 +13,7 @@ class ForksController < ApplicationController
    if current_user&.id == @project.user_id
      render_result(-1, "自己不能fork自己的项目")
    elsif Project.exists?(user_id: current_user.id, identifier: @project.identifier)
-      render_result(0, "fork失败，你已拥有了这个项目")
+      render_result(-1, "fork失败，你已拥有了这个项目")
    end
    # return if current_user != @project.owner
    # render_result(-1, "自己不能fork自己的项目")
--- a/app/controllers/issue_tags_controller.rb
+++ b/app/controllers/issue_tags_controller.rb
@ -2,7 +2,7 @@ class IssueTagsController < ApplicationController
  before_action :require_login, except: [:index]
  before_action :load_repository
  before_action :set_user
-  before_action :check_issue_tags_permission
+  before_action :check_issue_permission, except: :index
  before_action :set_issue_tag, only: [:edit, :update, :destroy]


@ -17,7 +17,7 @@ class IssueTagsController < ApplicationController


  def create
-    title = params[:name].to_s.strip.first(15)
+    title = params[:name].to_s.strip.first(10)
    desc = params[:description].to_s.first(30)
    color = params[:color] || "#ccc"

@ -29,7 +29,7 @@ class IssueTagsController < ApplicationController

    if title.present?
      if IssueTag.exists?(name: title, project_id: @project.id)
-        normal_status(-1, "项目标记已存在")
+        normal_status(-1, "标签已存在")
      else
        ActiveRecord::Base.transaction do
          begin
@ -37,12 +37,12 @@ class IssueTagsController < ApplicationController
            if issue_tag.save
              # gitea_tag = Gitea::Labels::CreateService.new(current_user, @repository.try(:identifier), tag_params).call
              # if gitea_tag && issue_tag.update_attributes(gid: gitea_tag["id"], gitea_url: gitea_tag["url"])
-              normal_status(0, "项目标记创建成功！")
+              #   normal_status(0, "标签创建成功")
              # else
-              #   normal_status(-1, "项目标记创建失败")
+              #   normal_status(-1, "标签创建失败")
              # end
            else
-              normal_status(-1, "项目标记创建失败")
+              normal_status(-1, "标签创建失败")
            end
          rescue => e
            puts "create version release error: #{e.message}"
@ -51,7 +51,7 @@ class IssueTagsController < ApplicationController
        end
      end
    else
-      normal_status(-1, "项目标记名称不能为空")
+      normal_status(-1, "标签名称不能为空")
    end
  end

@ -60,8 +60,8 @@ class IssueTagsController < ApplicationController
  end

  def update
-    title = params[:name].to_s.strip.first(15)
-    desc = params[:description].to_s.first(30)
+    title = params[:name]
+    desc = params[:description]
    color = params[:color] || "#ccc"

    tag_params = {
@ -71,19 +71,19 @@ class IssueTagsController < ApplicationController
    }
    if title.present?
      if IssueTag.exists?(name: title, project_id: @project.id) && (@issue_tag.name != title)
-        normal_status(-1, "项目标记已存在")
+        normal_status(-1, "标签已存在")
      else
        ActiveRecord::Base.transaction do
          begin
            if @issue_tag.update_attributes(tag_params)
              # gitea_tag = Gitea::Labels::UpdateService.new(current_user, @repository.try(:identifier),@issue_tag.try(:gid), tag_params).call
              # if gitea_tag
-              #   normal_status(0, "项目标记更新成功")
+              #   normal_status(0, "标签更新成功")
              # else
-              #   normal_status(-1, "项目标记更新失败")
+              #   normal_status(-1, "标签更新失败")
              # end
            else
-              normal_status(-1, "项目标记更新失败")
+              normal_status(-1, "标签更新失败")
            end
          rescue => e
            puts "create version release error: #{e.message}"
@ -92,7 +92,7 @@ class IssueTagsController < ApplicationController
        end
      end
    else
-      normal_status(-1, "项目标记名称不能为空")
+      normal_status(-1, "标签名称不能为空")
    end
  end

@ -102,12 +102,12 @@ class IssueTagsController < ApplicationController
        if @issue_tag.destroy
          # issue_tag = Gitea::Labels::DeleteService.new(@user, @repository.try(:identifier), @issue_tag.try(:gid)).call
          # if issue_tag
-          #   normal_status(0, "项目标记删除成功")
+          #   normal_status(0, "标签删除成功")
          # else
-          #   normal_status(-1, "项目标记删除失败")
+          #   normal_status(-1, "标签删除失败")
          # end
        else
-          normal_status(-1, "项目标记删除失败")
+          normal_status(-1, "标签删除失败")
        end
      rescue => e
        puts "create version release error: #{e.message}"
@ -122,16 +122,16 @@ class IssueTagsController < ApplicationController
    @user = @project.owner
  end

-  def check_issue_tags_permission
-    unless @project.manager?(current_user) || current_user.admin?
-      return render_forbidden('你不是管理员，没有权限操作')
+  def check_issue_permission
+    unless @project.member?(current_user) || current_user.admin?
+      normal_status(-1, "您没有权限")
    end
  end

  def set_issue_tag
    @issue_tag = IssueTag.find_by_id(params[:id])
    unless @issue_tag.present?
-      normal_status(-1, "项目标记不存在")
+      normal_status(-1, "标签不存在")
    end
  end

--- a/app/controllers/issues_controller.rb
+++ b/app/controllers/issues_controller.rb
@ -15,7 +15,6 @@ class IssuesController < ApplicationController
  include TagChosenHelper

  def index
-    @user_operate_issue = current_user.present? && current_user.logged? && (current_user.admin || @project.member?(current_user))
    @user_admin_or_member = current_user.present? && current_user.logged? && (current_user.admin || @project.member?(current_user) || @project.is_public?)
    issues = @project.issues.issue_issue.issue_index_includes
    issues = issues.where(is_private: false) unless @user_admin_or_member
@ -24,13 +23,13 @@ class IssuesController < ApplicationController
    @filter_issues = @all_issues
    @filter_issues = @filter_issues.where.not(status_id: IssueStatus::CLOSED) if params[:status_type].to_i == IssueStatus::ADD
    @filter_issues = @filter_issues.where(status_id: IssueStatus::CLOSED) if params[:status_type].to_i == IssueStatus::SOLVING
-    @filter_issues = @filter_issues.where("issues.subject LIKE ? OR issues.description LIKE ? ", "%#{params[:search]}%", "%#{params[:search]}%") if params[:search].present?
+    @filter_issues = @filter_issues.where("subject LIKE ? OR description LIKE ? ", "%#{params[:search]}%", "%#{params[:search]}%") if params[:search].present?
    @open_issues = @all_issues.where.not(status_id: IssueStatus::CLOSED)
    @close_issues = @all_issues.where(status_id: IssueStatus::CLOSED)
+    @assign_to_me = @filter_issues.where(assigned_to_id: current_user&.id)
+    @my_published = @filter_issues.where(author_id: current_user&.id)
    scopes = Issues::ListQueryService.call(issues,params.delete_if{|k,v| v.blank?}, "Issue")
    @issues_size = scopes.size
-    @assign_to_me = scopes.where(assigned_to_id: current_user&.id)
-    @my_published = scopes.where(author_id: current_user&.id)
    @issues = paginate(scopes)

    respond_to do |format|
@ -126,15 +125,9 @@ class IssuesController < ApplicationController
        end
      end
      if params[:issue_tag_ids].present?
-        if params[:issue_tag_ids].is_a?(Array) && params[:issue_tag_ids].size > 1
-          return normal_status(-1, "最多只能创建一个标记。")
-        elsif params[:issue_tag_ids].is_a?(Array) && params[:issue_tag_ids].size == 1
-          params[:issue_tag_ids].each do |tag|
-            IssueTagsRelate.create!(issue_id: @issue.id, issue_tag_id: tag)
-          end
-        else
-          return normal_status(-1, "请输入正确的标记。")
-        end 
+        params[:issue_tag_ids].each do |tag|
+          IssueTagsRelate.create!(issue_id: @issue.id, issue_tag_id: tag)
+        end
      end
      if params[:assigned_to_id].present?
        Tiding.create!(user_id: params[:assigned_to_id], trigger_user_id: current_user.id,
@ -149,13 +142,11 @@ class IssuesController < ApplicationController
      end

      @issue.project_trends.create(user_id: current_user.id, project_id: @project.id, action_type: "create")
-      @issue.project_trends.create(user_id: current_user.id, project_id: @project.id, action_type: ProjectTrend::CLOSE) if params[:status_id].to_i == 5
-

      Rails.logger.info "[ATME] maybe to at such users: #{@atme_receivers.pluck(:login)}"
      AtmeService.call(current_user, @atme_receivers, @issue) if @atme_receivers.size > 0

-      render json: {status: 0, message: "创建成功", id: @issue.id}
+      render json: {status: 0, message: "创建成", id: @issue.id}
    else
      normal_status(-1, "创建失败")
    end
@ -174,18 +165,11 @@ class IssuesController < ApplicationController
    last_token = @issue.token
    last_status_id = @issue.status_id
    @issue&.issue_tags_relates&.destroy_all if params[:issue_tag_ids].blank?
-    if params[:issue_tag_ids].present? 
-      if params[:issue_tag_ids].is_a?(Array) && params[:issue_tag_ids].size > 1
-        return normal_status(-1, "最多只能创建一个标记。")
-      elsif params[:issue_tag_ids].is_a?(Array) && params[:issue_tag_ids].size == 1
-        @issue&.issue_tags_relates&.destroy_all
-        params[:issue_tag_ids].each do |tag|
-          next if tag == [""]
-          IssueTagsRelate.create!(issue_id: @issue.id, issue_tag_id: tag)
-        end
-      else
-        return normal_status(-1, "请输入正确的标记。")
-      end 
+    if params[:issue_tag_ids].present? && !@issue&.issue_tags_relates.where(issue_tag_id: params[:issue_tag_ids]).exists?
+      @issue&.issue_tags_relates&.destroy_all
+      params[:issue_tag_ids].each do |tag|
+        IssueTagsRelate.create(issue_id: @issue.id, issue_tag_id: tag)
+      end
    end

    issue_files = params[:attachment_ids]
@ -247,7 +231,7 @@ class IssuesController < ApplicationController
        end
        if params[:status_id].to_i == 5  #任务由非关闭状态到关闭状态时
          @issue.issue_times.update_all(end_time: Time.now)
-          # @issue.update_closed_issues_count_in_project!
+          @issue.update_closed_issues_count_in_project!
          if @issue.issue_type.to_s == "2" && last_status_id != 5
            if @issue.assigned_to_id.present? && last_status_id == 3 #只有当用户完成100%时，才给token
              post_to_chain("add", @issue.token, @issue.get_assign_user.try(:login))
@ -489,8 +473,7 @@ class IssuesController < ApplicationController
  end

  def operate_issue_permission
-    @issue = Issue.find_by_id(params[:id]) unless @issue.present?
-    return render_forbidden("您没有权限进行此操作.") unless current_user.present? && current_user.logged? && (current_user.admin? || @project.member?(current_user) || (@project.is_public && @issue.nil?) || (@project.is_public && @issue.present? && @issue.author_id == current_user.id))
+    return render_forbidden("您没有权限进行此操作.") unless current_user.present? && current_user.logged? && (current_user.admin? || @project.member?(current_user) || @project.is_public?)
  end

  def export_issues(issues)
--- a/app/controllers/members_controller.rb
+++ b/app/controllers/members_controller.rb
@ -3,7 +3,7 @@ class MembersController < ApplicationController
  before_action :load_project
  before_action :find_user_with_id, only: %i[create remove change_role]
  before_action :check_user_profile_completed, only: [:create]
-  before_action :operate!
+  before_action :operate!, except: %i[index]
  before_action :check_member_exists!, only: %i[create]
  before_action :check_member_not_exists!, only: %i[remove change_role]

--- a/app/controllers/notices_controller.rb
+++ b/app/controllers/notices_controller.rb
@ -1,21 +0,0 @@
-class NoticesController < ApplicationController
-
-  def create
-    tip_exception("参数有误") if params["source"].blank?
-    user_id = params[:user_id]
-
-    if params["source"] == "CompetitionBegin"
-      competition_id = params[:competition_id]
-      SendTemplateMessageJob.perform_later('CompetitionBegin', user_id, competition_id)
-    elsif params["source"] == "CompetitionResult"
-      competition_id = params[:competition_id]
-      SendTemplateMessageJob.perform_later('CompetitionResult', user_id, competition_id)
-    elsif params["source"] == "CompetitionReview"
-      competition_id = params[:competition_id]
-      SendTemplateMessageJob.perform_later('CompetitionReview', user_id, competition_id)
-    else
-      tip_exception("#{params["source"]}未配置")
-    end
-    render_ok
-  end
-end
--- a/app/controllers/organizations/organization_users_controller.rb
+++ b/app/controllers/organizations/organization_users_controller.rb
@ -5,11 +5,7 @@ class Organizations::OrganizationUsersController < Organizations::BaseController
  def index
    @organization_users = @organization.organization_users.includes(:user)
    search = params[:search].to_s.downcase
-    user_condition_users = User.like(search).to_sql 
-    team_condition_teams = User.joins(:teams).merge(@organization.teams.like(search)).to_sql
-    users = User.from("( #{user_condition_users} UNION #{team_condition_teams }) AS users")
-   
-    @organization_users = @organization_users.where(user_id: users).distinct
+    @organization_users = @organization_users.joins(:user).merge(User.like(search))

    @organization_users = kaminari_paginate(@organization_users)
  end
--- a/app/controllers/organizations/organizations_controller.rb
+++ b/app/controllers/organizations/organizations_controller.rb
@ -28,7 +28,7 @@ class Organizations::OrganizationsController < Organizations::BaseController
  def create
    ActiveRecord::Base.transaction do
      tip_exception("无法使用以下关键词：#{organization_params[:name]}，请重新命名") if ReversedKeyword.check_exists?(organization_params[:name])
-      Organizations::CreateForm.new(organization_params.merge(original_name: "")).validate!
+      Organizations::CreateForm.new(organization_params).validate!
      @organization = Organizations::CreateService.call(current_user, organization_params)
      Util.write_file(@image, avatar_path(@organization)) if params[:image].present?
    end
@ -39,14 +39,14 @@ class Organizations::OrganizationsController < Organizations::BaseController

  def update
    ActiveRecord::Base.transaction do
-      Organizations::CreateForm.new(organization_params.merge(original_name: @organization.login)).validate!
+      Organizations::CreateForm.new(organization_params).validate!
      login = @organization.login
      @organization.login = organization_params[:name] if organization_params[:name].present?
      @organization.nickname = organization_params[:nickname] if organization_params[:nickname].present?
      @organization.save!
      sync_organization_extension!
      
-      Gitea::Organization::UpdateService.call(current_user.gitea_token, login, @organization.reload)
+      Gitea::Organization::UpdateService.call(@organization.gitea_token, login, @organization.reload)
      Util.write_file(@image, avatar_path(@organization)) if params[:image].present?
    end
  rescue Exception => e
@ -57,16 +57,10 @@ class Organizations::OrganizationsController < Organizations::BaseController
  def destroy
    tip_exception("密码不正确") unless current_user.check_password?(password)
    ActiveRecord::Base.transaction do
-      gitea_destroy = Gitea::Organization::DeleteService.call(current_user.gitea_token, @organization.login)
-      if gitea_destroy[:status] == 204 
-        @organization.destroy!
-        render_ok
-      elsif gitea_destroy[:status] == 500
-        tip_exception("当组织内含有仓库时，无法删除此组织")
-      else
-        tip_exception("")
-      end
+      Gitea::Organization::DeleteService.call(@organization.gitea_token, @organization.login)
+      @organization.destroy!
    end
+    render_ok
  rescue Exception => e
    uid_logger_error(e.message)
    tip_exception(e.message)
--- a/app/controllers/organizations/team_users_controller.rb
+++ b/app/controllers/organizations/team_users_controller.rb
@ -18,7 +18,7 @@ class Organizations::TeamUsersController < Organizations::BaseController
    ActiveRecord::Base.transaction do
      @team_user = TeamUser.build(@organization.id, @operate_user.id, @team.id)
      @organization_user = OrganizationUser.build(@organization.id, @operate_user.id)
-      SendTemplateMessageJob.perform_later('TeamJoined', @operate_user.id, @organization.id, @team.id) if Site.has_notice_menu?
+      SendTemplateMessageJob.perform_later('OrganizationRole', @operate_user.id, @organization.id, @team.authorize_name) if Site.has_notice_menu?
      Gitea::Organization::TeamUser::CreateService.call(@organization.gitea_token, @team.gtid, @operate_user.login)
    end
  rescue Exception => e
@ -31,7 +31,6 @@ class Organizations::TeamUsersController < Organizations::BaseController
    ActiveRecord::Base.transaction do
      @team_user.destroy!
      Gitea::Organization::TeamUser::DeleteService.call(@organization.gitea_token, @team.gtid, @operate_user.login)
-      SendTemplateMessageJob.perform_later('TeamLeft', @operate_user.id, @organization.id, @team.id) if Site.has_notice_menu?
      org_team_users = @organization.team_users.where(user_id: @operate_user.id)
      unless org_team_users.present?
        @organization.organization_users.find_by(user_id: @operate_user.id).destroy!
--- a/app/controllers/organizations/teams_controller.rb
+++ b/app/controllers/organizations/teams_controller.rb
@ -4,24 +4,15 @@ class Organizations::TeamsController < Organizations::BaseController
  before_action :check_user_can_edit_org, only: [:create, :update, :destroy]

  def index
-
-    if params[:is_full].present? 
-      if can_edit_org?
-        @teams = @organization.teams
-      else 
-        @teams = []
-      end
-    else 
-      #if @organization.is_owner?(current_user) || current_user.admin?
+    #if @organization.is_owner?(current_user) || current_user.admin?
      @teams = @organization.teams
-      #else
-      #  @teams = @organization.teams.joins(:team_users).where(team_users: {user_id: current_user.id})
-      #end
-      @is_admin = can_edit_org?
-      @teams = @teams.includes(:team_units, :team_users)
-  
-      @teams = kaminari_paginate(@teams)
-    end
+    #else
+    #  @teams = @organization.teams.joins(:team_users).where(team_users: {user_id: current_user.id})
+    #end
+    @is_admin = can_edit_org?
+    @teams = @teams.includes(:team_units, :team_users)
+
+    @teams = kaminari_paginate(@teams)
  end

  def search
@ -43,12 +34,8 @@ class Organizations::TeamsController < Organizations::BaseController

  def create
    ActiveRecord::Base.transaction do
-      if @organization.teams.count >= 50
-        return tip_exception("组织的团队数量已超过限制！") 
-      else 
-        Organizations::CreateTeamForm.new(team_params).validate!
-        @team = Organizations::Teams::CreateService.call(current_user, @organization, team_params)
-      end
+      Organizations::CreateTeamForm.new(team_params).validate!
+      @team = Organizations::Teams::CreateService.call(current_user, @organization, team_params)
    end
  rescue Exception => e
    uid_logger_error(e.message)
--- a/app/controllers/owners_controller.rb
+++ b/app/controllers/owners_controller.rb
@ -12,7 +12,7 @@ class OwnersController < ApplicationController

  def show 
    @owner = Owner.find_by(login: params[:id]) || Owner.find_by(id: params[:id])
-    # return render_not_found unless @owner.present?
+    return render_not_found unless @owner.present?
    # 组织
    if @owner.is_a?(Organization)
      return render_forbidden("没有查看组织的权限") if org_limited_condition || org_privacy_condition
@ -20,7 +20,7 @@ class OwnersController < ApplicationController
      @is_admin = current_user.admin? || @owner.is_owner?(current_user.id)
      @is_member = @owner.is_member?(current_user.id)
    # 用户
-    elsif @owner.is_a?(User)
+    else 
      #待办事项，现在未做
      if User.current.admin? || User.current.login == @owner.login 
        @waiting_applied_messages = @owner.applied_messages.waiting
@ -45,6 +45,7 @@ class OwnersController < ApplicationController
      @projects_common_count = user_projects.common.size
      @projects_mirrior_count = user_projects.mirror.size
      @projects_sync_mirrior_count = user_projects.sync_mirror.size
+      puts @owner.as_json
    end
  end

--- a/app/controllers/praise_tread_controller.rb
+++ b/app/controllers/praise_tread_controller.rb
@ -12,7 +12,6 @@ class PraiseTreadController < ApplicationController
    begin
      return normal_status(2, "你已点过赞了") if current_user.liked?(@project)
      current_user.like!(@project)
-      SendTemplateMessageJob.perform_later('ProjectPraised', current_user.id, @project.id) if Site.has_notice_menu?
      render_ok({praises_count: @project.praises_count, praised: current_user.liked?(@project)})
    rescue Exception => e
      uid_logger_error(e.message)
--- a/app/controllers/project_trends_controller.rb
+++ b/app/controllers/project_trends_controller.rb
@ -3,7 +3,7 @@ class ProjectTrendsController < ApplicationController
  before_action :check_project_public

  def index
-    project_trends = @project.project_trends.preload(:user, trend: :user, project: :owner)
+    project_trends = @project.project_trends.preload(:user, trend: :user)

    check_time = params[:time]  #时间的筛选
    check_type = params[:type]   #动态类型的筛选，目前已知的有 Issue, PullRequest, Version
--- a/app/controllers/projects_controller.rb
+++ b/app/controllers/projects_controller.rb
@ -16,13 +16,13 @@ class ProjectsController < ApplicationController
    menu.append(menu_hash_by_name("home"))
    menu.append(menu_hash_by_name("code")) if @project.has_menu_permission("code")
    menu.append(menu_hash_by_name("issues")) if @project.has_menu_permission("issues")
-    menu.append(menu_hash_by_name("pulls")) if @project.has_menu_permission("pulls") && @project.forge?
-    menu.append(menu_hash_by_name("devops")) if @project.has_menu_permission("devops") && @project.forge?
+    menu.append(menu_hash_by_name("pulls")) if @project.has_menu_permission("pulls")
+    menu.append(menu_hash_by_name("wiki")) if @project.has_menu_permission("wiki")
+    menu.append(menu_hash_by_name("devops")) if @project.has_menu_permission("devops")
    menu.append(menu_hash_by_name("versions")) if @project.has_menu_permission("versions")
-    menu.append(menu_hash_by_name("wiki")) if @project.has_menu_permission("wiki") && @project.forge?
-    menu.append(menu_hash_by_name("resources")) if @project.has_menu_permission("resources") && @project.forge?
+    menu.append(menu_hash_by_name("resources")) if @project.has_menu_permission("resources")
    menu.append(menu_hash_by_name("activity"))
-    menu.append(menu_hash_by_name("settings")) if (current_user.admin? || @project.manager?(current_user)) && @project.forge?
+    menu.append(menu_hash_by_name("settings")) if current_user.admin? || @project.manager?(current_user)

    render json: menu
  end
@ -59,7 +59,7 @@ class ProjectsController < ApplicationController
    Projects::MigrateForm.new(mirror_params).validate!

    @project = 
-      if EduSetting.get("mirror_address").to_s.include?("github") && enable_accelerator?(mirror_params[:clone_addr])
+      if enable_accelerator?(mirror_params[:clone_addr])
        source_clone_url = mirror_params[:clone_addr]
        uid_logger("########## 已动加速器 ##########")
        result = Gitea::Accelerator::MigrateService.call(mirror_params)
@ -71,11 +71,6 @@ class ProjectsController < ApplicationController
        else
          Projects::MigrateService.call(current_user, mirror_params)
        end
-      elsif EduSetting.get("mirror_address").to_s.include?("cnpmjs") && mirror_params[:clone_addr].include?("github.com")
-        source_clone_url = mirror_params[:clone_addr]
-        clone_url = source_clone_url.gsub('github.com', 'github.com.cnpmjs.org')
-        uid_logger("########## 更改clone_addr ##########")
-        Projects::MigrateService.call(current_user, mirror_params.merge(source_clone_url: source_clone_url, clone_addr: clone_url))
      else
        Projects::MigrateService.call(current_user, mirror_params)
      end
@ -87,9 +82,8 @@ class ProjectsController < ApplicationController
  def branches
    return @branches = [] unless @project.forge?

-    # result = Gitea::Repository::Branches::ListService.call(@owner, @project.identifier)
-    result = Gitea::Repository::Branches::ListNameService.call(@owner, @project.identifier)
-    @branches =  result.is_a?(Hash) ? (result.key?(:status) ? [] : result["branch_name"]) : result
+    result = Gitea::Repository::Branches::ListService.call(@owner, @project.identifier)
+    @branches =  result.is_a?(Hash) && result.key?(:status) ? [] : result
  end

  def branches_slice
@ -135,7 +129,7 @@ class ProjectsController < ApplicationController
        validate_params = project_params.slice(:name, :description, 
          :project_category_id, :project_language_id, :private, :identifier)
  
-        Projects::UpdateForm.new(validate_params.merge(user_id: @project.user_id, project_identifier: @project.identifier, project_name: @project.name)).validate!
+        Projects::UpdateForm.new(validate_params.merge(user_id: @project.user_id, project_identifier: @project.identifier)).validate!
  
        private = @project.forked_from_project.present? ? !@project.forked_from_project.is_public : params[:private] || false

--- a/app/controllers/pull_requests_controller.rb
+++ b/app/controllers/pull_requests_controller.rb
@ -2,7 +2,7 @@ class PullRequestsController < ApplicationController
  before_action :require_login, except: [:index, :show, :files, :commits]
  before_action :require_profile_completed, only: [:create]
  before_action :load_repository
-  before_action :check_menu_authorize, only: [:index, :show, :create, :update, :refuse_merge, :pr_merge]
+  before_action :check_menu_authorize
  before_action :find_pull_request, except: [:index, :new, :create, :check_can_merge,:get_branches,:create_merge_infos, :files, :commits]
  before_action :load_pull_request, only: [:files, :commits]
  before_action :find_atme_receivers, only: [:create, :update]
@ -16,7 +16,7 @@ class PullRequestsController < ApplicationController
    issues = issues.where(is_private: false) unless current_user.present? && (current_user.admin? || @project.member?(current_user))
    @all_issues = issues.distinct
    @filter_issues = @all_issues
-    @filter_issues = @filter_issues.where("issues.subject LIKE ? OR issues.description LIKE ? ", "%#{params[:search]}%", "%#{params[:search]}%") if params[:search].present?
+    @filter_issues = @filter_issues.where("subject LIKE ? OR description LIKE ? ", "%#{params[:search]}%", "%#{params[:search]}%") if params[:search].present?
    @open_issues = @filter_issues.joins(:pull_request).where(pull_requests: {status: PullRequest::OPEN})
    @close_issues = @filter_issues.joins(:pull_request).where(pull_requests: {status: PullRequest::CLOSED})
    @merged_issues = @filter_issues.joins(:pull_request).where(pull_requests: {status: PullRequest::MERGED})
@ -56,7 +56,6 @@ class PullRequestsController < ApplicationController
  end

  def create
-    # return normal_status(-1, "您不是目标分支开发者，没有权限，请联系目标分支作者.") unless @project.operator?(current_user)
    ActiveRecord::Base.transaction do
      @pull_request, @gitea_pull_request = PullRequests::CreateService.call(current_user, @owner, @project, params)
      if @gitea_pull_request[:status] == :success
@ -70,8 +69,6 @@ class PullRequestsController < ApplicationController
        raise ActiveRecord::Rollback
      end
    end
-  rescue => e
-    normal_status(-1, e.message)
  end

  def edit
@ -81,7 +78,6 @@ class PullRequestsController < ApplicationController
  end

  def update
-    return render_forbidden("你没有权限操作.") unless @project.operator?(current_user)
    if params[:title].nil?
      normal_status(-1, "名称不能为空")
    elsif params[:issue_tag_ids].nil?
@ -89,21 +85,14 @@ class PullRequestsController < ApplicationController
    else
      ActiveRecord::Base.transaction do
        begin
-          return normal_status(-1, "title不能超过255个字符") if params[:title].length > 255
          merge_params

          @issue&.issue_tags_relates&.destroy_all if params[:issue_tag_ids].blank?
          if params[:issue_tag_ids].present? && !@issue&.issue_tags_relates.where(issue_tag_id: params[:issue_tag_ids]).exists?
-            if params[:issue_tag_ids].is_a?(Array) && params[:issue_tag_ids].size > 1
-              return normal_status(-1, "最多只能创建一个标记。")
-            elsif params[:issue_tag_ids].is_a?(Array) && params[:issue_tag_ids].size == 1
-              @issue&.issue_tags_relates&.destroy_all
-              params[:issue_tag_ids].each do |tag|
-                IssueTagsRelate.create!(issue_id: @issue.id, issue_tag_id: tag)
-              end
-            else
-              return normal_status(-1, "请输入正确的标记。")
-            end 
+            @issue&.issue_tags_relates&.destroy_all
+            params[:issue_tag_ids].each do |tag|
+              IssueTagsRelate.create(issue_id: @issue.id, issue_tag_id: tag)
+            end
          end

          if @issue.update_attributes(@issue_params)
@ -113,16 +102,9 @@ class PullRequestsController < ApplicationController

              if gitea_pull[:status] === :success
                if params[:issue_tag_ids].present?
-                  if params[:issue_tag_ids].is_a?(Array) && params[:issue_tag_ids].size > 1
-                    return normal_status(-1, "最多只能创建一个标记。")
-                  elsif params[:issue_tag_ids].is_a?(Array) && params[:issue_tag_ids].size == 1
-                    @issue&.issue_tags_relates&.destroy_all
-                    params[:issue_tag_ids].each do |tag|
-                      IssueTagsRelate.create!(issue_id: @issue.id, issue_tag_id: tag)
-                    end
-                  else
-                    return normal_status(-1, "请输入正确的标记。")
-                  end 
+                  params[:issue_tag_ids].each do |tag|
+                    IssueTagsRelate.create(issue_id: @issue.id, issue_tag_id: tag)
+                  end
                end
                if params[:status_id].to_i == 5
                  @issue.issue_times.update_all(end_time: Time.now)
@ -215,7 +197,7 @@ class PullRequestsController < ApplicationController
  def check_can_merge
    target_head = params[:head]  #源分支
    target_base = params[:base]  #目标分支
-    is_original = params[:is_original] || false
+    is_original = params[:is_original]
    if target_head.blank? || target_base.blank?
      normal_status(-2, "请选择分支")
    elsif target_head === target_base && !is_original
@ -246,11 +228,11 @@ class PullRequestsController < ApplicationController

  private
  def load_pull_request
-    @pull_request = @project.pull_requests.where(gitea_number: params[:id]).where.not(id: params[:id]).take || PullRequest.find_by_id(params[:id])
+    @pull_request = PullRequest.find params[:id]
  end

  def find_pull_request
-    @pull_request = @project.pull_requests.where(gitea_number: params[:id]).where.not(id: params[:id]).take || PullRequest.find_by_id(params[:id])
+    @pull_request = PullRequest.find_by_id(params[:id])
    @issue = @pull_request&.issue
    if @pull_request.blank?
      normal_status(-1, "合并请求不存在")
@ -274,12 +256,12 @@ class PullRequestsController < ApplicationController
      base: params[:base],  #目标分支
      milestone: 0,  #里程碑,未与本地的里程碑关联
    }
-    assignee_login = User.find_by_id(params[:assigned_to_id])&.login
    @requests_params = @local_params.merge({
+      assignee: current_user.try(:login),
      # assignees: ["#{params[:assigned_login].to_s}"],
-      assignees: ["#{assignee_login.to_s}"],
-      labels: params[:issue_tag_ids]
-      # due_date: Time.now
+      assignees: ["#{current_user.try(:login).to_s}"],
+      labels: params[:issue_tag_ids],
+      due_date: Time.now
    })
    @issue_params = {
      author_id: current_user.id,
@ -289,7 +271,7 @@ class PullRequestsController < ApplicationController
      assigned_to_id: params[:assigned_to_id],
      fixed_version_id: params[:fixed_version_id],
      issue_tags_value: params[:issue_tag_ids].present? ? params[:issue_tag_ids].join(",") : "",
-      priority_id: params[:priority_id],
+      priority_id: params[:priority_id] || "2",
      issue_classify: "pull_request",
      issue_type: params[:issue_type] || "1",
      tracker_id: 2,
--- a/app/controllers/repositories_controller.rb
+++ b/app/controllers/repositories_controller.rb
@ -64,6 +64,7 @@ class RepositoriesController < ApplicationController

  def sub_entries
    file_path_uri = URI.parse(URI.encode(params[:filepath].to_s.strip))
+    @path = Gitea.gitea_config[:domain]+"/#{@project.owner.login}/#{@project.identifier}/raw/branch/#{@ref}/"

    if @project.educoder?
      if params[:type] === 'file'
@ -71,35 +72,18 @@ class RepositoriesController < ApplicationController
        logger.info "######### sub_entries: #{@sub_entries}"
        return render_error('该文件暂未开放，敬请期待.') if @sub_entries['status'].to_i === -1

-        tmp_entries = {
+        tmp_entries = [{
            "content" =>  @sub_entries['data']['content'],
            "type"    => "blob"
-          }
+          }]
        @sub_entries = {
          "trees"=>tmp_entries,
          "commits" => [{}]
        }
      else
-        begin
-          @sub_entries = Educoder::Repository::Entries::ListService.call(@project&.project_educoder&.repo_name, {path: file_path_uri})
-          if @sub_entries.blank? || @sub_entries['status'].to_i === -1
-            @sub_entries = Educoder::Repository::Entries::GetService.call(@project&.project_educoder&.repo_name, file_path_uri)
-            return render_error('该文件暂未开放，敬请期待.') if @sub_entries['status'].to_i === -1
-            tmp_entries = {
-              "content" =>  @sub_entries['data']['content'],
-              "type"    => "blob"
-            }
-            @sub_entries = {
-              "trees"=>tmp_entries,
-              "commits" => [{}]
-            }
-          end
-        rescue 
-          return render_error('该文件暂未开放，敬请期待.')
-        end
+        @sub_entries = Educoder::Repository::Entries::ListService.call(@project&.project_educoder&.repo_name, {path: file_path_uri})
      end
    else
-      @path = Gitea.gitea_config[:domain]+"/#{@project.owner.login}/#{@project.identifier}/raw/branch/#{@ref}/"
      interactor = Repositories::EntriesInteractor.call(@owner, @project.identifier, file_path_uri, ref: @ref)
      if interactor.success?
        result = interactor.result
@ -111,17 +95,13 @@ class RepositoriesController < ApplicationController
  end

  def commits
-    if @project.educoder?
-      @commits = Educoder::Repository::Commits::ListService.call(@project&.project_educoder&.repo_name)
+    if params[:filepath].present?
+      file_path_uri = URI.parse(URI.encode(params[:filepath].to_s.strip))
+      @hash_commit = Gitea::Repository::Commits::FileListService.new(@owner.login, @project.identifier, file_path_uri,
+        sha: params[:sha], page: params[:page], limit: params[:limit], token: current_user&.gitea_token).call
    else
-      if params[:filepath].present?
-        file_path_uri = URI.parse(URI.encode(params[:filepath].to_s.strip))
-        @hash_commit = Gitea::Repository::Commits::FileListService.new(@owner.login, @project.identifier, file_path_uri,
-                                                                       sha: params[:sha], page: params[:page], limit: params[:limit], token: current_user&.gitea_token).call
-      else
-        @hash_commit = Gitea::Repository::Commits::ListService.new(@owner.login, @project.identifier,
-                                                                   sha: params[:sha], page: params[:page], limit: params[:limit], token: current_user&.gitea_token).call
-      end
+      @hash_commit = Gitea::Repository::Commits::ListService.new(@owner.login, @project.identifier,
+        sha: params[:sha], page: params[:page], limit: params[:limit], token: current_user&.gitea_token).call
    end
  end

@ -132,12 +112,8 @@ class RepositoriesController < ApplicationController

  def commit
    @sha         = params[:sha]
-    if @project.educoder?
-      return render_error('暂未开放，敬请期待.')
-    else
-      @commit      = Gitea::Repository::Commits::GetService.call(@owner.login, @repository.identifier, @sha, current_user&.gitea_token)
-      @commit_diff = Gitea::Repository::Commits::GetService.call(@owner.login, @repository.identifier, @sha, current_user&.gitea_token, {diff: true})
-    end
+    @commit      = Gitea::Repository::Commits::GetService.call(@owner.login, @repository.identifier, @sha, current_user&.gitea_token)
+    @commit_diff = Gitea::Repository::Commits::GetService.call(@owner.login, @repository.identifier, @sha, current_user&.gitea_token, {diff: true})
  end

  def tags
@ -147,14 +123,11 @@ class RepositoriesController < ApplicationController
  end

  def contributors
-    if params[:filepath].present? || @project.educoder?
+    if params[:filepath].present? 
      @contributors = []
    else
-      result = Gitea::Repository::Contributors::GetService.call(@owner, @repository.identifier)
-      @contributors = result.is_a?(Hash) && result.key?(:status) ? [] : result
+      @contributors = Gitea::Repository::Contributors::GetService.call(@owner, @repository.identifier)
    end
-  rescue
-    @contributors = []
  end

  def edit
@ -222,26 +195,21 @@ class RepositoriesController < ApplicationController
    else
      result = Gitea::Repository::Readme::GetService.call(@owner.login, @repository.identifier, params[:ref], current_user&.gitea_token)
    end
-    @path = Gitea.gitea_config[:domain]+"/#{@owner.login}/#{@repository.identifier}/raw/branch/#{params[:ref]}/"
    @readme = result[:status] === :success ? result[:body] : nil
-    @readme['content'] = decode64_content(@readme, @owner, @repository, params[:ref], @path)
+    @readme['content'] = decode64_content(@readme, @owner, @repository, params[:ref])
    render json: @readme.slice("type", "encoding", "size", "name", "path", "content", "sha")
  rescue 
    render json: nil
  end

  def languages
-    if @project.educoder? 
-      render json: {}
-    else
-      render json: languages_precentagable
-    end
+    render json: languages_precentagable
  end

  def archive
    domain  = Gitea.gitea_config[:domain]
    api_url = Gitea.gitea_config[:base_url]
-    archive_url = "/repos/#{@owner.login}/#{@repository.identifier}/archive/#{Addressable::URI.escape(params[:archive])}"
+    archive_url = "/repos/#{@owner.login}/#{@repository.identifier}/archive/#{params[:archive]}"

    file_path = [domain, api_url, archive_url].join
    file_path = [file_path, "access_token=#{current_user&.gitea_token}"].join("?") if @repository.hidden?
@ -255,11 +223,11 @@ class RepositoriesController < ApplicationController
    domain  = Gitea.gitea_config[:domain]
    api_url = Gitea.gitea_config[:base_url]

-    url = "/repos/#{@owner.login}/#{@repository.identifier}/raw/#{Addressable::URI.escape(params[:filepath])}?ref=#{Addressable::URI.escape(params[:ref])}"
+    url = "/repos/#{@owner.login}/#{@repository.identifier}/raw/#{params[:filepath]}?ref=#{params[:ref]}"
    file_path = [domain, api_url, url].join
-    file_path = [file_path, "access_token=#{current_user&.gitea_token}"].join("&") 
+    file_path = [file_path, "access_token=#{current_user&.gitea_token}"].join("&") if @repository.hidden?

-    redirect_to file_path
+    redirect_to URI.escape(file_path)
  end

  private
--- a/app/controllers/settings_controller.rb
+++ b/app/controllers/settings_controller.rb
@ -1,7 +1,6 @@
 class SettingsController < ApplicationController
  def show
    @old_projects_url = nil
-    get_navbar
    get_add_menu
    get_common_menu
    get_personal_menu
@ -9,14 +8,6 @@ class SettingsController < ApplicationController
  end

  private
-    def get_navbar 
-      @navbar = default_laboratory.navbar
-      if User.current.logged?
-        pernal_index = {"name"=>"个人主页", "link"=>get_site_url("link", "/current_user"), "hidden"=>false}
-        @navbar << pernal_index
-      end
-    end
-    
    def get_add_menu
      @add = []
      Site.add.select(:id, :name, :url, :key).to_a.map(&:serializable_hash).each do |site|
--- a/app/controllers/users/statistics_controller.rb
+++ b/app/controllers/users/statistics_controller.rb
@ -12,7 +12,7 @@ class Users::StatisticsController < Users::BaseController
    @commit_data = []
    date_range.each do |date|
      @date_data << date.strftime("%Y.%m.%d")
-      @issue_data << observed_user.issues.issue_issue.where("DATE(created_on) = ?", date).size
+      @issue_data << observed_user.issues.where("DATE(created_on) = ?", date).size
      @pull_request_data << observed_user.pull_requests.where("DATE(created_at) = ?", date).size
      date_commit_data = commit_data.blank? ? nil : commit_data.select{|item| item["timestamp"] == date.to_time.to_i}
      @commit_data << (date_commit_data.blank? ? 0 : date_commit_data[0]["contributions"].to_i)
--- a/app/controllers/users/template_message_settings_controller.rb
+++ b/app/controllers/users/template_message_settings_controller.rb
@ -23,8 +23,6 @@ class Users::TemplateMessageSettingsController < Users::BaseController
  def get_current_setting
    @current_setting = @_observed_user.user_template_message_setting
    @current_setting = UserTemplateMessageSetting.build(@_observed_user.id) if @current_setting.nil?
-    @current_setting.notification_body.merge!(UserTemplateMessageSetting.init_notification_body.except(*@current_setting.notification_body.keys))
-    @current_setting.email_body.merge!(UserTemplateMessageSetting.init_email_body.except(*@current_setting.email_body.keys))
  end

  def setting_params 
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@ -6,7 +6,7 @@ class UsersController < ApplicationController
  before_action :check_user_exist, only: [:show, :homepage_info,:projects, :watch_users, :fan_users, :hovercard]
  before_action :require_login, only: %i[me list sync_user_info]
  before_action :connect_to_ci_db, only: [:get_user_info]
-  before_action :convert_image!, only: [:update, :update_image]
+  before_action :convert_image!, only: [:update]
  skip_before_action :check_sign, only: [:attachment_show]

  def connect_to_ci_db(options={})
@ -32,8 +32,7 @@ class UsersController < ApplicationController
        @waiting_applied_messages = @user.applied_messages.waiting
        @common_applied_transfer_projects = AppliedTransferProject.where(owner_id: @user.id).common + AppliedTransferProject.where(owner_id: Organization.joins(team_users: :team).where(team_users: {user_id: @user.id}, teams: {authorize: %w(admin owner)} )).common
        @common_applied_projects = AppliedProject.where(project_id: @user.full_admin_projects).common
-        #@undo_events = @waiting_applied_messages.size + @common_applied_transfer_projects.size + @common_applied_projects.size
-        @undo_events = @common_applied_transfer_projects.size + @common_applied_projects.size
+        @undo_events = @waiting_applied_messages.size + @common_applied_transfer_projects.size + @common_applied_projects.size
      else 
        @waiting_applied_messages = AppliedMessage.none
        @common_applied_transfer_projects = AppliedTransferProject.none
@ -82,21 +81,10 @@ class UsersController < ApplicationController
    Util.write_file(@image, avatar_path(@user)) if user_params[:image].present?
    @user.attributes = user_params.except(:image)
    unless @user.save
-      render_error(-1, @user.errors.full_messages.join(", "))
+      render_error(@user.errors.full_messages.join(", "))
    end
  end

-  def update_image 
-    return render_not_found unless @user = User.find_by(login: params[:id]) || User.find_by_id(params[:id]) 
-    return render_forbidden unless User.current.logged? && (current_user&.admin? || current_user.id == @user.id)
-
-    Util.write_file(@image, avatar_path(@user)) 
-    return render_ok({message: '头像修改成功'})
-  rescue Exception => e
-    uid_logger_error(e.message)
-    render_error(-1, '头像修改失败！')
-  end
-
  def me
    @user = current_user
  end
--- a/app/docs/slate/source/images/logo.png
+++ b/app/docs/slate/source/images/logo.png
--- a/app/docs/slate/source/includes/_projects.md
+++ b/app/docs/slate/source/includes/_projects.md
@ -280,7 +280,7 @@ repo             |是| |string |项目标识identifier
 ### 返回字段说明
 参数  | 类型 | 字段说明
 --------- | ----------- | -----------
-menu_name     |string|导航名称， home:主页,code:代码库,issues:疑修,pulls:合并请求,devops:工作流,versions:里程碑,activity:动态,setting:仓库设置
+menu_name     |string|导航名称， home:主页,code:代码库,issues:易修,pulls:合并请求,devops:工作流,versions:里程碑,activity:动态,setting:仓库设置


 > 返回的JSON示例:
@ -408,7 +408,7 @@ await octokit.request('POST /api/yystopf/ceshi/project_units')
 ### 请求参数
 参数    | 必选 | 默认 | 类型 | 字段说明
 --------- | ------- | ------- | -------- | ----------
-|unit_types |是| |array    | 项目模块内容， 支持以下参数:code:代码库,issues:疑修,pulls:合并请求,devops:工作流,versions:里程碑 |
+|unit_types |是| |array    | 项目模块内容， 支持以下参数:code:代码库,issues:易修,pulls:合并请求,devops:工作流,versions:里程碑 |


 ### 返回字段说明:
--- a/app/docs/slate/source/includes/_repositories.md
+++ b/app/docs/slate/source/includes/_repositories.md
@ -1240,11 +1240,11 @@ await octokit.request('GET /api/yystopf/ceshi/webhooks/3/edit.json')
 |delete|分支或标签删除|
 |fork|仓库被fork|
 |push|git仓库推送|
-|issue|疑修已打开、已关闭、已重新打开或编辑|
-|issue_assign|疑修被指派|
-|issue_label|疑修标签被更新或删除|
-|issue_milestone|疑修被收入里程碑|
-|issue_comment|疑修评论|
+|issue|易修已打开、已关闭、已重新打开或编辑|
+|issue_assign|易修被指派|
+|issue_label|易修标签被更新或删除|
+|issue_milestone|易修被收入里程碑|
+|issue_comment|易修评论|
 |pull_request|合并请求|
 |pull_request_assign|合并请求被指派|
 |pull_request_label|合并请求被贴上标签|
@ -1337,11 +1337,11 @@ await octokit.request('POST /api/yystopf/ceshi/webhooks.json')
 |delete|分支或标签删除|
 |fork|仓库被fork|
 |push|git仓库推送|
-|issue|疑修已打开、已关闭、已重新打开或编辑|
-|issue_assign|疑修被指派|
-|issue_label|疑修标签被更新或删除|
-|issue_milestone|疑修被收入里程碑|
-|issue_comment|疑修评论|
+|issue|易修已打开、已关闭、已重新打开或编辑|
+|issue_assign|易修被指派|
+|issue_label|易修标签被更新或删除|
+|issue_milestone|易修被收入里程碑|
+|issue_comment|易修评论|
 |pull_request|合并请求|
 |pull_request_assign|合并请求被指派|
 |pull_request_label|合并请求被贴上标签|
@ -1440,11 +1440,11 @@ await octokit.request('PATCH /api/yystopf/ceshi/webhooks/7.json')
 |delete|分支或标签删除|
 |fork|仓库被fork|
 |push|git仓库推送|
-|issue|疑修已打开、已关闭、已重新打开或编辑|
-|issue_assign|疑修被指派|
-|issue_label|疑修标签被更新或删除|
-|issue_milestone|疑修被收入里程碑|
-|issue_comment|疑修评论|
+|issue|易修已打开、已关闭、已重新打开或编辑|
+|issue_assign|易修被指派|
+|issue_label|易修标签被更新或删除|
+|issue_milestone|易修被收入里程碑|
+|issue_comment|易修评论|
 |pull_request|合并请求|
 |pull_request_assign|合并请求被指派|
 |pull_request_label|合并请求被贴上标签|
--- a/app/docs/slate/source/includes/_users.md
+++ b/app/docs/slate/source/includes/_users.md
@ -90,12 +90,13 @@ await octokit.request('GET /api/users/:login/messages.json')
 #### 消息来源source字段说明
 类型|说明
 --------- | -----------
-|IssueAssigned              | 有新指派给我的疑修  | 
-|IssueExpire                | 我创建或负责的疑修截止日期到达最后一天  | 
-|IssueAtme                  | 在疑修中@我  | 
-|IssueChanged               | 我创建或负责的疑修状态变更  | 
-|IssueDeleted               | 我创建或负责的疑修删除  | 
-|IssueJournal               | 我创建或负责的疑修有新的评论  | 
+|IssueAssigned              | 有新指派给我的易修  | 
+|IssueAssignerExpire        | 我负责的易修截止日期到达最后一天  | 
+|IssueAtme                  | 在易修中@我  | 
+|IssueChanged               | 我创建或负责的易修状态变更  | 
+|IssueCreatorExpire         | 我创建的易修截止日期到达最后一天  | 
+|IssueDeleted               | 我创建或负责的易修删除  | 
+|IssueJournal               | 我创建或负责的易修有新的评论  | 
 |LoginIpTip                 | 登录异常提示  | 
 |OrganizationJoined         | 账号被拉入组织  | 
 |OrganizationLeft           | 账号被移出组织  | 
@ -103,12 +104,11 @@ await octokit.request('GET /api/users/:login/messages.json')
 |ProjectDeleted             | 我关注的仓库被删除  | 
 |ProjectFollowed            | 我管理的仓库被关注  | 
 |ProjectForked              | 我管理的仓库被复刻  | 
-|ProjectIssue               | 我管理/关注的仓库有新的疑修  | 
+|ProjectIssue               | 我管理/关注的仓库有新的易修  | 
 |ProjectJoined              | 账号被拉入项目  | 
 |ProjectLeft                | 账号被移出项目  | 
 |ProjectMemberJoined        | 我管理的仓库有成员加入  | 
 |ProjectMemberLeft          | 我管理的仓库有成员移出  | 
-|ProjectMilestoneCompleted  | 我管理的仓库有里程碑完成度100%  | 
 |ProjectMilestone           | 我管理的仓库有新的里程碑  | 
 |ProjectPraised             | 我管理的仓库被点赞  | 
 |ProjectPullRequest         | 我管理/关注的仓库有新的合并请求  |
@ -250,7 +250,7 @@ await octokit.request('POST /api/users/:login/messages.json')
 --------- | ----------- | -----------
 |type       | string  | 消息类型 |
 |receivers_login  | array   | 需要发送消息的用户名数组|
-|atmeable_type | string | atme消息对象，是从哪里@我的，比如评论：Journal、疑修：Issue、合并请求：PullRequest |
+|atmeable_type | string | atme消息对象，是从哪里@我的，比如评论：Journal、易修：Issue、合并请求：PullRequest |
 |atmeable_id | integer | atme消息对象id |

 > 请求的JSON示例:
@ -469,7 +469,7 @@ await octokit.request('GET /api/template_message_settings.json')
            "total_settings_count": 4,
            "settings": [
                {
-                    "name": "疑修被指派",
+                    "name": "易修被指派",
                    "key": "IssueAssigned",
                    "notification_disabled": true,
                    "email_disabled": false
@ -488,7 +488,7 @@ await octokit.request('GET /api/template_message_settings.json')
            "total_settings_count": 4,
            "settings": [
                {
-                    "name": "有新的疑修",
+                    "name": "有新的易修",
                    "key": "Issue",
                    "notification_disabled": true,
                    "email_disabled": false
@ -875,7 +875,7 @@ await octokit.request('GET /api/users/:login/statistics/activity.json')
 参数  | 类型 | 字段说明
 --------- | ----------- | -----------
 |dates                  |array   |时间 |
-|issues_count           |array   |疑修数量|
+|issues_count           |array   |易修数量|
 |pull_requests_count    |array   |合并请求数量|
 |commtis_count          |array   |贡献数量|

@ -1084,7 +1084,7 @@ await octokit.request('GET /api/users/:login/project_trends.json')
 参数  | 类型 | 字段说明
 --------- | ----------- | -----------
 |total_count                    |int   |所选时间内的总动态数 |
-|project_trends.trend_type      |string|动态类型，Issue：疑修，VersionRelease：版本发布，PullRequest：合并请求|
+|project_trends.trend_type      |string|动态类型，Issue：易修，VersionRelease：版本发布，PullRequest：合并请求|
 |project_trends.action_type     |string|操作类型|
 |project_trends.trend_id        |integer|动态id|
 |project_trends.user_name       |string|用户名称|
--- a/app/docs/slate/source/layouts/layout.erb
+++ b/app/docs/slate/source/layouts/layout.erb
@ -63,7 +63,7 @@ under the License.
      </span>
    </a>
    <div class="toc-wrapper">
-      <%= image_tag "logo.png", class: 'logo ' %>
+      <%= image_tag "logo.png", class: 'logo' %>
      <% if language_tabs.any? %>
        <div class="lang-selector">
          <% language_tabs.each do |lang| %>
--- a/app/docs/slate/source/stylesheets/screen.css.scss
+++ b/app/docs/slate/source/stylesheets/screen.css.scss
@ -77,7 +77,6 @@ html, body {
    margin: 15px auto;
    max-width: 100%;
    margin-bottom: $logo-margin;
-    max-width: 80%;
  }

  &>.search {
--- a/app/forms/base_form.rb
+++ b/app/forms/base_form.rb
@ -26,34 +26,8 @@ class BaseForm
    raise "项目标识已被占用." if ReversedKeyword.check_exists?(repository_name)
  end

-  def check_password(password)
-    password = strip(password)
-    raise PasswordFormatError, "密码8~16位密码，支持字母数字和符号" unless password =~ CustomRegexp::PASSWORD
-  end
-
-  def check_password_confirmation(password, password_confirmation)
-    password = strip(password)
-    password_confirmation = strip(password_confirmation)
-
-    raise PasswordFormatError, "确认密码为8~16位密码，支持字母数字和符号" unless password_confirmation =~ CustomRegexp::PASSWORD
-    raise PasswordConfirmationError, "两次输入的密码不一致" unless password == password_confirmation
-  end
-
-  def check_verifi_code(verifi_code, code)
-    code = strip(code)
-    # return if code == "123123" # TODO 万能验证码，用于测试
-    raise VerifiCodeError, "验证码已失效" if !verifi_code&.effective?
-    raise VerifiCodeError, "验证码不正确" if verifi_code&.code != code
-  end
-
  private
  def strip(str)
    str.to_s.strip.presence
  end
-
-  # 1 手机类型；0 邮箱类型
-  # 注意新版的login是自动名生成的
-  def phone_mail_type value
-    value =~ /^1\d{10}$/ ? 1 : 0
-  end
 end
--- a/app/forms/organizations/create_form.rb
+++ b/app/forms/organizations/create_form.rb
@ -1,6 +1,6 @@
 class Organizations::CreateForm < BaseForm
  NAME_REGEX = /^(?!_)(?!.*?_$)[a-zA-Z0-9_-]+$/ #只含有数字、字母、下划线不能以下划线开头和结尾
-  attr_accessor :name, :description, :website, :location, :repo_admin_change_team_access, :visibility, :max_repo_creation, :nickname, :original_name
+  attr_accessor :name, :description, :website, :location, :repo_admin_change_team_access, :visibility, :max_repo_creation, :nickname

  validates :name, :nickname, :visibility, presence: true
  validates :name, :nickname, length: { maximum: 100 }
@ -8,11 +8,4 @@ class Organizations::CreateForm < BaseForm
  validates :description, length: { maximum: 200 }
  validates :name, format: { with: NAME_REGEX, multiline: true, message: "只能含有数字、字母、下划线且不能以下划线开头和结尾" }

-  validate do 
-    check_name(name) unless name.blank? || name == original_name
-  end
-
-  def check_name(name)
-    raise "组织账号已被使用." if Owner.where(login: name.strip).exists?
-  end
 end
--- a/app/forms/projects/update_form.rb
+++ b/app/forms/projects/update_form.rb
@ -1,5 +1,5 @@
 class Projects::UpdateForm < BaseForm
-  attr_accessor :name, :description, :project_category_id, :project_language_id, :private, :identifier, :user_id, :project_identifier, :project_name
+  attr_accessor :name, :description, :project_category_id, :project_language_id, :private, :identifier, :user_id, :project_identifier
  validates :name, presence: true
  validates :name, length: { maximum: 50 }
  validates :description, length: { maximum: 200 }
@ -10,7 +10,6 @@ class Projects::UpdateForm < BaseForm
    check_project_language(project_language_id)

    check_repository_name(user_id, identifier) unless identifier.blank? || identifier == project_identifier
-    check_project_name(user_id, name) unless name.blank? || name == project_name
  end

 end
--- a/app/forms/register/form.rb
+++ b/app/forms/register/form.rb
@ -10,8 +10,7 @@ module Register
    
    def check!
      Rails.logger.info "Register::Form params: code: #{code}; login: #{login}; namespace: #{namespace}; password: #{password}; type: #{type}"
-      type = phone_mail_type(strip(login))
-      db_verifi_code =
+      db_verifi_code = 
        if type == 1
          check_phone(login)
          VerificationCode.where(phone: login, code: code, code_type: 1).last
--- a/app/forms/register/remote_form.rb
+++ b/app/forms/register/remote_form.rb
@ -1,16 +0,0 @@
-module Register
-  class RemoteForm < Register::BaseForm
-    # login 登陆方式，支持邮箱、登陆、手机号等
-    attr_accessor :username, :email, :password, :platform
-
-    validates :username, :email, :password, presence: true
-    validate :check!
-    
-    def check!
-      Rails.logger.info "Register::RemoteForm params: username: #{username}; email: #{email}; password: #{password}; platform: #{platform}"
-      check_login(username)
-      check_mail(email)
-      check_password(password)
-    end
-  end
-end
--- a/app/forms/users/login_form.rb
+++ b/app/forms/users/login_form.rb
@ -4,5 +4,5 @@ class Users::LoginForm
  attr_accessor :password, :login

  validates :login, presence: true
-  validates :password, presence: true, length: { minimum: 6, maximum: 16 }, format: { with: CustomRegexp::LOGIN_PASSWORD, message: "6~16位，支持字母数字和符号" }
+  validates :password, presence: true, length: { minimum: 8, maximum: 16 }, format: { with: CustomRegexp::PASSWORD, message: "8~16位，支持字母数字和符号" }
 end
--- a/app/helpers/repositories_helper.rb
+++ b/app/helpers/repositories_helper.rb
@ -10,12 +10,12 @@ module RepositoriesHelper
  end

  def download_type(str)
-    default_type = %w(xlsx xls ppt pptx pdf zip 7z rar exe pdb obj idb RData rdata doc docx mpp vsdx dot otf eot ttf woff woff2 mp4 mov wmv flv mpeg avi avchd webm mkv)
-    default_type.include?(str&.downcase) || str.blank?
+    default_type = %w(xlsx xls ppt pptx pdf zip 7z rar exe pdb obj idb RData rdata doc docx mpp vsdx dot otf eot ttf woff woff2)
+    default_type.include?(str&.downcase)
  end

  def image_type?(str)
-    default_type = %w(png jpg gif tif psd svg bmp webp jpeg ico psd)
+    default_type = %w(png jpg gif tif psd svg bmp webp jpeg)
    default_type.include?(str&.downcase)
  end

@ -45,7 +45,7 @@ module RepositoriesHelper
    end
  end

-  def readme_render_decode64_content(str, owner, repo, ref)
+  def readme_render_decode64_content(str, path)
    return nil if str.blank?
    begin
      content = Base64.decode64(str).force_encoding('UTF-8')
@ -57,28 +57,21 @@ module RepositoriesHelper
      total_images = ss + ss_src
      if total_images.length > 0
        total_images.each do |s|
-         begin
          image_title = /\"(.*?)\"/
          r_content = s[0]
          remove_title = r_content.to_s.scan(image_title)
          if remove_title.length > 0
            r_content = r_content.gsub(/#{remove_title[0]}/, "").strip
          end
-          # if r_content.include?("?")
-          #   new_r_content = r_content + "&raw=true"
-          # else
-          #   new_r_content = r_content + "?raw=true"
-          # end
-          new_r_content = r_content
-
+          if r_content.include?("?")
+            new_r_content = r_content + "&raw=true"
+          else
+            new_r_content = r_content + "?raw=true"
+          end
          unless r_content.include?("http://") || r_content.include?("https://") || r_content.include?("mailto:")
-            # new_r_content = "#{path}" + new_r_content
-            new_r_content = [base_url, "/api/#{owner&.login}/#{repo.identifier}/raw?filepath=#{r_content}&ref=#{ref}"].join
+            new_r_content = "#{path}" + new_r_content
          end
          content = content.gsub(/#{r_content}/, new_r_content)
-         rescue
-          next
-         end
        end
      end
  
@ -100,10 +93,8 @@ module RepositoriesHelper

  def decode64_content(entry, owner, repo, ref, path=nil)
    if is_readme?(entry['type'], entry['name'])
-      Rails.logger.info("entry===#{entry["type"]} #{entry["name"]}")
      content = Gitea::Repository::Entries::GetService.call(owner, repo.identifier, URI.escape(entry['path']), ref: ref)['content']
-      Rails.logger.info("content===#{content}")
-      readme_render_decode64_content(content, owner, repo, ref)
+      readme_render_decode64_content(content, path)
    else
      file_type = File.extname(entry['name'].to_s)[1..-1]
      if image_type?(file_type)
--- a/app/helpers/tag_chosen_helper.rb
+++ b/app/helpers/tag_chosen_helper.rb
@ -26,13 +26,8 @@ module TagChosenHelper
  end

  def render_branches(project)
-    if project.educoder?
-      return ['master']
-    else
-      branches = Gitea::Repository::Branches::ListNameService.call(project&.owner, project.identifier)
-      return branches.collect{|i| i["name"] if i.is_a?(Hash)} if branches.is_a?(Array)
-      return branches["branch_name"] if branches.is_a?(Hash)
-    end
+    branches = Gitea::Repository::Branches::ListService.call(project&.owner, project.identifier)
+    branches.collect{|i| i["name"] if i.is_a?(Hash)}
  end

  def render_cache_trackers
--- a/app/jobs/cache_async_clear_job.rb
+++ b/app/jobs/cache_async_clear_job.rb
@ -7,8 +7,6 @@ class CacheAsyncClearJob < ApplicationJob
      Cache::V2::ProjectCommonService.new(id).clear
    when "owner_common_service"
      Cache::V2::OwnnerCommonService.new(id).clear
-    when "project_rank_service"
-      Cache::V2::ProjectRankService.new(id).clear
    end
  end
 end
--- a/app/jobs/delay_expired_issue_job.rb
+++ b/app/jobs/delay_expired_issue_job.rb
@ -3,7 +3,8 @@ class DelayExpiredIssueJob < ApplicationJob

  def perform
    Issue.where(due_date: Date.today + 1.days).find_each do |issue|
-      SendTemplateMessageJob.perform_later('IssueExpire', issue.id) if Site.has_notice_menu?
+      SendTemplateMessageJob.perform_later('IssueAssignerExpire', issue.id) if Site.has_notice_menu?
+      SendTemplateMessageJob.perform_later('IssueCreatorExpire', issue.id) if Site.has_notice_menu?
    end
  end

--- a/app/jobs/migrate_remote_repository_job.rb
+++ b/app/jobs/migrate_remote_repository_job.rb
@ -6,7 +6,7 @@ class MigrateRemoteRepositoryJob < ApplicationJob
    return if repo.blank?

    puts "############ MigrateRemoteRepositoryJob starting ... ############"
-    params.except!(:auth_password, :auth_username) if params[:auth_username].nil?
+
    gitea_repository = Gitea::Repository::MigrateService.new(token, params).call
    puts "#gitea_repository#{gitea_repository}"
    if gitea_repository[0]==201
--- a/app/jobs/send_template_message_job.rb
+++ b/app/jobs/send_template_message_job.rb
@ -24,13 +24,19 @@ class SendTemplateMessageJob < ApplicationJob
        receivers_email_string, email_title, email_content = MessageTemplate::IssueAssigned.get_email_message_content(receiver, operator, issue)
        Notice::Write::EmailCreateService.call(receivers_email_string, email_title, email_content)
      end
+    when 'IssueAssignerExpire'
+      issue_id = args[0]
+      issue = Issue.find_by_id(issue_id)
+      return unless issue.present?
+      receivers = User.where(id: issue&.assigned_to_id)
+      receivers_string, content, notification_url = MessageTemplate::IssueAssignerExpire.get_message_content(receivers, issue)
+      Notice::Write::CreateService.call(receivers_string, content, notification_url, source, {issue_id: issue.id})
    when 'IssueAtme'
      receivers, operator_id, issue_id = args[0], args[1], args[2]
      operator = User.find_by_id(operator_id)
      issue = Issue.find_by_id(issue_id)
      return unless operator.present? && issue.present?
      # receivers = receivers.where.not(id: operator&.id)
-      receivers = User.where(id: receivers)
      receivers_string, content, notification_url = MessageTemplate::IssueAtme.get_message_content(receivers, operator, issue)
      Notice::Write::CreateService.call(receivers_string, content, notification_url, source, {operator_id: operator.id, issue_id: issue.id}, 2, operator_id)
    when 'IssueChanged'
@ -45,17 +51,13 @@ class SendTemplateMessageJob < ApplicationJob
        receivers_email_string, email_title, email_content = MessageTemplate::IssueChanged.get_email_message_content(receiver, operator, issue, change_params)
        Notice::Write::EmailCreateService.call(receivers_email_string, email_title, email_content)
      end
-    when 'IssueExpire'
+    when 'IssueCreatorExpire'
      issue_id = args[0]
      issue = Issue.find_by_id(issue_id)
      return unless issue.present?
-      receivers = User.where(id: [issue&.assigned_to_id, issue&.author_id])
-      receivers_string, content, notification_url = MessageTemplate::IssueExpire.get_message_content(receivers, issue)
+      receivers = User.where(id: issue&.author_id)
+      receivers_string, content, notification_url = MessageTemplate::IssueCreatorExpire.get_message_content(receivers, issue)
      Notice::Write::CreateService.call(receivers_string, content, notification_url, source, {issue_id: issue.id})
-      receivers.find_each do |receiver|
-        receivers_email_string, email_title, email_content = MessageTemplate::IssueExpire.get_email_message_content(receiver, issue)
-        Notice::Write::EmailCreateService.call(receivers_email_string, email_title, email_content)
-      end
    when 'IssueDeleted'
      operator_id, issue_title, issue_assigned_to_id, issue_author_id = args[0], args[1], args[2], args[3]
      operator = User.find_by_id(operator_id)
@ -91,14 +93,18 @@ class SendTemplateMessageJob < ApplicationJob
        receivers_email_string, email_title, email_content = MessageTemplate::OrganizationLeft.get_email_message_content(receiver, organization)
        Notice::Write::EmailCreateService.call(receivers_email_string, email_title, email_content)
      end
-    when 'ProjectForked'
-      operator_id, project_id = args[0], args[1]
-      operator = User.find_by_id(operator_id)
-      project = Project.find_by_id(project_id)
-      return unless operator.present? && project.present?
-      receivers = project&.all_managers.where.not(id: operator&.id)
-      receivers_string, content, notification_url = MessageTemplate::ProjectForked.get_message_content(receivers, operator, project)
-      Notice::Write::CreateService.call(receivers_string, content, notification_url, source, {operator_id: operator.id, project_id: project.id})
+    when 'OrganizationRole'
+      user_id, organization_id, role = args[0], args[1], args[2]
+      user = User.find_by_id(user_id)
+      organization = Organization.find_by_id(organization_id)
+      return unless user.present? && organization.present?
+      receivers = User.where(id: user.id)
+      receivers_string, content, notification_url = MessageTemplate::OrganizationRole.get_message_content(receivers, organization, role)
+      Notice::Write::CreateService.call(receivers_string, content, notification_url, source, {user_id: user.id, organization_id: organization.id, role: role})
+      receivers.find_each do |receiver|
+        receivers_email_string, email_title, email_content = MessageTemplate::OrganizationRole.get_email_message_content(receiver, organization, role)
+        Notice::Write::EmailCreateService.call(receivers_email_string, email_title, email_content)
+      end
    when 'ProjectIssue'
      operator_id, issue_id = args[0], args[1]
      operator = User.find_by_id(operator_id)
@ -168,37 +174,6 @@ class SendTemplateMessageJob < ApplicationJob
        receivers_email_string, email_title, email_content = MessageTemplate::ProjectMemberLeft.get_email_message_content(receiver, user, project)
        Notice::Write::EmailCreateService.call(receivers_email_string, email_title, email_content)
      end
-    when 'ProjectMilestoneCompleted'
-      milestone_id = args[0]
-      milestone = Version.find_by_id(milestone_id)
-      return unless milestone.present? && milestone&.project.present?
-      receivers = milestone&.project&.all_managers
-      receivers_string, content, notification_url = MessageTemplate::ProjectMilestoneCompleted.get_message_content(receivers, milestone)
-      Notice::Write::CreateService.call(receivers_string, content, notification_url, source, {milestone_id: milestone_id})
-      receivers.find_each do |receiver| 
-        receivers_email_string, email_title, email_content = MessageTemplate::ProjectMilestoneCompleted.get_email_message_content(receiver, milestone)
-        Notice::Write::EmailCreateService.call(receivers_email_string, email_title, email_content)
-      end
-    when 'ProjectMilestone'
-      milestone_id, operator_id = args[0], args[1]
-      milestone = Version.find_by_id(milestone_id)
-      operator = User.find_by_id(operator_id)
-      return unless milestone.present? && milestone&.project.present? && operator.present?
-      receivers = milestone&.project&.all_managers.where.not(id: operator_id)
-      receivers_string, content, notification_url = MessageTemplate::ProjectMilestone.get_message_content(receivers, operator, milestone)
-      Notice::Write::CreateService.call(receivers_string, content, notification_url, source, {milestone_id: milestone_id, operator_id: operator_id})
-      receivers.find_each do |receiver|
-        receivers_email_string, email_title, email_content = MessageTemplate::ProjectMilestone.get_email_message_content(receiver, operator, milestone)
-        Notice::Write::EmailCreateService.call(receivers_email_string, email_title, email_content)
-      end
-    when 'ProjectPraised'
-      operator_id, project_id = args[0], args[1]
-      operator = User.find_by_id(operator_id)
-      project = Project.find_by_id(project_id)
-      return unless operator.present? && project.present?
-      receivers = project&.all_managers.where.not(id: operator&.id)
-      receivers_string, content, notification_url = MessageTemplate::ProjectPraised.get_message_content(receivers, operator, project)
-      Notice::Write::CreateService.call(receivers_string, content, notification_url, source, {operator_id: operator.id, project_id: project.id})
    when 'ProjectPullRequest'
      operator_id, pull_request_id = args[0], args[1]
      operator = User.find_by_id(operator_id)
@ -260,7 +235,6 @@ class SendTemplateMessageJob < ApplicationJob
      pull_request = PullRequest.find_by_id(pull_request_id)
      return unless operator.present? && pull_request.present?
      # receivers = receivers.where.not(id: operator&.id)
-      receivers = User.where(id: receivers)
      receivers_string, content, notification_url = MessageTemplate::PullRequestAtme.get_message_content(receivers, operator, pull_request)
      Notice::Write::CreateService.call(receivers_string, content, notification_url, source, {operator_id: operator.id, pull_request_id: pull_request.id}, 2, operator_id)
    when 'PullRequestChanged'
@ -300,56 +274,6 @@ class SendTemplateMessageJob < ApplicationJob
        receivers_email_string, email_title, email_content = MessageTemplate::PullRequestMerged.get_email_message_content(receiver, operator, pull_request)
        Notice::Write::EmailCreateService.call(receivers_email_string, email_title, email_content)
      end
-    when 'TeamJoined'
-      user_id, organization_id, team_id = args[0], args[1], args[2]
-      user = User.find_by_id(user_id)
-      organization = Organization.find_by_id(organization_id)
-      team = Team.find_by_id(team_id)
-      return unless user.present? && organization.present? && team.present?
-      receivers = User.where(id: user.id)
-      receivers_string, content, notification_url = MessageTemplate::TeamJoined.get_message_content(receivers, organization, team)
-      Notice::Write::CreateService.call(receivers_string, content, notification_url, source, {user_id: user.id, organization_id: organization.id, team_id: team.id})
-      receivers.find_each do |receiver|
-        receivers_email_string, email_title, email_content = MessageTemplate::TeamJoined.get_email_message_content(receiver, organization, team)
-        Notice::Write::EmailCreateService.call(receivers_email_string, email_title, email_content)
-      end
-    when 'TeamLeft'
-      user_id, organization_id, team_id = args[0], args[1], args[2]
-      user = User.find_by_id(user_id)
-      organization = Organization.find_by_id(organization_id)
-      team = Team.find_by_id(team_id)
-      return unless user.present? && organization.present? && team.present?
-      receivers = User.where(id: user.id)
-      receivers_string, content, notification_url = MessageTemplate::TeamLeft.get_message_content(receivers, organization, team)
-      Notice::Write::CreateService.call(receivers_string, content, notification_url, source, {user_id: user.id, organization_id: organization.id, team_id: team.id})
-      receivers.find_each do |receiver|
-        receivers_email_string, email_title, email_content = MessageTemplate::TeamLeft.get_email_message_content(receiver, organization, team)
-        Notice::Write::EmailCreateService.call(receivers_email_string, email_title, email_content)
-      end
-    when 'CompetitionBegin'
-      user_id, competition_id = args[0], args[1]
-      user = User.find_by_id(user_id)
-      project = Project.find_by_sql("select *,title as name from competitions where id=#{competition_id}")
-      return unless user.present? && project.present?
-      receivers = User.where(id: user_id)
-      receivers_string, content, notification_url = MessageTemplate::CompetitionBegin.get_message_content(receivers, project.first)
-      Notice::Write::CreateService.call(receivers_string, content, notification_url, source, {user_id: user_id, competition_name: project.first&.name, identifier: project.first&.identifier})
-    when 'CompetitionReview'
-      user_id, competition_id = args[0], args[1]
-      user = User.find_by_id(user_id)
-      project = Project.find_by_sql("select *,title as name from competitions where id=#{competition_id}")
-      return unless user.present? && project.present?
-      receivers = User.where(id: user_id)
-      receivers_string, content, notification_url = MessageTemplate::CompetitionReview.get_message_content(receivers, project.first)
-      Notice::Write::CreateService.call(receivers_string, content, notification_url, source, {user_id: user_id, competition_name: project.first&.name, identifier: project.first&.identifier})
-    when 'CompetitionResult'
-      user_id, competition_id = args[0], args[1]
-      user = User.find_by_id(user_id)
-      project = Project.find_by_sql("select *,title as name from competitions where id=#{competition_id}")
-      return unless user.present? && project.present?
-      receivers = User.where(id: user_id)
-      receivers_string, content, notification_url = MessageTemplate::CompetitionResult.get_message_content(receivers, project.first)
-      Notice::Write::CreateService.call(receivers_string, content, notification_url, source, {user_id: user_id, competition_name: project.first&.name, identifier: project.first&.identifier})
    end
  end
 end
--- a/app/libs/custom_regexp.rb
+++ b/app/libs/custom_regexp.rb
@ -5,7 +5,6 @@ module CustomRegexp
  LASTNAME = /\A[a-zA-Z0-9\u4e00-\u9fa5]+\z/
  NICKNAME = /\A[\u4e00-\u9fa5_a-zA-Z0-9]+\z/
  PASSWORD = /\A[a-z_A-Z0-9\-\.!@#\$%\\\^&\*\)\(\+=\{\}\[\]\/",'_<>~\·`\?:;|]{8,16}\z/
-  LOGIN_PASSWORD = /\A[a-z_A-Z0-9\-\.!@#\$%\\\^&\*\)\(\+=\{\}\[\]\/",'_<>~\·`\?:;|]{6,16}\z/
  URL = /\Ahttps?:\/\/[-A-Za-z0-9+&@#\/%?=~_|!:,.;]+[-A-Za-z0-9+&@#\/%=~_|]\z/
  IP = /^((\d|[1-9]\d|1\d{2}|2[0-4]\d|25[0-5])\.){3}(\d|[1-9]\d|1\d{2}|2[0-4]\d|25[0-5])$/

--- a/app/libs/trace.rb
+++ b/app/libs/trace.rb
@ -1,21 +0,0 @@
-module Trace 
-  class << self
-    def trace_config 
-      trace_config = {}
-
-      begin
-        config = Rails.application.config_for(:configuration).symbolize_keys!
-        trace_config = config[:trace].symbolize_keys!
-        raise 'trace config missing' if trace_config.blank?
-      rescue => exception
-        raise ex if Rails.env.production?
-
-        puts %Q{\033[33m [warning] gitea config or configuration.yml missing,
-                 please add it or execute 'cp config/configuration.yml.example config/configuration.yml' \033[0m}
-        trace_config = {}
-      end
-
-      trace_config 
-    end
-  end
-end
--- a/app/libs/util.rb
+++ b/app/libs/util.rb
@ -29,7 +29,6 @@ module Util
        file.write(io)
      end
    end
-    true
  end

  def download_file(url, save_path)
--- a/app/models/ci/repo.rb
+++ b/app/models/ci/repo.rb
@ -5,10 +5,10 @@ class Ci::Repo < Ci::RemoteBase
  has_one :perm, foreign_key: :perm_repo_uid
  has_many :builds, foreign_key: :build_repo_id, dependent: :destroy

-  def self.find_with_namespace(namespace_path, identifier, user_login)
+  def self.find_with_namespace(namespace_path, identifier)
    logger.info "########namespace_path: #{namespace_path} ########identifier: #{identifier} "
-    user_login = user_login || namespace_path
-    user = Ci::User.find_by(user_login: user_login)
+
+    user = Ci::User.find_by_user_login namespace_path
    repo = Ci::Repo.where(repo_namespace: namespace_path, repo_name: identifier).first

    [user, repo]
--- a/app/models/concerns/matchable.rb
+++ b/app/models/concerns/matchable.rb
@ -5,7 +5,7 @@ module Matchable
    scope :with_project_category, ->(category_id) { where(project_category_id: category_id) unless category_id.blank? }
    scope :with_project_language, ->(language_id) { where(project_language_id: language_id) unless language_id.blank? }
    scope :with_project_type,     ->(project_type) { where(project_type: project_type) if Project.project_types.include?(project_type) }
-    scope :by_name_or_identifier, ->(search) { where("name like :search or identifier LIKE :search", :search => "%#{search.split(" ").join('|')}%") unless search.blank? }
+    scope :by_name_or_identifier, ->(search) { where("name like :search or identifier LIKE :search", :search => "#{search.split(" ").join('|')}%") unless search.blank? }
  end

 end
--- a/app/models/concerns/project_operable.rb
+++ b/app/models/concerns/project_operable.rb
@ -21,37 +21,13 @@ module ProjectOperable
  end

  def add_member!(user_id, role_name='Developer')
-    if self.owner.is_a?(Organization) 
-      case role_name 
-      when 'Manager'
-        team = self.owner.teams.admin.take
-        team = team.nil? ? Team.build(self.user_id, 'admin', '管理员', '', 'admin', false, false) : team
-        TeamProject.build(self.user_id, team.id, self.id)
-        OrganizationUser.build(self.user_id, user_id)
-        team_user = TeamUser.build(self.user_id, user_id, team.id)
-      when 'Developer'
-        team = self.owner.teams.write.take
-        team = team.nil? ? Team.build(self.user_id, 'developer', '开发者', '', 'write', false, false) : team
-        TeamProject.build(self.user_id, team.id, self.id)
-        OrganizationUser.build(self.user_id, user_id)
-        team_user = TeamUser.build(self.user_id, user_id, team.id)
-      when 'Reporter'
-        team = self.owner.teams.read.take
-        team = team.nil? ? Team.build(self.user_id, 'reporter', '报告者', '', 'read', false, false) : team
-        TeamProject.build(self.user_id, team.id, self.id)
-        OrganizationUser.build(self.user_id, user_id)
-        team_user = TeamUser.build(self.user_id, user_id, team.id)
-      end
-    end
-    member = members.create!(user_id: user_id, team_user_id: team_user&.id)
+    member = members.create!(user_id: user_id)
    set_developer_role(member, role_name)
  end

  def remove_member!(user_id)
    member = members.find_by(user_id: user_id)
    member.destroy! if member && self.user_id != user_id
-    team_user = TeamUser.find_by_id(member&.team_user_id)
-    team_user.destroy! if team_user
  end

  def member?(user_id)
@ -71,28 +47,6 @@ module ProjectOperable

  def change_member_role!(user_id, role)
    member = self.member(user_id)
-    if self.owner.is_a?(Organization) && member.team_user.present?
-      case role&.name
-      when 'Manager'
-        team = self.owner.teams.admin.take
-        team = team.nil? ? Team.build(self.user_id, 'admin', '管理员', '', 'admin', false, false) : team
-        TeamProject.build(self.user_id, team.id, self.id)
-        OrganizationUser.build(self.user_id, user_id)
-        team_user = member.team_user.update(team_id: team&.id)
-      when 'Developer'
-        team = self.owner.teams.write.take
-        team = team.nil? ? Team.build(self.user_id, 'developer', '开发者', '', 'write', false, false) : team
-        TeamProject.build(self.user_id, team.id, self.id)
-        OrganizationUser.build(self.user_id, user_id)
-        team_user = member.team_user.update(team_id: team&.id)
-      when 'Reporter'
-        team = self.owner.teams.read.take
-        team = team.nil? ? Team.build(self.user_id, 'reporter', '报告者', '', 'read', false, false) : team
-        TeamProject.build(self.user_id, team.id, self.id)
-        OrganizationUser.build(self.user_id, user_id)
-        team_user = member.team_user.update(team_id: team&.id)
-      end
-    end
    member.member_roles.last.update_attributes!(role: role)
  end

--- a/app/models/gitea/webhook_task.rb
+++ b/app/models/gitea/webhook_task.rb
@ -1,6 +1,7 @@
 class Gitea::WebhookTask < Gitea::Base 
  serialize :payload_content, JSON
  serialize :request_content, JSON
+  serialize :response_content, JSON

  self.inheritance_column = nil

@ -9,10 +10,4 @@ class Gitea::WebhookTask < Gitea::Base
  belongs_to :webhook, class_name: "Gitea::Webhook", foreign_key: :hook_id

  enum type: {gogs: 1, slack: 2, gitea: 3, discord: 4, dingtalk: 5, telegram: 6, msteams: 7, feishu: 8, matrix: 9}
-
-  def response_content_json
-    JSON.parse(response_content)
-  rescue 
-    {}
-  end
 end
--- a/app/models/issue.rb
+++ b/app/models/issue.rb
@ -11,7 +11,7 @@
 #  category_id          :integer
 #  status_id            :integer          not null
 #  assigned_to_id       :integer
-#  priority_id          :integer
+#  priority_id          :integer          not null
 #  fixed_version_id     :integer
 #  author_id            :integer          not null
 #  created_on           :datetime
@ -75,7 +75,7 @@ class Issue < ApplicationRecord
  scope :issue_index_includes, ->{includes(:tracker, :priority, :version, :issue_status, :journals,:issue_tags,user: :user_extension)}
  scope :closed, ->{where(status_id: 5)}
  after_create :incre_project_common, :incre_user_statistic, :incre_platform_statistic
-  after_save :change_versions_count, :send_update_message_to_notice_system
+  after_update :change_versions_count
  after_destroy :update_closed_issues_count_in_project!, :decre_project_common, :decre_user_statistic, :decre_platform_statistic

  def incre_project_common
@ -153,10 +153,6 @@ class Issue < ApplicationRecord
    end
  end

-  def is_collaborators?
-    self.assigned_to_id.present? ? self.project.member?(self.assigned_to_id) : false
-  end
-
  def get_issue_tags_name
    if issue_tags.present?
      issue_tags.select(:name).uniq.pluck(:name).join(",")
@ -170,25 +166,11 @@ class Issue < ApplicationRecord
  end

  def change_versions_count
-    if self.saved_change_to_fixed_version_id?
-      before_version = Version.find_by_id(self.fixed_version_id_before_last_save)
-      Rails.logger.info self.fixed_version_id_before_last_save
-      if before_version.present?
-        Rails.logger.info self.status_id
-        Rails.logger.info self.status_id_before_last_save
-        # 更改前状态为完成 或者 更改前后都为完成状态
-        if self.status_id_before_last_save == 5
-          percent = before_version.issues_count == 0 ? 0.0 : ((before_version.closed_issues_count - 1).to_f / before_version.issues_count)
-          before_version.update_attributes(closed_issues_count: (before_version.closed_issues_count - 1), percent: percent)
-        end
-      end
-    end
-
-    if self.version.present? && (self.saved_change_to_status_id? || self.saved_change_to_fixed_version_id?)
+    if self.version.present? && self.saved_change_to_status_id?
      if self.status_id == 5
        percent = self.version.issues_count == 0 ? 0.0 : ((self.version.closed_issues_count + 1).to_f / self.version.issues_count)
        self.version.update_attributes(closed_issues_count: (self.version.closed_issues_count + 1), percent: percent)
-      elsif self.status_id_before_last_save == 5 && !self.saved_change_to_fixed_version_id?
+      elsif self.status_id_before_last_save == 5
        percent = self.version.issues_count == 0 ? 0.0 : ((self.version.closed_issues_count - 1).to_f / self.version.issues_count)
        self.version.update_attributes(closed_issues_count: (self.version.closed_issues_count - 1), percent: percent)
      end
@ -196,11 +178,7 @@ class Issue < ApplicationRecord
  end

  def update_closed_issues_count_in_project!
-    self.project.decrement!(:closed_issues_count) if self.status_id == 5
-  end
-
-  def send_update_message_to_notice_system
-    SendTemplateMessageJob.perform_later('IssueExpire', self.id) if Site.has_notice_menu? && self.due_date == Date.today + 1.days
+    self.project.decrement!(:closed_issues_count)
  end

 end
--- a/app/models/member.rb
+++ b/app/models/member.rb
@ -11,26 +11,23 @@
 #  course_group_id     :integer          default("0")
 #  is_collect          :integer          default("1")
 #  graduation_group_id :integer          default("0")
-#  team_user_id        :integer
 #
 # Indexes
 #
 #  index_members_on_course_id               (course_id)
 #  index_members_on_project_id              (project_id)
-#  index_members_on_team_user_id            (team_user_id)
 #  index_members_on_user_id                 (user_id)
 #  index_members_on_user_id_and_project_id  (user_id,project_id,course_id) UNIQUE
 #

-class Member < ApplicationRecord
-  belongs_to :user
-  # belongs_to :course, optional: true
-  belongs_to :project, optional: true
-  belongs_to :team_user, optional: true
-
-  has_many :member_roles, dependent: :destroy
-  has_many :roles, through: :member_roles
-
-  validates :user_id, :project_id, presence: true
-
-end
+class Member < ApplicationRecord
+  belongs_to :user
+  # belongs_to :course, optional: true
+  belongs_to :project, optional: true
+
+  has_many :member_roles, dependent: :destroy
+  has_many :roles, through: :member_roles
+
+  validates :user_id, :project_id, presence: true
+
+end
--- a/app/models/message_template.rb
+++ b/app/models/message_template.rb
@ -13,72 +13,59 @@
 #

 class MessageTemplate < ApplicationRecord
-  PLATFORM = 'GitLink'

  def self.build_init_data
-    MessageTemplate::IssueAssignerExpire.destroy_all
-    MessageTemplate::IssueCreatorExpire.destroy_all
    self.create(type: 'MessageTemplate::FollowedTip', sys_notice: '<b>{nickname}</b> 关注了你', notification_url: '{baseurl}/{login}')
    email_html = File.read("#{email_template_html_dir}/issue_assigned.html")
-    self.create(type: 'MessageTemplate::IssueAssigned', sys_notice: '{nickname1}在 <b>{nickname2}/{repository}</b> 指派给你一个疑修：<b>{title}</b>', notification_url: '{baseurl}/{owner}/{identifier}/issues/{id}', email: email_html, email_title: "#{PLATFORM}: {nickname1} 在 {nickname2}/{repository} 指派给你一个疑修")
-    self.create(type: 'MessageTemplate::IssueAtme', sys_notice: '<b>{nickname}</b> 在疑修 <b>{title}</b> 中@我', notification_url: '{baseurl}/{owner}/{identifier}/issues/{id}')
+    self.create(type: 'MessageTemplate::IssueAssigned', sys_notice: '{nickname1}在 <b>{nickname2}/{repository}</b> 指派给你一个易修：<b>{title}</b>', notification_url: '{baseurl}/{owner}/{identifier}/issues/{id}', email: email_html, email_title: 'GitLink: {nickname1} 在 {nickname2}/{repository} 指派给你一个易修')
+    self.create(type: 'MessageTemplate::IssueAssignerExpire', sys_notice: '您负责的易修 <b>{title}</b> 已临近截止日期，请尽快处理', notification_url: '{baseurl}/{owner}/{identifier}/issues/{id}')
+    self.create(type: 'MessageTemplate::IssueAtme', sys_notice: '<b>{nickname}</b> 在易修 <b>{title}</b> 中@我', notification_url: '{baseurl}/{owner}/{identifier}/issues/{id}')
    email_html = File.read("#{email_template_html_dir}/issue_changed.html")
-    self.create(type: 'MessageTemplate::IssueChanged', sys_notice: '在项目 <b>{nickname2}/{repository}</b> 的疑修 <b>{title}</b> 中：{ifassigner}{nickname1}将负责人从 <b>{assigner1}</b> 修改为 <b>{assigner2}</b> {endassigner}{ifstatus}{nickname1}将状态从 <b>{status1}</b> 修改为 <b>{status2}</b> {endstatus}{iftracker}{nickname1}将类型从 <b>{tracker1}</b> 修改为 <b>{tracker2}</b> {endtracker}{ifpriority}{nickname1}将优先级从 <b>{priority1}</b> 修改为 <b>{priority2}</b> {endpriority}{ifmilestone}{nickname1}将里程碑从 <b>{milestone1}</b> 修改为 <b>{milestone2}</b> {endmilestone}{iftag}{nickname1}将标记从 <b>{tag1}</b> 修改为 <b>{tag2}</b> {endtag}{ifdoneratio}{nickname1}将完成度从 <b>{doneratio1}</b> 修改为 <b>{doneratio2}</b> {enddoneratio}{ifbranch}{nickname1}将指定分支从 <b>{branch1}</b> 修改为 <b>{branch2}</b> {endbranch}{ifstartdate}{nickname1}将开始日期从 <b>{startdate1}</b> 修改为 <b>{startdate2}</b> {endstartdate}{ifduedate}{nickname1}将结束日期从 <b>{duedate1}</b> 修改为 <b>{duedate2}</b> {endduedate}', email: email_html, email_title: "#{PLATFORM}: 疑修 {title} 有状态变更", notification_url: '{baseurl}/{owner}/{identifier}/issues/{id}')
-    email_html = File.read("#{email_template_html_dir}/issue_expire.html")
-    self.create(type: 'MessageTemplate::IssueExpire', sys_notice: '疑修 <b>{title}</b> 已临近截止日期，请尽快处理', notification_url: '{baseurl}/{owner}/{identifier}/issues/{id}', email: email_html, email_title: "#{PLATFORM}: 疑修截止日期到达最后一天")
+    self.create(type: 'MessageTemplate::IssueChanged', sys_notice: '在项目 <b>{nickname2}/{repository}</b> 的易修 <b>{title}</b> 中：{ifassigner}{nickname1}将负责人从 <b>{assigner1}</b> 修改为 <b>{assigner2}</b> {endassigner}{ifstatus}{nickname1}将状态从 <b>{status1}</b> 修改为 <b>{status2}</b> {endstatus}{iftracker}{nickname1}将类型从 <b>{tracker1}</b> 修改为 <b>{tracker2}</b> {endtracker}{ifpriority}{nickname1}将优先级从 <b>{priority1}</b> 修改为 <b>{priority2}</b> {endpriority}{ifmilestone}{nickname1}将里程碑从 <b>{milestone1}</b> 修改为 <b>{milestone2}</b> {endmilestone}{iftag}{nickname1}将标记从 <b>{tag1}</b> 修改为 <b>{tag2}</b> {endtag}{ifdoneratio}{nickname1}将完成度从 <b>{doneratio1}</b> 修改为 <b>{doneratio2}</b> {enddoneratio}{ifbranch}{nickname1}将指定分支从 <b>{branch1}</b> 修改为 <b>{branch2}</b> {endbranch}{ifstartdate}{nickname1}将开始日期从 <b>{startdate1}</b> 修改为 <b>{startdate2}</b> {endstartdate}{ifduedate}{nickname1}将结束日期从 <b>{duedate1}</b> 修改为 <b>{duedate2}</b> {endduedate}', email: email_html, email_title: 'GitLink: 易修 {title} 有状态变更', notification_url: '{baseurl}/{owner}/{identifier}/issues/{id}')
+    self.create(type: 'MessageTemplate::IssueCreatorExpire', sys_notice: '您发布的易修 <b>{title}</b> 已临近截止日期，请尽快处理', notification_url: '{baseurl}/{owner}/{identifier}/issues/{id}')
    email_html = File.read("#{email_template_html_dir}/issue_deleted.html")
-    self.create(type: 'MessageTemplate::IssueDeleted', sys_notice: '{nickname}已将疑修 <b>{title}</b> 删除', email: email_html, email_title: "#{PLATFORM}: 疑修 {title} 有状态变更", notification_url: '')
-    self.create(type: 'MessageTemplate::IssueJournal', sys_notice: '{nickname}评论疑修{title}：<b>{notes}</b>', notification_url: '{baseurl}/{owner}/{identifier}/issues/{id}')
+    self.create(type: 'MessageTemplate::IssueDeleted', sys_notice: '{nickname}已将易修 <b>{title}</b> 删除', email: email_html, email_title: 'GitLink: 易修 {title} 有状态变更', notification_url: '')
+    self.create(type: 'MessageTemplate::IssueJournal', sys_notice: '{nickname}评论易修{title}：<b>{notes}</b>', notification_url: '{baseurl}/{owner}/{identifier}/issues/{id}')
    self.create(type: 'MessageTemplate::LoginIpTip', sys_notice: '您的账号{nickname}于{login_time)在非常用的IP地址{ip}登录，如非本人操作，请立即修改密码', notification_url: '')
    email_html = File.read("#{email_template_html_dir}/organization_joined.html")
-    self.create(type: 'MessageTemplate::OrganizationJoined', sys_notice: '你已加入 <b>{organization}</b> 组织', notification_url: '{baseurl}/{login}', email: email_html, email_title: "#{PLATFORM}: 你已加入 {organization} 组织")
+    self.create(type: 'MessageTemplate::OrganizationJoined', sys_notice: '你已加入 <b>{organization}</b> 组织', notification_url: '{baseurl}/{login}', email: email_html, email_title: 'GitLink: 你已加入 {organization} 组织')
    email_html = File.read("#{email_template_html_dir}/organization_left.html")
-    self.create(type: 'MessageTemplate::OrganizationLeft', sys_notice: '你已被移出 <b>{organization}</b> 组织', notification_url: '', email: email_html, email_title: "#{PLATFORM}: 你已被移出 {organization} 组织")
+    self.create(type: 'MessageTemplate::OrganizationLeft', sys_notice: '你已被移出 <b>{organization}</b> 组织', notification_url: '', email: email_html, email_title: 'GitLink: 你已被移出 {organization} 组织')
+    email_html = File.read("#{email_template_html_dir}/organization_role.html")
+    self.create(type: 'MessageTemplate::OrganizationRole', sys_notice: '组织 <b>{organization}</b> 已把你的角色改为 <b>{role}</b>', email: email_html, email_title: 'GitLink: 在 {organization} 组织你的账号有权限变更', notification_url: '{baseurl}/{login}')
    self.create(type: 'MessageTemplate::ProjectDeleted', sys_notice: '你关注的仓库{nickname}/{repository}已被删除', notification_url: '')
    self.create(type: 'MessageTemplate::ProjectFollowed', sys_notice: '<b>{nickname}</b> 关注了你管理的仓库', notification_url: '{baseurl}/{login}')
-    self.create(type: 'MessageTemplate::ProjectForked', sys_notice: '<b>{nickname1}</b> 复刻了你管理的仓库 <b>{nickname2}/{repository}</b> 到 <b>{nickname1}/{repository}</b>', notification_url: '{baseurl}/{owner}/{identifier}')
+    self.create(type: 'MessageTemplate::ProjectForked', sys_notice: '<b>{nickname1}</b> 复刻了你管理的仓库{nickname1}/{repository1}到{nickname2}/{repository2}', notification_url: '{baseurl}/{owner}/{identifier}')
    email_html = File.read("#{email_template_html_dir}/project_issue.html")
-    self.create(type: 'MessageTemplate::ProjectIssue', sys_notice: '{nickname1}在 <b>{nickname2}/{repository}</b> 新建疑修：<b>{title}</b>', notification_url: '{baseurl}/{owner}/{identifier}/issues/{id}', email: email_html, email_title: "#{PLATFORM}: {nickname1} 在 {nickname2}/{repository} 新建了一个疑修")
+    self.create(type: 'MessageTemplate::ProjectIssue', sys_notice: '{nickname1}在 <b>{nickname2}/{repository}</b> 新建易修：<b>{title}</b>', notification_url: '{baseurl}/{owner}/{identifier}/issues/{id}', email: email_html, email_title: 'GitLink: {nickname1} 在 {nickname2}/{repository} 新建了一个易修')
    email_html = File.read("#{email_template_html_dir}/project_joined.html")
-    self.create(type: 'MessageTemplate::ProjectJoined', sys_notice: '你已加入 <b>{repository}</b> 项目', notification_url: '{baseurl}/{owner}/{identifier}', email: email_html, email_title: "#{PLATFORM}: 你已加入 {repository} 项目")
+    self.create(type: 'MessageTemplate::ProjectJoined', sys_notice: '你已加入 <b>{repository}</b> 项目', notification_url: '{baseurl}/{owner}/{identifier}', email: email_html, email_title: 'GitLink: 你已加入 {repository} 项目')
    email_html = File.read("#{email_template_html_dir}/project_left.html")
-    self.create(type: 'MessageTemplate::ProjectLeft', sys_notice: '你已被移出 <b>{repository}</b> 项目', notification_url: '', email: email_html, email_title: "#{PLATFORM}: 你已被移出 {repository} 项目")
+    self.create(type: 'MessageTemplate::ProjectLeft', sys_notice: '你已被移出 <b>{repository}</b> 项目', notification_url: '', email: email_html, email_title: 'GitLink: 你已被移出 {repository} 项目')
    email_html = File.read("#{email_template_html_dir}/project_member_joined.html")
-    self.create(type: 'MessageTemplate::ProjectMemberJoined', sys_notice: '<b>{nickname1}</b> 已加入项目 <b>{nickname2}/{repository}</b>', notification_url: '{baseurl}/{owner}/{identifier}', email: email_html, email_title: "#{PLATFORM}: {nickname1} 已加入项目 {nickname2}/{repository}")
+    self.create(type: 'MessageTemplate::ProjectMemberJoined', sys_notice: '<b>{nickname1}</b> 已加入项目 <b>{nickname2}/{repository}</b>', notification_url: '{baseurl}/{owner}/{identifier}', email: email_html, email_title: 'GitLink: {nickname1} 已加入项目 {nickname2}/{repository}')
    email_html = File.read("#{email_template_html_dir}/project_member_left.html")
-    self.create(type: 'MessageTemplate::ProjectMemberLeft', sys_notice: '<b>{nickname1}</b> 已被移出项目 <b>{nickname2}/{repository}</b>', notification_url: '{baseurl}/{owner}/{identifier}', email: email_html, email_title: "#{PLATFORM}: {nickname1} 已被移出项目 {nickname2}/{repository}")
-    email_html = File.read("#{email_template_html_dir}/project_milestone.html")
-    self.create(type: 'MessageTemplate::ProjectMilestone', sys_notice: '{nickname1}在 <b>{nickname2}/{repository}</b> 创建了一个里程碑：<b>{name}</b>', notification_url: '{baseurl}/{owner}/{identifier}/milestones/{id}', email: email_html, email_title: "#{PLATFORM}: {nickname1} 在 {nickname2}/{repository} 新建了一个里程碑")
-    email_html = File.read("#{email_template_html_dir}/project_milestone_completed.html")
-    self.create(type: 'MessageTemplate::ProjectMilestoneCompleted', sys_notice: '在 <b>{nickname}/{repository}</b> 仓库，里程碑 <b>{name}</b> 的完成度已达到100%', notification_url: '{baseurl}/{owner}/{identifier}/milestones/{id}', email: email_html, email_title: "#{PLATFORM}: 仓库 {nickname}/{repository} 有里程碑已完成")
-    self.create(type: 'MessageTemplate::ProjectPraised', sys_notice: '<b>{nickname1}</b> 点赞了你管理的仓库 <b>{nickname2}/{repository}</b>', notification_url: '{baseurl}/{login}')
+    self.create(type: 'MessageTemplate::ProjectMemberLeft', sys_notice: '<b>{nickname1}</b> 已被移出项目 <b>{nickname2}/{repository}</b>', notification_url: '{baseurl}/{owner}/{identifier}', email: email_html, email_title: 'GitLink: {nickname1} 已被移出项目 {nickname2}/{repository}')
+    self.create(type: 'MessageTemplate::ProjectMilestone', sys_notice: '{nickname1}在 <b>{nickname2}/{repository}</b> 创建了一个里程碑：<b>{title}</b>', notification_url: '{baseurl}/{owner}/{identifier}/milestones/{id}')
+    self.create(type: 'MessageTemplate::ProjectPraised', sys_notice: '<b>{nickname}</b> 点赞了你管理的仓库', notification_url: '{baseurl}/{login}')
    email_html = File.read("#{email_template_html_dir}/project_pull_request.html")
-    self.create(type: 'MessageTemplate::ProjectPullRequest', sys_notice: '{nickname1}在 <b>{nickname2}/{repository}</b> 提交了一个合并请求：<b>{title}</b>', notification_url: '{baseurl}/{owner}/{identifier}/pulls/{id}', email: email_html, email_title: "#{PLATFORM}: {nickname1} 在 {nickname2}/{repository} 提交了一个合并请求")
+    self.create(type: 'MessageTemplate::ProjectPullRequest', sys_notice: '{nickname1}在 <b>{nickname2}/{repository}</b> 提交了一个合并请求：<b>{title}</b>', notification_url: '{baseurl}/{owner}/{identifier}/pulls/{id}', email: email_html, email_title: 'GitLink: {nickname1} 在 {nickname2}/{repository} 提交了一个合并请求')
    email_html = File.read("#{email_template_html_dir}/project_role.html")
-    self.create(type: 'MessageTemplate::ProjectRole', sys_notice: '仓库 <b>{nickname}/{repository}</b> 已把你的角色改为 <b>{role}</b>', email: email_html, email_title: '#{PLATFORM}: 在 {nickname}/{repository} 项目你的账号有权限变更', notification_url: '{baseurl}/{owner}/{identifier}')
+    self.create(type: 'MessageTemplate::ProjectRole', sys_notice: '仓库 <b>{nickname}/{repository}</b> 已把你的角色改为 <b>{role}</b>', email: email_html, email_title: 'GitLink: 在 {nickname}/{repository} 项目你的账号有权限变更', notification_url: '{baseurl}/{owner}/{identifier}')
    email_html = File.read("#{email_template_html_dir}/project_setting_changed.html")
-    self.create(type: 'MessageTemplate::ProjectSettingChanged', sys_notice: '{nickname1}更改了 <b>{nickname2}/{repository}</b> 仓库设置：{ifname}更改项目名称为"<b>{name}</b>"{endname}{ifidentifier}更改项目标识为"<b>{identifier}</b>"{endidentifier}{ifdescription}更改项目简介为"<b>{description}</b>"{enddescription}{ifcategory}更改项目类别为"<b>{category}</b>"{endcategory}{iflanguage}更改项目语言为"<b>{language}</b>"{endlanguage}{ifpermission}将仓库设为"<b>{permission}</b>"{endpermission}{ifnavbar}将项目导航更改为"<b>{navbar}</b>"{endnavbar}', notification_url: '{baseurl}/{owner}/{identifier}/settings', email: email_html, email_title: "#{PLATFORM}: 您管理的仓库 {nickname2}/{repository} 仓库设置已被更改")
+    self.create(type: 'MessageTemplate::ProjectSettingChanged', sys_notice: '{nickname1}更改了 <b>{nickname2}/{repository}</b> 仓库设置：{ifname}更改项目名称为"<b>{name}</b>"{endname}{ifidentifier}更改项目标识为"<b>{identifier}</b>"{endidentifier}{ifdescription}更改项目简介为"<b>{description}</b>"{enddescription}{ifcategory}更改项目类别为"<b>{category}</b>"{endcategory}{iflanguage}更改项目语言为"<b>{language}</b>"{endlanguage}{ifpermission}将仓库设为"<b>{permission}</b>"{endpermission}{ifnavbar}将项目导航更改为"<b>{navbar}</b>"{endnavbar}', notification_url: '{baseurl}/{owner}/{identifier}/settings', email: email_html, email_title: 'GitLink: 您管理的仓库 {nickname2}/{repository} 仓库设置已被更改')
    self.create(type: 'MessageTemplate::ProjectTransfer', sys_notice: '你关注的仓库{nickname1}/{repository1}已被转移至{nickname2}/{repository2}', notification_url: '{baseurl}/{owner}/{identifier}')
    self.create(type: 'MessageTemplate::ProjectVersion', sys_notice: '{nickname1}在 <b>{nickname2}/{repository}</b> 创建了发行版：<b>{title}</b>', notification_url: '{baseurl}/{owner}/{identifier}/releases')
    email_html = File.read("#{email_template_html_dir}/pull_request_assigned.html")
-    self.create(type: 'MessageTemplate::PullRequestAssigned', sys_notice: '{nickname1}在 <b>{nickname2}/{repository}</b> 指派给你一个合并请求：<b>{title}<b>', notification_url: '{baseurl}/{owner}/{identifier}/pulls/{id}', email: email_html, email_title: "#{PLATFORM}: {nickname1} 在 {nickname2}/{repository} 指派给你一个合并请求")
+    self.create(type: 'MessageTemplate::PullRequestAssigned', sys_notice: '{nickname1}在 <b>{nickname2}/{repository}</b> 指派给你一个合并请求：<b>{title}<b>', notification_url: '{baseurl}/{owner}/{identifier}/pulls/{id}', email: email_html, email_title: 'GitLink: {nickname1} 在 {nickname2}/{repository} 指派给你一个合并请求')
    self.create(type: 'MessageTemplate::PullRequestAtme', sys_notice: '<b>{nickname}</b> 在合并请求 <b>{title}</b> 中@我', notification_url: '{baseurl}/{owner}/{identifier}/pulls/{id}')
    email_html = File.read("#{email_template_html_dir}/pull_request_changed.html")
-    self.create(type: 'MessageTemplate::PullRequestChanged', sys_notice: '在项目{nickname2}/{repository}的合并请求 <b>{title}</b> 中：{ifassigner}{nickname1}将审查成员从 <b>{assigner1}</b> 修改为 <b>{assigner2}</b> {endassigner}{ifmilestone}{nickname1}将里程碑从 <b>{milestone1}</b> 修改为 <b>{milestone2}</b> {endmilestone}{iftag}{nickname1}将标记从 <b>{tag1}</b> 修改为 <b>{tag2}</b> {endtag}{ifpriority}{nickname1}将优先级从 <b>{priority1}</b> 修改为 <b>{priority2}</b> {endpriority}', email: email_html, email_title: "#{PLATFORM}: 合并请求 {title} 有状态变更", notification_url: '{baseurl}/{owner}/{identifier}/pulls/{id}')
+    self.create(type: 'MessageTemplate::PullRequestChanged', sys_notice: '在项目{nickname2}/{repository}的合并请求 <b>{title}</b> 中：{ifassigner}{nickname1}将审查成员从 <b>{assigner1}</b> 修改为 <b>{assigner2}</b> {endassigner}{ifmilestone}{nickname1}将里程碑从 <b>{milestone1}</b> 修改为 <b>{milestone2}</b> {endmilestone}{iftag}{nickname1}将标记从 <b>{tag1}</b> 修改为 <b>{tag2}</b> {endtag}{ifpriority}{nickname1}将优先级从 <b>{priority1}</b> 修改为 <b>{priority2}</b> {endpriority}', email: email_html, email_title: 'GitLink: 合并请求 {title} 有状态变更', notification_url: '{baseurl}/{owner}/{identifier}/pulls/{id}')
    email_html = File.read("#{email_template_html_dir}/pull_request_closed.html")
-    self.create(type: 'MessageTemplate::PullRequestClosed', sys_notice: '你提交的合并请求：{title} <b>被拒绝</b>', email: email_html, email_title: "#{PLATFORM}: 合并请求 {title} 有状态变更", notification_url: '')
+    self.create(type: 'MessageTemplate::PullRequestClosed', sys_notice: '你提交的合并请求：{title} <b>被拒绝</b>', email: email_html, email_title: 'GitLink: 合并请求 {title} 有状态变更', notification_url: '')
    self.create(type: 'MessageTemplate::PullRequestJournal', sys_notice: '{nickname}评论合并请求{title}：<b>{notes}</b>', notification_url: '{baseurl}/{owner}/{identifier}/pulls/{id}')
    email_html = File.read("#{email_template_html_dir}/pull_request_merged.html")
-    self.create(type: 'MessageTemplate::PullRequestMerged', sys_notice: '你提交的合并请求：{title} <b>已通过</b>', email: email_html, email_title: "#{PLATFORM}: 合并请求 {title} 有状态变更", notification_url: '{baseurl}/{owner}/{identifier}/pulls/{id}')
-    email_html = File.read("#{email_template_html_dir}/team_joined.html")
-    self.create(type: 'MessageTemplate::TeamJoined', sys_notice: '你已被拉入组织 <b>{organization}</b> 的 <b>{team}</b> 团队，拥有<b>{role}</b>权限', email: email_html, email_title: "#{PLATFORM}: 在 {organization} 组织你的账号有权限变更", notification_url: '{baseurl}/{login}')
-    email_html = File.read("#{email_template_html_dir}/team_left.html")
-    self.create(type: 'MessageTemplate::TeamLeft', sys_notice: '你已被移出组织 <b>{organization}</b> 的 <b>{team}</b> 团队', email: email_html, email_title: "#{PLATFORM}: 在 {organization} 组织你的账号有权限变更", notification_url: '{baseurl}/{login}')
-
-    # 竞赛通知
-    self.create(type: 'MessageTemplate::CompetitionBegin', sys_notice: '你报名的竞赛 <b>{competition_name}</b> 已进入比赛进行阶段，可在此期间提交作品', notification_url: '{to_url}')
-    self.create(type: 'MessageTemplate::CompetitionResult', sys_notice: '你报名的竞赛 <b>{competition_name}</b> 已进入成绩公示阶段，可查看排行榜信息', notification_url: '{to_url}')
-    self.create(type: 'MessageTemplate::CompetitionReview', sys_notice: '你报名的竞赛 <b>{competition_name}</b> 距作品提交结束日期仅剩3天，若尚未提交参赛作品，请尽快提交', notification_url: '{to_url}')
+    self.create(type: 'MessageTemplate::PullRequestMerged', sys_notice: '你提交的合并请求：{title} <b>已通过</b>', email: email_html, email_title: 'GitLink: 合并请求 {title} 有状态变更', notification_url: '{baseurl}/{owner}/{identifier}/pulls/{id}')
  end

  def self.sys_notice
--- a/app/models/message_template/competition_begin.rb
+++ b/app/models/message_template/competition_begin.rb
@ -1,35 +0,0 @@
-# == Schema Information
-#
-# Table name: message_templates
-#
-#  id               :integer          not null, primary key
-#  type             :string(255)
-#  sys_notice       :text(65535)
-#  email            :text(65535)
-#  created_at       :datetime         not null
-#  updated_at       :datetime         not null
-#  notification_url :string(255)
-#  email_title      :string(255)
-#
-
-# 报名的竞赛进入比赛进行阶段
-# 触发场景
-# 	赛队成员报名的竞赛已进入比赛进行阶段
-# 通知文案格式
-# 	你报名的竞赛 xxx 已进入比赛进行阶段，可在此阶段提交作品
-#    时间：x分钟/小时/天/月前
-# 通知文案示例
-# 	你报名的竞赛 代码审查大赛 已进入比赛进行阶段，可在此期间提交作品
-#    时间：3小时前
-# 点击通知跳转页面
-# 	点击此通知将跳转到代码审查大赛详情页：
-#    http://117.50.100.12:8080/competitions/lgw7st/home
-class MessageTemplate::CompetitionBegin < MessageTemplate
-
-  # MessageTemplate::FollowedTip.get_message_content(User.where(login: 'yystopf'), User.last)
-  def self.get_message_content(receivers, competition)
-    return receivers_string(receivers), sys_notice.to_s.gsub('{competition_name}', competition&.name), notification_url.to_s.gsub('{to_url}', "/competitions/#{competition.identifier}/home")
-  # rescue
-  #   return '', '', ''
-  end
-end
--- a/app/models/message_template/competition_result.rb
+++ b/app/models/message_template/competition_result.rb
@ -1,35 +0,0 @@
-# == Schema Information
-#
-# Table name: message_templates
-#
-#  id               :integer          not null, primary key
-#  type             :string(255)
-#  sys_notice       :text(65535)
-#  email            :text(65535)
-#  created_at       :datetime         not null
-#  updated_at       :datetime         not null
-#  notification_url :string(255)
-#  email_title      :string(255)
-#
-
-# 报名的竞赛进入成绩公示阶段
-# 触发场景
-# 	赛队成员报名的竞赛已进入成绩公示阶段
-# 通知文案格式
-# 	你报名的竞赛 xxx 已进入成绩公示阶段，可查看排行榜信息
-#    时间：x分钟/小时/天/月前
-# 通知文案示例
-# 	你报名的竞赛 代码审查大赛 已进入成绩公示阶段，可查看排行榜信息
-#    时间：3小时前
-# 点击通知跳转页面
-# 	点击此通知将跳转到代码审查大赛详情页：
-#    http://117.50.100.12:8080/competitions/lgw7st/home
-class MessageTemplate::CompetitionResult < MessageTemplate
-
-  # MessageTemplate::FollowedTip.get_message_content(User.where(login: 'yystopf'), User.last)
-  def self.get_message_content(receivers, competition)
-    return receivers_string(receivers), sys_notice.gsub('{competition_name}', competition&.title), notification_url.gsub('{to_url}', "/competitions/#{competition.identifier}/home")
-  rescue 
-    return '', '', ''
-  end
-end
--- a/app/models/message_template/competition_review.rb
+++ b/app/models/message_template/competition_review.rb
@ -1,35 +0,0 @@
-# == Schema Information
-#
-# Table name: message_templates
-#
-#  id               :integer          not null, primary key
-#  type             :string(255)
-#  sys_notice       :text(65535)
-#  email            :text(65535)
-#  created_at       :datetime         not null
-#  updated_at       :datetime         not null
-#  notification_url :string(255)
-#  email_title      :string(255)
-#
-
-# 报名的竞赛比赛结束时间临近
-# 触发场景
-# 	赛队成员报名的竞赛阶段处于比赛进行中，且距比赛结束日期仅剩3天
-# 通知文案格式
-# 	你报名的竞赛 xxx 距作品提交结束日期仅剩3天，若尚未提交参赛作品，请尽快提交
-#    时间：x分钟/小时/天/月前
-# 通知文案示例
-# 	你报名的竞赛 代码审查大赛 距作品提交结束日期仅剩3天，若尚未提交参赛作品，请尽快提交
-#    时间：3小时前
-# 点击通知跳转页面
-# 	点击此通知将跳转到代码审查大赛详情页：
-#    http://117.50.100.12:8080/competitions/lgw7st/home
-class MessageTemplate::CompetitionReview < MessageTemplate
-
-  # MessageTemplate::FollowedTip.get_message_content(User.where(login: 'yystopf'), User.last)
-  def self.get_message_content(receivers, competition)
-    return receivers_string(receivers), sys_notice.gsub('{competition_name}', competition&.title), notification_url.gsub('{to_url}', "/competitions/#{competition.identifier}/home")
-  rescue 
-    return '', '', ''
-  end
-end
--- a/app/models/message_template/issue_assigned.rb
+++ b/app/models/message_template/issue_assigned.rb
@ -12,7 +12,7 @@
 #  email_title      :string(255)
 #

-# 有新指派给我的疑修
+# 有新指派给我的易修
 class MessageTemplate::IssueAssigned < MessageTemplate

  # MessageTemplate::IssueAssigned.get_message_content(User.where(login: 'yystopf'), User.last, Issue.last)
@ -36,29 +36,26 @@ class MessageTemplate::IssueAssigned < MessageTemplate
  def self.get_email_message_content(receiver, operator, issue)
    if receiver.user_template_message_setting.present? 
      return '', '', '' unless receiver.user_template_message_setting.email_body["Normal::IssueAssigned"]
-      project = issue&.project
-      owner = project&.owner 
-      title = email_title
-      title.gsub!('{nickname1}', operator&.real_name)
-      title.gsub!('{nickname2}', owner&.real_name)
-      title.gsub!('{repository}', project&.name)
-      content = email
-      content.gsub!('{receiver}', receiver&.real_name)
-      content.gsub!('{nickname1}', operator&.real_name)
-      content.gsub!('{login1}', operator&.login)
-      content.gsub!('{nickname2}', owner&.real_name)
-      content.gsub!('{login2}', owner&.login)
-      content.gsub!('{identifier}', project&.identifier)
-      content.gsub!('{repository}', project&.name)
-      content.gsub!('{baseurl}', base_url)
-      content.gsub!('{title}', issue&.subject)
-      content.gsub!('{id}', issue&.id.to_s)
-      content.gsub!('{platform}', PLATFORM)
-  
-      return receiver&.mail, title, content
-    else
-      return '', '', ''
    end
+    project = issue&.project
+    owner = project&.owner 
+    title = email_title
+    title.gsub!('{nickname1}', operator&.real_name)
+    title.gsub!('{nickname2}', owner&.real_name)
+    title.gsub!('{repository}', project&.name)
+    content = email
+    content.gsub!('{receiver}', receiver&.real_name)
+    content.gsub!('{nickname1}', operator&.real_name)
+    content.gsub!('{login1}', operator&.login)
+    content.gsub!('{nickname2}', owner&.real_name)
+    content.gsub!('{login2}', owner&.login)
+    content.gsub!('{identifier}', project&.identifier)
+    content.gsub!('{repository}', project&.name)
+    content.gsub!('{baseurl}', base_url)
+    content.gsub!('{title}', issue&.subject)
+    content.gsub!('{id}', issue&.id.to_s)
+
+    return receiver&.mail, title, content
  rescue => e
    Rails.logger.info("MessageTemplate::IssueAssigned.get_email_message_content [ERROR] #{e}")
    return '', '', ''
--- a/app/models/message_template/issue_assigner_expire.rb
+++ b/app/models/message_template/issue_assigner_expire.rb
@ -12,7 +12,7 @@
 #  email_title      :string(255)
 #

-# 我负责的疑修截止日期到达最后一天
+# 我负责的易修截止日期到达最后一天
 class MessageTemplate::IssueAssignerExpire < MessageTemplate

  # MessageTemplate::IssueAssignerExpire.get_message_content(User.where(login: 'yystopf'), Issue.last)
--- a/app/models/message_template/issue_atme.rb
+++ b/app/models/message_template/issue_atme.rb
@ -12,7 +12,7 @@
 #  email_title      :string(255)
 #

-# 在疑修中@我
+# 在易修中@我
 class MessageTemplate::IssueAtme < MessageTemplate 

  # MessageTemplate::IssueAtme.get_message_content(User.where(login: 'yystopf'), User.last, Issue.last)
--- a/app/models/message_template/issue_changed.rb
+++ b/app/models/message_template/issue_changed.rb
@ -12,7 +12,7 @@
 #  email_title      :string(255)
 #

-# 我创建或负责的疑修状态变更
+# 我创建或负责的易修状态变更
 class MessageTemplate::IssueChanged < MessageTemplate 

  # MessageTemplate::IssueChanged.get_message_content(User.where(login: 'yystopf'), User.last, Issue.last, {status_id: [1, 2], assigned_to_id: [nil, 203], tracker_id: [4, 3], priority_id: [2, 4], fixed_version_id: [nil, 5], due_date: ['', '2021-09-11'], done_ratio: [0, 40], issue_tags_value: ["", "7"], branch_name: ["", "master"]})
@ -29,7 +29,7 @@ class MessageTemplate::IssueChanged < MessageTemplate
    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])
@ -44,7 +44,7 @@ class MessageTemplate::IssueChanged < MessageTemplate
    else
      content.gsub!(/({ifassigner})(.*)({endassigner})/, '') 
    end
-    # 疑修状态修改
+    # 易修状态修改
    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])
@ -59,7 +59,7 @@ class MessageTemplate::IssueChanged < MessageTemplate
    else
      content.gsub!(/({ifstatus})(.*)({endstatus})/, '') 
    end
-    # 疑修类型修改
+    # 易修类型修改
    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])
@ -74,7 +74,7 @@ class MessageTemplate::IssueChanged < MessageTemplate
    else
      content.gsub!(/({iftracker})(.*)({endtracker})/, '') 
    end
-    # 疑修里程碑修改
+    # 易修里程碑修改
    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])
@ -89,7 +89,7 @@ class MessageTemplate::IssueChanged < MessageTemplate
    else
      content.gsub!(/({ifmilestone})(.*)({endmilestone})/, '') 
    end
-    # 疑修标记修改
+    # 易修标记修改
    if change_params[:issue_tags_value].present?
      issue_tags1 = IssueTag.where(id: change_params[:issue_tags_value][0]).distinct
      issue_tags2 = IssueTag.where(id: change_params[:issue_tags_value][1]).distinct
@ -106,7 +106,7 @@ class MessageTemplate::IssueChanged < MessageTemplate
    else
      content.gsub!(/({iftag})(.*)({endtag})()/, '') 
    end
-    # 疑修优先级修改
+    # 易修优先级修改
    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])
@ -121,7 +121,7 @@ class MessageTemplate::IssueChanged < MessageTemplate
    else
      content.gsub!(/({ifpriority})(.*)({endpriority})/, '') 
    end
-    # 疑修完成度修改
+    # 易修完成度修改
    if change_params[:done_ratio].present?
      doneratio1 = change_params[:done_ratio][0]
      doneratio2 = change_params[:done_ratio][1]
@ -136,7 +136,7 @@ class MessageTemplate::IssueChanged < MessageTemplate
    else
      content.gsub!(/({ifdoneratio})(.*)({enddoneratio})/, '') 
    end
-    # 疑修指定分支修改
+    # 易修指定分支修改
    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]
@ -151,7 +151,7 @@ class MessageTemplate::IssueChanged < MessageTemplate
    else
      content.gsub!(/({ifbranch})(.*)({endbranch})/, '') 
    end
-    # 疑修开始日期修改
+    # 易修开始日期修改
    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]
@ -166,7 +166,7 @@ class MessageTemplate::IssueChanged < MessageTemplate
    else
      content.gsub!(/({ifstartdate})(.*)({endstartdate})/, '') 
    end
-    # 疑修结束日期修改
+    # 易修结束日期修改
    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]
@ -191,181 +191,177 @@ class MessageTemplate::IssueChanged < MessageTemplate
    return '', '', '' if change_params.blank?
    if receiver.user_template_message_setting.present? 
      return '', '', '' unless receiver.user_template_message_setting.email_body["CreateOrAssign::IssueChanged"]
-      project = issue&.project
-      owner = project&.owner 
-      title = email_title
-      title.gsub!('{title}', issue&.subject)
-      content = email
-      content.gsub!('{receiver}', receiver&.real_name)
-      content.gsub!('{baseurl}', base_url)
-      content.gsub!('{login1}', operator&.login)
-      content.gsub!('{nickname1}', operator&.real_name)
-      content.gsub!('{login2}', owner&.login)
-      content.gsub!('{nickname2}', owner&.real_name)
-      content.gsub!('{identifier}', project&.identifier)
-      content.gsub!('{repository}', project&.name)
-      content.gsub!('{title}', issue&.subject)
-      content.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])
-        if change_count > 1
-          content.sub!('{ifassigner}', '<br/>') 
-        else
-          content.sub!('{ifassigner}', '') 
-        end
-        content.sub!('{endassigner}', '')
-        content.gsub!('{assigner1}', assigner1.present? ? assigner1&.real_name : '未指派成员')
-        content.gsub!('{assigner2}', assigner2.present? ? assigner2&.real_name : '未指派成员')
-      else
-        content.gsub!(/({ifassigner})(.*)({endassigner})/, '') 
-      end
-      # 疑修状态修改
-      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])
-        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)
-      else
-        content.gsub!(/({ifstatus})(.*)({endstatus})/, '') 
-      end
-      # 疑修类型修改
-      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])
-        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)
-      else
-        content.gsub!(/({iftracker})(.*)({endtracker})/, '') 
-      end
-      # 疑修里程碑修改
-      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])
-        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 : '未选择里程碑')
-      else
-        content.gsub!(/({ifmilestone})(.*)({endmilestone})/, '') 
-      end
-      # 疑修标记修改
-      if change_params[:issue_tags_value].present?
-        issue_tags1 = IssueTag.where(id: change_params[:issue_tags_value][0]).distinct
-        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(",")
-        if change_count > 1
-          content.sub!('{iftag}', '<br/>')
-        else
-          content.sub!('{iftag}', '')
-        end
-        content.sub!('{endtag}', '')
-        content.gsub!('{tag1}', tag1)
-        content.gsub!('{tag2}', tag2)
-      else
-        content.gsub!(/({iftag})(.*)({endtag})()/, '') 
-      end
-      # 疑修优先级修改
-      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!('{endpriority}', '')
-        content.gsub!('{priority1}', priority1&.name)
-        content.gsub!('{priority2}', priority2&.name)
-      else
-        content.gsub!(/({ifpriority})(.*)({endpriority})/, '') 
-      end
-      # 疑修完成度修改
-      if change_params[:done_ratio].present?
-        doneratio1 = change_params[:done_ratio][0]
-        doneratio2 = change_params[:done_ratio][1]
-        if change_count > 1
-          content.sub!('{ifdoneratio}', '<br/>')
-        else
-          content.sub!('{ifdoneratio}', '')
-        end
-        content.sub!('{enddoneratio}', '')
-        content.gsub!('{doneratio1}', "#{doneratio1}%")
-        content.gsub!('{doneratio2}', "#{doneratio2}%")
-      else
-        content.gsub!(/({ifdoneratio})(.*)({enddoneratio})/, '') 
-      end
-      # 疑修指定分支修改
-      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]
-        if change_count > 1
-          content.sub!('{ifbranch}', '<br/>')
-        else
-          content.sub!('{ifbranch}', '')
-        end
-        content.sub!('{endbranch}', '')
-        content.gsub!('{branch1}', branch1)
-        content.gsub!('{branch2}', branch2)
-      else
-        content.gsub!(/({ifbranch})(.*)({endbranch})/, '') 
-      end
-      # 疑修开始日期修改
-      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]
-        if change_count > 1
-          content.sub!('{ifstartdate}', '<br/>')
-        else
-          content.sub!('{ifstartdate}', '')
-        end
-        content.sub!('{endstartdate}', '')
-        content.gsub!('{startdate1}', startdate1 )
-        content.gsub!('{startdate2}', startdate2)
-      else
-        content.gsub!(/({ifstartdate})(.*)({endstartdate})/, '') 
-      end
-      # 疑修结束日期修改
-      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]
-        if change_count > 1
-          content.sub!('{ifduedate}', '<br/>')
-        else
-          content.sub!('{ifduedate}', '')
-        end
-        content.sub!('{endduedate}', '')
-        content.gsub!('{duedate1}', duedate1)
-        content.gsub!('{duedate2}', duedate2)
-      else
-        content.gsub!(/({ifduedate})(.*)({endduedate})/, '') 
-      end
-      content.gsub!('{platform}', PLATFORM)
-
-      return receiver&.mail, title, content
-    else
-      return '', '', ''
    end
-    
+    project = issue&.project
+    owner = project&.owner 
+    title = email_title
+    title.gsub!('{title}', issue&.subject)
+    content = email
+    content.gsub!('{receiver}', receiver&.real_name)
+    content.gsub!('{baseurl}', base_url)
+    content.gsub!('{login1}', operator&.login)
+    content.gsub!('{nickname1}', operator&.real_name)
+    content.gsub!('{login2}', owner&.login)
+    content.gsub!('{nickname2}', owner&.real_name)
+    content.gsub!('{identifier}', project&.identifier)
+    content.gsub!('{repository}', project&.name)
+    content.gsub!('{title}', issue&.subject)
+    content.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])
+      if change_count > 1
+        content.sub!('{ifassigner}', '<br/>') 
+      else
+        content.sub!('{ifassigner}', '') 
+      end
+      content.sub!('{endassigner}', '')
+      content.gsub!('{assigner1}', assigner1.present? ? assigner1&.real_name : '未指派成员')
+      content.gsub!('{assigner2}', assigner2.present? ? assigner2&.real_name : '未指派成员')
+    else
+      content.gsub!(/({ifassigner})(.*)({endassigner})/, '') 
+    end
+    # 易修状态修改
+    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])
+      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)
+    else
+      content.gsub!(/({ifstatus})(.*)({endstatus})/, '') 
+    end
+    # 易修类型修改
+    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])
+      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)
+    else
+      content.gsub!(/({iftracker})(.*)({endtracker})/, '') 
+    end
+    # 易修里程碑修改
+    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])
+      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 : '未选择里程碑')
+    else
+      content.gsub!(/({ifmilestone})(.*)({endmilestone})/, '') 
+    end
+    # 易修标记修改
+    if change_params[:issue_tags_value].present?
+      issue_tags1 = IssueTag.where(id: change_params[:issue_tags_value][0]).distinct
+      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(",")
+      if change_count > 1
+        content.sub!('{iftag}', '<br/>')
+      else
+        content.sub!('{iftag}', '')
+      end
+      content.sub!('{endtag}', '')
+      content.gsub!('{tag1}', tag1)
+      content.gsub!('{tag2}', tag2)
+    else
+      content.gsub!(/({iftag})(.*)({endtag})()/, '') 
+    end
+    # 易修优先级修改
+    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!('{endpriority}', '')
+      content.gsub!('{priority1}', priority1&.name)
+      content.gsub!('{priority2}', priority2&.name)
+    else
+      content.gsub!(/({ifpriority})(.*)({endpriority})/, '') 
+    end
+    # 易修完成度修改
+    if change_params[:done_ratio].present?
+      doneratio1 = change_params[:done_ratio][0]
+      doneratio2 = change_params[:done_ratio][1]
+      if change_count > 1
+        content.sub!('{ifdoneratio}', '<br/>')
+      else
+        content.sub!('{ifdoneratio}', '')
+      end
+      content.sub!('{enddoneratio}', '')
+      content.gsub!('{doneratio1}', "#{doneratio1}%")
+      content.gsub!('{doneratio2}', "#{doneratio2}%")
+    else
+      content.gsub!(/({ifdoneratio})(.*)({enddoneratio})/, '') 
+    end
+    # 易修指定分支修改
+    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]
+      if change_count > 1
+        content.sub!('{ifbranch}', '<br/>')
+      else
+        content.sub!('{ifbranch}', '')
+      end
+      content.sub!('{endbranch}', '')
+      content.gsub!('{branch1}', branch1)
+      content.gsub!('{branch2}', branch2)
+    else
+      content.gsub!(/({ifbranch})(.*)({endbranch})/, '') 
+    end
+    # 易修开始日期修改
+    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]
+      if change_count > 1
+        content.sub!('{ifstartdate}', '<br/>')
+      else
+        content.sub!('{ifstartdate}', '')
+      end
+      content.sub!('{endstartdate}', '')
+      content.gsub!('{startdate1}', startdate1 )
+      content.gsub!('{startdate2}', startdate2)
+    else
+      content.gsub!(/({ifstartdate})(.*)({endstartdate})/, '') 
+    end
+    # 易修结束日期修改
+    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]
+      if change_count > 1
+        content.sub!('{ifduedate}', '<br/>')
+      else
+        content.sub!('{ifduedate}', '')
+      end
+      content.sub!('{endduedate}', '')
+      content.gsub!('{duedate1}', duedate1)
+      content.gsub!('{duedate2}', duedate2)
+    else
+      content.gsub!(/({ifduedate})(.*)({endduedate})/, '') 
+    end
+
+    return receiver&.mail, title, content
  rescue => e
    Rails.logger.info("MessageTemplate::IssueChanged.get_email_message_content [ERROR] #{e}")
    return '', '', ''
--- a/app/models/message_template/issue_creator_expire.rb
+++ b/app/models/message_template/issue_creator_expire.rb
@ -1,3 +1,29 @@
+# == Schema Information
+#
+# Table name: message_templates
+#
+#  id               :integer          not null, primary key
+#  type             :string(255)
+#  sys_notice       :text(65535)
+#  email            :text(65535)
+#  created_at       :datetime         not null
+#  updated_at       :datetime         not null
+#  notification_url :string(255)
+#  email_title      :string(255)
+#
+
+# 我创建的易修截止日期到达最后一天
 class MessageTemplate::IssueCreatorExpire < MessageTemplate

-end
+  # MessageTemplate::IssueCreatorExpire.get_message_content(User.where(login: 'yystopf'), Issue.last)
+  def self.get_message_content(receivers, issue)
+    project = issue&.project
+    owner = project&.owner
+    content = sys_notice.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::IssueAssignerExpire.get_message_content [ERROR] #{e}")
+    return '', '', ''
+  end
+end
--- a/app/models/message_template/issue_deleted.rb
+++ b/app/models/message_template/issue_deleted.rb
@ -12,7 +12,7 @@
 #  email_title      :string(255)
 #

-# 我创建或负责的疑修删除
+# 我创建或负责的易修删除
 class MessageTemplate::IssueDeleted < MessageTemplate 

  # MessageTemplate::IssueDeleted.get_message_content(User.where(login: 'yystopf'), User.last, "hahah")
@ -33,20 +33,17 @@ class MessageTemplate::IssueDeleted < MessageTemplate
  def self.get_email_message_content(receiver, operator, issue_title)
    if receiver.user_template_message_setting.present? 
      return '', '', '' unless receiver.user_template_message_setting.email_body["CreateOrAssign::IssueChanged"]
-      title = email_title
-      title.gsub!('{title}', issue_title)
-      content = email
-      content.gsub!('{receiver}', receiver&.real_name)
-      content.gsub!('{nickname}', operator&.real_name)
-      content.gsub!('{login}', operator&.login)
-      content.gsub!('{baseurl}', base_url)
-      content.gsub!('{title}', issue_title)
-      content.gsub!('{platform}', PLATFORM)
-
-      return receiver&.mail, title, content
-    else
-      return '', '', ''
    end
+    title = email_title
+    title.gsub!('{title}', issue_title)
+    content = email
+    content.gsub!('{receiver}', receiver&.real_name)
+    content.gsub!('{nickname}', operator&.real_name)
+    content.gsub!('{login}', operator&.login)
+    content.gsub!('{baseurl}', base_url)
+    content.gsub!('{title}', issue_title)
+
+    return receiver&.mail, title, content
  rescue => e
    Rails.logger.info("MessageTemplate::IssueDeleted.get_email_message_content [ERROR] #{e}")
    return '', '', ''
--- a/app/models/message_template/issue_expire.rb
+++ b/app/models/message_template/issue_expire.rb
@ -1,67 +0,0 @@
-# == Schema Information
-#
-# Table name: message_templates
-#
-#  id               :integer          not null, primary key
-#  type             :string(255)
-#  sys_notice       :text(65535)
-#  email            :text(65535)
-#  created_at       :datetime         not null
-#  updated_at       :datetime         not null
-#  notification_url :string(255)
-#  email_title      :string(255)
-#
-
-# 我创建或负责的疑修截止日期到达最后一天
-class MessageTemplate::IssueExpire < MessageTemplate
-
-  # MessageTemplate::IssueCreatorExpire.get_message_content(User.where(login: 'yystopf'), Issue.last)
-  def self.get_message_content(receivers, issue)
-    receivers.each do |receiver|
-      if receiver.user_template_message_setting.present? 
-        send_setting = receiver.user_template_message_setting.notification_body["CreateOrAssign::IssueExpire"]
-        send_setting = send_setting.nil? ? UserTemplateMessageSetting.init_notification_body["CreateOrAssign::IssueExpire"] : send_setting
-        receivers = receivers.where.not(id: receiver.id) unless send_setting
-      end
-    end
-    return '', '', '' if receivers.blank?
-    project = issue&.project
-    owner = project&.owner
-    content = sys_notice.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::IssueExpire.get_message_content [ERROR] #{e}")
-    return '', '', ''
-  end
-
-  def self.get_email_message_content(receiver, issue)
-    if receiver.user_template_message_setting.present? 
-      send_setting = receiver.user_template_message_setting.email_body["CreateOrAssign::IssueExpire"]
-      send_setting = send_setting.nil? ? UserTemplateMessageSetting.init_email_body["CreateOrAssign::IssueExpire"] : send_setting
-      return '', '', '' unless send_setting
-      project = issue&.project
-      owner = project&.owner 
-      title = email_title
-
-      content = email
-      content.gsub!('{receiver}', receiver&.real_name)
-      content.gsub!('{nickname}', owner&.real_name)
-      content.gsub!('{login}', owner&.login)
-      content.gsub!('{identifier}', project&.identifier)
-      content.gsub!('{repository}', project&.name)
-      content.gsub!('{baseurl}', base_url)
-      content.gsub!('{title}', issue&.subject)
-      content.gsub!('{id}', issue&.id.to_s)
-      content.gsub!('{platform}', PLATFORM)
-  
-      return receiver&.mail, title, content
-    else
-      return '', '', ''
-    end
-  rescue => e
-    Rails.logger.info("MessageTemplate::IssueExpire.get_email_message_content [ERROR] #{e}")
-    return '', '', ''
-  end
-end
--- a/app/models/message_template/issue_journal.rb
+++ b/app/models/message_template/issue_journal.rb
@ -12,7 +12,7 @@
 #  email_title      :string(255)
 #

-# TODO 我创建或负责的疑修有新的评论
+# TODO 我创建或负责的易修有新的评论
 class MessageTemplate::IssueJournal < MessageTemplate

  # MessageTemplate::IssueJournal.get_message_content(User.where(login: 'yystopf'))
--- a/app/models/message_template/organization_joined.rb
+++ b/app/models/message_template/organization_joined.rb
@ -34,20 +34,16 @@ class MessageTemplate::OrganizationJoined < MessageTemplate
  def self.get_email_message_content(receiver, organization) 
    if receiver.user_template_message_setting.present? 
      return '', '', '' unless receiver.user_template_message_setting.email_body["Normal::Organization"]
-      title = email_title
-      title.gsub!('{organization}', organization&.real_name)
-      content = email 
-      content.gsub!('{receiver}', receiver&.real_name)
-      content.gsub!('{baseurl}', base_url)
-      content.gsub!('{login}', organization&.login)
-      content.gsub!('{organization}', organization&.real_name)
-      content.gsub!('{platform}', PLATFORM)
-    
-      return receiver&.mail, title, content
-    else
-      return '', '', ''
    end
-
+    title = email_title
+    title.gsub!('{organization}', organization&.real_name)
+    content = email 
+    content.gsub!('{receiver}', receiver&.real_name)
+    content.gsub!('{baseurl}', base_url)
+    content.gsub!('{login}', organization&.login)
+    content.gsub!('{organization}', organization&.real_name)
+  
+    return receiver&.mail, title, content
  rescue => e
    Rails.logger.info("MessageTemplate::OrganizationJoined.get_email_message_content [ERROR] #{e}")
    return '', '', ''
--- a/app/models/message_template/organization_left.rb
+++ b/app/models/message_template/organization_left.rb
@ -34,20 +34,16 @@ class MessageTemplate::OrganizationLeft < MessageTemplate
  def self.get_email_message_content(receiver, organization)
    if receiver.user_template_message_setting.present? 
      return '', '', '' unless receiver.user_template_message_setting.email_body["Normal::Organization"]
-      title = email_title
-      title.gsub!('{organization}', organization&.real_name)
-      content = email 
-      content.gsub!('{receiver}', receiver&.real_name)
-      content.gsub!('{baseurl}', base_url)
-      content.gsub!('{login}', organization&.login)
-      content.gsub!('{organization}', organization&.real_name)
-      content.gsub!('{platform}', PLATFORM)
-  
-      return receiver&.mail, title, content
-    else
-      return '', '', ''
    end
+    title = email_title
+    title.gsub!('{organization}', organization&.real_name)
+    content = email 
+    content.gsub!('{receiver}', receiver&.real_name)
+    content.gsub!('{baseurl}', base_url)
+    content.gsub!('{login}', organization&.login)
+    content.gsub!('{organization}', organization&.real_name)

+    return receiver&.mail, title, content
  rescue => e
    Rails.logger.info("MessageTemplate::OrganizationLeft.get_email_message_content [ERROR] #{e}")
    return '', '', ''
--- a/app/models/message_template/organization_role.rb
+++ b/app/models/message_template/organization_role.rb
@ -34,22 +34,18 @@ class MessageTemplate::OrganizationRole < MessageTemplate
  def self.get_email_message_content(receiver, organization, role) 
    if receiver.user_template_message_setting.present? 
      return '', '', '' unless receiver.user_template_message_setting.email_body["Normal::Permission"]
-      title = email_title
-      title.gsub!('{organization}', organization&.real_name)
-      title.gsub!('{role}', role)
-      content = email 
-      content.gsub!('{receiver}', receiver&.real_name)
-      content.gsub!('{baseurl}', base_url)
-      content.gsub!('{login}', organization&.login)
-      content.gsub!('{organization}', organization&.real_name)
-      content.gsub!('{role}', role)
-      content.gsub!('{platform}', PLATFORM)
-  
-      return receiver&.mail, title, content
-    else
-      return '', '', ''
    end
+    title = email_title
+    title.gsub!('{organization}', organization&.real_name)
+    title.gsub!('{role}', role)
+    content = email 
+    content.gsub!('{receiver}', receiver&.real_name)
+    content.gsub!('{baseurl}', base_url)
+    content.gsub!('{login}', organization&.login)
+    content.gsub!('{organization}', organization&.real_name)
+    content.gsub!('{role}', role)

+    return receiver&.mail, title, content
  rescue => e
    Rails.logger.info("MessageTemplate::OrganizationRole.get_email_message_content [ERROR] #{e}")
    return '', '', ''
--- a/app/models/message_template/project_forked.rb
+++ b/app/models/message_template/project_forked.rb
@ -12,21 +12,11 @@
 #  email_title      :string(255)
 #

-# 我管理的仓库被复刻
+# TODO 我管理的仓库被复刻
 class MessageTemplate::ProjectForked < MessageTemplate

  # MessageTemplate::ProjectForked.get_message_content(User.where(login: 'yystopf'))
-  def self.get_message_content(receivers, user, project)
-    receivers.each do |receiver|
-      if receiver.user_template_message_setting.present? 
-        send_setting = receiver.user_template_message_setting.notification_body["ManageProject::Forked"]
-        send_setting = send_setting.nil? ? UserTemplateMessageSetting.init_notification_body["ManageProject::Forked"] : send_setting
-        receivers = receivers.where.not(id: receiver.id) unless send_setting
-      end
-    end
-    return '', '', '' if receivers.blank?
-    content = sys_notice.gsub('{nickname1}', user&.real_name).gsub('{nickname2}', project&.owner&.real_name).gsub('{repository}', project&.name)
-    url = notification_url.gsub('{owner}', user&.login).gsub('{identifier}', project&.identifier)
+  def self.get_message_content(receivers)
    return receivers_string(receivers), content, url
  rescue => e
    Rails.logger.info("MessageTemplate::ProjectForked.get_message_content [ERROR] #{e}")
--- a/app/models/message_template/project_issue.rb
+++ b/app/models/message_template/project_issue.rb
@ -12,7 +12,7 @@
 #  email_title      :string(255)
 #

-# TODO 我管理/关注的仓库有新的疑修
+# TODO 我管理/关注的仓库有新的易修
 class MessageTemplate::ProjectIssue < MessageTemplate

  # MessageTemplate::ProjectIssue.get_message_content(User.where(login: 'yystopf'), User.where(login: 'forgetest1'), User.last, Issue.last)
@ -38,31 +38,27 @@ class MessageTemplate::ProjectIssue < MessageTemplate
  def self.get_email_message_content(receiver, is_manager, operator, issue)
    if receiver.user_template_message_setting.present? && is_manager
      return '', '', '' unless receiver.user_template_message_setting.email_body["ManageProject::Issue"]
-      project = issue&.project 
-      owner = project&.owner 
-      title = email_title
-      title.gsub!('{nickname1}', operator&.real_name)
-      title.gsub!('{nickname2}', owner&.real_name)
-      title.gsub!('{repository}', project&.name)
-  
-      content = email 
-      content.gsub!('{receiver}', receiver&.real_name)
-      content.gsub!('{baseurl}', base_url)
-      content.gsub!('{login1}', operator&.login)
-      content.gsub!('{nickname1}', operator&.real_name)
-      content.gsub!('{nickname2}', owner&.real_name)
-      content.gsub!('{repository}', project&.name)
-      content.gsub!('{login2}', owner&.login)
-      content.gsub!('{identifier}', project&.identifier)
-      content.gsub!('{id}', issue&.id.to_s)
-      content.gsub!('{title}', issue&.subject)
-      content.gsub!('{platform}', PLATFORM)
-      
-      return receiver&.mail, title, content
-    else
-      return '', '', ''
    end
-   
+    project = issue&.project 
+    owner = project&.owner 
+    title = email_title
+    title.gsub!('{nickname1}', operator&.real_name)
+    title.gsub!('{nickname2}', owner&.real_name)
+    title.gsub!('{repository}', project&.name)
+
+    content = email 
+    content.gsub!('{receiver}', receiver&.real_name)
+    content.gsub!('{baseurl}', base_url)
+    content.gsub!('{login1}', operator&.login)
+    content.gsub!('{nickname1}', operator&.real_name)
+    content.gsub!('{nickname2}', owner&.real_name)
+    content.gsub!('{repository}', project&.name)
+    content.gsub!('{login2}', owner&.login)
+    content.gsub!('{identifier}', project&.identifier)
+    content.gsub!('{id}', issue&.id.to_s)
+    content.gsub!('{title}', issue&.subject)
+    
+    return receiver&.mail, title, content
  rescue => e
    Rails.logger.info("MessageTemplate::ProjectIssue.get_email_message_content [ERROR] #{e}")
    return '', '', ''
--- a/app/models/message_template/project_joined.rb
+++ b/app/models/message_template/project_joined.rb
@ -34,23 +34,19 @@ class MessageTemplate::ProjectJoined < MessageTemplate
  def self.get_email_message_content(receiver, project) 
    if receiver.user_template_message_setting.present? 
      return '', '', '' unless receiver.user_template_message_setting.email_body["Normal::Project"]
-      title = email_title
-      title.gsub!('{repository}', project&.name)
-      
-      content = email
-      content.gsub!('{receiver}', receiver&.real_name)
-      content.gsub!('{baseurl}', base_url)
-      content.gsub!('{login}', project&.owner&.login)
-      content.gsub!('{identifier}', project&.identifier)
-      content.gsub!('{nickname}', project&.owner&.real_name)
-      content.gsub!('{repository}', project&.name)
-      content.gsub!('{platform}', PLATFORM)
-
-      return receiver&.mail, title, content
-    else
-      return '', '', ''
    end
+    title = email_title
+    title.gsub!('{repository}', project&.name)
    
+    content = email
+    content.gsub!('{receiver}', receiver&.real_name)
+    content.gsub!('{baseurl}', base_url)
+    content.gsub!('{login}', project&.owner&.login)
+    content.gsub!('{identifier}', project&.identifier)
+    content.gsub!('{nickname}', project&.owner&.real_name)
+    content.gsub!('{repository}', project&.name)
+
+    return receiver&.mail, title, content
  rescue => e
    Rails.logger.info("MessageTemplate::ProjectJoined.get_email_message_content [ERROR] #{e}")
    return '', '', ''
--- a/app/models/message_template/project_left.rb
+++ b/app/models/message_template/project_left.rb
@ -33,23 +33,19 @@ class MessageTemplate::ProjectLeft < MessageTemplate
  def self.get_email_message_content(receiver, project)
    if receiver.user_template_message_setting.present? 
      return '', '', '' unless receiver.user_template_message_setting.email_body["Normal::Project"]
-      title = email_title
-      title.gsub!('{repository}', project&.name)
-      
-      content = email
-      content.gsub!('{receiver}', receiver&.real_name)
-      content.gsub!('{baseurl}', base_url)
-      content.gsub!('{login}', project&.owner&.login)
-      content.gsub!('{identifier}', project&.identifier)
-      content.gsub!('{nickname}', project&.owner&.real_name)
-      content.gsub!('{repository}', project&.name)
-      content.gsub!('{platform}', PLATFORM)
-
-      return receiver&.mail, title, content
-    else
-      return '', '', ''
    end
+    title = email_title
+    title.gsub!('{repository}', project&.name)
    
+    content = email
+    content.gsub!('{receiver}', receiver&.real_name)
+    content.gsub!('{baseurl}', base_url)
+    content.gsub!('{login}', project&.owner&.login)
+    content.gsub!('{identifier}', project&.identifier)
+    content.gsub!('{nickname}', project&.owner&.real_name)
+    content.gsub!('{repository}', project&.name)
+
+    return receiver&.mail, title, content
  rescue => e
    Rails.logger.info("MessageTemplate::ProjectLeft.get_email_message_content [ERROR] #{e}")
    return '', '', ''
--- a/app/models/message_template/project_member_joined.rb
+++ b/app/models/message_template/project_member_joined.rb
@ -34,26 +34,23 @@ class MessageTemplate::ProjectMemberJoined < MessageTemplate
  def self.get_email_message_content(receiver, user, project)
    if receiver.user_template_message_setting.present? 
      return '', '', '' unless receiver.user_template_message_setting.email_body["ManageProject::Member"]
-      title = email_title
-      title.gsub!('{nickname1}', user&.real_name)
-      title.gsub!('{nickname2}', project&.owner&.real_name)
-      title.gsub!('{repository}', project&.name)
-      
-      content = email
-      content.gsub!('{receiver}', receiver&.real_name)
-      content.gsub!('{baseurl}', base_url)
-      content.gsub!('{login1}', user&.login)
-      content.gsub!('{login2}', project&.owner&.login)
-      content.gsub!('{identifier}', project&.identifier)
-      content.gsub!('{nickname1}', user&.real_name)
-      content.gsub!('{nickname2}', project&.owner&.real_name)
-      content.gsub!('{repository}', project&.name)
-      content.gsub!('{platform}', PLATFORM)
-
-      return receiver&.mail, title, content
-    else
-      return '', '', ''
    end
+    title = email_title
+    title.gsub!('{nickname1}', user&.real_name)
+    title.gsub!('{nickname2}', project&.owner&.real_name)
+    title.gsub!('{repository}', project&.name)
+    
+    content = email
+    content.gsub!('{receiver}', receiver&.real_name)
+    content.gsub!('{baseurl}', base_url)
+    content.gsub!('{login1}', user&.login)
+    content.gsub!('{login2}', project&.owner&.login)
+    content.gsub!('{identifier}', project&.identifier)
+    content.gsub!('{nickname1}', user&.real_name)
+    content.gsub!('{nickname2}', project&.owner&.real_name)
+    content.gsub!('{repository}', project&.name)
+
+    return receiver&.mail, title, content
  rescue => e
    Rails.logger.info("MessageTemplate::ProjectMemberJoined.get_email_message_content [ERROR] #{e}")
    return '', '', ''
--- a/app/models/message_template/project_member_left.rb
+++ b/app/models/message_template/project_member_left.rb
@ -34,27 +34,23 @@ class MessageTemplate::ProjectMemberLeft < MessageTemplate
  def self.get_email_message_content(receiver, user, project)
    if receiver.user_template_message_setting.present? 
      return '', '', '' unless receiver.user_template_message_setting.email_body["ManageProject::Member"]
-      title = email_title
-      title.gsub!('{nickname1}', user&.real_name)
-      title.gsub!('{nickname2}', project&.owner&.real_name)
-      title.gsub!('{repository}', project&.name)
-      
-      content = email
-      content.gsub!('{receiver}', receiver&.real_name)
-      content.gsub!('{baseurl}', base_url)
-      content.gsub!('{login1}', user&.login)
-      content.gsub!('{login2}', project&.owner&.login)
-      content.gsub!('{identifier}', project&.identifier)
-      content.gsub!('{nickname1}', user&.real_name)
-      content.gsub!('{nickname2}', project&.owner&.real_name)
-      content.gsub!('{repository}', project&.name)
-      content.gsub!('{platform}', PLATFORM)
-  
-      return receiver&.mail, title, content
-    else
-      return '', '', ''
    end
+    title = email_title
+    title.gsub!('{nickname1}', user&.real_name)
+    title.gsub!('{nickname2}', project&.owner&.real_name)
+    title.gsub!('{repository}', project&.name)
+    
+    content = email
+    content.gsub!('{receiver}', receiver&.real_name)
+    content.gsub!('{baseurl}', base_url)
+    content.gsub!('{login1}', user&.login)
+    content.gsub!('{login2}', project&.owner&.login)
+    content.gsub!('{identifier}', project&.identifier)
+    content.gsub!('{nickname1}', user&.real_name)
+    content.gsub!('{nickname2}', project&.owner&.real_name)
+    content.gsub!('{repository}', project&.name)

+    return receiver&.mail, title, content
  rescue => e
    Rails.logger.info("MessageTemplate::ProjectMemberLeft.get_email_message_content [ERROR] #{e}")
    return '', '', ''
--- a/app/models/message_template/project_milestone.rb
+++ b/app/models/message_template/project_milestone.rb
@ -12,61 +12,14 @@
 #  email_title      :string(255)
 #

-# 我管理的仓库有新的里程碑
+# TODO 我管理的仓库有新的里程碑
 class MessageTemplate::ProjectMilestone < MessageTemplate

  # MessageTemplate::ProjectMilestone.get_message_content(User.where(login: 'yystopf'))
-  def self.get_message_content(receivers, operator, milestone)
-    receivers.each do |receiver|
-      if receiver.user_template_message_setting.present? 
-        send_setting = receiver.user_template_message_setting.notification_body["ManageProject::Milestone"]
-        send_setting = send_setting.nil? ? UserTemplateMessageSetting.init_notification_body["ManageProject::Milestone"] : send_setting
-        receivers = receivers.where.not(id: receiver.id) unless receiver.user_template_message_setting.notification_body["ManageProject::Milestone"]
-      end
-    end
-    return '', '', '' if receivers.blank?
-    project = milestone&.project 
-    owner = project&.owner 
-    content = sys_notice.gsub('{nickname1}', operator&.real_name).gsub('{nickname2}', owner&.real_name).gsub('{repository}', project&.name).gsub('{name}', milestone&.name)
-    url = notification_url.gsub('{owner}', owner&.login).gsub('{identifier}', project&.identifier).gsub('{id}', milestone&.id.to_s)
-    
+  def self.get_message_content(receivers)
    return receivers_string(receivers), content, url
  rescue => e
    Rails.logger.info("MessageTemplate::ProjectMilestone.get_message_content [ERROR] #{e}")
    return '', '', ''
  end
-
-  def self.get_email_message_content(receiver, operator, milestone)
-    if receiver.user_template_message_setting.present? 
-      send_setting = receiver.user_template_message_setting.email_body["ManageProject::Milestone"]
-      send_setting = send_setting.nil? ? UserTemplateMessageSetting.init_email_body["ManageProject::Milestone"] : send_setting
-      return '', '', '' unless send_setting
-      project = milestone&.project 
-      owner = project&.owner 
-      title = email_title
-      title.gsub!('{nickname1}', operator&.real_name)
-      title.gsub!('{nickname2}', owner&.real_name)
-      title.gsub!('{repository}', project&.name)
-  
-      content = email 
-      content.gsub!('{receiver}', receiver&.real_name)
-      content.gsub!('{baseurl}', base_url)
-      content.gsub!('{nickname1}', operator&.real_name)
-      content.gsub!('{nickname2}', owner&.real_name)
-      content.gsub!('{repository}', project&.name)
-      content.gsub!('{login}', owner&.login)
-      content.gsub!('{identifier}', project&.identifier)
-      content.gsub!('{id}', milestone&.id.to_s)
-      content.gsub!('{name}', milestone&.name)
-      content.gsub!('{platform}', PLATFORM)
-      
-      return receiver&.mail, title, content
-    else
-      return '', '', ''
-    end
-   
-  rescue => e
-    Rails.logger.info("MessageTemplate::ProjectMilestone.get_email_message_content [ERROR] #{e}")
-    return '', '', ''
-  end
 end
--- a/app/models/message_template/project_milestone_completed.rb
+++ b/app/models/message_template/project_milestone_completed.rb
@ -1,70 +0,0 @@
-# == Schema Information
-#
-# Table name: message_templates
-#
-#  id               :integer          not null, primary key
-#  type             :string(255)
-#  sys_notice       :text(65535)
-#  email            :text(65535)
-#  created_at       :datetime         not null
-#  updated_at       :datetime         not null
-#  notification_url :string(255)
-#  email_title      :string(255)
-#
-
-# 我管理的仓库有里程碑完成
-class MessageTemplate::ProjectMilestoneCompleted < MessageTemplate
-
-  # MessageTemplate::ProjectMilestoneCompleted.get_message_content(User.where(login: 'yystopf'))
-  def self.get_message_content(receivers, milestone)
-    receivers.each do |receiver|
-      if receiver.user_template_message_setting.present? 
-        send_setting = receiver.user_template_message_setting.notification_body["ManageProject::MilestoneCompleted"]
-        send_setting = send_setting.nil? ? UserTemplateMessageSetting.init_notification_body["ManageProject::MilestoneCompleted"] : send_setting
-        receivers = receivers.where.not(id: receiver.id) unless send_setting
-      end
-    end
-    return '', '', '' if receivers.blank?
-    project = milestone&.project 
-    owner = project&.owner 
-    content = sys_notice.gsub('{nickname}', owner&.real_name).gsub('{repository}', project&.name).gsub('{name}', milestone&.name)
-    url = notification_url.gsub('{owner}', owner&.login).gsub('{identifier}', project&.identifier).gsub('{id}', milestone&.id.to_s)
-    
-    return receivers_string(receivers), content, url
-  rescue => e
-    Rails.logger.info("MessageTemplate::ProjectMilestoneCompleted.get_message_content [ERROR] #{e}")
-    return '', '', ''
-  end
-
-  def self.get_email_message_content(receiver, milestone)
-    if receiver.user_template_message_setting.present? 
-      send_setting = receiver.user_template_message_setting.email_body["ManageProject::MilestoneCompleted"]
-      send_setting = send_setting.nil? ? UserTemplateMessageSetting.init_email_body["ManageProject::MilestoneCompleted"] : send_setting
-      return '', '', '' unless send_setting
-      project = milestone&.project 
-      owner = project&.owner 
-      title = email_title
-      title.gsub!('{nickname}', owner&.real_name)
-      title.gsub!('{repository}', project&.name)
-  
-      content = email 
-      content.gsub!('{receiver}', receiver&.real_name)
-      content.gsub!('{baseurl}', base_url)
-      content.gsub!('{nickname}', owner&.real_name)
-      content.gsub!('{repository}', project&.name)
-      content.gsub!('{login}', owner&.login)
-      content.gsub!('{identifier}', project&.identifier)
-      content.gsub!('{id}', milestone&.id.to_s)
-      content.gsub!('{name}', milestone&.name)
-      content.gsub!('{platform}', PLATFORM)
-      
-      return receiver&.mail, title, content
-    else
-      return '', '', ''
-    end
-   
-  rescue => e
-    Rails.logger.info("MessageTemplate::ProjectMilestoneCompleted.get_email_message_content [ERROR] #{e}")
-    return '', '', ''
-  end
-end
--- a/app/models/message_template/project_praised.rb
+++ b/app/models/message_template/project_praised.rb
@ -12,21 +12,11 @@
 #  email_title      :string(255)
 #

-# 我管理的仓库被点赞
+# TODO 我管理的仓库被点赞
 class MessageTemplate::ProjectPraised < MessageTemplate

  # MessageTemplate::ProjectPraised.get_message_content(User.where(login: 'yystopf'))
-  def self.get_message_content(receivers, user, project)
-    receivers.each do |receiver|
-      if receiver.user_template_message_setting.present? 
-        send_setting = receiver.user_template_message_setting.notification_body["ManageProject::Praised"]
-        send_setting = send_setting.nil? ? UserTemplateMessageSetting.init_notification_body["ManageProject::Praised"] : send_setting
-        receivers = receivers.where.not(id: receiver.id) unless send_setting
-      end
-    end
-    return '', '', '' if receivers.blank?
-    content = sys_notice.gsub('{nickname1}', user&.real_name).gsub('{nickname2}', project&.owner&.real_name).gsub('{repository}', project&.name)
-    url = notification_url.gsub('{login}', user&.login)
+  def self.get_message_content(receivers)
    return receivers_string(receivers), content, url
  rescue => e
    Rails.logger.info("MessageTemplate::ProjectPraised.get_message_content [ERROR] #{e}")
--- a/app/models/message_template/project_pull_request.rb
+++ b/app/models/message_template/project_pull_request.rb
@ -38,30 +38,27 @@ class MessageTemplate::ProjectPullRequest < MessageTemplate
  def self.get_email_message_content(receiver, is_manager, operator, pull_request)
    if receiver.user_template_message_setting.present? && is_manager
      return '', '', '' unless receiver.user_template_message_setting.email_body["ManageProject::PullRequest"]
-      project = pull_request&.project 
-      owner = project&.owner 
-      title = email_title
-      title.gsub!('{nickname1}', operator&.real_name)
-      title.gsub!('{nickname2}', owner&.real_name)
-      title.gsub!('{repository}', project&.name)
-  
-      content = email 
-      content.gsub!('{receiver}', receiver&.real_name)
-      content.gsub!('{baseurl}', base_url)
-      content.gsub!('{login1}', operator&.login)
-      content.gsub!('{nickname1}', operator&.real_name)
-      content.gsub!('{nickname2}', owner&.real_name)
-      content.gsub!('{repository}', project&.name)
-      content.gsub!('{login2}', owner&.login)
-      content.gsub!('{identifier}', project&.identifier)
-      content.gsub!('{id}', pull_request&.id.to_s)
-      content.gsub!('{title}', pull_request&.title)
-      content.gsub!('{platform}', PLATFORM)
-      
-      return receiver&.mail, title, content
-    else
-      return '', '', ''
    end
+    project = pull_request&.project 
+    owner = project&.owner 
+    title = email_title
+    title.gsub!('{nickname1}', operator&.real_name)
+    title.gsub!('{nickname2}', owner&.real_name)
+    title.gsub!('{repository}', project&.name)
+
+    content = email 
+    content.gsub!('{receiver}', receiver&.real_name)
+    content.gsub!('{baseurl}', base_url)
+    content.gsub!('{login1}', operator&.login)
+    content.gsub!('{nickname1}', operator&.real_name)
+    content.gsub!('{nickname2}', owner&.real_name)
+    content.gsub!('{repository}', project&.name)
+    content.gsub!('{login2}', owner&.login)
+    content.gsub!('{identifier}', project&.identifier)
+    content.gsub!('{id}', pull_request&.id.to_s)
+    content.gsub!('{title}', pull_request&.title)
+    
+    return receiver&.mail, title, content
  rescue => e
    Rails.logger.info("MessageTemplate::ProjectPullRequest.get_email_message_content [ERROR] #{e}")
    return '', '', ''
--- a/app/models/message_template/project_role.rb
+++ b/app/models/message_template/project_role.rb
@ -34,25 +34,21 @@ class MessageTemplate::ProjectRole < MessageTemplate
  def self.get_email_message_content(receiver, project, role)
    if receiver.user_template_message_setting.present? 
      return '', '', '' unless receiver.user_template_message_setting.email_body["Normal::Permission"]
-      title = email_title
-      title.gsub!('{repository}', project&.name)
-      title.gsub!('{role}', role)
-      title.gsub!('{nickname}', project&.owner&.real_name)
-      content = email 
-      content.gsub!('{receiver}', receiver&.real_name)
-      content.gsub!('{baseurl}', base_url)
-      content.gsub!('{login}', project&.owner&.login)
-      content.gsub!('{nickname}', project&.owner&.real_name)
-      content.gsub!('{identifier}', project&.identifier)
-      content.gsub!('{repository}', project&.name)
-      content.gsub!('{role}', role)
-      content.gsub!('{platform}', PLATFORM)
-  
-      return receiver&.mail, title, content
-    else
-      return '', '', ''
    end
+    title = email_title
+    title.gsub!('{repository}', project&.name)
+    title.gsub!('{role}', role)
+    title.gsub!('{nickname}', project&.owner&.real_name)
+    content = email 
+    content.gsub!('{receiver}', receiver&.real_name)
+    content.gsub!('{baseurl}', base_url)
+    content.gsub!('{login}', project&.owner&.login)
+    content.gsub!('{nickname}', project&.owner&.real_name)
+    content.gsub!('{identifier}', project&.identifier)
+    content.gsub!('{repository}', project&.name)
+    content.gsub!('{role}', role)

+    return receiver&.mail, title, content
  rescue => e
    Rails.logger.info("MessageTemplate::ProjectRole.get_email_message_content [ERROR] #{e}")
    return '', '', ''
--- a/app/models/message_template/project_setting_changed.rb
+++ b/app/models/message_template/project_setting_changed.rb
@ -15,7 +15,7 @@
 # 我管理的仓库项目设置被更改
 class MessageTemplate::ProjectSettingChanged < MessageTemplate

-  # MessageTemplate::ProjectSettingChanged.get_message_content(User.where(login: 'yystopf'), User.last, Project.last, {description: '测试修改项目简介', category: '大数据', language: 'Ruby', permission: '公有', navbar: '疑修, 合并请求'})
+  # MessageTemplate::ProjectSettingChanged.get_message_content(User.where(login: 'yystopf'), User.last, Project.last, {description: '测试修改项目简介', category: '大数据', language: 'Ruby', permission: '公有', navbar: '易修, 合并请求'})
  def self.get_message_content(receivers, operator, project, change_params)
    receivers.each do |receiver|
      if receiver.user_template_message_setting.present? 
@ -135,7 +135,7 @@ class MessageTemplate::ProjectSettingChanged < MessageTemplate
      unit_types.unshift('主页')
      unit_types.append('动态')
      navbar = unit_types.join('，') 
-      navbar.gsub!('issues', '疑修')
+      navbar.gsub!('issues', '易修')
      navbar.gsub!('pulls', '合并请求')
      navbar.gsub!('wiki', 'Wiki')
      navbar.gsub!('devops', '工作流')
@ -159,153 +159,150 @@ class MessageTemplate::ProjectSettingChanged < MessageTemplate
  end

  def self.get_email_message_content(receiver, operator, project, change_params)
-    return '', '', '' if change_params.blank?
    if receiver.user_template_message_setting.present? 
      return '', '', '' unless receiver.user_template_message_setting.email_body["ManageProject::SettingChanged"]
-      owner = project&.owner
-      title = email_title
-      title.gsub!('{nickname2}', owner&.real_name)
-      title.gsub!('{repository}', project&.name)
-  
-      content = email 
-      content.gsub!('{receiver}', receiver&.real_name)
-      content.gsub!('{baseurl}', base_url)
-      content.gsub!('{login1}', operator&.login)
-      content.gsub!('{nickname1}', operator&.real_name)
-      content.gsub!('{login2}', owner&.login)
-      content.gsub!('{nickname2}', owner&.real_name)
-      content.gsub!('{identifier}', project&.identifier)
-      content.gsub!('{repository}', project&.name)
-      change_count = change_params.keys.size
-      # 项目名称更改
-      if change_params[:name].present?
-        if change_count > 1
-          content.sub!('{ifname}', '<br/>') 
-        else
-          content.sub!('{ifname}', '') 
-        end
-        content.sub!('{endname}', '')
-        content.gsub!('{name}', change_params[:name][1])
-      else
-        content.gsub!(/({ifname})(.*)({endname})/, '') 
-      end
-      # 项目标识更改
-      if change_params[:identifier].present?
-        if change_count > 1
-          content.sub!('{ifidentifier}', '<br/>') 
-        else
-          content.sub!('{ifidentifier}', '') 
-        end
-        content.sub!('{endidentifier}', '')
-        content.gsub!('{identifier}', change_params[:identifier][1])
-      else
-        content.gsub!(/({ifidentifier})(.*)({endidentifier})/, '') 
-      end
-      # 项目简介更改
-      if change_params[:description].present?
-        if change_params[:description][1].blank?
-          if change_count > 1
-            content.gsub!(/({ifdescription})(.*)({enddescription})/, '<br/>删除了项目简介') 
-          else
-            content.gsub!(/({ifdescription})(.*)({enddescription})/, '删除了项目简介') 
-          end
-        else
-          if change_count > 1
-            content.sub!('{ifdescription}', '<br/>') 
-          else
-            content.sub!('{ifdescription}', '') 
-          end
-          content.sub!('{enddescription}', '')
-          content.gsub!('{description}', change_params[:description][1])
-        end
-      else 
-        content.gsub!(/({ifdescription})(.*)({enddescription})/, '') 
-      end
-      # 项目类别更改
-      if change_params[:project_category_id].present?
-        category = ProjectCategory.find_by_id(change_params[:project_category_id][1])
-        if category.present? 
-          if change_count > 1
-            content.sub!('{ifcategory}', '<br/>') 
-          else
-            content.sub!('{ifcategory}', '') 
-          end
-          content.sub!('{endcategory}', '')
-          content.gsub!('{category}', category&.name)
-        else 
-          if change_count > 1
-            content.gsub!(/({ifcategory})(.*)({endcategory})/, '<br/>删除了项目类别') 
-          else
-            content.gsub!(/({ifcategory})(.*)({endcategory})/, '删除了项目类别') 
-          end
-        end
-      else
-        content.gsub!(/({ifcategory})(.*)({endcategory})/, '') 
-      end
-      # 项目语言更改
-      if change_params[:project_language_id].present?
-        language = ProjectLanguage.find_by_id(change_params[:project_language_id][1])
-        if language.present?
-          if change_count > 1
-            content.sub!('{iflanguage}', '<br/>') 
-          else
-            content.sub!('{iflanguage}', '') 
-          end
-          content.sub!('{endlanguage}', '')
-          content.gsub!('{language}', language&.name)
-        else
-          if change_count > 1
-            content.gsub!(/({iflanguage})(.*)({endlanguage})/, '<br/>删除了项目语言') 
-          else
-            content.gsub!(/({iflanguage})(.*)({endlanguage})/, '删除了项目语言') 
-          end
-        end
-      else
-        content.gsub!(/({iflanguage})(.*)({endlanguage})/, '') 
-      end
-      # 项目公私有更改
-      if change_params[:is_public].present?
-        permission = change_params[:is_public][1] ? '公有' : '私有'
-        if change_count > 1
-          content.sub!('{ifpermission}', '<br/>') 
-        else
-          content.sub!('{ifpermission}', '') 
-        end
-        content.sub!('{endpermission}', '')
-        content.gsub!('{permission}', permission)
-      else
-        content.gsub!(/({ifpermission})(.*)({endpermission})/, '') 
-      end
-      # 项目导航更改
-      if change_params[:navbar].present? 
-        unit_types = project.project_units.order(unit_type: :asc).pluck(:unit_type)
-        unit_types.delete('code')
-        unit_types.unshift('代码库')
-        unit_types.unshift('主页')
-        unit_types.append('动态')
-        navbar = unit_types.join('，') 
-        navbar.gsub!('issues', '疑修')
-        navbar.gsub!('pulls', '合并请求')
-        navbar.gsub!('wiki', 'Wiki')
-        navbar.gsub!('devops', '工作流')
-        navbar.gsub!('versions', '里程碑')
-        navbar.gsub!('resources', '资源库')
-        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
-      content.gsub!('{platform}', PLATFORM)
-      
-      return receiver&.mail, title, content
-    else
-      return '', '', '' 
    end
+    return '', '', '' if change_params.blank?
+    owner = project&.owner
+    title = email_title
+    title.gsub!('{nickname2}', owner&.real_name)
+    title.gsub!('{repository}', project&.name)
+
+    content = email 
+    content.gsub!('{receiver}', receiver&.real_name)
+    content.gsub!('{baseurl}', base_url)
+    content.gsub!('{login1}', operator&.login)
+    content.gsub!('{nickname1}', operator&.real_name)
+    content.gsub!('{login2}', owner&.login)
+    content.gsub!('{nickname2}', owner&.real_name)
+    content.gsub!('{identifier}', project&.identifier)
+    content.gsub!('{repository}', project&.name)
+    change_count = change_params.keys.size
+    # 项目名称更改
+    if change_params[:name].present?
+      if change_count > 1
+        content.sub!('{ifname}', '<br/>') 
+      else
+        content.sub!('{ifname}', '') 
+      end
+      content.sub!('{endname}', '')
+      content.gsub!('{name}', change_params[:name][1])
+    else
+      content.gsub!(/({ifname})(.*)({endname})/, '') 
+    end
+    # 项目标识更改
+    if change_params[:identifier].present?
+      if change_count > 1
+        content.sub!('{ifidentifier}', '<br/>') 
+      else
+        content.sub!('{ifidentifier}', '') 
+      end
+      content.sub!('{endidentifier}', '')
+      content.gsub!('{identifier}', change_params[:identifier][1])
+    else
+      content.gsub!(/({ifidentifier})(.*)({endidentifier})/, '') 
+    end
+    # 项目简介更改
+    if change_params[:description].present?
+      if change_params[:description][1].blank?
+        if change_count > 1
+          content.gsub!(/({ifdescription})(.*)({enddescription})/, '<br/>删除了项目简介') 
+        else
+          content.gsub!(/({ifdescription})(.*)({enddescription})/, '删除了项目简介') 
+        end
+      else
+        if change_count > 1
+          content.sub!('{ifdescription}', '<br/>') 
+        else
+          content.sub!('{ifdescription}', '') 
+        end
+        content.sub!('{enddescription}', '')
+        content.gsub!('{description}', change_params[:description][1])
+      end
+    else 
+      content.gsub!(/({ifdescription})(.*)({enddescription})/, '') 
+    end
+    # 项目类别更改
+    if change_params[:project_category_id].present?
+      category = ProjectCategory.find_by_id(change_params[:project_category_id][1])
+      if category.present? 
+        if change_count > 1
+          content.sub!('{ifcategory}', '<br/>') 
+        else
+          content.sub!('{ifcategory}', '') 
+        end
+        content.sub!('{endcategory}', '')
+        content.gsub!('{category}', category&.name)
+      else 
+        if change_count > 1
+          content.gsub!(/({ifcategory})(.*)({endcategory})/, '<br/>删除了项目类别') 
+        else
+          content.gsub!(/({ifcategory})(.*)({endcategory})/, '删除了项目类别') 
+        end
+      end
+    else
+      content.gsub!(/({ifcategory})(.*)({endcategory})/, '') 
+    end
+    # 项目语言更改
+    if change_params[:project_language_id].present?
+      language = ProjectLanguage.find_by_id(change_params[:project_language_id][1])
+      if language.present?
+        if change_count > 1
+          content.sub!('{iflanguage}', '<br/>') 
+        else
+          content.sub!('{iflanguage}', '') 
+        end
+        content.sub!('{endlanguage}', '')
+        content.gsub!('{language}', language&.name)
+      else
+        if change_count > 1
+          content.gsub!(/({iflanguage})(.*)({endlanguage})/, '<br/>删除了项目语言') 
+        else
+          content.gsub!(/({iflanguage})(.*)({endlanguage})/, '删除了项目语言') 
+        end
+      end
+    else
+      content.gsub!(/({iflanguage})(.*)({endlanguage})/, '') 
+    end
+    # 项目公私有更改
+    if change_params[:is_public].present?
+      permission = change_params[:is_public][1] ? '公有' : '私有'
+      if change_count > 1
+        content.sub!('{ifpermission}', '<br/>') 
+      else
+        content.sub!('{ifpermission}', '') 
+      end
+      content.sub!('{endpermission}', '')
+      content.gsub!('{permission}', permission)
+    else
+      content.gsub!(/({ifpermission})(.*)({endpermission})/, '') 
+    end
+    # 项目导航更改
+    if change_params[:navbar].present? 
+      unit_types = project.project_units.order(unit_type: :asc).pluck(:unit_type)
+      unit_types.delete('code')
+      unit_types.unshift('代码库')
+      unit_types.unshift('主页')
+      unit_types.append('动态')
+      navbar = unit_types.join('，') 
+      navbar.gsub!('issues', '易修')
+      navbar.gsub!('pulls', '合并请求')
+      navbar.gsub!('wiki', 'Wiki')
+      navbar.gsub!('devops', '工作流')
+      navbar.gsub!('versions', '里程碑')
+      navbar.gsub!('resources', '资源库')
+      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 receiver&.mail, title, content
  rescue => e
    Rails.logger.info("MessageTemplate::ProjectSettingChanged.get_email_message_content [ERROR] #{e}")
    return '', '', ''
--- a/app/models/message_template/pull_request_assigned.rb
+++ b/app/models/message_template/pull_request_assigned.rb
@ -36,29 +36,26 @@ class MessageTemplate::PullRequestAssigned < MessageTemplate
  def self.get_email_message_content(receiver, operator, pull_request)
    if receiver.user_template_message_setting.present? 
      return '', '', '' unless receiver.user_template_message_setting.email_body["Normal::PullRequestAssigned"]
-      project = pull_request&.project
-      owner = project&.owner 
-      title = email_title
-      title.gsub!('{nickname1}', operator&.real_name)
-      title.gsub!('{nickname2}', owner&.real_name)
-      title.gsub!('{repository}', project&.name)
-      content = email
-      content.gsub!('{receiver}', receiver&.real_name)
-      content.gsub!('{nickname1}', operator&.real_name)
-      content.gsub!('{login1}', operator&.login)
-      content.gsub!('{nickname2}', owner&.real_name)
-      content.gsub!('{login2}', owner&.login)
-      content.gsub!('{identifier}', project&.identifier)
-      content.gsub!('{repository}', project&.name)
-      content.gsub!('{baseurl}', base_url)
-      content.gsub!('{title}', pull_request&.title)
-      content.gsub!('{id}', pull_request&.id.to_s)
-      content.gsub!('{platform}', PLATFORM)
-
-      return receiver&.mail, title, content
-    else
-      return '', '', ''
    end
+    project = pull_request&.project
+    owner = project&.owner 
+    title = email_title
+    title.gsub!('{nickname1}', operator&.real_name)
+    title.gsub!('{nickname2}', owner&.real_name)
+    title.gsub!('{repository}', project&.name)
+    content = email
+    content.gsub!('{receiver}', receiver&.real_name)
+    content.gsub!('{nickname1}', operator&.real_name)
+    content.gsub!('{login1}', operator&.login)
+    content.gsub!('{nickname2}', owner&.real_name)
+    content.gsub!('{login2}', owner&.login)
+    content.gsub!('{identifier}', project&.identifier)
+    content.gsub!('{repository}', project&.name)
+    content.gsub!('{baseurl}', base_url)
+    content.gsub!('{title}', pull_request&.title)
+    content.gsub!('{id}', pull_request&.id.to_s)
+
+    return receiver&.mail, title, content
  rescue => e
    Rails.logger.info("MessageTemplate::PullRequestAssigned.get_email_message_content [ERROR] #{e}")
    return '', '', ''
--- a/app/models/message_template/pull_request_changed.rb
+++ b/app/models/message_template/pull_request_changed.rb
@ -103,93 +103,89 @@ class MessageTemplate::PullRequestChanged < MessageTemplate
    return '', '', '' if change_params.blank?
    if receiver.user_template_message_setting.present? 
      return '', '', '' unless receiver.user_template_message_setting.email_body["CreateOrAssign::PullRequestChanged"]
-      project = pull_request&.project
-      owner = project&.owner 
-      title = email_title
-      title.gsub!('{title}', pull_request&.title)
-      content = email
-      content.gsub!('{receiver}', receiver&.real_name)
-      content.gsub!('{nickname1}', operator&.real_name)
-      content.gsub!('{login1}', operator&.login)
-      content.gsub!('{nickname2}', owner&.real_name)
-      content.gsub!('{login2}', owner&.login)
-      content.gsub!('{identifier}', project&.identifier)
-      content.gsub!('{repository}', project&.name)
-      content.gsub!('{baseurl}', base_url)
-      content.gsub!('{title}', pull_request&.title)
-      content.gsub!('{id}', pull_request&.id.to_s)
-      content.gsub!('{platform}', PLATFORM)
-  
-      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])      
-        if change_count > 1
-          content.sub!('{ifassigner}', '<br/>') 
-        else
-          content.sub!('{ifassigner}', '') 
-        end
-        content.sub!('{endassigner}', '')
-        content.gsub!('{assigner1}', assigner1.present? ? assigner1&.real_name : '未指派成员')
-        content.gsub!('{assigner2}', assigner2.present? ? assigner2&.real_name : '未指派成员')
+    end
+    project = pull_request&.project
+    owner = project&.owner 
+    title = email_title
+    title.gsub!('{title}', pull_request&.title)
+    content = email
+    content.gsub!('{receiver}', receiver&.real_name)
+    content.gsub!('{nickname1}', operator&.real_name)
+    content.gsub!('{login1}', operator&.login)
+    content.gsub!('{nickname2}', owner&.real_name)
+    content.gsub!('{login2}', owner&.login)
+    content.gsub!('{identifier}', project&.identifier)
+    content.gsub!('{repository}', project&.name)
+    content.gsub!('{baseurl}', base_url)
+    content.gsub!('{title}', pull_request&.title)
+    content.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])      
+      if change_count > 1
+        content.sub!('{ifassigner}', '<br/>') 
      else
-        content.gsub!(/({ifassigner})(.*)({endassigner})/, '') 
+        content.sub!('{ifassigner}', '') 
      end
-      # 合并请求里程碑修改
-      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])
-        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 : '未选择里程碑')
-      else
-        content.gsub!(/({ifmilestone})(.*)({endmilestone})/, '') 
-      end
-      # 合并请求标记修改
-      if change_params[:issue_tags_value].present?
-        issue_tags1 = IssueTag.where(id: change_params[:issue_tags_value][0]).distinct
-        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(",")
-        if change_count > 1
-          content.sub!('{iftag}', '<br/>') 
-        else
-          content.sub!('{iftag}', '') 
-        end
-        content.sub!('{endtag}', '')
-        content.gsub!('{tag1}', tag1)
-        content.gsub!('{tag2}', tag2)
-      else
-        content.gsub!(/({iftag})(.*)({endtag})()/, '') 
-      end
-      # 合并请求优先级修改
-      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)
-        content.gsub!('{priority2}', priority2&.name)
-      else
-        content.gsub!(/({ifpriority})(.*)({endpriority})/, '') 
-      end
-  
-      return receiver&.mail, title, content
+      content.sub!('{endassigner}', '')
+      content.gsub!('{assigner1}', assigner1.present? ? assigner1&.real_name : '未指派成员')
+      content.gsub!('{assigner2}', assigner2.present? ? assigner2&.real_name : '未指派成员')
    else
-      return '', '', ''
+      content.gsub!(/({ifassigner})(.*)({endassigner})/, '') 
+    end
+    # 合并请求里程碑修改
+    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])
+      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 : '未选择里程碑')
+    else
+      content.gsub!(/({ifmilestone})(.*)({endmilestone})/, '') 
+    end
+    # 合并请求标记修改
+    if change_params[:issue_tags_value].present?
+      issue_tags1 = IssueTag.where(id: change_params[:issue_tags_value][0]).distinct
+      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(",")
+      if change_count > 1
+        content.sub!('{iftag}', '<br/>') 
+      else
+        content.sub!('{iftag}', '') 
+      end
+      content.sub!('{endtag}', '')
+      content.gsub!('{tag1}', tag1)
+      content.gsub!('{tag2}', tag2)
+    else
+      content.gsub!(/({iftag})(.*)({endtag})()/, '') 
+    end
+    # 合并请求优先级修改
+    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)
+      content.gsub!('{priority2}', priority2&.name)
+    else
+      content.gsub!(/({ifpriority})(.*)({endpriority})/, '') 
    end

+    return receiver&.mail, title, content
  rescue => e
    Rails.logger.info("MessageTemplate::PullRequestChanged.get_email_message_content [ERROR] #{e}")
    return '', '', ''
--- a/app/models/message_template/pull_request_closed.rb
+++ b/app/models/message_template/pull_request_closed.rb
@ -36,28 +36,24 @@ class MessageTemplate::PullRequestClosed < MessageTemplate
  def self.get_email_message_content(receiver, operator, pull_request)
    if receiver.user_template_message_setting.present? 
      return '', '', '' unless receiver.user_template_message_setting.email_body["CreateOrAssign::PullRequestChanged"]
-      project = pull_request&.project
-      owner = project&.owner 
-      title = email_title
-      title.gsub!('{title}', pull_request&.title)
-      content = email
-      content.gsub!('{receiver}', receiver&.real_name)
-      content.gsub!('{nickname1}', operator&.real_name)
-      content.gsub!('{login1}', operator&.login)
-      content.gsub!('{nickname2}', owner&.real_name)
-      content.gsub!('{login2}', owner&.login)
-      content.gsub!('{identifier}', project&.identifier)
-      content.gsub!('{repository}', project&.name)
-      content.gsub!('{baseurl}', base_url)
-      content.gsub!('{title}', pull_request&.title)
-      content.gsub!('{id}', pull_request&.id.to_s)
-      content.gsub!('{platform}', PLATFORM)
-  
-      return receiver&.mail, title, content
-    else
-      return '', '', '' 
    end
+    project = pull_request&.project
+    owner = project&.owner 
+    title = email_title
+    title.gsub!('{title}', pull_request&.title)
+    content = email
+    content.gsub!('{receiver}', receiver&.real_name)
+    content.gsub!('{nickname1}', operator&.real_name)
+    content.gsub!('{login1}', operator&.login)
+    content.gsub!('{nickname2}', owner&.real_name)
+    content.gsub!('{login2}', owner&.login)
+    content.gsub!('{identifier}', project&.identifier)
+    content.gsub!('{repository}', project&.name)
+    content.gsub!('{baseurl}', base_url)
+    content.gsub!('{title}', pull_request&.title)
+    content.gsub!('{id}', pull_request&.id.to_s)

+    return receiver&.mail, title, content
  rescue => e
    Rails.logger.info("MessageTemplate::PullRequestClosed.get_email_message_content [ERROR] #{e}")
    return '', '', ''
--- a/app/models/message_template/pull_request_merged.rb
+++ b/app/models/message_template/pull_request_merged.rb
@ -36,27 +36,24 @@ class MessageTemplate::PullRequestMerged < MessageTemplate
  def self.get_email_message_content(receiver, operator, pull_request)
    if receiver.user_template_message_setting.present? 
      return '', '', '' unless receiver.user_template_message_setting.email_body["CreateOrAssign::PullRequestChanged"]
-      project = pull_request&.project
-      owner = project&.owner 
-      title = email_title
-      title.gsub!('{title}', pull_request&.title)
-      content = email
-      content.gsub!('{receiver}', receiver&.real_name)
-      content.gsub!('{nickname1}', operator&.real_name)
-      content.gsub!('{login1}', operator&.login)
-      content.gsub!('{nickname2}', owner&.real_name)
-      content.gsub!('{login2}', owner&.login)
-      content.gsub!('{identifier}', project&.identifier)
-      content.gsub!('{repository}', project&.name)
-      content.gsub!('{baseurl}', base_url)
-      content.gsub!('{title}', pull_request&.title)
-      content.gsub!('{id}', pull_request&.id.to_s)
-      content.gsub!('{platform}', PLATFORM)
-  
-      return receiver&.mail, title, content
-    else
-      return '', '', ''
    end
+    project = pull_request&.project
+    owner = project&.owner 
+    title = email_title
+    title.gsub!('{title}', pull_request&.title)
+    content = email
+    content.gsub!('{receiver}', receiver&.real_name)
+    content.gsub!('{nickname1}', operator&.real_name)
+    content.gsub!('{login1}', operator&.login)
+    content.gsub!('{nickname2}', owner&.real_name)
+    content.gsub!('{login2}', owner&.login)
+    content.gsub!('{identifier}', project&.identifier)
+    content.gsub!('{repository}', project&.name)
+    content.gsub!('{baseurl}', base_url)
+    content.gsub!('{title}', pull_request&.title)
+    content.gsub!('{id}', pull_request&.id.to_s)
+
+    return receiver&.mail, title, content
  rescue => e
    Rails.logger.info("MessageTemplate::PullRequestMerged.get_email_message_content [ERROR] #{e}")
    return '', '', ''
--- a/app/models/message_template/team_joined.rb
+++ b/app/models/message_template/team_joined.rb
@ -1,59 +0,0 @@
-# == Schema Information
-#
-# Table name: message_templates
-#
-#  id               :integer          not null, primary key
-#  type             :string(255)
-#  sys_notice       :text(65535)
-#  email            :text(65535)
-#  created_at       :datetime         not null
-#  updated_at       :datetime         not null
-#  notification_url :string(255)
-#  email_title      :string(255)
-#
-
-# 账号被拉入组织团队
-class MessageTemplate::TeamJoined < MessageTemplate
-
-  # MessageTemplate::TeamJoined.get_message_content(User.where(login: 'yystopf'), Organization.last, Organization.last.teams.take)
-  def self.get_message_content(receivers, organization, team)
-    receivers.each do |receiver|
-      if receiver.user_template_message_setting.present? 
-        receivers = receivers.where.not(id: receiver.id) unless receiver.user_template_message_setting.notification_body["Normal::Permission"]
-      end
-    end
-    return '', '', '' if receivers.blank?
-    content = sys_notice.gsub('{organization}', organization&.real_name).gsub('{team}', team&.nickname).gsub('{role}', team&.authorize_name)
-    url = notification_url.gsub('{login}', organization&.login)
-    return receivers_string(receivers), content, url
-  rescue => e
-    Rails.logger.info("MessageTemplate::TeamJoined.get_message_content [ERROR] #{e}")
-    return '', '', ''
-  end
-
-  def self.get_email_message_content(receiver, organization, role) 
-    if receiver.user_template_message_setting.present? 
-      return '', '', '' unless receiver.user_template_message_setting.email_body["Normal::Permission"]
-      title = email_title
-      title.gsub!('{organization}', organization&.real_name)
-      title.gsub!('{team}', team&.nickname)
-      title.gsub!('{role}', team&.authorize_name)
-      content = email 
-      content.gsub!('{receiver}', receiver&.real_name)
-      content.gsub!('{baseurl}', base_url)
-      content.gsub!('{login}', organization&.login)
-      content.gsub!('{organization}', organization&.real_name)
-      content.gsub!('{team}', team&.nickname)
-      content.gsub!('{role}', team&.authorize_name)
-      content.gsub!('{platform}', PLATFORM)
-  
-      return receiver&.mail, title, content
-    else
-      return '', '', ''
-    end
-
-  rescue => e
-    Rails.logger.info("MessageTemplate::TeamJoined.get_email_message_content [ERROR] #{e}")
-    return '', '', ''
-  end
-end
--- a/app/models/message_template/team_left.rb
+++ b/app/models/message_template/team_left.rb
@ -1,59 +0,0 @@
-# == Schema Information
-#
-# Table name: message_templates
-#
-#  id               :integer          not null, primary key
-#  type             :string(255)
-#  sys_notice       :text(65535)
-#  email            :text(65535)
-#  created_at       :datetime         not null
-#  updated_at       :datetime         not null
-#  notification_url :string(255)
-#  email_title      :string(255)
-#
-
-# 账号被移出组织团队
-class MessageTemplate::TeamLeft < MessageTemplate
-
-  # MessageTemplate::TeamLeft.get_message_content(User.where(login: 'yystopf'), Organization.last, Organization.last.teams.take)
-  def self.get_message_content(receivers, organization, team)
-    receivers.each do |receiver|
-      if receiver.user_template_message_setting.present? 
-        receivers = receivers.where.not(id: receiver.id) unless receiver.user_template_message_setting.notification_body["Normal::Permission"]
-      end
-    end
-    return '', '', '' if receivers.blank?
-    content = sys_notice.gsub('{organization}', organization&.real_name).gsub('{team}', team&.nickname).gsub('{role}', team&.authorize_name)
-    url = notification_url.gsub('{login}', organization&.login)
-    return receivers_string(receivers), content, url
-  rescue => e
-    Rails.logger.info("MessageTemplate::TeamLeft.get_message_content [ERROR] #{e}")
-    return '', '', ''
-  end
-
-  def self.get_email_message_content(receiver, organization, team) 
-    if receiver.user_template_message_setting.present? 
-      return '', '', '' unless receiver.user_template_message_setting.email_body["Normal::Permission"]
-      title = email_title
-      title.gsub!('{organization}', organization&.real_name)
-      title.gsub!('{team}', team&.nickname)
-      title.gsub!('{role}', team&.authorize_name)
-      content = email 
-      content.gsub!('{receiver}', receiver&.real_name)
-      content.gsub!('{baseurl}', base_url)
-      content.gsub!('{login}', organization&.login)
-      content.gsub!('{organization}', organization&.real_name)
-      content.gsub!('{team}', team&.nickname)
-      content.gsub!('{role}', team&.authorize_name)
-      content.gsub!('{platform}', PLATFORM)
-  
-      return receiver&.mail, title, content
-    else
-      return '', '', ''
-    end
-
-  rescue => e
-    Rails.logger.info("MessageTemplate::TeamLeft.get_email_message_content [ERROR] #{e}")
-    return '', '', ''
-  end
-end
--- a/app/models/project.rb
+++ b/app/models/project.rb
@ -129,9 +129,9 @@ class Project < ApplicationRecord
  has_many :has_pinned_users, through: :pinned_projects, source: :user
  has_many :webhooks, class_name: "Gitea::Webhook", primary_key: :gpid, foreign_key: :repo_id
  after_create :incre_user_statistic, :incre_platform_statistic
-  after_save :check_project_members
-  before_save :set_invite_code, :reset_unmember_followed, :set_recommend_and_is_pinned, :reset_cache_data
-  before_destroy :decre_project_common, :decre_forked_from_project_count
+  after_save :check_project_members, :reset_cache_data
+  before_save :set_invite_code, :reset_unmember_followed, :set_recommend_and_is_pinned
+  before_destroy :decre_project_common
  after_destroy :decre_user_statistic, :decre_platform_statistic
  scope :project_statics_select, -> {select(:id,:name, :is_public, :identifier, :status, :project_type, :user_id, :forked_count, :description, :visits, :project_category_id, :project_language_id, :license_id, :ignore_id, :watchers_count, :created_on)}
  scope :no_anomory_projects, -> {where("projects.user_id is not null and projects.user_id != ?", 2)}
@ -154,7 +154,7 @@ class Project < ApplicationRecord
  end

  def reset_cache_data 
-    CacheAsyncResetJob.set(wait: 5.seconds).perform_later("project_common_service", self.id)
+    CacheAsyncResetJob.perform_later("project_common_service", self.id)
    if changes[:user_id].present?
      CacheAsyncSetJob.perform_later("user_statistic_service", {project_count: -1}, changes[:user_id].first)
      CacheAsyncSetJob.perform_later("user_statistic_service", {project_count: 1}, changes[:user_id].last)
@ -167,28 +167,12 @@ class Project < ApplicationRecord
      CacheAsyncSetJob.perform_later("platform_statistic_service", {project_language_count_key: first_language&.name, project_language_count: -1})
      CacheAsyncSetJob.perform_later("platform_statistic_service", {project_language_count_key: last_language&.name, project_language_count: 1})
    end
-    if changes[:is_public].present?
-      if changes[:is_public][0] && !changes[:is_public][1]
-        CacheAsyncClearJob.perform_later('project_rank_service', self.id)
-      end
-      if !changes[:is_public][0] && changes[:is_public][1]
-        $redis_cache.srem("v2-project-rank-deleted", self.id)
-      end
-    end
  end

  def decre_project_common
    CacheAsyncClearJob.perform_later('project_common_service', self.id)
  end

-  def decre_forked_from_project_count
-    forked_project = self.forked_from_project
-    if forked_project.present?
-      forked_project.decrement(:forked_count, 1)
-      forked_project.save
-    end
-  end
-
  def incre_user_statistic 
    CacheAsyncSetJob.perform_later("user_statistic_service", {project_count: 1, project_language_count_key: self.project_language&.name, project_language_count: 1}, self.user_id)
  end
@ -374,7 +358,6 @@ class Project < ApplicationRecord
    logger.info "########namespace_path: #{namespace_path} ########identifier: #{identifier} "

    user = Owner.find_by_login namespace_path
-    user = Owner.new(login: namespace_path) if user.nil?
    project = user&.projects&.find_by(identifier: identifier) || Project.find_by(identifier: "#{namespace_path}/#{identifier}")
    return nil if project.blank?

--- a/app/models/team.rb
+++ b/app/models/team.rb
@ -29,11 +29,6 @@ class Team < ApplicationRecord
  has_many :team_units, dependent: :destroy
  has_many :team_users, dependent: :destroy

-  scope :like, lambda { |keywords|
-    sql = "teams.nickname LIKE :search OR teams.name LIKE :search"
-    where(sql, :search => "%#{keywords.split(" ").join('|')}%") unless keywords.blank?
-  }
-
  validates :name, uniqueness: {scope: :organization_id}

  enum authorize: {read: 1, write: 2, admin: 3, owner: 4}
@ -61,10 +56,10 @@ class Team < ApplicationRecord

  def authorize_name 
    case self.authorize 
-    when 'read' then '读取'
-    when 'write' then '写入'
+    when 'read' then '报告者'
+    when 'write' then '开发者'
    when 'admin' then '管理员'
-    when 'owner' then '管理员'
+    when 'owner' then '拥有者'
    else 
      ''
    end
--- a/app/models/team_user.rb
+++ b/app/models/team_user.rb
@ -22,17 +22,9 @@ class TeamUser < ApplicationRecord
  belongs_to :team, counter_cache: :num_users
  belongs_to :user

-  has_one :member
-
  validates :user_id, uniqueness: {scope: [:organization_id, :team_id]}

-  before_destroy :remove_project_member
-
  def self.build(organization_id, user_id, team_id)
-    self.find_or_create_by!(organization_id: organization_id, user_id: user_id, team_id: team_id)
-  end
-
-  def remove_project_member
-    member.destroy if member.present? 
+    self.create!(organization_id: organization_id, user_id: user_id, team_id: team_id)
  end
 end
--- a/app/models/template_message_setting.rb
+++ b/app/models/template_message_setting.rb
@ -22,7 +22,6 @@ class TemplateMessageSetting < ApplicationRecord
  end

  def self.build_init_data
-    TemplateMessageSetting.destroy_all
    TemplateMessageSetting::CreateOrAssign.build_init_data
    TemplateMessageSetting::ManageProject.build_init_data
    TemplateMessageSetting::Normal.build_init_data
--- a/app/models/template_message_setting/create_or_assign.rb
+++ b/app/models/template_message_setting/create_or_assign.rb
@ -25,8 +25,7 @@ class TemplateMessageSetting::CreateOrAssign < TemplateMessageSetting
  end

  def self.build_init_data
-    self.find_or_create_by(name: "疑修状态变更", key: "IssueChanged")
+    self.find_or_create_by(name: "易修状态变更", key: "IssueChanged")
    self.find_or_create_by(name: "合并请求状态变更", key: "PullRequestChanged")
-    self.find_or_create_by(name: "疑修截止日期到达最后一天", key: "IssueExpire", notification_disabled: false)
  end
 end
--- a/app/models/template_message_setting/manage_project.rb
+++ b/app/models/template_message_setting/manage_project.rb
@ -25,13 +25,9 @@ class TemplateMessageSetting::ManageProject < TemplateMessageSetting
  end

  def self.build_init_data
-    self.find_or_create_by(name: "有新的疑修", key: "Issue")
+    self.find_or_create_by(name: "有新的易修", key: "Issue")
    self.find_or_create_by(name: "有新的合并请求", key: "PullRequest")
    self.find_or_create_by(name: "有成员变动", key: "Member")
    self.find_or_create_by(name: "仓库设置被更改", key: "SettingChanged")
-    self.find_or_create_by(name: "被点赞", key: "Praised", notification_disabled: false, email_disabled: true)
-    self.find_or_create_by(name: "被fork", key: "Forked", notification_disabled: false, email_disabled: true)
-    self.find_or_create_by(name: "有新的里程碑", key: "Milestone", notification_disabled: false)
-    self.find_or_create_by(name: "有里程碑已完成", key: "MilestoneCompleted", notification_disabled: false)
  end
 end
--- a/app/models/template_message_setting/normal.rb
+++ b/app/models/template_message_setting/normal.rb
@ -27,7 +27,7 @@ class TemplateMessageSetting::Normal < TemplateMessageSetting
    self.find_or_create_by(name: "账号有权限变更", key: "Permission")
    self.find_or_create_by(name: "被拉入或移出组织", key: "Organization")
    self.find_or_create_by(name: "被拉入或移出项目", key: "Project")
-    self.find_or_create_by(name: "有新的疑修指派给我", key: "IssueAssigned")
+    self.find_or_create_by(name: "有新的易修指派给我", key: "IssueAssigned")
    self.find_or_create_by(name: "有新的合并请求指派给我", key: "PullRequestAssigned")
  end
 end
--- a/app/models/trace_user.rb
+++ b/app/models/trace_user.rb
@ -1,58 +0,0 @@
-# == Schema Information
-#
-# Table name: trace_users
-#
-#  id         :integer          not null, primary key
-#  user_id    :integer
-#  username   :string(255)
-#  password   :string(255)
-#  unit       :string(255)
-#  telnumber  :string(255)
-#  email      :string(255)
-#  name       :string(255)
-#  token      :text(65535)
-#  expired_at :datetime
-#  created_at :datetime         not null
-#  updated_at :datetime         not null
-#
-# Indexes
-#
-#  index_trace_users_on_user_id  (user_id)
-#
-
-# 代码溯源 用户
-class TraceUser < ApplicationRecord
-
-  belongs_to :user
-
-
-  def build_self_data
-    return if user.nil? 
-
-    self.username = user.login 
-    self.password = SecureRandom.hex
-    self.unit = user.custom_department.blank? ? 'GitLink' : user.custom_department
-    self.telnumber = user.phone.blank? ? '13800000000' : user.phone
-    self.email = user.mail 
-    self.name = user.nickname.blank? ? user.login : user.nickname 
-
-    self
-  end
-
-
-  def build_token 
-    return if username.blank? || password.blank? || unit.blank? || telnumber.blank? || email.blank? || name.blank? 
-
-    response = Trace::AddUserService.call(username, password, unit, telnumber, email, name)
-    self.token = response[1]['token']
-    self.expired_at = Time.now + 1.hours
-  end
-
-  def refresh_token 
-    return if username.blank? || password.blank? || unit.blank? || telnumber.blank? || email.blank? || name.blank? 
-
-    response = Trace::LoginService.call(username, password)
-    self.token = response[1]['token']
-    self.expired_at = Time.now + 1.hours
-  end
-end
--- a/app/models/user.rb
+++ b/app/models/user.rb
@ -173,7 +173,6 @@ class User < Owner

  has_many :system_notification_histories
  has_many :system_notifications, through: :system_notification_histories
-  has_one :trace_user, dependent: :destroy
  
  # Groups and active users
  scope :active, lambda { where(status: STATUS_ACTIVE) }
@ -774,25 +773,7 @@ class User < Owner
  end

  def profile_is_completed?
-    self.nickname.present? && self.mail.present?
-  end
-
-  def trace_token 
-    if trace_user.present?
-      if trace_user.expired_at < Time.now
-        trace_user.refresh_token
-        trace_user.save
-      end
-      return trace_user.token
-    else
-      tu = TraceUser.new
-      tu.user = self
-      tu.build_self_data
-      tu.build_token 
-      tu.save
-
-      return tu.token
-    end
+    self.nickname.present? && self.gender.present? && self.mail.present? && self.custom_department.present?
  end

  protected
--- a/app/models/user_template_message_setting.rb
+++ b/app/models/user_template_message_setting.rb
@ -35,36 +35,26 @@ class UserTemplateMessageSetting < ApplicationRecord
      "Normal::PullRequestAssigned": true,
      "CreateOrAssign::IssueChanged": true,
      "CreateOrAssign::PullRequestChanged": true,
-      "CreateOrAssign::IssueExpire": true,
      "ManageProject::Issue": true,
      "ManageProject::PullRequest": true,
      "ManageProject::Member": true,
      "ManageProject::SettingChanged": true,
-      "ManageProject::Praised": true,
-      "ManageProject::Forked": true,
-      "ManageProject::Milestone": true,
-      "ManageProject::MilestoneCompleted": true,
    }.stringify_keys!
  end

  def self.init_email_body 
    {
-      "Normal::Permission": false,
-      "Normal::Project": false,
-      "Normal::Organization": false,
-      "Normal::IssueAssigned": false,
-      "Normal::PullRequestAssigned": false,
-      "CreateOrAssign::IssueChanged": false,
-      "CreateOrAssign::PullRequestChanged": false,
-      "CreateOrAssign::IssueExpire": false,
-      "ManageProject::Issue": false,
-      "ManageProject::PullRequest": false,
-      "ManageProject::Member": false,
-      "ManageProject::SettingChanged": false,
-      "ManageProject::Praised": false,
-      "ManageProject::Forked": false,
-      "ManageProject::Milestone": false,
-      "ManageProject::MilestoneCompleted": false,
+      "Normal::Permission": true,
+      "Normal::Project": true,
+      "Normal::Organization": true,
+      "Normal::IssueAssigned": true,
+      "Normal::PullRequestAssigned": true,
+      "CreateOrAssign::IssueChanged": true,
+      "CreateOrAssign::PullRequestChanged": true,
+      "ManageProject::Issue": true,
+      "ManageProject::PullRequest": true,
+      "ManageProject::Member": true,
+      "ManageProject::SettingChanged": true,
    }.stringify_keys!
  end

--- a/app/models/version.rb
+++ b/app/models/version.rb
@ -40,19 +40,8 @@ class Version < ApplicationRecord
  #   issues.select(:id,:status_id).where(status_id: 5).size
  # end

-  after_create :send_create_message_to_notice_system
-  after_save :send_update_message_to_notice_system
-
  def version_user
    User.select(:login, :lastname,:firstname, :nickname)&.find_by_id(self.user_id)
  end

-  private 
-  def send_create_message_to_notice_system
-    SendTemplateMessageJob.perform_later('ProjectMilestone', self.id, self.user_id) if Site.has_notice_menu?
-  end
-
-  def send_update_message_to_notice_system
-    SendTemplateMessageJob.perform_later('ProjectMilestoneCompleted', self.id) if Site.has_notice_menu? && self.percent == 1.0
-  end
 end
--- a/app/services/atme_service.rb
+++ b/app/services/atme_service.rb
@ -32,6 +32,6 @@ class AtmeService < ApplicationService
    else 
      return 
    end
-    SendTemplateMessageJob.perform_later(message_source, receivers.pluck(:id), user.id, @atmeable.id) if Site.has_notice_menu?
+    SendTemplateMessageJob.perform_now(message_source, receivers, user.id, @atmeable.id) if Site.has_notice_menu?
  end
 end
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
jasder	4fa10a3683	Merge pull request 'fix mege develop' (#248 ) from develop into master	2021-11-14 20:39:31 +08:00
jasder	cb11a5c8e9	发布v3.1.1版本 * FIX 修复pulls、issues 搜索数量统计问题 * FIX 解决在线创建文件错误提示信息不准确的问题 * FIX table name bug * FIX 解决applied_projects相关表操作的问题 * FIX 解决排序参数的判断预防SQL注入 * FIX 项目导航栏数量改为开启中的数量 * FIX 解决项目邀请码的索引查询问题 * FIX FIX get readme file bug * FIX sql attack * FIX projects load by invite code slowly	2021-06-18 17:09:57 +08:00
jasder	c5d73b7cf8	v3.1.0 * 改版升级个人主页 * 修复bug * 更改license	2021-06-09 09:52:57 +08:00
jasder	8a10a183e0	Merge branch 'develop'	2021-05-24 10:18:03 +08:00
jasder	6d1bcabd51	Merge branch 'master' of https://git.trustie.net/jasder/forgeplus	2021-05-24 10:10:24 +08:00
jasder	86f03ffafc	Merge OK	2021-05-08 17:46:22 +08:00