fix: change email default rule

app/controllers/application_controller.rb

@@ -337,7 +337,6 @@ class ApplicationController < ActionController::Base
 				User.current = user
 			end
 		end
-
 		# if !User.current.logged? && Rails.env.development?
 		# 	User.current = User.find 1
 		# end

app/controllers/concerns/register_helper.rb

@@ -1,13 +1,17 @@
 module RegisterHelper
   extend ActiveSupport::Concern
 
-  def autologin_register(username, email, password, platform= 'forge')
+  def autologin_register(username, email, password, platform= 'forge', need_edit_info = false)
     result = {message: nil, user: nil}
 
     user = User.new(admin: false, login: username, mail: email, type: "User")
     user.password = password
     user.platform = platform
-    user.activate
+    if need_edit_info
+      user.need_edit_info
+    else 
+      user.activate
+    end
     
     return unless user.valid?
 
@@ -27,4 +31,31 @@ module RegisterHelper
     result
   end
 
+  def autosync_register_trustie(username, password, email, lastname="")
+    config = Rails.application.config_for(:configuration).symbolize_keys!
+
+    api_host = config[:sync_url]
+
+    return if api_host.blank?
+
+    url = "#{api_host}/api/v1/users/common"
+    sync_json = {
+      "mail": email,
+      "password": password,
+      "login": username,
+      "lastname": lastname
+    }.compact
+    uri = URI.parse(url)
+
+    if api_host
+      http = Net::HTTP.new(uri.hostname, uri.port)
+
+      if api_host.include?("https://")
+        http.use_ssl = true
+      end
+
+      http.send_request('POST', uri.path, sync_json.to_json, {'Content-Type' => 'application/json'})
+    end
+  end
+
 end

app/controllers/oauth/base_controller.rb

@@ -2,6 +2,7 @@ class Oauth::BaseController < ActionController::Base
   include RenderHelper
   include LoginHelper
   include ControllerRescueHandler
+  include LoggerHelper
   # include LaboratoryHelper
 
   skip_before_action :verify_authenticity_token
@@ -11,6 +12,18 @@ class Oauth::BaseController < ActionController::Base
   end
 
   private
+  def tip_exception(status = -1, message)
+		raise Educoder::TipException.new(status, message)
+  end
+  
+  def tip_show_exception(status = -2, message)
+		raise Educoder::TipException.new(status, message)
+  end
+  
+  def tip_show(exception)
+		uid_logger("Tip show status is #{exception.status}, message is #{exception.message}")
+		render json: exception.tip_json
+	end
 
   def session_user_id
     # session[:user_id]
@@ -48,4 +61,13 @@ class Oauth::BaseController < ActionController::Base
     Rails.logger.info("[wechat] set session unionid: #{unionid}")
     session[:unionid] = unionid
   end
+
+  def session_edulogin
+    session[:edulogin]
+  end
+
+  def set_session_edulogin(login)
+    Rails.logger.info("[educoder] set sesstion edulogin: #{login}")
+    session[:edulogin] = login
+  end
 end

app/controllers/oauth/educoder_controller.rb

@@ -1,4 +1,6 @@
 class Oauth::EducoderController < Oauth::BaseController
+  include RegisterHelper
+
   def bind
     begin
       login = params[:login]
@@ -32,4 +34,41 @@ class Oauth::EducoderController < Oauth::BaseController
       render_error(ex.message)
     end
   end
+
+  # 需要educoder那边设置回调地址
+  def create
+    begin
+      code = params['code'].to_s.strip
+      tip_exception("code不能为空") if code.blank?
+
+      new_user = false
+      result = EducoderOauth::Service.access_token(code)
+      result = EducoderOauth::Service.user_info(result[:access_token])
+
+      # 存在该用户
+      open_user = OpenUsers::Educoder.find_by(uid: result['login'])
+      if open_user.present? && open_user.user.present?
+        successful_authentication(open_user.user)
+      else
+        if current_user.blank? || !current_user.logged?
+          new_user = true
+          login = User.generate_login('E')
+          reg_result = autologin_register(login,"#{login}@forge.com", "Ec#{login}2021#", 'educoder', true)
+          if reg_result[:message].blank?
+            open_user = OpenUsers::Educoder.create!(user_id: reg_result[:user][:id], uid: result['login'], extra: result)
+            autosync_register_trustie(login, "Ec#{login}2021#", "#{login}@forge.com")
+            successful_authentication(open_user.user)
+          else
+            render_error(reg_result[:message])
+          end
+        else
+          OpenUsers::Educoder.create!(user: current_user, uid: result['login'], extra: result)
+        end
+      end
+
+      redirect_to root_path(new_user: new_user)
+    rescue Exception => ex
+      render_error(ex.message)
+    end
+  end
 end

app/controllers/oauth_controller.rb

@@ -61,6 +61,7 @@ class OauthController < ApplicationController
     login = params[:login]
     email = params[:mail]
     password = params[:password]
+    lastname = params[:lastname]
     callback_url =  params[:callback_url]
     platform = params[:plathform] || 'educoder'
 
@@ -72,8 +73,11 @@ class OauthController < ApplicationController
       if result[:message].blank?
         logger.info "[Oauth educoer] ====auto_register success"
         user = User.find result[:user][:id]
-        successful_authentication(user)
+        user.update_column(:lastname, params[:lastname])
+        autosync_register_trustie(login, password, email, lastname)
+        
         OpenUsers::Educoder.create!(user: user, uid: user.login)
+        successful_authentication(user)
 
         render json: { callback_url: callback_url }
         # redirect_to callback_url

app/controllers/repositories_controller.rb

@@ -347,7 +347,7 @@ class RepositoriesController < ApplicationController
         local_requests = PullRequest.new(local_params.merge(user_id: current_user.try(:id), project_id: @project.id, issue_id: @pull_issue.id))
         if local_requests.save
           gitea_request = Gitea::PullRequest::CreateService.new(current_user.try(:gitea_token), @owner.login, @project.try(:identifier), requests_params).call
-          if gitea_request[:status] == :success && local_requests.update_attributes(gpid: gitea_request["body"]["number"])
+          if gitea_request[:status] == :success && local_requests.update_attributes(gitea_number: gitea_request["body"]["number"])
             local_requests.project_trends.create(user_id: current_user.id, project_id: @project.id, action_type: "create")
           end
         end

app/controllers/settings_controller.rb

@@ -4,6 +4,7 @@ class SettingsController < ApplicationController
     get_add_menu
     get_common_menu
     get_personal_menu
+    get_third_party
     get_top_system_notification
   end
 
@@ -40,6 +41,14 @@ class SettingsController < ApplicationController
       end
     end
 
+    def get_third_party
+      @third_party = []
+      @third_party << {
+        name: 'educoder',
+        url: EducoderOauth.oauth_url
+      }
+    end
+    
     def get_top_system_notification
       @top_system_notification = SystemNotification.is_top.first
     end

app/controllers/users_controller.rb

@@ -275,7 +275,7 @@ class UsersController < ApplicationController
 
     interactor = Gitea::User::UpdateInteractor.call(user.login, sync_params)
     if interactor.success?
-      user.update!(password: params[:password], mail: params[:email], status: User::STATUS_EDIT_INFO)
+      user.update!(password: params[:password], mail: params[:email], status: User::STATUS_ACTIVE)
       render_ok
     else
       render_error(interactor.error)

app/libs/educoder_oauth.rb

@@ -0,0 +1,18 @@
+module EducoderOauth
+  class << self
+    attr_accessor :client_id, :client_secret, :base_url, :redirect_uri
+
+    def logger
+      @_logger ||= STDOUT
+    end
+
+    def logger=(l)
+      @_logger = l
+    end
+
+    def oauth_url
+      "#{base_url}/oauth2?call_url=/oauth/authorize?client_id=#{client_id}&redirect_uri=#{URI.encode_www_form_component(redirect_uri)}&response_type=code"
+    end
+    
+  end
+end

app/libs/educoder_oauth/service.rb

@@ -0,0 +1,37 @@
+require 'oauth2'
+
+module EducoderOauth::Service
+  module_function
+
+  def request(method, url, params)
+    begin 
+      Rails.logger.info("[EducoderOauth] [#{method.to_s.upcase}] #{url} || #{params}")
+
+      client = Faraday.new(url: EducoderOauth.base_url)
+      response = client.public_send(method, url, params)
+      result = JSON.parse(response.body)
+
+      Rails.logger.info("[EducoderOauth] [#{response.status}] #{result}")
+
+      result
+    rescue Exception => e
+      raise Educoder::TipException.new(e.message)
+    end
+  end
+
+  def access_token(code)
+    begin
+      Rails.logger.info("[EducoderOauth] [code] #{code} ")
+      Rails.logger.info("[EducoderOauth] [redirect_uri] #{EducoderOauth.redirect_uri} ")
+      client = OAuth2::Client.new(EducoderOauth.client_id, EducoderOauth.client_secret, site: EducoderOauth.base_url)
+      result = client.auth_code.get_token(code, redirect_uri: EducoderOauth.redirect_uri).to_hash
+      return result
+    rescue Exception => e
+      raise Educoder::TipException.new(e.message)
+    end
+  end
+
+  def user_info(access_token)
+    request(:get, '/api/users/info.json', {access_token: access_token})
+  end
+end

app/models/gitea/pull.rb

@@ -39,6 +39,6 @@ class Gitea::Pull < Gitea::Base
 
   serialize :conflicted_files, Array
 
-  belongs_to :pull_request, class_name: '::PullRequest', foreign_key: :id, primary_key: :gitea_number, optional: true
+  belongs_to :pull_request, class_name: '::PullRequest', foreign_key: :id, primary_key: :gitea_id, optional: true
 
 end

app/models/message_template/issue_assigned.rb

@@ -36,26 +36,28 @@ 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)
+  
+      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 '', '', ''

app/models/message_template/issue_changed.rb

@@ -190,177 +190,180 @@ class MessageTemplate::IssueChanged < MessageTemplate
   def self.get_email_message_content(receiver, operator, issue, change_params)
     if receiver.user_template_message_setting.present? 
       return '', '', '' unless receiver.user_template_message_setting.email_body["CreateOrAssign::IssueChanged"]
-    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/>') 
+      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.sub!('{ifassigner}', '') 
+        content.gsub!(/({ifassigner})(.*)({endassigner})/, '') 
       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/>') 
+      # 易修状态修改
+      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.sub!('{ifstatus}', '') 
+        content.gsub!(/({ifstatus})(.*)({endstatus})/, '') 
       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/>')
+      # 易修类型修改
+      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.sub!('{iftracker}', '')
+        content.gsub!(/({iftracker})(.*)({endtracker})/, '') 
       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/>')
+      # 易修里程碑修改
+      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.sub!('{ifmilestone}', '')
+        content.gsub!(/({ifmilestone})(.*)({endmilestone})/, '') 
       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/>')
+      # 易修标记修改
+      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.sub!('{iftag}', '')
+        content.gsub!(/({iftag})(.*)({endtag})()/, '') 
       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/>')
+      # 易修优先级修改
+      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.sub!('{ifpriority}', '')
+        content.gsub!(/({ifpriority})(.*)({endpriority})/, '') 
       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/>')
+      # 易修完成度修改
+      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.sub!('{ifdoneratio}', '')
+        content.gsub!(/({ifdoneratio})(.*)({enddoneratio})/, '') 
       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/>')
+      # 易修指定分支修改
+      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.sub!('{ifbranch}', '')
+        content.gsub!(/({ifbranch})(.*)({endbranch})/, '') 
       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/>')
+      # 易修开始日期修改
+      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.sub!('{ifstartdate}', '')
+        content.gsub!(/({ifstartdate})(.*)({endstartdate})/, '') 
       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/>')
+      # 易修结束日期修改
+      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.sub!('{ifduedate}', '')
+        content.gsub!(/({ifduedate})(.*)({endduedate})/, '') 
       end
-      content.sub!('{endduedate}', '')
-      content.gsub!('{duedate1}', duedate1)
-      content.gsub!('{duedate2}', duedate2)
-    else
-      content.gsub!(/({ifduedate})(.*)({endduedate})/, '') 
-    end
 
-    return receiver&.mail, title, content
+      return receiver&.mail, title, content
+    else
+      return '', '', ''
+    end
+    
   rescue => e
     Rails.logger.info("MessageTemplate::IssueChanged.get_email_message_content [ERROR] #{e}")
     return '', '', ''

app/models/message_template/issue_deleted.rb

@@ -33,17 +33,19 @@ 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"]
-    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)
+      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
+      return receiver&.mail, title, content
+    else
+      return '', '', ''
+    end
   rescue => e
     Rails.logger.info("MessageTemplate::IssueDeleted.get_email_message_content [ERROR] #{e}")
     return '', '', ''

app/models/message_template/organization_joined.rb

@@ -34,16 +34,19 @@ 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)
+    
+      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 '', '', ''

app/models/message_template/organization_left.rb

@@ -34,16 +34,19 @@ 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)
+  
+      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 '', '', ''

app/models/message_template/organization_role.rb

@@ -34,18 +34,21 @@ 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)
+  
+      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 '', '', ''

app/models/message_template/project_issue.rb

@@ -38,27 +38,30 @@ 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)
+      
+      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 '', '', ''

app/models/message_template/project_joined.rb

@@ -34,19 +34,22 @@ 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"]
-    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)
+      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
+      return receiver&.mail, title, content
+    else
+      return '', '', ''
+    end
+    
   rescue => e
     Rails.logger.info("MessageTemplate::ProjectJoined.get_email_message_content [ERROR] #{e}")
     return '', '', ''

app/models/message_template/project_left.rb

@@ -33,19 +33,22 @@ 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"]
-    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)
+      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
+      return receiver&.mail, title, content
+    else
+      return '', '', ''
+    end
+    
   rescue => e
     Rails.logger.info("MessageTemplate::ProjectLeft.get_email_message_content [ERROR] #{e}")
     return '', '', ''

app/models/message_template/project_member_joined.rb

@@ -34,23 +34,25 @@ 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"]
-    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)
+      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
+      return receiver&.mail, title, content
+    else
+      return '', '', ''
+    end
   rescue => e
     Rails.logger.info("MessageTemplate::ProjectMemberJoined.get_email_message_content [ERROR] #{e}")
     return '', '', ''

app/models/message_template/project_member_left.rb

@@ -34,23 +34,26 @@ 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)
+  
+      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 '', '', ''

app/models/message_template/project_pull_request.rb

@@ -38,27 +38,29 @@ 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)
+      
+      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 '', '', ''

app/models/message_template/project_role.rb

@@ -34,21 +34,24 @@ 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)
+  
+      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 '', '', ''

app/models/message_template/project_setting_changed.rb

@@ -159,150 +159,152 @@ 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"]
-    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?
+      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.gsub!(/({ifdescription})(.*)({enddescription})/, '<br/>删除了项目简介') 
+          content.sub!('{ifname}', '<br/>') 
         else
-          content.gsub!(/({ifdescription})(.*)({enddescription})/, '删除了项目简介') 
+          content.sub!('{ifname}', '') 
         end
+        content.sub!('{endname}', '')
+        content.gsub!('{name}', change_params[:name][1])
       else
-        if change_count > 1
-          content.sub!('{ifdescription}', '<br/>') 
-        else
-          content.sub!('{ifdescription}', '') 
-        end
-        content.sub!('{enddescription}', '')
-        content.gsub!('{description}', change_params[:description][1])
+        content.gsub!(/({ifname})(.*)({endname})/, '') 
       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_params[:identifier].present?
         if change_count > 1
-          content.sub!('{ifcategory}', '<br/>') 
+          content.sub!('{ifidentifier}', '<br/>') 
         else
-          content.sub!('{ifcategory}', '') 
+          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
-        content.sub!('{endcategory}', '')
-        content.gsub!('{category}', category&.name)
       else 
-        if change_count > 1
-          content.gsub!(/({ifcategory})(.*)({endcategory})/, '<br/>删除了项目类别') 
-        else
-          content.gsub!(/({ifcategory})(.*)({endcategory})/, '删除了项目类别') 
+        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
-    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/>') 
+      # 项目语言更改
+      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
-          content.sub!('{iflanguage}', '') 
+          if change_count > 1
+            content.gsub!(/({iflanguage})(.*)({endlanguage})/, '<br/>删除了项目语言') 
+          else
+            content.gsub!(/({iflanguage})(.*)({endlanguage})/, '删除了项目语言') 
+          end
         end
-        content.sub!('{endlanguage}', '')
-        content.gsub!('{language}', language&.name)
       else
+        content.gsub!(/({iflanguage})(.*)({endlanguage})/, '') 
+      end
+      # 项目公私有更改
+      if change_params[:is_public].present?
+        permission = change_params[:is_public][1] ? '公有' : '私有'
         if change_count > 1
-          content.gsub!(/({iflanguage})(.*)({endlanguage})/, '<br/>删除了项目语言') 
+          content.sub!('{ifpermission}', '<br/>') 
         else
-          content.gsub!(/({iflanguage})(.*)({endlanguage})/, '删除了项目语言') 
+          content.sub!('{ifpermission}', '') 
         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/>') 
+        content.sub!('{endpermission}', '')
+        content.gsub!('{permission}', permission)
       else
-        content.sub!('{ifpermission}', '') 
+        content.gsub!(/({ifpermission})(.*)({endpermission})/, '') 
       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/>') 
+      # 项目导航更改
+      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.sub!('{ifnavbar}', '') 
+        content.gsub!(/({ifnavbar})(.*)({endnavbar})/, '') 
       end
-      content.sub!('{endnavbar}', '')
-      content.gsub!('{navbar}', navbar)
+      
+      return receiver&.mail, title, content
     else
-      content.gsub!(/({ifnavbar})(.*)({endnavbar})/, '') 
+      return '', '', '' 
     end
-    
-    return receiver&.mail, title, content
   rescue => e
     Rails.logger.info("MessageTemplate::ProjectSettingChanged.get_email_message_content [ERROR] #{e}")
     return '', '', ''

app/models/message_template/pull_request_assigned.rb

@@ -36,26 +36,28 @@ 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"]
-    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)
+      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
+      return receiver&.mail, title, content
+    else
+      return '', '', ''
+    end
   rescue => e
     Rails.logger.info("MessageTemplate::PullRequestAssigned.get_email_message_content [ERROR] #{e}")
     return '', '', ''

app/models/message_template/pull_request_changed.rb

@@ -102,89 +102,92 @@ class MessageTemplate::PullRequestChanged < MessageTemplate
   def self.get_email_message_content(receiver, operator, pull_request, change_params)
     if receiver.user_template_message_setting.present? 
       return '', '', '' unless receiver.user_template_message_setting.email_body["CreateOrAssign::PullRequestChanged"]
-    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/>') 
+      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.sub!('{ifassigner}', '') 
+        end
+        content.sub!('{endassigner}', '')
+        content.gsub!('{assigner1}', assigner1.present? ? assigner1&.real_name : '未指派成员')
+        content.gsub!('{assigner2}', assigner2.present? ? assigner2&.real_name : '未指派成员')
       else
-        content.sub!('{ifassigner}', '') 
+        content.gsub!(/({ifassigner})(.*)({endassigner})/, '') 
       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[: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/>') 
+      # 合并请求里程碑修改
+      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.sub!('{ifmilestone}', '') 
+        content.gsub!(/({ifmilestone})(.*)({endmilestone})/, '') 
       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/>') 
+      # 合并请求标记修改
+      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.sub!('{iftag}', '') 
+        content.gsub!(/({iftag})(.*)({endtag})()/, '') 
       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/>') 
+      # 合并请求优先级修改
+      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.sub!('{ifpriority}', '') 
+        content.gsub!(/({ifpriority})(.*)({endpriority})/, '') 
       end
-      content.sub!('{ifpriority}', '')
-      content.sub!('{endpriority}', '')
-      content.gsub!('{priority1}', priority1&.name)
-      content.gsub!('{priority2}', priority2&.name)
+  
+      return receiver&.mail, title, content
     else
-      content.gsub!(/({ifpriority})(.*)({endpriority})/, '') 
+      return '', '', ''
     end
 
-    return receiver&.mail, title, content
   rescue => e
     Rails.logger.info("MessageTemplate::PullRequestChanged.get_email_message_content [ERROR] #{e}")
     return '', '', ''

app/models/message_template/pull_request_closed.rb

@@ -36,24 +36,27 @@ 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)
+  
+      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 '', '', ''

app/models/message_template/pull_request_merged.rb

@@ -36,24 +36,26 @@ 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)
+  
+      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 '', '', ''

app/models/project.rb

@@ -1,4 +1,3 @@
-
 # == Schema Information
 #
 # Table name: projects
@@ -38,8 +37,6 @@
 #  rep_identifier         :string(255)
 #  project_category_id    :integer
 #  project_language_id    :integer
-#  license_id             :integer
-#  ignore_id              :integer
 #  praises_count          :integer          default("0")
 #  watchers_count         :integer          default("0")
 #  issues_count           :integer          default("0")
@@ -53,6 +50,8 @@
 #  open_devops_count      :integer          default("0")
 #  recommend              :boolean          default("0")
 #  platform               :integer          default("0")
+#  license_id             :integer
+#  ignore_id              :integer
 #  default_branch         :string(255)      default("master")
 #  website                :string(255)
 #  lesson_url             :string(255)
@@ -78,9 +77,6 @@
 #  index_projects_on_updated_on              (updated_on)
 #
 
-
-
-
 class Project < ApplicationRecord
   include Matchable
   include Publicable

app/models/pull_request.rb

@@ -37,7 +37,7 @@ class PullRequest < ApplicationRecord
   has_many :pull_request_tags, foreign_key: :pull_request_id
   has_many :project_trends, as: :trend, dependent: :destroy
   has_many :attachments, as: :container, dependent: :destroy
-  has_one :gitea_pull, foreign_key: :id, primary_key: :gitea_number, class_name: 'Gitea::Pull'
+  has_one :gitea_pull, foreign_key: :id, primary_key: :gitea_id, class_name: 'Gitea::Pull'
 
   scope :merged_and_closed, ->{where.not(status: 0)}
   scope :opening, -> {where(status: 0)}

app/models/token.rb

@@ -1,19 +1,19 @@
-# == Schema Information
-#
-# Table name: tokens
-#
-#  id         :integer          not null, primary key
-#  user_id    :integer          default("0"), not null
-#  action     :string(30)       default(""), not null
-#  value      :string(40)       default(""), not null
-#  created_on :datetime         not null
-#
-# Indexes
-#
-#  index_tokens_on_user_id  (user_id)
-#  tokens_value             (value) UNIQUE
-#
-
+# == Schema Information
+#
+# Table name: tokens
+#
+#  id         :integer          not null, primary key
+#  user_id    :integer          default("0"), not null
+#  action     :string(30)       default(""), not null
+#  value      :string(40)       default(""), not null
+#  created_on :datetime         not null
+#
+# Indexes
+#
+#  index_tokens_on_user_id  (user_id)
+#  tokens_value             (value) UNIQUE
+#
+
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License
@@ -76,7 +76,7 @@ class Token < ActiveRecord::Base
   # Returns the active user who owns the key for the given action
   def self.find_active_user(action, key, validity_days=nil)
     user = find_user(action, key, validity_days)
-    if user && user.active?
+    if user && (user.active? || user.need_edit_info?)
       user
     end
   end

app/models/user.rb

@@ -83,6 +83,7 @@ class User < Owner
   STATUS_ACTIVE     = 1
   STATUS_REGISTERED = 2
   STATUS_LOCKED     = 3
+  STATUS_EDIT_INFO   = 4
 
   # tpi tpm权限控制
   EDU_ADMIN = 1       # 超级管理员
@@ -174,7 +175,7 @@ class User < Owner
   has_one :user_template_message_setting, dependent: :destroy
 
   # Groups and active users
-  scope :active, lambda { where(status: STATUS_ACTIVE) }
+  scope :active, lambda { where(status: [STATUS_ACTIVE, STATUS_EDIT_INFO]) }
   scope :like, lambda { |keywords|
     sql = "CONCAT(lastname, firstname) LIKE :search OR nickname LIKE :search OR login LIKE :search OR mail LIKE :search OR nickname LIKE :search"
     where(sql, :search => "%#{keywords.split(" ").join('|')}%") unless keywords.blank?
@@ -417,6 +418,10 @@ class User < Owner
     status == STATUS_LOCKED
   end
 
+  def need_edit_info?
+    status == STATUS_EDIT_INFO
+  end
+
   def activate
     self.status = STATUS_ACTIVE
   end
@@ -429,6 +434,10 @@ class User < Owner
     self.status = STATUS_LOCKED
   end
 
+  def need_edit_info 
+    self.status = STATUS_EDIT_INFO
+  end
+
   def activate!
     update_attribute(:status, STATUS_ACTIVE)
   end
@@ -441,6 +450,10 @@ class User < Owner
     update_attribute(:status, STATUS_LOCKED)
   end
 
+  def need_edit_info!
+    update_attribute(:status, STATUS_EDIT_INFO)
+  end
+
   # 课程用户身份
   def course_identity(course)
     if !logged?

app/models/user_template_message_setting.rb

@@ -44,17 +44,17 @@ class UserTemplateMessageSetting < ApplicationRecord
 
   def self.init_email_body 
     {
-      "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,
+      "Normal::Permission": false,
+      "Normal::Project": false,
+      "Normal::Organization": false,
+      "Normal::IssueAssigned": false,
+      "Normal::PullRequestAssigned": false,
+      "CreateOrAssign::IssueChanged": false,
+      "CreateOrAssign::PullRequestChanged": false,
+      "ManageProject::Issue": false,
+      "ManageProject::PullRequest": false,
+      "ManageProject::Member": false,
+      "ManageProject::SettingChanged": false,
     }.stringify_keys!
   end
 

app/services/cache/v2/project_common_service.rb

@@ -226,6 +226,7 @@ class Cache::V2::ProjectCommonService < ApplicationService
 
   def reset_project_common
     load_project
+    return unless @project.present?
     return unless @project.is_full_public
     $redis_cache.del(project_common_key)
     reset_project_owner_id

app/views/oauth/register.html.erb

@@ -1,14 +1,19 @@
 <div class="indexPanel">
-  <p class="indexTitle">完善信息，进入比赛</p>
+  <p class="indexTitle">平台已检测到您的如下信息，完善即可进入比赛</p>
   <div class="indexInfos">
 
     <%= form_tag('', method: :post, id: 'oauth_form',  class: 'form-inline search-form flex-1', remote: true) do %>
       <%= hidden_field_tag 'callback_url', params[:callback_url] %>
       <div class="indexInfo">
-        <span>用户名：</span>
-        <%= text_field_tag :login, params[:login], placeholder: '请输入用户名', readonly: true, id: 'login' %>
+        <span>登录名：</span>
+        <%= text_field_tag :login, params[:login], placeholder: '请输入登录名', readonly: true, id: 'login' %>
         <p class="checkInfo loginCheck"><span></span></p>
       </div>
+      <div class="indexInfo">
+        <span>用户名称：</span>
+        <%= text_field_tag :lastname, params[:lastname], placeholder: '登录平台后显示的用户名称', maxlength: 40, id: 'lastname' %>
+        <p class="checkInfo lastnameCheck"><span></span></p>
+      </div>
       <div class="indexInfo">
         <span>邮箱：</span>
         <%= text_field_tag :mail, params[:mail], placeholder: '请输入绑定邮箱', maxlength: 40, id: 'email' %>
@@ -16,7 +21,7 @@
       </div>
       <div class="indexInfo">
         <span>密码：</span>
-        <%= password_field_tag :password, '', placeholder: '请输入账号密码', id: 'password'  %>
+        <%= password_field_tag :password, '', placeholder: '输入EduCoder账号密码或新的密码',maxlength: 15, id: 'password'  %>
         <p class="checkInfo passwordCheck"><span></span></p>
       </div>
       <div class="indexBtn">
@@ -29,6 +34,7 @@
   function submitdata(){
     var login = $("#login").val();
     var email = $("#email").val();
+    var lastname = $("#lastname").val();
     var password = $("#password").val();
 
     if(!login){
@@ -37,6 +43,12 @@
     }else{
       $(".loginCheck span").html("");
     }
+    if(!lastname){
+      $(".lastnameCheck span").html("请输入用户名称");
+      return;
+    }else{
+      $(".lastnameCheck span").html("");
+    }
     if(!email){
       $(".emailCheck span").html("请输入绑定的邮箱");
       return;

app/views/settings/show.json.jbuilder

@@ -56,6 +56,7 @@ json.setting do
   end
 
   json.common @common
+  json.third_party @third_party
 
   if @top_system_notification.present?
     json.system_notification do 

app/views/users/get_user_info.json.jbuilder

@@ -10,6 +10,7 @@ json.is_teacher @user.user_extension&.teacher?
 json.user_identity @user.identity
 json.tidding_count 0
 json.user_phone_binded @user.phone.present?
+json.need_edit_info @user.need_edit_info?
 # json.phone @user.phone
 # json.email @user.mail
 json.profile_completed @user.profile_is_completed?
@@ -22,4 +23,4 @@ json.city @user.city
 json.custom_department @user.custom_department
 json.description @user.description
 json.(@user, :show_email, :show_department, :show_location)
-json.message_unread_total @message_unread_total
+json.message_unread_total @message_unread_total

config/configuration.yml.example

@@ -44,6 +44,11 @@ default: &default
       cate_id: '-1'
       callback_url: 'callback_url'
       signature_key: 'test12345678'
+    educoder: 
+      client_id: 'e9ce4d5ba1698d6f7d01d8ee2959776c7a6d743ebe94da2341e288fd2fbf60aa'
+      client_secret: '6ff84dd75eddd859c5bd0e7a791b58bc5ad1ba4fbb30bc9db37cb0baf9f33012'
+      base_url: 'https://test-data.educoder.net'
+      redirect_uri: 'https://testforgeplus.trustie.net/api/auth/educoder/callback'
 
   gitea:
     access_key_id: ''

config/initializers/educoder_oauth_init.rb

@@ -0,0 +1,16 @@
+oauth_config = {}
+begin
+  config = Rails.application.config_for(:configuration)
+  oauth_config = config.dig('oauth', 'educoder')
+  raise 'oauth educoder config missing' if oauth_config.blank?
+rescue => ex
+  raise ex if Rails.env.production?
+
+  puts %Q{\033[33m [warning] wechat oauth config or configuration.yml missing,
+           please add it or execute 'cp config/configuration.yml.example config/configuration.yml' \033[0m}
+end
+
+EducoderOauth.client_id = oauth_config['client_id']
+EducoderOauth.client_secret = oauth_config['client_secret']
+EducoderOauth.base_url = oauth_config['base_url']
+EducoderOauth.redirect_uri = oauth_config['redirect_uri']