update

.gitignore

@@ -37,11 +37,13 @@ public/react/yarn.lock
 
 # Ignore react node_modules
 public/system/*
+public/react/*
 /public/react/.cache
 /public/react/node_modules/
 /public/react/config/stats.json
 /public/react/stats.json
 /public/react/.idea/*
+/public/react/build/*
 /public/h5build
 /public/npm-debug.log
 

CHANGELOG.md

@@ -1,35 +1,4 @@
 # Changelog
-## [v3.2.0](https://forgeplus.trustie.net/projects/jasder/forgeplus/releases) - 2021-06-09
-
-### ENHANCEMENTS
-  * ADD 集成邮件和平台站内信等通知系统
-  * Fix 代码库二级页面-优化文件子目录浏览功能(#50388)
-  * Fix 代码库二级页面-优化commit提交详情页页面排版及数据显示(#50372)
-  * Fix 代码库二级页面-优化commit提交信息列表页加载方式和数据排序功能(#50348)
-  * Fix 代码库二级页面-优化创建发行版功能(#50346)
-  * Fix 代码库二级页面-优化标签列表页功能(#50344)
-  * Fix 代码库二级页面-优化发行版本列表页功能(#50345)
-  * Fix 代码库二级页面-优化分支列表页功能(#50343)
-  * Fix 其他问题优化(#51581) (#51343) (#51108)
-
----
-
-### BUGFIXES
-  * Fix 发行版—标签跳转链接错误(#51666)
-  * Fix 文件预览报错(#51660)
-  * Fix 标签创建时间显示错误(#51658)
-  * Fix 分支列表中头像显示问题(#51656)
-  * Fix 文本信息过长(#51630) (#51626)
-  * Fix 版本库中附件下载400(#51625)
-  * Fix loading页面优化(#51588)
-  * Fix 提交详情页面优化(#51577)
-  * Fix 修复易修复制功能(#51569)
-  * Fix 修复新建发行版用户信息显示错误的问题(#51665)
-  * Fix 修复查看文件详细信息报错的问题(#51561)
-  * Fix 修复提交记录中时间显示格式问题(#51526)
-  * Fix 组织下项目更加更新时间倒序排序(#50833)
-
-
 ## [v3.1.0](https://forgeplus.trustie.net/projects/jasder/forgeplus/releases) - 2021-06-09
 
 * ENHANCEMENTS

README.md

@@ -115,7 +115,7 @@ rails db:migrate RAILS_ENV=development
 git clone -b standalone https://git.trustie.net/jasder/build.git
 ```
 
-#### 12. 启动redis(此处以macOS系统为例)
+#### 12. 启动redis(此处已mac系统为例)
 ```bash
 redis-server&
 ```

api_document.md

@@ -51,51 +51,6 @@ http://localhost:3000/api/accounts/remote_register  | jq
 |-- token         |string|用户token|
 
 
-返回值
-```json
-{
-  "status": 0,
-  "message": "success",
-  "user": {
-    "id": 36400,
-    "token": "8c87a80d9cfacc92fcb2451845104f35119eda96"
-  }
-}
-```
----
-
-#### 独立注册接口
-```
-POST accounts/register
-```
-*示例*
-```bash
-curl -X POST \
--d "login=2456233122@qq.com" \
--d "password=djs_D_00001" \
--d "namespace=16895620" \
--d "code=forge" \
-http://localhost:3000/api/accounts/remote_register  | jq
-```
-*请求参数说明:*
-
-|参数名|必选|类型|说明|
-|-|-|-|-|
-|login    |是|string   |邮箱或者手机号  |
-|namespace |是|string   |登录名 |
-|password |是|string   |密码  |
-|code |是|string   |验证码  |
-
-
-*返回参数说明:*
-
-|参数名|类型|说明|
-|-|-|-|
-|user|json object |返回数据|
-|-- id            |int   |用户id |
-|-- token         |string|用户token|
-
-
 返回值
 ```json
 {

app/assets/javascripts/admin.js

@@ -99,38 +99,3 @@ $(document).on("turbolinks:before-cache", function () {
 
 $(function () {
 });
-
-$(document).on('turbolinks:load', function() {
-  
-  $('.logo-item-left').on("change", 'input[type="file"]', function () {
-    var $fileInput = $(this);
-    var file = this.files[0];
-    var imageType = /image.*/;
-    if (file && file.type.match(imageType)) {
-      var reader = new FileReader();
-      reader.onload = function () {
-        var $box = $fileInput.parent();
-        $box.find('img').attr('src', reader.result).css('display', 'block');
-        $box.addClass('has-img');
-      };
-      reader.readAsDataURL(file);
-    } else {
-    }
-  });
-
-  $('.attachment-item-left').on("change", 'input[type="file"]', function () {
-    var $fileInput = $(this);
-    var file = this.files[0];
-    var imageType = /image.*/;
-    if (file && file.type.match(imageType)) {
-      var reader = new FileReader();
-      reader.onload = function () {
-        var $box = $fileInput.parent();
-        $box.find('img').attr('src', reader.result).css('display', 'block');
-        $box.addClass('has-img');
-      };
-      reader.readAsDataURL(file);
-    } else {
-    }
-  });
-})

app/assets/stylesheets/admin.scss

@@ -58,149 +58,3 @@ input.form-control {
   position: absolute;
 }
 
-.logo-item {
-  display: flex;
-
-  &-img {
-    display: block;
-    width: 80px;
-    height: 80px;
-    background: #e9ecef;
-  }
-
-  &-upload {
-    cursor: pointer;
-    position: absolute;
-    top: 0;
-    width: 80px;
-    height: 80px;
-    background: #e9ecef;
-    border: 1px solid #ced4da;
-
-    &::before {
-      content: '';
-      position: absolute;
-      top: 27px;
-      left: 39px;
-      width: 2px;
-      height: 26px;
-      background: #495057;
-    }
-
-    &::after {
-      content: '';
-      position: absolute;
-      top: 39px;
-      left: 27px;
-      width: 26px;
-      height: 2px;
-      background: #495057;
-    }
-  }
-
-  &-left {
-    position: relative;
-    width: 80px;
-    height: 80px;
-
-    &.has-img {
-      .logo-item-upload {
-        display: none;
-      }
-
-      &:hover {
-        .logo-item-upload {
-          display: block;
-          background: rgba(145, 145, 145, 0.8);
-        }
-      }
-    }
-  }
-
-  &-right {
-    display: flex;
-    flex-direction: column;
-    justify-content: space-between;
-    color: #777777;
-    font-size: 0.8rem;
-  }
-
-  &-title {
-    color: #23272B;
-    font-size: 1rem;
-  }
-}
-
-.attachment-item {
-  display: flex;
-
-  &-img {
-    display: block;
-    width: 160px;
-    height: 160px;
-    background: #e9ecef;
-  }
-
-  &-upload {
-    cursor: pointer;
-    position: absolute;
-    top: 0;
-    width: 160px;
-    height: 160px;
-    background: #e9ecef;
-    border: 1px solid #ced4da;
-
-    &::before {
-      content: '';
-      position: absolute;
-      top: 54px;
-      left: 78px;
-      width: 2px;
-      height: 52px;
-      background: #495057;
-    }
-
-    &::after {
-      content: '';
-      position: absolute;
-      top: 78px;
-      left: 54px;
-      width: 52px;
-      height: 2px;
-      background: #495057;
-    }
-  }
-
-  &-left {
-    position: relative;
-    width: 160px;
-    height: 160px;
-
-    &.has-img {
-      .attachment-item-upload {
-        display: none;
-      }
-
-      &:hover {
-        .attachment-item-upload {
-          display: block;
-          background: rgba(145, 145, 145, 0.8);
-        }
-      }
-    }
-  }
-
-  &-right {
-    padding-top: 100px;
-    display: flex;
-    flex-direction: column;
-    justify-content: space-between;
-    color: #777777;
-    font-size: 0.8rem;
-  }
-
-  &-title {
-    color: #23272B;
-    font-size: 1rem;
-  }
-}

app/controllers/accounts_controller.rb

@@ -1,5 +1,6 @@
 class AccountsController < ApplicationController
-  include ApplicationHelper
+
+  #skip_before_action :check_account, :only => [:logout]
 
   def index
     render json: session
@@ -8,7 +9,7 @@ class AccountsController < ApplicationController
   # 其他平台同步注册的用户
   def remote_register
     username = params[:username]&.gsub(/\s+/, "")
-    tip_exception("无法使用以下关键词：#{username}，请重新命名") if ReversedKeyword.check_exists?(username)
+    tip_exception("无法使用以下关键词：#{username}，请重新命名") if ReversedKeyword.is_reversed(username).present?
     email = params[:email]&.gsub(/\s+/, "")
     password = params[:password]
     platform = (params[:platform] || 'forge')&.gsub(/\s+/, "")
@@ -108,48 +109,60 @@ class AccountsController < ApplicationController
   # 用户注册
   # 注意：用户注册需要兼顾本地版，本地版是不需要验证码及激活码以及使用授权的，注册完成即可使用
   # params[:login] 邮箱或者手机号
-  # params[:namespace] 登录名
   # params[:code]  验证码
   # code_type 1：注册手机验证码  8：邮箱注册验证码
-  # 本地forge注册入口需要重新更改逻辑
+  # 本地forge注册入口
   def register
-    # type只可能是1或者8
-    user = nil
     begin
-      Register::Form.new(register_params).validate!
+      # 查询验证码是否正确;type只可能是1或者8
+      type = phone_mail_type(params[:login].strip)
+      # code = params[:code].strip
 
-      user = Users::RegisterService.call(register_params)
+      if type == 1
-      password = register_params[:password].strip
+        uid_logger("start register by phone:  type is #{type}")
+        pre = 'p'
+        email = nil
+        phone = params[:login]
+        # verifi_code = VerificationCode.where(phone: phone, code: code, code_type: 1).last
+        # TODO: 暂时限定邮箱注册
+        return normal_status(-1, '只支持邮箱注册')
+      else
+        uid_logger("start register by email:  type is #{type}")
+        pre = 'm'
+        email = params[:login]
+        phone = nil
+        return normal_status(-1, "该邮箱已注册") if User.exists?(mail: params[:login])
+        return normal_status(-1, "邮箱格式错误") unless params[:login] =~ CustomRegexp::EMAIL
+        # verifi_code = VerificationCode.where(email: email, code: code, code_type: 8).last
+      end
+      # uid_logger("start register:  verifi_code is #{verifi_code}, code is #{code}, time is #{Time.now.to_i - verifi_code.try(:created_at).to_i}")
+      # check_code = (verifi_code.try(:code) == code.strip && (Time.now.to_i - verifi_code.created_at.to_i) <= 10*60)
+      # todo 上线前请删除万能验证码"513231"
+      return normal_status(-1, "8~16位密码，支持字母数字和符号") unless params[:password] =~ CustomRegexp::PASSWORD
 
-      # gitea用户注册, email, username, password
+      code = generate_identifier User, 8, pre
-      interactor = Gitea::RegisterInteractor.call({username: user.login, email: user.mail, password: password})
+      login = pre + code
+      @user = User.new(admin: false, login: login, mail: email, phone: phone, type: "User")
+      @user.password = params[:password]
+      # 现在因为是验证码，所以在注册的时候就可以激活
+      @user.activate
+      # 必须要用save操作，密码的保存是在users中
+
+      interactor = Gitea::RegisterInteractor.call({username: login, email: email, password: params[:password]})
       if interactor.success?
         gitea_user = interactor.result
-        result = Gitea::User::GenerateTokenService.call(user.login, password)
+        result = Gitea::User::GenerateTokenService.new(login, params[:password]).call
-        user.gitea_token = result['sha1']
+        @user.gitea_token = result['sha1']
-        user.gitea_uid = gitea_user[:body]['id']
+        @user.gitea_uid = gitea_user[:body]['id']
-        if user.save!
+        if @user.save!
-          UserExtension.create!(user_id: user.id)
+          UserExtension.create!(user_id: @user.id)
-          successful_authentication(user)
+          successful_authentication(@user)
-          render_ok
+          normal_status("注册成功")
         end
       else
         tip_exception(-1, interactor.error)
       end
-    rescue Register::BaseForm::EmailError => e
-      render_result(-2, e.message)
-    rescue Register::BaseForm::LoginError => e
-      render_result(-3, e.message)
-    rescue Register::BaseForm::PhoneError => e
-      render_result(-4, e.message)
-    rescue Register::BaseForm::PasswordFormatError => e
-      render_result(-5, e.message)
-    rescue Register::BaseForm::PasswordConfirmationError => e
-      render_result(-7, e.message)
-    rescue Register::BaseForm::VerifiCodeError => e
-      render_result(-6, e.message)
     rescue Exception => e
-      Gitea::User::DeleteService.call(user.login) unless user.nil?
       uid_logger_error(e.message)
       tip_exception(-1, e.message)
     end
@@ -157,7 +170,7 @@ class AccountsController < ApplicationController
 
   # 用户登录
   def login
-    Users::LoginForm.new(login_params).validate!
+    Users::LoginForm.new(account_params).validate!
     @user = User.try_to_login(params[:login], params[:password])
 
     return normal_status(-2, "错误的账号或密码") if @user.blank?
@@ -206,27 +219,28 @@ class AccountsController < ApplicationController
   # 忘记密码
   def reset_password
     begin
-      Accounts::ResetPasswordForm.new(reset_password_params).validate!
+      code = params[:code]
+      login_type = phone_mail_type(params[:login].strip)
+      # 获取验证码
+      if login_type == 1
+        phone = params[:login]
+        verifi_code = VerificationCode.where(phone: phone, code: code, code_type: 2).last
+        user = User.find_by_phone(phone)
+      else
+        email = params[:login]
+        verifi_code = VerificationCode.where(email: email, code: code, code_type: 3).last
+        user = User.find_by_mail(email)     #这里有问题，应该是为email,而不是mail  6.13-hs
+      end
+      return normal_status(-2, "验证码不正确") if verifi_code.try(:code) != code.strip
+      return normal_status(-2, "验证码已失效") if !verifi_code&.effective?
+      return normal_status(-1, "8~16位密码，支持字母数字和符号") unless params[:new_password] =~ CustomRegexp::PASSWORD
 
-      user = find_user
+      user.password, user.password_confirmation = params[:new_password], params[:new_password_confirmation]
-      return render_error('未找到相关账号') if user.blank?
+      ActiveRecord::Base.transaction do
-
+        user.save!
-      user = Accounts::ResetPasswordService.call(user, reset_password_params)
+        LimitForbidControl::UserLogin.new(user).clear
-      LimitForbidControl::UserLogin.new(user).clear if user.save!
+      end
-
+      sucess_status
-      render_ok
-    rescue Register::BaseForm::EmailError => e
-      render_result(-2, e.message)
-    rescue Register::BaseForm::PhoneError => e
-      render_result(-4, e.message)
-    rescue Register::BaseForm::PasswordFormatError => e
-      render_result(-5, e.message)
-    rescue Register::BaseForm::PasswordConfirmationError => e
-      render_result(-7, e.message)
-    rescue Register::BaseForm::VerifiCodeError => e
-      render_result(-6, e.message)
-    rescue ActiveRecord::Rollback => e
-      render_result(-1, "服务器异常")
     rescue Exception => e
       uid_logger_error(e.message)
       tip_exception(e.message)
@@ -283,7 +297,7 @@ class AccountsController < ApplicationController
 
   # 发送验证码
   # params[:login]  手机号或者邮箱号
-  # params[:type]为事件通知类型 1：用户注册 2：忘记密码 3: 绑定手机 4: 绑定邮箱, 5: 验收手机号有效 # 如果有新的继续后面加
+  # params[:type]为事件通知类型 1：用户注册注册 2：忘记密码 3: 绑定手机 4: 绑定邮箱, 5: 验收手机号有效 # 如果有新的继续后面加
   # 发送验证码：send_type 1：注册手机验证码 2：找回密码手机验证码 3：找回密码邮箱验证码 4：绑定手机 5：绑定邮箱
   # 6：手机验证码登录 7：邮箱验证码登录 8：邮箱注册验证码 9: 验收手机号有效
   def get_verification_code
@@ -297,22 +311,19 @@ class AccountsController < ApplicationController
     sign = Digest::MD5.hexdigest("#{OPENKEY}#{value}")
     tip_exception(501, "请求不合理") if sign != params[:smscode]
 
-    logger.info "########### 验证码：#{verification_code}"
     logger.info("########get_verification_code: login_type： #{login_type}， send_type：#{send_type}, ")
 
     # 记录验证码
     check_verification_code(verification_code, send_type, value)
-    render_ok
+    sucess_status
   end
 
-  # check user's login or email or phone is used
+  # 1 手机类型；0 邮箱类型
-  # params[:value]  手机号或者邮箱号或者登录名
+  # 注意新版的login是自动名生成的
-  # params[:type] 为事件类型 1：登录名(login) 2：email(邮箱) 3：phone(手机号)
+  def phone_mail_type value
-  def check
+    value =~ /^1\d{10}$/ ? 1 : 0
-    Register::CheckColumnsForm.new(check_params).validate!
-    render_ok
   end
-  
+
   private
 
   # type 事件类型 1：用户注册 2：忘记密码 3: 绑定手机 4: 绑定邮箱, 5: 验证手机号是否有效 # 如果有新的继续后面加
@@ -355,25 +366,7 @@ class AccountsController < ApplicationController
     params.require(:user).permit(:login, :email, :phone)
   end
 
-  def login_params 
+  def account_params 
     params.require(:account).permit(:login, :password)
   end
-
-  def check_params
-    params.permit(:type, :value)
-  end
-
-  def register_params
-    params.permit(:login, :namespace, :password, :password_confirmation, :code)
-  end
-
-  def reset_password_params
-    params.permit(:login, :password, :password_confirmation, :code)
-  end
-  
-  def find_user
-    phone_or_mail = strip(reset_password_params[:login])
-    User.where("phone = :search OR mail = :search", search: phone_or_mail).last
-  end
-  
 end

app/controllers/admins/project_categories_controller.rb

@@ -22,7 +22,7 @@ class Admins::ProjectCategoriesController < Admins::BaseController
     max_position_items = ProjectCategory.select(:id, :position).pluck(:position).reject!(&:blank?) 
     max_position =  max_position_items.present? ? max_position_items.max.to_i : 0
 
-    @project_category = ProjectCategory.new(name: @name,position: max_position, pinned_index: params[:project_category][:pinned_index].to_i)
+    @project_category = ProjectCategory.new(name: @name,position: max_position)
     if @project_category.save
       redirect_to admins_project_categories_path
       flash[:success] = '创建成功'
@@ -33,18 +33,17 @@ class Admins::ProjectCategoriesController < Admins::BaseController
   end
 
   def update 
-    if @project_category.update_attributes({name: @name, pinned_index: params[:project_category][:pinned_index].to_i})
+    if @project_category.update_attribute(:name, @name)
-      save_image_file(params[:logo], 'logo')
       redirect_to admins_project_categories_path
       flash[:success] = '更新成功'
     else 
       redirect_to admins_project_categories_path
-      flash[:danger] = '更新失败'
+      flash[:success] = '更新失败'
     end
   end
 
   def destroy 
-    if @project_category.destroy 
+    if @project_language.destroy 
       redirect_to admins_project_categories_path
       flash[:success] = "删除成功"
     else 
@@ -81,12 +80,4 @@ class Admins::ProjectCategoriesController < Admins::BaseController
       flash[:danger] = '分类已存在'
     end
   end
-
-  def save_image_file(file, type)
-    return unless file.present? && file.is_a?(ActionDispatch::Http::UploadedFile)
-
-    file_path = Util::FileManage.source_disk_filename(@project_category, type)
-    File.delete(file_path) if File.exist?(file_path) # 删除之前的文件
-    Util.write_file(file, file_path)
-  end
 end

app/controllers/admins/projects_controller.rb

@@ -1,5 +1,4 @@
 class Admins::ProjectsController < Admins::BaseController
-  before_action :find_project, only: [:edit, :update]
 
   def index
     sort_by = Project.column_names.include?(params[:sort_by]) ? params[:sort_by] : 'created_on'
@@ -9,26 +8,6 @@ class Admins::ProjectsController < Admins::BaseController
     @projects = paginate projects.includes(:owner, :members, :issues, :versions, :attachments, :project_score)
   end
 
-  def edit ;end
-
-  def update
-    respond_to do |format|
-      if @project.update_attributes(project_update_params)
-        format.html do 
-          redirect_to admins_projects_path
-          flash[:sucess] = "更新成功"
-        end
-        format.js {render_ok}
-      else 
-        format.html do 
-          redirect_to admins_projects_path
-          flash[:danger] = "更新失败"
-        end
-        format.js {render_js_error}
-      end
-    end
-  end
-
   def destroy
     project = Project.find_by!(id: params[:id])
     ActiveRecord::Base.transaction do
@@ -42,13 +21,4 @@ class Admins::ProjectsController < Admins::BaseController
       redirect_to admins_projects_path
       flash[:danger] = "删除失败"
   end
-
-  private 
-  def find_project
-    @project = Project.find_by_id(params[:id])
-  end
-
-  def project_update_params 
-    params.require(:project).permit(:is_pinned, :recommend, :recommend_index)
-  end
 end

app/controllers/admins/users_controller.rb

@@ -1,6 +1,4 @@
 class Admins::UsersController < Admins::BaseController
-  before_action :finder_user, except: [:index]
-
   def index
     params[:sort_by] = params[:sort_by].presence || 'created_on'
     params[:sort_direction] = params[:sort_direction].presence || 'desc'
@@ -10,9 +8,12 @@ class Admins::UsersController < Admins::BaseController
   end
 
   def edit
+    @user = User.find(params[:id])
   end
 
   def update
+    @user = User.find(params[:id])
+
     Admins::UpdateUserService.call(@user, update_params)
     flash[:success] = '保存成功'
     redirect_to edit_admins_user_path(@user)
@@ -25,47 +26,43 @@ class Admins::UsersController < Admins::BaseController
   end
 
   def destroy
-    @user.destroy!
+    User.find(params[:id]).destroy!
-    Gitea::User::DeleteService.call(@user.login)
 
     render_delete_success
   end
 
   def lock
-    @user.lock!
+    User.find(params[:id]).lock!
 
     render_ok
   end
 
   def unlock
-    @user.activate!
+    User.find(params[:id]).activate!
 
     render_ok
   end
 
   def reward_grade
+    user = User.find(params[:user_id])
     return render_unprocessable_entity('金币数量必须大于0') if params[:grade].to_i <= 0
 
-    RewardGradeService.call(@user, container_id: @user.id, container_type: 'Feedback', score: params[:grade].to_i, not_unique: true)
+    RewardGradeService.call(user, container_id: user.id, container_type: 'Feedback', score: params[:grade].to_i, not_unique: true)
 
-    render_ok(grade: @user.grade)
+    render_ok(grade: user.grade)
   end
 
   def reset_login_times
-    @user.reset_login_times!
+    User.find(params[:id]).reset_login_times!
 
     render_ok
   end
 
   private
 
-  def finder_user
-    @user = User.find(params[:id])
-  end
-
   def update_params
     params.require(:user).permit(%i[lastname nickname gender identity technical_title student_id is_shixun_marker
                                     mail phone location location_city school_id department_id admin business is_test
-                                    password professional_certification authentication login])
+                                    password professional_certification authentication])
   end
 end

app/controllers/application_controller.rb

@@ -26,8 +26,7 @@ class ApplicationController < ActionController::Base
   end
 
 	DCODES = %W(2 3 4 5 6 7 8 9 a b c f e f g h i j k l m n o p q r s t u v w x y z)
-	OPENKEY = Rails.application.config_for(:configuration)['sign_key'] || "79e33abd4b6588941ab7622aed1e67e8"
+	OPENKEY = "79e33abd4b6588941ab7622aed1e67e8"
-
 
 	helper_method :current_user, :base_url
 
@@ -71,11 +70,49 @@ class ApplicationController < ActionController::Base
 																									(current_user.professional_certification && (ue.teacher? || ue.professional?))
 	end
 
+	def shixun_marker
+		unless current_user.is_shixun_marker? || current_user.admin_or_business?
+			tip_exception(403, "..")
+		end
+	end
+
+	# 实训的访问权限
+	def shixun_access_allowed
+		if !current_user.shixun_permission(@shixun)
+			tip_exception(403, "..")
+		end
+	end
 
 	def admin_or_business?
 		User.current.admin? || User.current.business?
 	end
 
+	# 访问课堂时没权限直接弹加入课堂的弹框 ：409
+	def user_course_identity
+		@user_course_identity = current_user.course_identity(@course)
+		if @user_course_identity > Course::STUDENT && @course.is_public == 0
+			tip_exception(401, "..") unless User.current.logged?
+			check_account
+			tip_exception(@course.excellent ? 410 : 409, "您没有权限进入")
+		end
+		if @user_course_identity > Course::CREATOR && @user_course_identity <= Course::STUDENT && @course.tea_id != current_user.id
+			# 实名认证和职业认证的身份判断
+			tip_exception(411, "你的实名认证和职业认证审核未通过") if @course.authentication &&
+				@course.professional_certification && (!current_user.authentication && !current_user.professional_certification)
+			tip_exception(411, "你的实名认证审核未通过") if @course.authentication && !current_user.authentication
+			tip_exception(411, "你的职业认证审核未通过") if @course.professional_certification && !current_user.professional_certification
+		end
+		uid_logger("###############user_course_identity:#{@user_course_identity}")
+	end
+
+	# 题库的访问权限
+	def bank_visit_auth
+		tip_exception(-2,"未通过职业认证") if current_user.is_teacher? && !current_user.certification_teacher? && !current_user.admin_or_business? && @bank.user_id != current_user.id && @bank.is_public
+		tip_exception(403, "无权限") unless @bank.user_id == current_user.id || current_user.admin_or_business? ||
+			(current_user.certification_teacher? && @bank.is_public)
+	end
+
+
 	# 判断用户的邮箱或者手机是否可用
 	# params[:type] 1: 注册；2：忘记密码；3：绑定
 	def  check_mail_and_phone_valid login, type
@@ -83,16 +120,16 @@ class ApplicationController < ActionController::Base
 					 login =~ /^[a-zA-Z0-9]+([._\\]*[a-zA-Z0-9])$/
 			tip_exception(-2, "请输入正确的手机号或邮箱")
 		end
-	
+		# 考虑到安全参数问题，多一次查询，去掉Union
-		user_exist = Owner.exists?(phone: login) || Owner.exists?(mail: login)
+		user = User.where(phone: login).first ||  User.where(mail: login).first
-		if user_exist && type.to_i == 1
+		if type.to_i == 1 && !user.nil?
 			tip_exception(-2, "该手机号码或邮箱已被注册")
-		elsif type.to_i == 2 && !user_exist
+		elsif type.to_i == 2 && user.nil?
 			tip_exception(-2, "该手机号码或邮箱未注册")
-		elsif type.to_i == 3 && user_exist
+		elsif type.to_i == 3 && user.present?
 			tip_exception(-2, "该手机号码或邮箱已绑定")
 		end
-		render_ok
+		sucess_status
 	end
 
 	# 发送及记录激活码
@@ -103,7 +140,7 @@ class ApplicationController < ActionController::Base
 		when 1, 2, 4, 9
 			# 手机类型的发送
 			sigle_para = {phone: value}
-			status = Gitlink::Sms.send(mobile: value, code: code)
+			status = Educoder::Sms.send(mobile: value, code: code)
 			tip_exception(-2, code_msg(status)) if status != 0
 		when 8, 3, 5
 			# 邮箱类型的发送
@@ -149,6 +186,26 @@ class ApplicationController < ActionController::Base
 		end
 	end
 
+	def find_course
+		return normal_status(2, '缺少course_id参数！') if params[:course_id].blank?
+		@course = Course.find(params[:course_id])
+		tip_exception(404, "") if @course.is_delete == 1 && !current_user.admin_or_business?
+	rescue Exception => e
+		tip_exception(e.message)
+	end
+
+	def course_manager
+		return normal_status(403, '只有课堂管理员才有权限') if @user_course_identity > Course::CREATOR
+	end
+
+	def find_board
+		return normal_status(2, "缺少board_id参数") if params[:board_id].blank?
+		@board = Board.find(params[:board_id])
+	rescue Exception => e
+		uid_logger_error(e.message)
+		tip_exception(e.message)
+	end
+
 	def validate_type(object_type)
 		normal_status(2, "参数") if params.has_key?(:sort_type) && !SORT_TYPE.include?(params[:sort_type].strip)
 	end
@@ -158,6 +215,21 @@ class ApplicationController < ActionController::Base
 		@page_size = params[:page_size] || 15
 	end
 
+	# 课堂教师权限
+	def teacher_allowed
+		logger.info("#####identity: #{current_user.course_identity(@course)}")
+		unless current_user.course_identity(@course) < Course::STUDENT
+			normal_status(403, "")
+		end
+	end
+
+	# 课堂教师、课堂管理员、超级管理员的权限(不包含助教)
+	def teacher_or_admin_allowed
+		unless current_user.course_identity(@course) < Course::ASSISTANT_PROFESSOR
+			normal_status(403, "")
+		end
+	end
+
 	def require_admin
 		normal_status(403, "") unless User.current.admin?
 	end
@@ -184,7 +256,7 @@ class ApplicationController < ActionController::Base
 
 	# 异常提醒
 	def tip_exception(status = -1, message)
-		raise Gitlink::TipException.new(status, message)
+		raise Educoder::TipException.new(status, message)
 	end
 
 	def missing_template
@@ -193,7 +265,7 @@ class ApplicationController < ActionController::Base
 
 	# 弹框提醒
 	def tip_show_exception(status = -2, message)
-		raise Gitlink::TipException.new(status, message)
+		raise Educoder::TipException.new(status, message)
 	end
 
 	def normal_status(status = 0, message)
@@ -265,6 +337,7 @@ class ApplicationController < ActionController::Base
 				User.current = user
 			end
 		end
+
 		# if !User.current.logged? && Rails.env.development?
 		# 	User.current = User.find 1
 		# end
@@ -272,18 +345,18 @@ class ApplicationController < ActionController::Base
 
 		# 测试版前端需求
 		logger.info("subdomain:#{request.subdomain}")
-		# if request.subdomain != "www"
+		if request.subdomain != "www"
-		# 	if params[:debug] == 'teacher' #todo 为了测试,记得讲debug删除
+			if params[:debug] == 'teacher' #todo 为了测试,记得讲debug删除
-		# 		User.current = User.find 81403
+				User.current = User.find 81403
-		# 	elsif params[:debug] == 'student'
+			elsif params[:debug] == 'student'
-		# 		User.current = User.find 8686
+				User.current = User.find 8686
-		# 	elsif params[:debug] == 'admin'
+			elsif params[:debug] == 'admin'
-		# 		logger.info "@@@@@@@@@@@@@@@@@@@@@@ debug mode....."
+				logger.info "@@@@@@@@@@@@@@@@@@@@@@ debug mode....."
-		# 		user =  User.find 36480
+				user =  User.find 36480
-		# 		User.current = user
+				User.current = user
-		# 		cookies.signed[:user_id] = user.id
+				cookies.signed[:user_id] = user.id
-		# 	end
+			end
-		# end
+		end
 		# User.current = User.find 81403
 	end
 
@@ -336,6 +409,11 @@ class ApplicationController < ActionController::Base
 		@message = message
 	end
 
+	# 实训等对应的仓库地址
+	def repo_ip_url(repo_path)
+		"#{edu_setting('git_address_ip')}/#{repo_path}"
+	end
+
 	def repo_url(repo_path)
 		"#{edu_setting('git_address_domain')}/#{repo_path}"
 	end
@@ -368,7 +446,7 @@ class ApplicationController < ActionController::Base
 			JSON.parse(res)
 		rescue Exception => e
 			uid_logger_error("--uri_exec: exception #{e.message}")
-			raise Gitlink::TipException.new("实训平台繁忙（繁忙等级：84）")
+			raise Educoder::TipException.new("实训平台繁忙（繁忙等级：84）")
 		end
 	end
 
@@ -387,7 +465,7 @@ class ApplicationController < ActionController::Base
 			end
 		rescue Exception => e
 			uid_logger("--uri_exec: exception #{e.message}")
-			raise Gitlink::TipException.new(message)
+			raise Educoder::TipException.new(message)
 		end
 	end
 
@@ -411,7 +489,7 @@ class ApplicationController < ActionController::Base
 			end
 		rescue Exception => e
 			uid_logger("--uri_exec: exception #{e.message}")
-			raise Gitlink::TipException.new("服务器繁忙")
+			raise Educoder::TipException.new("服务器繁忙")
 		end
 	end
 
@@ -583,8 +661,8 @@ class ApplicationController < ActionController::Base
 
 	# 获取Oauth Client
 	def get_client(site)
-		client_id = Rails.configuration.Gitlink['client_id']
+		client_id = Rails.configuration.educoder['client_id']
-		client_secret = Rails.configuration.Gitlink['client_secret']
+		client_secret = Rails.configuration.educoder['client_secret']
 
 		OAuth2::Client.new(client_id, client_secret, site: site)
 	end
@@ -604,7 +682,7 @@ class ApplicationController < ActionController::Base
 
 	def kaminari_paginate(relation)
 		limit = params[:limit] || params[:per_page]
-		limit = (limit.to_i.zero? || limit.to_i > 20) ? 20 : limit.to_i
+		limit = (limit.to_i.zero? || limit.to_i > 15) ? 15 : limit.to_i
 		page  = params[:page].to_i.zero? ? 1 : params[:page].to_i
 
 		relation.page(page).per(limit)
@@ -612,7 +690,7 @@ class ApplicationController < ActionController::Base
 
 	def kaminari_array_paginate(relation)
 		limit = params[:limit] || params[:per_page]
-		limit = (limit.to_i.zero? || limit.to_i > 20) ? 20 : limit.to_i
+		limit = (limit.to_i.zero? || limit.to_i > 15) ? 15 : limit.to_i
 		page  = params[:page].to_i.zero? ? 1 : params[:page].to_i
 
 		Kaminari.paginate_array(relation).page(page).per(limit)
@@ -737,10 +815,37 @@ class ApplicationController < ActionController::Base
 		render json: exception.tip_json
 	end
 
+	def render_parameter_missing
+		render json: { status: -1, message: '参数缺失' }
+	end
+
 	def set_export_cookies
 		cookies[:fileDownload] = true
 	end
 
+	# 149课程的评审用户数据创建（包含创建课堂学生）
+	def open_class_user
+		user = User.find_by(login: "OpenClassUser")
+		unless user
+			ActiveRecord::Base.transaction do
+				user_params = {status: 1, login: "OpenClassUser", lastname: "开放课程",
+											 nickname: "开放课程", professional_certification: 1, certification: 1, grade: 0,
+											 password: "12345678", phone: "11122223333", profile_completed: 1}
+				user = User.create!(user_params)
+
+				UserExtension.create!(user_id: user.id, gender: 0, school_id: 3396, :identity => 1, :student_id => "openclassuser") # 3396
+
+				subject = Subject.find_by(id: 149)
+				if subject
+					subject.courses.each do |course|
+						CourseMember.create!(course_id: course.id, role: 3, user_id: user.id) if !course.course_members.exists?(user_id: user.id)
+					end
+				end
+			end
+		end
+		user
+	end
+
 	# 记录热门搜索关键字
 	def record_search_keyword
 		keyword = params[:keyword].to_s.strip
@@ -750,8 +855,4 @@ class ApplicationController < ActionController::Base
 		HotSearchKeyword.add(keyword)
 	end
 
-  def find_atme_receivers
-    @atme_receivers = User.where(login: params[:receivers_login])
-  end
-
 end

app/controllers/attachments_controller.rb

@@ -196,7 +196,7 @@ class AttachmentsController < ApplicationController
   end
 
   def file_save_to_ucloud(path, file, content_type)
-    ufile = Gitlink::Ufile.new(
+    ufile = Educoder::Ufile.new(
         ucloud_public_key: edu_setting('public_key'),
         ucloud_private_key: edu_setting('private_key'),
         ucloud_public_read: true,

app/controllers/compare_controller.rb

@@ -24,7 +24,7 @@ class CompareController < ApplicationController
         @exist_pullrequest = @project.pull_requests.where(is_original: false, head: @base, base: @head, status: 0).take
       end
       if @exist_pullrequest.present?
-        return -2, "在这些分支之间的合并请求已存在：<a href='/#{@owner.login}/#{@project.identifier}/pulls/#{@exist_pullrequest.id}'>#{@exist_pullrequest.try(:title)}</a>"
+        return -2, "在这些分支之间的合并请求已存在：<a href='/projects/#{@owner.login}/#{@project.identifier}/pulls/#{@exist_pullrequest.id}/Messagecount'>#{@exist_pullrequest.try(:title)}</a>"
       else 
         if @compare_result["Commits"].blank? && @compare_result["Diff"].blank?
           return -2, "分支内容相同，无需创建合并请求"

app/controllers/concerns/controller_rescue_handler.rb

@@ -20,7 +20,7 @@ module ControllerRescueHandler
     end
     # rescue_from ActionView::MissingTemplate, with: :object_not_found
     # rescue_from ActiveRecord::RecordNotFound, with: :object_not_found
-    rescue_from Gitlink::TipException, with: :tip_show
+    rescue_from Educoder::TipException, with: :tip_show
     rescue_from ::ActionView::MissingTemplate, with: :missing_template
     rescue_from ActiveRecord::RecordNotFound, with: :object_not_found
     rescue_from ActionController::ParameterMissing, with: :render_parameter_missing

app/controllers/concerns/git_common.rb

@@ -36,10 +36,10 @@ module GitCommon
     begin
       @commits = GitService.commits(repo_path: @repo_path)
       logger.info("git first commit is #{@commits.try(:first)}")
-      raise Gitlink::TipException.new("请先创建版本库") if @commits.nil?
+      raise Educoder::TipException.new("请先创建版本库") if @commits.nil?
     rescue Exception => e
       uid_logger_error(e.message)
-      raise Gitlink::TipException.new("提交记录异常")
+      raise Educoder::TipException.new("提交记录异常")
     end
   end
 

app/controllers/concerns/git_helper.rb

@@ -34,7 +34,7 @@ module GitHelper
 
     rescue Exception => e
       Rails.logger.error(e.message)
-      raise Gitlink::TipException.new("文档内容获取异常")
+      raise Educoder::TipException.new("文档内容获取异常")
     end
   end
 
@@ -64,7 +64,7 @@ module GitHelper
 
   # 版本库Fork功能
   def project_fork(container, original_rep_path, username)
-    raise Gitlink::TipException.new("fork源路径为空,fork失败!") if original_rep_path.blank?
+    raise Educoder::TipException.new("fork源路径为空,fork失败!") if original_rep_path.blank?
     # 将要生成的仓库名字
     new_repo_name = "#{username.try(:strip)}/#{container.try(:identifier)}#{ Time.now.strftime("%Y%m%d%H%M%S")}"
     # uid_logger("start fork container: repo_name is #{new_repo_name}")

app/controllers/concerns/register_helper.rb

@@ -1,17 +1,13 @@
 module RegisterHelper
   extend ActiveSupport::Concern
 
-  def autologin_register(username, email, password, platform= 'forge', need_edit_info = false)
+  def autologin_register(username, email, password, platform= 'forge')
     result = {message: nil, user: nil}
 
     user = User.new(admin: false, login: username, mail: email, type: "User")
     user.password = password
     user.platform = platform
-    if need_edit_info
+    user.activate
-      user.need_edit_info
-    else 
-      user.activate
-    end
     
     return unless user.valid?
 
@@ -31,31 +27,4 @@ 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/concerns/render_helper.rb

@@ -28,8 +28,4 @@ module RenderHelper
   def render_result(status=1, message='success')
     render json: { status: status, message: message }
   end
-
-  def render_parameter_missing
-		render json: { status: -1, message: '参数缺失' }
-	end
 end

app/controllers/issues_controller.rb

@@ -9,7 +9,7 @@ class IssuesController < ApplicationController
   before_action :check_project_public, only: [:index ,:show, :copy, :index_chosen, :close_issue]
 
   before_action :set_issue, only: [:edit, :update, :destroy, :show, :copy, :close_issue, :lock_issue]
-  before_action :check_token_enough, :find_atme_receivers, only: [:create, :update]
+  before_action :check_token_enough, only: [:create, :update]
 
   include ApplicationHelper
   include TagChosenHelper
@@ -111,8 +111,8 @@ class IssuesController < ApplicationController
     Issues::CreateForm.new({subject:issue_params[:subject]}).validate!
     @issue = Issue.new(issue_params)
     if @issue.save!
-      SendTemplateMessageJob.perform_later('IssueAssigned', current_user.id, @issue&.id) if Site.has_notice_menu?
+      SendTemplateMessageJob.perform_later('IssueAssigned', current_user.id, @issue&.id)
-      SendTemplateMessageJob.perform_later('ProjectIssue', current_user.id, @issue&.id) if Site.has_notice_menu?
+      SendTemplateMessageJob.perform_later('ProjectIssue', current_user.id, @issue&.id)
       if params[:attachment_ids].present?
         params[:attachment_ids].each do |id|
           attachment = Attachment.select(:id, :container_id, :container_type)&.find_by_id(id)
@@ -142,10 +142,6 @@ class IssuesController < ApplicationController
       end
 
       @issue.project_trends.create(user_id: current_user.id, project_id: @project.id, action_type: "create")
-
-      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}
     else
       normal_status(-1, "创建失败")
@@ -210,8 +206,8 @@ class IssuesController < ApplicationController
       Issues::UpdateForm.new({subject:issue_params[:subject]}).validate!
       if @issue.update_attributes(issue_params)
         if @issue&.pull_request.present?
-          SendTemplateMessageJob.perform_later('PullRequestChanged', current_user.id, @issue&.pull_request&.id, @issue.previous_changes.slice(:assigned_to_id, :priority_id, :fixed_version_id, :issue_tags_value)) if Site.has_notice_menu?
+          SendTemplateMessageJob.perform_later('PullRequestChanged', current_user.id, @issue&.pull_request&.id, @issue.previous_changes.slice(:assigned_to_id, :priority_id, :fixed_version_id, :issue_tags_value))
-          SendTemplateMessageJob.perform_later('PullRequestAssigned', current_user.id, @issue&.pull_request&.id ) if @issue.previous_changes[:assigned_to_id].present? && Site.has_notice_menu?
+          SendTemplateMessageJob.perform_later('PullRequestAssigned', current_user.id, @issue&.pull_request&.id ) if @issue.previous_changes[:assigned_to_id].present?
         else
           previous_changes = @issue.previous_changes.slice(:status_id, :assigned_to_id, :tracker_id, :priority_id, :fixed_version_id, :done_ratio, :issue_tags_value, :branch_name)
           if @issue.previous_changes[:start_date].present? 
@@ -220,14 +216,8 @@ class IssuesController < ApplicationController
           if @issue.previous_changes[:due_date].present? 
             previous_changes.merge!(due_date: [@issue.previous_changes[:due_date][0].to_s,  @issue.previous_changes[:due_date][1].to_s])
           end
-          if @issue.previous_changes[:status_id].present? && @issue.previous_changes[:status_id][1] == 5
+          SendTemplateMessageJob.perform_later('IssueChanged', current_user.id, @issue&.id, previous_changes)
-            @issue.project_trends.create(user_id: current_user.id, project_id: @project.id, action_type: ProjectTrend::CLOSE)
+          SendTemplateMessageJob.perform_later('IssueAssigned', current_user.id, @issue&.id) if @issue.previous_changes[:assigned_to_id].present?
-          end
-          if @issue.previous_changes[:status_id].present? && @issue.previous_changes[:status_id][0] == 5
-            @issue.project_trends.where(action_type: ProjectTrend::CLOSE).destroy_all
-          end
-          SendTemplateMessageJob.perform_later('IssueChanged', current_user.id, @issue&.id, previous_changes) if Site.has_notice_menu?
-          SendTemplateMessageJob.perform_later('IssueAssigned', current_user.id, @issue&.id) if @issue.previous_changes[:assigned_to_id].present? && Site.has_notice_menu?
         end
         if params[:status_id].to_i == 5  #任务由非关闭状态到关闭状态时
           @issue.issue_times.update_all(end_time: Time.now)
@@ -248,10 +238,6 @@ class IssuesController < ApplicationController
           post_to_chain(change_type, change_token.abs, current_user.try(:login))
         end
         @issue.create_journal_detail(change_files, issue_files, issue_file_ids, current_user&.id) if @issue.previous_changes.present? 
-
-        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
-
         normal_status(0, "更新成功")
       else
         normal_status(-1, "更新失败")
@@ -284,7 +270,7 @@ class IssuesController < ApplicationController
       status_id = @issue.status_id
       token = @issue.token
       login =  @issue.user.try(:login)
-      SendTemplateMessageJob.perform_later('IssueDeleted', current_user.id, @issue&.subject, @issue.assigned_to_id, @issue.author_id) if Site.has_notice_menu?
+      SendTemplateMessageJob.perform_later('IssueDeleted', current_user.id, @issue&.subject, @issue.assigned_to_id, @issue.author_id)
       if @issue.destroy
         if issue_type == "2" && status_id != 5
           post_to_chain("add", token, login)
@@ -307,7 +293,7 @@ class IssuesController < ApplicationController
     issues = Issue.where(id: issue_ids, issue_type: "1")
     if issues.present?
       issues.find_each do |i|
-        SendTemplateMessageJob.perform_later('IssueDeleted', current_user.id, i&.subject, i.assigned_to_id, i.author_id) if Site.has_notice_menu?
+        SendTemplateMessageJob.perform_later('IssueDeleted', current_user.id, i&.subject, i.assigned_to_id, i.author_id)
       end
       if issues.destroy_all
         normal_status(0, "删除成功")
@@ -352,14 +338,8 @@ class IssuesController < ApplicationController
           if i.previous_changes[:due_date].present? 
             previous_changes.merge!(due_date: [i.previous_changes[:due_date][0].to_s,  i.previous_changes[:due_date][1].to_s])
           end
-          if i.previous_changes[:status_id].present? && i.previous_changes[:status_id][1] == 5
+          SendTemplateMessageJob.perform_later('IssueChanged', current_user.id, i&.id, previous_changes)
-            i.project_trends.create(user_id: current_user.id, project_id: @project.id, action_type: ProjectTrend::CLOSE)
+          SendTemplateMessageJob.perform_later('IssueAssigned', current_user.id, i&.id) if i.previous_changes[:assigned_to_id].present?
-          end
-          if i.previous_changes[:status_id].present? && i.previous_changes[:status_id][0] == 5
-            i.project_trends.where(action_type: ProjectTrend::CLOSE).destroy_all
-          end
-          SendTemplateMessageJob.perform_later('IssueChanged', current_user.id, i&.id, previous_changes) if Site.has_notice_menu?
-          SendTemplateMessageJob.perform_later('IssueAssigned', current_user.id, i&.id) if i.previous_changes[:assigned_to_id].present? && Site.has_notice_menu?
         end
         normal_status(0, "批量更新成功")
       else
@@ -374,8 +354,8 @@ class IssuesController < ApplicationController
     @new_issue = @issue.dup
     @new_issue.author_id = current_user.id
     if @new_issue.save
-      SendTemplateMessageJob.perform_later('IssueAssigned', current_user.id, @new_issue&.id) if Site.has_notice_menu?
+      SendTemplateMessageJob.perform_later('IssueAssigned', current_user.id, @new_issue&.id)
-      SendTemplateMessageJob.perform_later('ProjectIssue', current_user.id, @new_issue&.id) if Site.has_notice_menu?
+      SendTemplateMessageJob.perform_later('ProjectIssue', current_user.id, @new_issue&.id)
       issue_tags = @issue.issue_tags.pluck(:id)
       if issue_tags.present?
         issue_tags.each do |tag|

app/controllers/journals_controller.rb

@@ -1,6 +1,6 @@
 class JournalsController < ApplicationController
   before_action :require_login, except: [:index, :get_children_journals]
-  before_action :require_profile_completed, :find_atme_receivers, only: [:create]
+  before_action :require_profile_completed, only: [:create]
   before_action :set_issue
   before_action :check_issue_permission
   before_action :set_journal, only: [:destroy, :edit, :update]
@@ -22,35 +22,32 @@ class JournalsController < ApplicationController
     if notes.blank?
       normal_status(-1, "评论内容不能为空")
     else
-      ActiveRecord::Base.transaction do
+      journal_params = {
-        journal_params = {
+        journalized_id: @issue.id ,
-          journalized_id: @issue.id ,
+        journalized_type: "Issue",
-          journalized_type: "Issue",
+        user_id: current_user.id ,
-          user_id: current_user.id ,
+        notes: notes.to_s.strip,
-          notes: notes.to_s.strip,
+        parent_id: params[:parent_id]
-          parent_id: params[:parent_id]
+      }
-        }
+      journal = Journal.new journal_params
-        journal = Journal.new journal_params
+      if journal.save
-        if journal.save
+        if params[:attachment_ids].present?
-          if params[:attachment_ids].present?
+          params[:attachment_ids].each do |id|
-            params[:attachment_ids].each do |id|
+            attachment = Attachment.select(:id, :container_id, :container_type)&.find_by_id(id)
-              attachment = Attachment.select(:id, :container_id, :container_type)&.find_by_id(id)
+            unless attachment.blank?
-              unless attachment.blank?
+              attachment.container = journal
-                attachment.container = journal
+              attachment.author_id = current_user.id
-                attachment.author_id = current_user.id
+              attachment.description = ""
-                attachment.description = ""
+              attachment.save
-                attachment.save
-              end
             end
           end
-          Rails.logger.info "[ATME] maybe to at such users: #{@atme_receivers.pluck(:login)}"
-          AtmeService.call(current_user, @atme_receivers, journal) if @atme_receivers.size > 0
-          # @issue.project_trends.create(user_id: current_user.id, project_id: @project.id, action_type: "journal")
-          render :json => { status: 0, message: "评论成功", id:  journal.id}
-          # normal_status(0, "评论成功")
-        else
-          normal_status(-1, "评论失败")
         end
+
+        # @issue.project_trends.create(user_id: current_user.id, project_id: @project.id, action_type: "journal")
+        render :json => { status: 0, message: "评论成功", id:  journal.id}
+        # normal_status(0, "评论成功")
+      else
+        normal_status(-1, "评论失败")
       end
     end
   end

app/controllers/members_controller.rb

@@ -9,8 +9,8 @@ class MembersController < ApplicationController
 
   def create
     interactor = Projects::AddMemberInteractor.call(@project.owner, @project, @user)
-    SendTemplateMessageJob.perform_later('ProjectJoined', current_user.id, @user.id, @project.id) if Site.has_notice_menu?
+    SendTemplateMessageJob.perform_later('ProjectJoined', current_user.id, @user.id, @project.id)
-    SendTemplateMessageJob.perform_later('ProjectMemberJoined', current_user.id, @user.id, @project.id) if Site.has_notice_menu?
+    SendTemplateMessageJob.perform_later('ProjectMemberJoined', current_user.id, @user.id, @project.id)
     render_response(interactor)
   rescue Exception => e
     uid_logger_error(e.message)
@@ -30,8 +30,8 @@ class MembersController < ApplicationController
 
   def remove
     interactor = Projects::DeleteMemberInteractor.call(@project.owner, @project, @user)
-    SendTemplateMessageJob.perform_later('ProjectLeft', current_user.id, @user.id, @project.id) if Site.has_notice_menu?
+    SendTemplateMessageJob.perform_later('ProjectLeft', current_user.id, @user.id, @project.id)
-    SendTemplateMessageJob.perform_later('ProjectMemberLeft', current_user.id, @user.id, @project.id) if Site.has_notice_menu?
+    SendTemplateMessageJob.perform_later('ProjectMemberLeft', current_user.id, @user.id, @project.id)
     render_response(interactor)
   rescue Exception => e
     uid_logger_error(e.message)
@@ -40,7 +40,7 @@ class MembersController < ApplicationController
 
   def change_role
     interactor = Projects::ChangeMemberRoleInteractor.call(@project.owner, @project, @user, params[:role])
-    SendTemplateMessageJob.perform_later('ProjectRole', current_user.id, @user.id, @project.id, message_role_name) if Site.has_notice_menu?
+    SendTemplateMessageJob.perform_later('ProjectRole', current_user.id, @user.id, @project.id, message_role_name)
     render_response(interactor)
   rescue Exception => e
     uid_logger_error(e.message)

app/controllers/oauth/base_controller.rb

@@ -2,7 +2,6 @@ class Oauth::BaseController < ActionController::Base
   include RenderHelper
   include LoginHelper
   include ControllerRescueHandler
-  include LoggerHelper
   # include LaboratoryHelper
 
   skip_before_action :verify_authenticity_token
@@ -12,18 +11,6 @@ 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]
@@ -61,13 +48,4 @@ 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,6 +1,4 @@
 class Oauth::EducoderController < Oauth::BaseController
-  include RegisterHelper
-
   def bind
     begin
       login = params[:login]
@@ -34,41 +32,4 @@ 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,7 +61,6 @@ class OauthController < ApplicationController
     login = params[:login]
     email = params[:mail]
     password = params[:password]
-    lastname = params[:lastname]
     callback_url =  params[:callback_url]
     platform = params[:plathform] || 'educoder'
 
@@ -73,11 +72,8 @@ class OauthController < ApplicationController
       if result[:message].blank?
         logger.info "[Oauth educoer] ====auto_register success"
         user = User.find result[:user][:id]
-        user.update_column(:lastname, params[:lastname])
-        autosync_register_trustie(login, password, email, lastname)
-        
-        OpenUsers::Educoder.create!(user: user, uid: user.login)
         successful_authentication(user)
+        OpenUsers::Educoder.create!(user: user, uid: user.login)
 
         render json: { callback_url: callback_url }
         # redirect_to callback_url

app/controllers/organizations/organizations_controller.rb

@@ -22,12 +22,11 @@ class Organizations::OrganizationsController < Organizations::BaseController
     @can_create_project = @organization.can_create_project?(current_user.id)
     @is_admin = can_edit_org?
     @is_member = @organization.is_member?(current_user.id)
-    Cache::V2::OwnerCommonService.new(@organization.id).read
   end
 
   def create
     ActiveRecord::Base.transaction do
-      tip_exception("无法使用以下关键词：#{organization_params[:name]}，请重新命名") if ReversedKeyword.check_exists?(organization_params[:name])
+      tip_exception("无法使用以下关键词：#{organization_params[:name]}，请重新命名") if ReversedKeyword.is_reversed(organization_params[:name]).present?
       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?
@@ -69,7 +68,8 @@ class Organizations::OrganizationsController < Organizations::BaseController
   def recommend
     recommend = %W(xuos Huawei_Technology openatom_foundation pkecosystem TensorLayer)
     
-    @organizations = Organization.includes(:organization_extension).where(organization_extensions: {recommend: true}).to_a.each_slice(group_size).to_a
+    @organizations = Organization.with_visibility(%w(common))
+      .where(login: recommend).select(:id, :login, :firstname, :lastname, :nickname)
   end
 
   private
@@ -80,10 +80,6 @@ class Organizations::OrganizationsController < Organizations::BaseController
                   :max_repo_creation, :nickname)
   end
 
-  def group_size 
-    params.fetch(:group_size, 4).to_i
-  end
-
   def password
     params.fetch(:password, "")
   end

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('OrganizationRole', @operate_user.id, @organization.id, @team.authorize_name) if Site.has_notice_menu?
+      SendTemplateMessageJob.perform_later('OrganizationRole', @operate_user.id, @organization.id, @team.authorize_name)
       Gitea::Organization::TeamUser::CreateService.call(@organization.gitea_token, @team.gtid, @operate_user.login)
     end
   rescue Exception => e

app/controllers/project_categories_controller.rb

@@ -5,10 +5,6 @@ class ProjectCategoriesController < ApplicationController
     @project_categories = q.result(distinct: true)
   end
 
-  def pinned_index
-    @project_categories = ProjectCategory.where.not(pinned_index: 0).order(pinned_index: :desc)
-  end
-
   def group_list
     @project_categories = ProjectCategory.where('projects_count > 0').order(projects_count: :desc)
     # projects = Project.no_anomory_projects.visible

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_trends = @project.project_trends.includes(:user, trend: :user)
 
     check_time = params[:time]  #时间的筛选
     check_type = params[:type]   #动态类型的筛选，目前已知的有 Issue, PullRequest, Version
@@ -14,25 +14,20 @@ class ProjectTrendsController < ApplicationController
       project_trends = project_trends.where("created_at between ? and ?",(Time.now.beginning_of_day - check_time.days), Time.now.end_of_day)
     end
 
+    @project_open_issues_count = project_trends.where(trend_type: "Issue", action_type: "create").size
     @project_close_issues_count = project_trends.where(trend_type: "Issue", action_type: "close").size
-    @project_issues_count = project_trends.where(trend_type: "Issue", action_type: "create").size
+    @project_issues_count = @project_open_issues_count + @project_close_issues_count
-    @project_open_issues_count = @project_issues_count - @project_close_issues_count
+
+    @project_pr_count = project_trends.where(trend_type: "PullRequest", action_type: "close").size
+    @project_new_pr_count = project_trends.where(trend_type: "PullRequest", action_type: "create").size
+    @project_pr_all_count = @project_pr_count + @project_new_pr_count
 
-    @project_pr_count = project_trends.where(trend_type: "PullRequest", action_type: ["close", "merge"]).size
-    @project_pr_all_count = project_trends.where(trend_type: "PullRequest", action_type: "create").size
-    @project_new_pr_count = @project_pr_all_count - @project_pr_count
     if check_type.present?
       project_trends = project_trends.where(trend_type: check_type.to_s.strip)
     end
 
     if check_status.present?
-      if check_status == "delay" || check_status == "close"
+      project_trends = project_trends.where(action_type: check_status.to_s.strip)
-        project_trends = project_trends.where(action_type: ["close", "merge"])
-      else 
-        project_trends = project_trends.where(action_type: ["create"]).where.not(trend_id: project_trends.where(action_type: ["close", "merge"]).pluck(:trend_id)) 
-      end
-    else
-      project_trends = project_trends.where(action_type: "create")
     end
     project_trends = project_trends.order("created_at desc")
 

app/controllers/projects/project_units_controller.rb

@@ -7,7 +7,7 @@ class Projects::ProjectUnitsController < Projects::BaseController
     if current_user.admin? || @project.manager?(current_user)
       ActiveRecord::Base.transaction do 
         before_units, after_units = ProjectUnit.update_by_unit_types!(@project, unit_types)
-        SendTemplateMessageJob.perform_later('ProjectSettingChanged', current_user.id, @project&.id, {navbar: true}) unless before_units.eql?(after_units) if Site.has_notice_menu?
+        SendTemplateMessageJob.perform_later('ProjectSettingChanged', current_user.id, @project&.id, {navbar: true}) unless before_units.eql?(after_units) 
         render_ok
       end
     else 

app/controllers/projects_controller.rb

@@ -4,9 +4,9 @@ class ProjectsController < ApplicationController
   include ProjectsHelper
   include Acceleratorable
 
-  before_action :require_login, except: %i[index branches branches_slice group_type_list simple show fork_users praise_users watch_users recommend banner_recommend about menu_list]
+  before_action :require_login, except: %i[index branches branches_slice group_type_list simple show fork_users praise_users watch_users recommend about menu_list]
   before_action :require_profile_completed, only: [:create, :migrate]
-  before_action :load_repository, except: %i[index group_type_list migrate create recommend banner_recommend]
+  before_action :load_repository, except: %i[index group_type_list migrate create recommend]
   before_action :authorizate_user_can_edit_project!, only: %i[update]
   before_action :project_public?, only: %i[fork_users praise_users watch_users]
 
@@ -30,8 +30,8 @@ class ProjectsController < ApplicationController
   def index
     scope = current_user.logged? ? Projects::ListQuery.call(params, current_user.id) : Projects::ListQuery.call(params)
 
-    @projects = kaminari_paginate(scope.includes(:project_category, :project_language, :repository, :project_educoder, :owner, :project_units))
+    # @projects = kaminari_paginate(scope)
-    # @projects = paginate scope.includes(:project_category, :project_language, :repository, :project_educoder, :owner, :project_units)
+    @projects = paginate scope.includes(:project_category, :project_language, :repository, :project_educoder, :owner, :project_units)
 
     category_id = params[:category_id]
     @total_count =
@@ -127,9 +127,9 @@ class ProjectsController < ApplicationController
         Gitea::Repository::UpdateService.call(@owner, @project.identifier, gitea_params)
       else
         validate_params = project_params.slice(:name, :description, 
-          :project_category_id, :project_language_id, :private, :identifier)
+          :project_category_id, :project_language_id, :private)
   
-        Projects::UpdateForm.new(validate_params.merge(user_id: @project.user_id, project_identifier: @project.identifier)).validate!
+        Projects::UpdateForm.new(validate_params).validate!
   
         private = @project.forked_from_project.present? ? !@project.forked_from_project.is_public : params[:private] || false
 
@@ -139,13 +139,14 @@ class ProjectsController < ApplicationController
         gitea_params = {
           private: private,
           default_branch: @project.default_branch,
-          website: @project.website,
+          website: @project.website
-          name: @project.identifier
         }
-        gitea_repo = Gitea::Repository::UpdateService.call(@owner, @project&.repository&.identifier, gitea_params)
+        if [true, false].include? private
-        @project.repository.update_attributes({hidden: gitea_repo["private"], identifier: gitea_repo["name"]})
+          Gitea::Repository::UpdateService.call(@owner, @project.identifier, gitea_params)
+          @project.repository.update_column(:hidden, private)
+        end
       end
-      SendTemplateMessageJob.perform_later('ProjectSettingChanged', current_user.id, @project&.id, @project.previous_changes.slice(:name, :description, :project_category_id, :project_language_id, :is_public, :identifier)) if Site.has_notice_menu?
+      SendTemplateMessageJob.perform_later('ProjectSettingChanged', current_user.id, @project&.id, @project.previous_changes.slice(:name, :description, :project_category_id, :project_language_id, :is_public))
     end
   rescue Exception => e
     uid_logger_error(e.message)
@@ -190,8 +191,6 @@ class ProjectsController < ApplicationController
   end
 
   def simple
-    # 为了缓存活跃项目的基本信息，后续删除
-    Cache::V2::ProjectCommonService.new(@project.id).read
     json_response(@project, current_user)
   end
 
@@ -199,10 +198,6 @@ class ProjectsController < ApplicationController
     @projects = Project.recommend.includes(:repository, :project_category, :owner).order(visits: :desc)
   end
 
-  def banner_recommend
-    @projects = Project.recommend.where.not(recommend_index: 0).includes(:project_category, :owner, :project_language).order(recommend_index: :desc)
-  end
-
   def about
     @project_detail = @project.project_detail
     @attachments = Array(@project_detail&.attachments) if request.get?
@@ -234,7 +229,7 @@ class ProjectsController < ApplicationController
 
   private
   def project_params
-    params.permit(:user_id, :name, :description, :repository_name, :website, :lesson_url, :default_branch, :identifier,
+    params.permit(:user_id, :name, :description, :repository_name, :website, :lesson_url, :default_branch,
                   :project_category_id, :project_language_id, :license_id, :ignore_id, :private)
   end
 

app/controllers/pull_requests_controller.rb

@@ -5,7 +5,6 @@ class PullRequestsController < ApplicationController
   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]
   include TagChosenHelper
   include ApplicationHelper
 
@@ -59,11 +58,10 @@ class PullRequestsController < ApplicationController
     ActiveRecord::Base.transaction do
       @pull_request, @gitea_pull_request = PullRequests::CreateService.call(current_user, @owner, @project, params)
       if @gitea_pull_request[:status] == :success
-        @pull_request.bind_gitea_pull_request!(@gitea_pull_request[:body]["number"], @gitea_pull_request[:body]["id"])
+        @pull_request.bind_gitea_pull_request!(@gitea_pull_request[:body]["number"])
-        SendTemplateMessageJob.perform_later('PullRequestAssigned', current_user.id, @pull_request&.id) if Site.has_notice_menu?
+        SendTemplateMessageJob.perform_later('PullRequestAssigned', current_user.id, @pull_request&.id)
-        SendTemplateMessageJob.perform_later('ProjectPullRequest', current_user.id, @pull_request&.id) if Site.has_notice_menu?
+        SendTemplateMessageJob.perform_later('ProjectPullRequest', current_user.id, @pull_request&.id)
-        Rails.logger.info "[ATME] maybe to at such users: #{@atme_receivers.pluck(:login)}"
+        render_ok
-        AtmeService.call(current_user, @atme_receivers, @pull_request) if @atme_receivers.size > 0
       else
         render_error("create pull request error: #{@gitea_pull_request[:status]}")
         raise ActiveRecord::Rollback
@@ -72,9 +70,9 @@ class PullRequestsController < ApplicationController
   end
 
   def edit
-    @fork_project_user_name = @pull_request&.fork_project&.owner.try(:show_real_name)
+    @fork_project_user_name = @project&.fork_project&.owner.try(:show_real_name)
-    @fork_project_user = @pull_request&.fork_project&.owner.try(:login)
+    @fork_project_user = @project&.fork_project&.owner.try(:login)
-    @fork_project_identifier = @pull_request&.fork_project&.repository.try(:identifier)
+    @fork_project_identifier = @project&.fork_project&.repository.try(:identifier)
   end
 
   def update
@@ -109,8 +107,6 @@ class PullRequestsController < ApplicationController
                 if params[:status_id].to_i == 5
                   @issue.issue_times.update_all(end_time: Time.now)
                 end
-                Rails.logger.info "[ATME] maybe to at such users: #{@atme_receivers.pluck(:login)}"
-                AtmeService.call(current_user, @atme_receivers, @pull_request) if @atme_receivers.size > 0
                 normal_status(0, "PullRequest更新成功")
               else
                 normal_status(-1, "PullRequest更新失败")
@@ -123,8 +119,8 @@ class PullRequestsController < ApplicationController
           normal_status(-1, e.message)
           raise ActiveRecord::Rollback
         end
-        SendTemplateMessageJob.perform_later('PullRequestChanged', current_user.id, @pull_request&.id, @issue.previous_changes.slice(:assigned_to_id, :priority_id, :fixed_version_id, :issue_tags_value)) if Site.has_notice_menu?
+        SendTemplateMessageJob.perform_later('PullRequestChanged', current_user.id, @pull_request&.id, @issue.previous_changes.slice(:assigned_to_id, :priority_id, :fixed_version_id, :issue_tags_value))
-        SendTemplateMessageJob.perform_later('PullRequestAssigned', current_user.id, @pull_request&.id ) if @issue.previous_changes[:assigned_to_id].present? && Site.has_notice_menu?
+        SendTemplateMessageJob.perform_later('PullRequestAssigned', current_user.id, @pull_request&.id ) if @issue.previous_changes[:assigned_to_id].present?
       end
     end
 
@@ -135,8 +131,7 @@ class PullRequestsController < ApplicationController
       begin
         colsed = PullRequests::CloseService.call(@owner, @repository, @pull_request, current_user)
         if colsed === true 
-          @pull_request.project_trends.create!(user: current_user, project: @project,action_type: ProjectTrend::CLOSE)
+          SendTemplateMessageJob.perform_later('PullRequestClosed', current_user.id, @pull_request.id)
-          SendTemplateMessageJob.perform_later('PullRequestClosed', current_user.id, @pull_request.id) if Site.has_notice_menu?
           normal_status(1, "已拒绝") 
         else
           normal_status(-1, '合并失败')
@@ -177,10 +172,9 @@ class PullRequestsController < ApplicationController
           end
 
           if success_condition && @pull_request.merge!
-            # @pull_request.project_trend_status!
+            @pull_request.project_trend_status!
-            @pull_request.project_trends.create!(user: current_user, project: @project,action_type: ProjectTrend::MERGE)
             @issue&.custom_journal_detail("merge", "", "该合并请求已被合并", current_user&.id)
-            SendTemplateMessageJob.perform_later('PullRequestMerged', current_user.id, @pull_request.id) if Site.has_notice_menu?
+            SendTemplateMessageJob.perform_later('PullRequestMerged', current_user.id, @pull_request.id)
             normal_status(1, "合并成功")
           else
             normal_status(-1, result.message)
@@ -207,7 +201,7 @@ class PullRequestsController < ApplicationController
       if can_merge.present?
         render json: {
           status: -2,
-          message: "在这些分支之间的合并请求已存在：<a href='/#{@owner.login}/#{@project.identifier}/pulls/#{can_merge.first.id}''>#{can_merge.first.try(:title)}</a>",
+          message: "在这些分支之间的合并请求已存在：<a href='/projects/#{@owner.login}/#{@project.identifier}/pulls/#{can_merge.first.id}/Messagecount''>#{can_merge.first.try(:title)}</a>",
         }
       else
         normal_status(0, "可以合并")

app/controllers/repositories_controller.rb

@@ -48,7 +48,7 @@ class RepositoriesController < ApplicationController
 
   def entries
     @project.increment!(:visits)
-    CacheAsyncSetJob.perform_later("project_common_service", {visits: 1}, @project.id)
+
     if @project.educoder?
       @entries = Educoder::Repository::Entries::ListService.call(@project&.project_educoder.repo_name)
     else
@@ -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(gitea_number: gitea_request["body"]["number"])
+          if gitea_request[:status] == :success && local_requests.update_attributes(gpid: 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,8 +4,7 @@ class SettingsController < ApplicationController
     get_add_menu
     get_common_menu
     get_personal_menu
-    get_third_party
+
-    get_top_system_notification
   end
 
   private
@@ -41,18 +40,6 @@ 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
-
     def get_site_url(key, value)
       key.to_s === "url" ? append_http(reset_site_url(value)) : reset_site_url(value)
     end

app/controllers/users/messages_controller.rb

@@ -18,16 +18,16 @@ class Users::MessagesController < Users::BaseController
       Notice::Write::CreateAtmeForm.new(atme_params).validate!
       case atme_params[:atmeable_type]
       when 'Issue'
-        SendTemplateMessageJob.perform_now('IssueAtme', @receivers, current_user.id, atme_params[:atmeable_id]) if Site.has_notice_menu?
+        SendTemplateMessageJob.perform_now('IssueAtme', @receivers, current_user.id, atme_params[:atmeable_id])
       when 'PullRequest'
-        SendTemplateMessageJob.perform_now('PullRequestAtme', @receivers, current_user.id, atme_params[:atmeable_id]) if Site.has_notice_menu?
+        SendTemplateMessageJob.perform_now('PullRequestAtme', @receivers, current_user.id, atme_params[:atmeable_id])
       when 'Journal'
         journal = Journal.find_by_id(atme_params[:atmeable_id])
         if journal.present?
           if journal&.issue&.pull_request.present?
-            SendTemplateMessageJob.perform_now('PullRequestAtme', @receivers, current_user.id, atme_params[:atmeable_id]) if Site.has_notice_menu?
+            SendTemplateMessageJob.perform_now('PullRequestAtme', @receivers, current_user.id, atme_params[:atmeable_id])
           else
-            SendTemplateMessageJob.perform_now('IssueAtme', @receivers, current_user.id, atme_params[:atmeable_id]) if Site.has_notice_menu?
+            SendTemplateMessageJob.perform_now('IssueAtme', @receivers, current_user.id, atme_params[:atmeable_id])
           end
         end
       end

app/controllers/users/statistics_controller.rb

@@ -188,32 +188,30 @@ class Users::StatisticsController < Users::BaseController
       @project_languages_count = time_filter(Project.where(user_id: observed_user.id), 'created_on').joins(:project_language).group("project_languages.name").count
       @platform_project_languages_count = time_filter(Project, 'created_on').joins(:project_language).group("project_languages.name").count
     else
-      @platform_result = Cache::V2::PlatformStatisticService.new.read
-      @user_result = Cache::V2::UserStatisticService.new(observed_user.id).read
       # 用户被follow数量
-      @follow_count = @user_result["follow-count"].to_i
+      @follow_count = Cache::UserFollowCountService.call(observed_user)
-      @platform_follow_count = @platform_result["follow-count"].to_i
+      @platform_follow_count = Cache::PlatformFollowCountService.call
       # 用户pr数量
-      @pullrequest_count = @user_result["pullrequest-count"].to_i
+      @pullrequest_count = Cache::UserPullrequestCountService.call(observed_user)
-      @platform_pullrequest_count = @platform_result["pullrequest-count"].to_i
+      @platform_pullrequest_count = Cache::PlatformPullrequestCountService.call
       # 用户issue数量
-      @issues_count = @user_result["issue-count"].to_i
+      @issues_count = Cache::UserIssueCountService.call(observed_user)
-      @platform_issues_count = @platform_result["issue-count"].to_i
+      @platform_issues_count = Cache::PlatformIssueCountService.call
       # 用户总项目数 
-      @project_count = @user_result["project-count"].to_i
+      @project_count = Cache::UserProjectCountService.call(observed_user)
-      @platform_project_count = @platform_result["project-count"].to_i
+      @platform_project_count = Cache::PlatformProjectCountService.call
       # 用户项目被fork数量
-      @fork_count = @user_result["fork-count"].to_i
+      @fork_count = Cache::UserProjectForkCountService.call(observed_user)
-      @platform_fork_count = @platform_result["fork-count"].to_i
+      @platform_fork_count = Cache::PlatformProjectForkCountService.call
       # 用户项目关注数
-      @project_watchers_count = @user_result["project-watcher-count"].to_i
+      @project_watchers_count = Cache::UserProjectWatchersCountService.call(observed_user)
-      @platform_project_watchers_count = @platform_result["project-watcher-count"].to_i
+      @platform_project_watchers_count = Cache::PlatformProjectWatchersCountService.call 
       # 用户项目点赞数
-      @project_praises_count = @user_result["project-praise-count"].to_i
+      @project_praises_count = Cache::UserProjectPraisesCountService.call(observed_user)
-      @platform_project_praises_count = @platform_result["project-praise-count"].to_i
+      @platform_project_praises_count = Cache::PlatformProjectPraisesCountService.call
       # 用户不同语言项目数量
-      @project_languages_count = JSON.parse(@user_result["project-language"])
+      @project_languages_count = Cache::UserProjectLanguagesCountService.call(observed_user)
-      @platform_project_languages_count = JSON.parse(@platform_result["project-language"])
+      @platform_project_languages_count = Cache::PlatformProjectLanguagesCountService.call
     end
   end
 end

app/controllers/users_controller.rb

@@ -51,8 +51,6 @@ class UsersController < ApplicationController
       @projects_common_count = user_projects.common.size
       @projects_mirrior_count = user_projects.mirror.size
       @projects_sync_mirrior_count = user_projects.sync_mirror.size
-      # 为了缓存活跃用户的基本信息，后续删除
-      Cache::V2::OwnerCommonService.new(@user.id).read
   end
 
   def watch_users
@@ -193,7 +191,7 @@ class UsersController < ApplicationController
   def trustie_related_projects
     projects = Project.includes(:owner, :members, :project_score).where(id: params[:ids]).order("updated_on desc")
     projects_json = []
-    domain_url = EduSetting.get('host_name')
+    domain_url = EduSetting.get('host_name') + '/projects'
     if projects.present?
       projects.each do |p|
         project_url = "/#{p.owner.login}/#{p.identifier}"
@@ -275,7 +273,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_ACTIVE)
+      user.update!(password: params[:password], mail: params[:email], status: User::STATUS_EDIT_INFO)
       render_ok
     else
       render_error(interactor.error)

app/docs/slate/source/includes/_pulls.md

@@ -1,502 +1 @@
 # Pulls
-
-
-## Get a pull request
-获取合并请求详情接口
-
-> 示例:
-
-```shell
-curl -X GET http://localhost:3000/api/Jasder/gitlink/pulls/88.json
-```
-
-```javascript
-await octokit.request('GET /api/Jasder/gitlink/pulls/88.json')
-```
-
-### HTTP 请求
-`GET /api/:owner/:repo/pulls/:id.json`
-
-### 请求参数:
-参数    | 必选 | 默认 | 类型 | 字段说明
---------- | ------- | ------- | -------- | ----------
-|owner             |是| |string |用户登录名  |
-|repo             |是| |string |项目标识identifier  |
-|id             |是|  | integer | pull id值 |
-
-
-
-
-> 返回的JSON示例:
-
-```json
-{
-    "status": 0,
-    "message": "响应成功",
-    "project_name": "Gitlink",
-    "identifier": "forgeplus",
-    "project_identifier": "forgeplus",
-    "pr_time": "52分钟前",
-    "commits_count": 229,
-    "files_count": 328,
-    "comments_count": 0,
-    "comments_total_count": 0,
-    "pull_request": {
-        "id": 1189,
-        "base": "master",
-        "head": "develop",
-        "status": 0,
-        "fork_project_id": null,
-        "is_original": false,
-        "pull_request_staus": "open",
-        "fork_project_user": null,
-        "create_user": "jasder",
-        "mergeable": true,
-        "state": "open"
-    },
-    "issue": {
-        "id": 51888,
-        "subject": "FIx release v3.2.0",
-        "description": null,
-        "is_private": false,
-        "branch_name": null,
-        "project_author_name": "Gitlink",
-        "closed_on": "",
-        "created_at": "2021-10-12 15:51",
-        "assign_user_name": "victor",
-        "assign_user_login": "moshenglv",
-        "author_name": "段甲生",
-        "author_login": "jasder",
-        "author_picture": "images/avatars/User/36480?t=1615520120",
-        "issue_status": "新增",
-        "priority": "正常",
-        "version": null,
-        "issue_tags": null
-    },
-    "conflict_files": []
-}
-```
-
-## 获取pull request文件列表
-获取pull request文件列表
-
-> 示例:
-
-```shell
-curl -X GET \
-http://localhost:3000/api/Jason/gitlink/pulls/1/files.json 
-```
-
-```javascript
-await octokit.request('GET /api/jasder/gitlink/pulls/1/files.json')
-```
-
-### HTTP 请求
-`GET /api/:owner/:repo/pulls/:id/files.json`
-
-### 请求参数:
-|参数名|必选|类型|说明|
-|-|-|-|-|
-|owner          |是|string |用户登录名  |
-|repo           |是|string |project's identifier |
-|id             |是|int |pull request's id  |
-
-
-### 返回字段说明:
-参数  | 类型 | 字段说明
---------- | ----------- | -----------
-|-|-|-|
-|files_count        |int|文件更改的总数量|
-|total_addition         |int|添加代码总行数|
-|total_deletion        |int|删除代码总行数|
-|files      |array||
-|-- sha  |string|commit's sha value|
-|-- name  |string|当前文件名|
-|-- old_name |string| 修改之前的文件名称,与name相同的话，说明文件名未更改|
-|-- addition  |int|文件添加的行数|
-|-- deletion  |int|文件删除的行数|
-|-- type  |int|文件类型， 1: 表示该文件只添加了内容，2: 表示该文件内容有修改， 3: 表示文件被删除或者改文件只删除了内容|
-|-- isCreated  |boolean|当前文件是否为新增文件, true: 是， false: 否|
-|-- isDeleted  |boolean|当前文件是否被删除， true: 是，false: 否|
-|-- isBin  |boolean|当前文件是否为二进制文件，true: 是，false: 否|
-|-- isLFSFile  |boolean|当前文件是否为LFS文件，true: 是，false: 否|
-|-- isRenamed  |boolean|当前文件是否被重命名，true: 是，false: 否|
-|-- sections  |array||
-|---- fileName   |string|文件名称|
-|---- lines  |array||
-|------ leftIdx   |string|文件变动之前所在行数|
-|------ rightIdx   |string|文件更改后所在行数|
-|------ type   |string|文件变更类型，1: 新增，2: 修改， 3: 删除， 4: diff统计信息|
-|------ content   |string|文件变更的内容|
-|------ sectionInfo   |object||
-|-------- path   |string|文件相对仓库的路径|
-|-------- lastLeftIdx   |int||
-|-------- lastRightIdx   |int||
-|-------- leftHunkSize   |int|文件变更之前的行数|
-|-------- rightHunkSize   |int|文件变更之后的行数(及当前页面编辑器显示的总行数)|
-|-------- leftIdx   |int|文件变更之前所在行数|
-|-------- rightIdx   |int|文件变更之后所在行数(即：页面编辑器开始显示的行数)|
-
-
-
-> 返回的JSON示例:
-
-```json
-{
-  "files_count": 6,
-  "total_addition": 447,
-  "total_deletion": 0,
-  "files": [
-    {
-      "sha": "xefenisnii",
-      "name": "文件.txt",
-      "old_name": "文件.txt",
-      "index": 6,
-      "addition": 2,
-      "deletion": 0,
-      "type": 1,
-      "isCreated": true,
-      "isDeleted": false,
-      "isBin": false,
-      "isLFSFile": false,
-      "isRenamed": false,
-      "isSubmodule": false,
-      "sections": [
-        {
-          "fileName": "文件.txt",
-          "name": "",
-          "lines": [
-            {
-              "leftIdx": 0,
-              "rightIdx": 0,
-              "type": 4,
-              "content": "@@ -0,0 +1,2 @@",
-              "sectionInfo": {
-                "path": null,
-                "lastLeftIdx": null,
-                "lastRightIdx": null,
-                "leftIdx": 0,
-                "rightIdx": 0,
-                "leftHunkSize": null,
-                "rightHunkSize": null
-              }
-            },
-            {
-              "leftIdx": 0,
-              "rightIdx": 1,
-              "type": 2,
-              "content": "+用例图一致性更新",
-              "sectionInfo": null
-            },
-            {
-              "leftIdx": 0,
-              "rightIdx": 2,
-              "type": 2,
-              "content": "+工程文件直接上传会有文件缺失，现在压缩后上传",
-              "sectionInfo": null
-            }
-          ]
-        }
-      ]
-    }
-  ]
-}
-```
-
-
-## 获取pull request的commits列表
-获取pull request的commits列表
-
-> 示例:
-
-```shell
-curl -X GET http://localhost:3000/api/jasder/jasder_test/pulls/1/commits.json
-```
-
-```javascript
-await octokit.request('GET /api/jasder/jasder_test/pulls/1/commits.json')
-```
-
-### HTTP 请求
-`GET /api/:owner/:repo/pulls/:id/commits.json`
-
-### 请求参数:
-|参数名|必选|类型|说明|
-|-|-|-|-|
-|owner          |是|string |用户登录名  |
-|repo           |是|string |project's identifier |
-|id             |是|int |pull request's id  |
-
-
-### 返回字段说明:
-参数  | 类型 | 字段说明
---------- | ----------- | -----------
-|commits_count        |int|commits总数量|
-|commits      |array||
-|-- author          |object|项目作者|
-|---- login        |string|用户login|
-|---- name         |string|用户姓名|
-|---- image_url    |string|用户头像|
-|-- committer          |object|commit提交用户|
-|---- login        |string|用户login|
-|---- name         |string|用户姓名|
-|---- image_url    |string|用户头像|
-|-- timestamp      |int|commit的unix时间戳|
-|-- time_from_now|string|commit’s 提交时间距当前时间的时间值|
-|-- message      |string|commit说明信息|
-|-- sha          |string|commit’s sha值|
-
-
-> 返回的JSON示例:
-
-```json
-{
-  "commits_count": 1,
-  "commits": [
-    {
-      "author": {
-        "id": 36480,
-        "login": "jasder",
-        "name": "段甲生",
-        "image_url": "avatars/User/b"
-      },
-      "committer": {
-        "id": 36480,
-        "login": "jasder",
-        "name": "段甲生",
-        "image_url": "avatars/User/b"
-      },
-      "timestamp": 1604382982,
-      "time_from_now": "3小时前",
-      "message": "add some file\n* Add the tag list page to the release page\n* Apply suggestions from code review\n* Add the tags list view\n* Add the delete tag way on ui\n* Not delete tag and clear message when delete a release\n",
-      "sha": "8f5faee0d3b3be1b8063e84da0c79dd75327b968"
-    }
-  ]
-}
-```
-
-## Compare two commits
-Compare two commits
-
-> 示例:
-
-```shell
-curl -X GET \
-http://localhost:3000/api/Jason/test-txt/compare/master...develop
-
-curl -X GET \
-http://localhost:3000/api/Jason/test-txt/compare/master...Jason/test-txt:develop
-```
-
-```javascript
-await octokit.request('GET /api/Jason/test-txt/compare/master...Jason/test-txt:develop')
-```
-
-### HTTP 请求
-`GET /api/:owner/:repo/compare/{base}...{head}.json`
-
-### 请求参数:
-|参数名|必选|类型|说明|
-|-|-|-|-|
-|owner          |是|string |用户登录名  |
-|repo           |是|string |project's identifier |
-|base             |是|string |pull request's id  |
-|head             |是|string |pull request's id  |
-
-
-### 返回字段说明:
-参数  | 类型 | 字段说明
---------- | ----------- | -----------
-|-|-|-|
-|commits_count        |int|commits总数量|
-|commits      |array||
-|-- author          |object|项目作者|
-|---- login        |string|用户login|
-|---- name         |string|用户姓名|
-|---- image_url    |string|用户头像|
-|-- committer          |object|commit提交用户|
-|---- login        |string|用户login|
-|---- name         |string|用户姓名|
-|---- image_url    |string|用户头像|
-|-- timestamp      |int|commit的unix时间戳|
-|-- time_from_now|string|commit’s 提交时间距当前时间的时间值|
-|-- message      |string|commit说明信息|
-|-- sha          |string|commit’s sha值|
-|diff      |object||
-|-- files_count        |int|文件更改的总数量|
-|-- total_addition         |int|添加代码总行数|
-|-- total_deletion        |int|删除代码总行数|
-|-- files      |Array||
-|-- sha  |string|commit's sha |
-|-- name  |string|当前文件名|
-|-- old_name |string| 修改之前的文件名称,与name相同的话，说明文件名未更改|
-|-- addition  |int|文件添加的行数|
-|-- deletion  |int|文件删除的行数|
-|-- type  |int|文件类型， 1: 表示该文件只添加了内容，2: 表示该文件内容有修改， 3: 表示文件被删除或者改文件只删除了内容|
-|-- isCreated  |boolean|当前文件是否为新增文件, true: 是， false: 否|
-|-- isDeleted  |boolean|当前文件是否被删除， true: 是，false: 否|
-|-- isBin  |boolean|当前文件是否为二进制文件，true: 是，false: 否|
-|-- isLFSFile  |boolean|当前文件是否为LFS文件，true: 是，false: 否|
-|-- isRenamed  |boolean|当前文件是否被重命名，true: 是，false: 否|
-|-- sections  |array||
-|---- fileName   |string|文件名称|
-|---- lines  |array||
-|------ leftIdx   |string|文件变动之前所在行数|
-|------ rightIdx   |string|文件更改后所在行数|
-|------ type   |string|文件变更类型，1: 内容未改动，2: 添加， 3: 删除， 4: diff统计信息|
-|------ content   |string|文件变更的内容|
-|------ sectionInfo   |object||
-|-------- path   |string|文件相对仓库的路径|
-|-------- lastLeftIdx   |int||
-|-------- lastRightIdx   |int||
-|-------- leftHunkSize   |int|文件变更之前的行数|
-|-------- rightHunkSize   |int|文件变更之后的行数(及当前页面编辑器显示的总行数)|
-|-------- leftIdx   |int|文件变更之前所在行数|
-|-------- rightIdx   |int|文件变更之后所在行数|
-
-> 返回的JSON示例:
-
-```json
-{
-  "commits_count": 1,
-  "commits": [
-    {
-      "author": {
-        "id": 36480,
-        "login": "jasder",
-        "name": "段甲生",
-        "image_url": "avatars/User/b"
-      },
-      "committer": {
-        "id": 36480,
-        "login": "jasder",
-        "name": "段甲生",
-        "image_url": "avatars/User/b"
-      },
-      "timestamp": 1604382982,
-      "time_from_now": "4小时前",
-      "message": "add some file\n* Add the tag list page to the release page\n* Apply suggestions from code review\n* Add the tags list view\n* Add the delete tag way on ui\n* Not delete tag and clear message when delete a release\n",
-      "sha": "8f5faee0d3b3be1b8063e84da0c79dd75327b968"
-    }
-  ],
-  "diff": {
-    "files_count": 6,
-    "total_addition": 447,
-    "total_deletion": 0,
-    "files": [
-      {
-        "name": "build.go",
-        "old_name": "build.go",
-        "index": 1,
-        "addition": 33,
-        "deletion": 0,
-        "type": 1,
-        "isCreated": true,
-        "isDeleted": false,
-        "isBin": false,
-        "isLFSFile": false,
-        "isRenamed": false,
-        "isSubmodule": false,
-        "sections": [
-          {
-            "fileName": "build.go",
-            "name": "",
-            "lines": [
-              {
-                "leftIdx": 0,
-                "rightIdx": 0,
-                "type": 4,
-                "content": "@@ -0,0 +1,33 @@",
-                "sectionInfo": {
-                  "path": "build.go",
-                  "lastLeftIdx": 0,
-                  "lastRightIdx": 0,
-                  "leftIdx": 0,
-                  "rightIdx": 1,
-                  "leftHunkSize": 0,
-                  "rightHunkSize": 33
-                }
-              },
-              {
-                "leftIdx": 0,
-                "rightIdx": 1,
-                "type": 2,
-                "content": "+// Copyright 2020 The Gitea Authors. All rights reserved.",
-                "sectionInfo": null
-              }
-            ]
-          }
-        ]
-      }
-    ]
-  }
-```
-
-
-##  List pull requests
-获取合并请求列表
-
-> 示例:
-
-```shell
-curl -X GET http://localhost:3000/api/Jasder/gitlink/pulls.json
-```
-
-```javascript
-await octokit.request('GET /api/Jasder/gitlink/pulls.json')
-```
-
-### HTTP 请求
-`GET /api/:owner/:repo/pulls.json`
-
-### 请求参数:
-参数    | 必选 | 默认 | 类型 | 字段说明
---------- | ------- | ------- | -------- | ----------
-|owner             |是| |string |用户登录名  |
-|repo             |是| |string |项目标识identifier  |
-
-
-
-
-> 返回的JSON示例:
-
-```json
-{
-  "status": 0,
-  "message": "响应成功",
-  "open_count": 4,
-  "close_count": 51,
-  "merged_issues_size": 123,
-  "search_count": 4,
-  "limit": null,
-  "user_admin_or_member": true,
-  "user_admin_or_developer": true,
-  "project_name": "Gitlink",
-  "project_author_name": "Gitlink",
-  "issues": [
-    {
-      "pull_request_id": 1189,
-      "pull_request_status": 0,
-      "pull_request_head": "develop",
-      "pull_request_base": "master",
-      "pull_request_staus": "open",
-      "is_original": false,
-      "fork_project_id": null,
-      "fork_project_identifier": null,
-      "fork_project_user": null,
-      "id": 51888,
-      "name": "FIx release v3.2.0",
-      "pr_time": "59分钟前",
-      "assign_user_name": "victor",
-      "assign_user_login": "moshenglv",
-      "author_name": "段甲生",
-      "author_login": "jasder",
-      "avatar_url": "images/avatars/User/36480?t=1615520120",
-      "priority": "正常",
-      "version": null,
-      "journals_count": 0,
-      "issue_tags": null
-    }
-  ]
-}
-```

app/docs/slate/source/includes/_users.md

@@ -199,36 +199,6 @@ await octokit.request('GET /api/users/:login/messages.json')
   Success Data.
 </aside>
 
-## 用户阅读系统通知
-用户阅读系统通知
-
-> 示例:
-
-```shell
-curl -X POST http://localhost:3000/api/users/yystopf/system_notification_histories.json
-```
-
-```javascript
-await octokit.request('GET /api/users/:login/system_notification_histories.json')
-```
-
-### HTTP 请求
-`POST /api/users/:login/system_notification_histories.json`
-
-### 请求字段说明:
-参数  | 类型 | 字段说明
---------- | ----------- | -----------
-|system_notification_id       |integer   |阅读的系统通知id |
-
-> 返回的JSON示例:
-
-```json
-{
-    "status": 0,
-    "message": "success"
-}
-```
-
 ## 发送消息
 发送消息, 目前只支持atme
 
@@ -402,290 +372,6 @@ await octokit.request('PATCH/PUT /api/users/:login.json')
     "message": "success"
 }
 ```
-
-## 获取平台消息设置配置信息
-获取平台消息设置配置信息
-
-> 示例:
-
-```shell
-curl -X GET http://localhost:3000/api/template_message_settings.json
-```
-
-```javascript
-await octokit.request('GET /api/template_message_settings.json')
-```
-
-### HTTP 请求
-`GET /api/template_message_settings.json`
-
-### 返回字段说明:
-参数  | 类型 | 字段说明
---------- | ----------- | -----------
-|type                 |string   |消息配置类型 |
-|type_name            |string   |消息配置类型含义|
-|total_settings_count |int      |配置条数|
-|settings.name        |string   |配置名称|
-|settings.key         |string   |配置标识|
-|settings.notification_disabled |boolean  |站内信设置是否禁用|
-|settings.email_disabled        |boolean  |邮件设置是否禁用|
-
-
-> 返回的JSON示例:
-
-```json
-{
-    "status": 0,
-    "message": "响应成功",
-    "setting_types": [
-        {
-            "type": "TemplateMessageSetting::Normal",
-            "type_name": "",
-            "total_settings_count": 3,
-            "settings": [
-                {
-                    "name": "被拉入或移出组织",
-                    "key": "Organization",
-                    "notification_disabled": true,
-                    "email_disabled": false
-                },
-                {
-                    "name": "被拉入或移出项目",
-                    "key": "Project",
-                    "notification_disabled": true,
-                    "email_disabled": false
-                },
-                {
-                    "name": "有权限变更",
-                    "key": "Permission",
-                    "notification_disabled": true,
-                    "email_disabled": false
-                }
-            ]
-        },
-        {
-            "type": "TemplateMessageSetting::CreateOrAssign",
-            "type_name": "我创建的或负责的",
-            "total_settings_count": 4,
-            "settings": [
-                {
-                    "name": "易修被指派",
-                    "key": "IssueAssigned",
-                    "notification_disabled": true,
-                    "email_disabled": false
-                },
-                {
-                    "name": "合并请求被指派",
-                    "key": "PullRequestAssigned",
-                    "notification_disabled": true,
-                    "email_disabled": false
-                }
-            ]
-        },
-        {
-            "type": "TemplateMessageSetting::ManageProject",
-            "type_name": "我管理的仓库",
-            "total_settings_count": 4,
-            "settings": [
-                {
-                    "name": "有新的易修",
-                    "key": "Issue",
-                    "notification_disabled": true,
-                    "email_disabled": false
-                },
-                {
-                    "name": "有新的合并请求",
-                    "key": "PullRequest",
-                    "notification_disabled": true,
-                    "email_disabled": false
-                },
-                {
-                    "name": "有成员变动",
-                    "key": "Member",
-                    "notification_disabled": true,
-                    "email_disabled": false
-                },
-                {
-                    "name": "设置更改",
-                    "key": "SettingChanged",
-                    "notification_disabled": true,
-                    "email_disabled": false
-                }
-            ]
-        }
-    ]
-}
-```
-<aside class="success">
-  Success Data.
-</aside>
-
-## 获取用户消息设置配置信息
-获取用户消息设置配置信息
-
-> 示例:
-
-```shell
-curl -X GET http://localhost:3000/api/users/yystopf/template_message_settings.json
-```
-
-```javascript
-await octokit.request('GET /api/uses/yystopf/template_message_settings.json')
-```
-
-### HTTP 请求
-`GET /api/users/:user_id/template_message_settings.json`
-
-### 返回字段说明:
-参数  | 类型 | 字段说明
---------- | ----------- | -----------
-|notification_body    |string   |站内信配置 |
-|email_body           |string   |邮件配置|
-
-
-> 返回的JSON示例:
-
-```json
-{
-    "status": 0,
-    "message": "响应成功",
-    "user": {
-        "id": 2,
-        "type": "User",
-        "name": "heh",
-        "login": "yystopf",
-        "image_url": "system/lets/letter_avatars/2/H/188_239_142/120.png"
-    },
-    "notification_body": {
-        "CreateOrAssign::IssueAssigned": true,
-        "CreateOrAssign::PullRequestAssigned": true,
-        "ManageProject::Issue": true,
-        "ManageProject::PullRequest": true,
-        "ManageProject::Member": true,
-        "ManageProject::SettingChanged": true,
-        "Normal::Organization": true,
-        "Normal::Project": true,
-        "Normal::Permission": true
-    },
-    "email_body": {
-        "CreateOrAssign::IssueAssigned": false,
-        "CreateOrAssign::PullRequestAssigned": false,
-        "ManageProject::Issue": false,
-        "ManageProject::PullRequest": false,
-        "ManageProject::Member": false,
-        "ManageProject::SettingChanged": true,
-        "Normal::Organization": false,
-        "Normal::Project": true,
-        "Normal::Permission": false
-    }
-}
-```
-<aside class="success">
-  Success Data.
-</aside>
-
-## 重新设置用户消息设置配置信息
-重新设置用户消息设置配置信息
-
-> 示例:
-
-```shell
-curl -X POST http://localhost:3000/api/users/yystopf/template_message_settings/update_setting.json
-```
-
-```javascript
-await octokit.request('POST /api/uses/yystopf/template_message_settings/update_setting.json')
-```
-
-### HTTP 请求
-`POST /api/users/:user_id/template_message_settings/update_setting.json`
-
-### 请求字段说明:
-参数  | 类型 | 字段说明
---------- | ----------- | -----------
-|notification_body    |string   |站内信配置 |
-|email_body           |string   |邮件配置|
-
-
-> 请求的JSON示例:
-
-```json
-{
-    "setting": {
-        "notification_body": {
-            "CreateOrAssign::IssueAssigned": true,
-            "CreateOrAssign::PullRequestAssigned": true,
-            "ManageProject::Issue": true,
-            "ManageProject::PullRequest": true,
-            "ManageProject::Member": true,
-            "ManageProject::SettingChanged": true,
-            "Normal::Organization": true,
-            "Normal::Project": true,
-            "Normal::Permission": true
-        },
-        "email_body": {
-            "CreateOrAssign::IssueAssigned": false,
-            "CreateOrAssign::PullRequestAssigned": false,
-            "ManageProject::Issue": false,
-            "ManageProject::PullRequest": false,
-            "ManageProject::Member": false,
-            "ManageProject::SettingChanged": true,
-            "Normal::Organization": false,
-            "Normal::Project": "t",
-            "Normal::Permission": false
-        }
-   }
-}
-```
-
-### 返回字段说明:
-参数  | 类型 | 字段说明
---------- | ----------- | -----------
-|notification_body    |string   |站内信配置 |
-|email_body           |string   |邮件配置|
-
-
-> 返回的JSON示例:
-
-```json
-{
-    "status": 0,
-    "message": "响应成功",
-    "user": {
-        "id": 2,
-        "type": "User",
-        "name": "heh",
-        "login": "yystopf",
-        "image_url": "system/lets/letter_avatars/2/H/188_239_142/120.png"
-    },
-    "notification_body": {
-        "CreateOrAssign::IssueAssigned": true,
-        "CreateOrAssign::PullRequestAssigned": true,
-        "ManageProject::Issue": true,
-        "ManageProject::PullRequest": true,
-        "ManageProject::Member": true,
-        "ManageProject::SettingChanged": true,
-        "Normal::Organization": true,
-        "Normal::Project": true,
-        "Normal::Permission": true
-    },
-    "email_body": {
-        "CreateOrAssign::IssueAssigned": false,
-        "CreateOrAssign::PullRequestAssigned": false,
-        "ManageProject::Issue": false,
-        "ManageProject::PullRequest": false,
-        "ManageProject::Member": false,
-        "ManageProject::SettingChanged": true,
-        "Normal::Organization": false,
-        "Normal::Project": true,
-        "Normal::Permission": false
-    }
-}
-```
-<aside class="success">
-  Success Data.
-</aside>
-
 ## 获取用户星标项目
 获取用户星标项目
 

app/forms/base_form.rb

@@ -1,14 +1,6 @@
 class BaseForm
   include ActiveModel::Model
 
-  Error                     = Class.new(StandardError)
-  EmailError                = Class.new(Error)
-  LoginError                = Class.new(Error)
-  PhoneError                = Class.new(Error)
-  PasswordFormatError       = Class.new(Error)
-  VerifiCodeError           = Class.new(Error)
-  PasswordConfirmationError = Class.new(Error)
-
   def check_project_category(project_category_id)
     unless project_category_id == ''
       raise "project_category_id参数值无效." if project_category_id && !ProjectCategory.exists?(project_category_id)
@@ -31,38 +23,7 @@ class BaseForm
   end
 
   def check_reversed_keyword(repository_name)
-    raise "项目标识已被占用." if ReversedKeyword.check_exists?(repository_name)
+    raise "项目标识已被占用." if ReversedKeyword.is_reversed(repository_name).exists?
-  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&.code != code
-    raise VerifiCodeError, "验证码已失效" if !verifi_code&.effective?
-  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

app/forms/issues/create_form.rb

@@ -5,7 +5,7 @@ class Issues::CreateForm
 
   validates :subject, presence: { message: "不能为空" }
 
-  validates :subject, length: { maximum: 200, too_long: "不能超过200个字符" }
+  validates :subject, length: { maximum: 80, too_long: "不能超过80个字符" }
 
 
 end

app/forms/issues/update_form.rb

@@ -5,6 +5,6 @@ class Issues::UpdateForm
 
   validates :subject, presence: { message: "不能为空" }
 
-  validates :subject, length: { maximum: 200, too_long: "不能超过200个字符" }
+  validates :subject, length: { maximum: 80, too_long: "不能超过80个字符" }
 
 end

app/forms/projects/update_form.rb

@@ -1,15 +1,11 @@
 class Projects::UpdateForm < BaseForm
-  attr_accessor :name, :description, :project_category_id, :project_language_id, :private, :identifier, :user_id, :project_identifier
+  attr_accessor :name, :description, :project_category_id, :project_language_id, :private
   validates :name, presence: true
   validates :name, length: { maximum: 50 }
   validates :description, length: { maximum: 200 }
-  validates :identifier, format: { with: CustomRegexp::REPOSITORY_NAME_REGEX, multiline: true, message: "只能含有数字、字母、下划线且不能以下划线开头和结尾" }
-
   validate do
     check_project_category(project_category_id)
     check_project_language(project_language_id)
-
-    check_repository_name(user_id, identifier) unless identifier.blank? || identifier == project_identifier
   end
 
 end

app/helpers/admins/projects_helper.rb

@@ -4,7 +4,7 @@ module Admins::ProjectsHelper
     owner = project.owner
 
     if owner.is_a?(User)
-      link_to(project.owner&.real_name, "/#{project&.owner&.login}", target: '_blank')
+      link_to(project.owner&.real_name, "/users/#{project&.owner&.login}", target: '_blank')
     elsif owner.is_a?(Organization)
       link_to(project.owner&.real_name, "/organize/#{project&.owner&.login}", target: '_blank')
     else

app/helpers/application_helper.rb

@@ -1,6 +1,6 @@
 # 所有的方法请按首字母的顺序依次列出
 module ApplicationHelper
-  include Gitlink::I18n
+  include Educoder::I18n
   include GitHelper
 
   ONE_MINUTE = 60 * 1000
@@ -442,14 +442,6 @@ module ApplicationHelper
     User.find_by(gitea_uid: gitea_uid)
   end
 
-  def find_user_in_redis_cache(login, email)
-    $redis_cache.hgetall("v2-owner-common:#{login}-#{email}")
-  end
-
-  def find_user_in_redis_cache_by_id(id)
-    $redis_cache.hgetall("v2-owner-common:#{id}")
-  end
-
   def render_base64_decoded(str)
     return nil if str.blank?
     Base64.decode64 str
@@ -463,15 +455,5 @@ module ApplicationHelper
       sidebar_item(url, "数据统计", icon: 'bar-chart', controller: 'root')
     end
   end
-
-  # 1 手机类型；0 邮箱类型
-  # 注意新版的login是自动名生成的
-  def phone_mail_type value
-    value =~ /^1\d{10}$/ ? 1 : 0
-  end
-
-  def strip(str)
-    str.to_s.strip.presence
-  end
   
 end

app/helpers/repositories_helper.rb

@@ -35,16 +35,6 @@ module RepositoriesHelper
     end
   end
 
-  def render_cache_commit_author(author_json)
-    Rails.logger.info author_json['Email'] 
-    if author_json["name"].present? && author_json["email"].present?
-      return find_user_in_redis_cache(author_json['name'], author_json['email']) 
-    end
-    if author_json["Name"].present? && author_json["Email"].present?
-      return find_user_in_redis_cache(author_json['Name'], author_json['Email']) 
-    end
-  end
-
   def readme_render_decode64_content(str, path)
     return nil if str.blank?
     begin

app/jobs/delay_expired_issue_job.rb

@@ -3,8 +3,8 @@ class DelayExpiredIssueJob < ApplicationJob
 
   def perform
     Issue.where(due_date: Date.today + 1.days).find_each do |issue|
-      SendTemplateMessageJob.perform_later('IssueAssignerExpire', issue.id) if Site.has_notice_menu?
+      SendTemplateMessageJob.perform_later('IssueAssignerExpire', issue.id)
-      SendTemplateMessageJob.perform_later('IssueCreatorExpire', issue.id) if Site.has_notice_menu?
+      SendTemplateMessageJob.perform_later('IssueCreatorExpire', issue.id)
     end
   end
 

app/jobs/send_template_message_job.rb

@@ -36,21 +36,17 @@ class SendTemplateMessageJob < ApplicationJob
       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 = receivers.where.not(id: operator&.id)
       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)
+      Notice::Write::CreateService.call(receivers_string, content, notification_url, source, {operator_id: operator.id, issue_id: issue.id}, 2)
     when 'IssueChanged'
       operator_id, issue_id, change_params = 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 = User.where(id: [issue&.assigned_to_id, issue&.author_id]).where.not(id: operator&.id)
-      receivers_string, content, notification_url = MessageTemplate::IssueChanged.get_message_content(receivers, operator, issue, change_params.symbolize_keys)
+      receivers_string, content, notification_url = MessageTemplate::IssueChanged.get_message_content(receivers, operator, issue, change_params)
       Notice::Write::CreateService.call(receivers_string, content, notification_url, source, {operator_id: operator.id, issue_id: issue.id, change_params: change_params.symbolize_keys})
-      receivers.find_each do |receiver|
-        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 'IssueCreatorExpire'
       issue_id = args[0]
       issue = Issue.find_by_id(issue_id)
@@ -65,10 +61,6 @@ class SendTemplateMessageJob < ApplicationJob
       receivers = User.where(id: [issue_assigned_to_id, issue_author_id]).where.not(id: operator&.id)
       receivers_string, content, notification_url = MessageTemplate::IssueDeleted.get_message_content(receivers, operator, issue_title)
       Notice::Write::CreateService.call(receivers_string, content, notification_url, source, {operator_id: operator.id, issue_title: issue_title})
-      receivers.find_each do |receiver|
-        receivers_email_string, email_title, email_content = MessageTemplate::IssueDeleted.get_email_message_content(receiver, operator, issue_title)
-        Notice::Write::EmailCreateService.call(receivers_email_string, email_title, email_content)
-      end
     when 'OrganizationJoined'
       user_id, organization_id = args[0], args[1]
       user = User.find_by_id(user_id)
@@ -201,7 +193,7 @@ class SendTemplateMessageJob < ApplicationJob
       receivers_string, content, notification_url = MessageTemplate::ProjectRole.get_message_content(receivers, project, role)
       Notice::Write::CreateService.call(receivers_string, content, notification_url, source, {operator_id: operator.id, user_id: user.id, project_id: project.id, role: role})
       receivers.find_each do |receiver|
-        receivers_email_string, email_title, email_content = MessageTemplate::ProjectRole.get_email_message_content(receiver, project, role)
+        receivers_email_string, email_title, email_content = MessageTemplate::ProjectRole.get_email_message_content(receivers, project, role)
         Notice::Write::EmailCreateService.call(receivers_email_string, email_title, email_content)
       end
     when 'ProjectSettingChanged'
@@ -211,7 +203,7 @@ class SendTemplateMessageJob < ApplicationJob
       return unless operator.present? && project.present?
       receivers = project.all_managers.where.not(id: operator&.id)
       receivers_string, content, notification_url = MessageTemplate::ProjectSettingChanged.get_message_content(receivers, operator, project, change_params.symbolize_keys)
-      Notice::Write::CreateService.call(receivers_string, content, notification_url, source, {operator_id: operator.id, project_id: project.id, change_params: change_params.symbolize_keys})
+      Notice::Write::CreateService.call(receivers_string, content, notification_url, source, {operator_id: operator.id, project_id: project.id, change_params: change_params})
       receivers.find_each do |receiver|
         receivers_email_string, email_title, email_content = MessageTemplate::ProjectSettingChanged.get_email_message_content(receiver, operator, project, change_params.symbolize_keys)
         Notice::Write::EmailCreateService.call(receivers_email_string, email_title, email_content)
@@ -234,9 +226,9 @@ class SendTemplateMessageJob < ApplicationJob
       operator = User.find_by_id(operator_id)
       pull_request = PullRequest.find_by_id(pull_request_id)
       return unless operator.present? && pull_request.present?
-      # receivers = receivers.where.not(id: operator&.id)
+      receivers = receivers.where.not(id: operator&.id)
       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)
+      Notice::Write::CreateService.call(receivers_string, content, notification_url, source, {operator_id: operator.id, pull_request_id: pull_request.id}, 2)
     when 'PullRequestChanged'
       operator_id, pull_request_id, change_params = args[0], args[1], args[2]
       operator = User.find_by_id(operator_id)
@@ -246,10 +238,6 @@ class SendTemplateMessageJob < ApplicationJob
       receivers = User.where(id: [issue&.assigned_to_id, pull_request&.user_id]).where.not(id: operator&.id)
       receivers_string, content, notification_url = MessageTemplate::PullRequestChanged.get_message_content(receivers, operator, pull_request, change_params.symbolize_keys)
       Notice::Write::CreateService.call(receivers_string, content, notification_url, source, {operator_id: operator.id, pull_request_id: pull_request.id, change_params: change_params})
-      receivers.find_each do |receiver|
-        receivers_email_string, email_title, email_content = MessageTemplate::PullRequestChanged.get_email_message_content(receiver, operator, pull_request, change_params.symbolize_keys)
-        Notice::Write::EmailCreateService.call(receivers_email_string, email_title, email_content)
-      end
     when 'PullRequestClosed'
       operator_id, pull_request_id = args[0], args[1]
       operator = User.find_by_id(operator_id)
@@ -258,10 +246,6 @@ class SendTemplateMessageJob < ApplicationJob
       receivers = User.where(id: [pull_request&.issue&.assigned_to_id, pull_request&.user_id]).where.not(id: operator&.id)
       receivers_string, content, notification_url = MessageTemplate::PullRequestClosed.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})
-      receivers.find_each do |receiver|
-        receivers_email_string, email_title, email_content = MessageTemplate::PullRequestClosed.get_email_message_content(receiver, operator, pull_request)
-        Notice::Write::EmailCreateService.call(receivers_email_string, email_title, email_content)
-      end
     when 'PullRequestMerged'
       operator_id, pull_request_id = args[0], args[1]
       operator = User.find_by_id(operator_id)
@@ -270,10 +254,6 @@ class SendTemplateMessageJob < ApplicationJob
       receivers = User.where(id: [pull_request&.issue&.assigned_to_id, pull_request&.user_id]).where.not(id: operator&.id)
       receivers_string, content, notification_url = MessageTemplate::PullRequestMerged.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})
-      receivers.find_each do |receiver|
-        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
     end
   end
 end

app/libs/custom_regexp.rb

@@ -1,7 +1,6 @@
 module CustomRegexp
   PHONE = /1\d{10}/
   EMAIL = /\A[a-zA-Z0-9]+([._\\]*[a-zA-Z0-9])*@([a-z0-9]+[-a-z0-9]*[a-z0-9]+.){1,63}[a-z0-9]+\z/
-  LOGIN = /^(?!_)(?!.*?_$)[a-zA-Z0-9_-]+$/ #只含有数字、字母、下划线不能以下划线开头和结尾
   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/

app/mailers/user_mailer.rb

@@ -1,11 +1,17 @@
 class UserMailer < ApplicationMailer
   # 注意：这个地方一定要和你的邮箱服务域名一致
-  default from: 'notification@trustie.org'
+  default from: 'educoder@trustie.org'
 
   # 用户注册验证码
   def register_email(mail, code)
     @code = code
-    mail(to: mail, subject: 'Gitink | 注册验证码')
+    mail(to: mail, subject: '验证你的电子邮件')
   end
 
+  # 课堂讨论区的邮件通知
+  def course_message_email(mail, message_id)
+    @message = Message.find_by(id: message_id)
+    @course = @message&.board&.course
+    mail(to: mail, subject: '课堂发布了新的帖子') if @message.present? && @course.present?
+  end
 end

app/models/application_record.rb

@@ -17,6 +17,14 @@ class ApplicationRecord < ActiveRecord::Base
     Rails.env.production? && EduSetting.get('host_name') == 'https://www.educoder.net'
   end
 
+  def reset_user_cache_async_job(user)
+    ResetUserCacheJob.perform_later(user)
+  end
+
+  def reset_platform_cache_async_job
+    ResetPlatformCacheJob.perform_later
+  end
+
   def self.strip_param(key)
     key.to_s.strip.presence
   end

app/models/fork_user.rb

@@ -20,30 +20,12 @@ class ForkUser < ApplicationRecord
   belongs_to :user
   belongs_to :fork_project, class_name: 'Project', foreign_key: :fork_project_id
 
-  after_create :incre_project_common, :incre_user_statistic, :incre_platform_statistic
+  after_save :reset_cache_data
-  after_destroy :decre_project_common, :decre_user_statistic, :decre_platform_statistic
+  after_destroy :reset_cache_data
 
-  def incre_project_common
+  def reset_cache_data 
-    CacheAsyncSetJob.perform_later("project_common_service", {forks: 1}, self.project_id)
+    self.reset_platform_cache_async_job
+    self.reset_user_cache_async_job(self.project.owner)
   end
 
-  def decre_project_common
-    CacheAsyncSetJob.perform_later("project_common_service", {forks: -1}, self.project_id)
-  end
-
-  def incre_user_statistic 
-    CacheAsyncSetJob.perform_later("user_statistic_service", {fork_count: 1}, self.project&.user_id)
-  end
-
-  def decre_user_statistic
-    CacheAsyncSetJob.perform_later("user_statistic_service", {fork_count: -1}, self.project&.user_id)
-  end
-
-  def incre_platform_statistic
-    CacheAsyncSetJob.perform_later("platform_statistic_service", {fork_count: 1})
-  end
-
-  def decre_platform_statistic
-    CacheAsyncSetJob.perform_later("platform_statistic_service", {fork_count: -1})
-  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_id, optional: true
+  belongs_to :pull_request, class_name: '::PullRequest', foreign_key: :id, primary_key: :gitea_number, optional: true
 
 end

app/models/issue.rb

@@ -74,32 +74,13 @@ class Issue < ApplicationRecord
   scope :issue_pull_request, ->{where(issue_classify: "pull_request")}
   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_update :change_versions_count
-  after_destroy :update_closed_issues_count_in_project!, :decre_project_common, :decre_user_statistic, :decre_platform_statistic
+  after_save :reset_cache_data
+  after_destroy :update_closed_issues_count_in_project!, :reset_cache_data
 
-  def incre_project_common
+  def reset_cache_data 
-    CacheAsyncSetJob.perform_later("project_common_service", {issues: 1}, self.project_id)
+    self.reset_platform_cache_async_job
-  end
+    self.reset_user_cache_async_job(self.user)
-
-  def decre_project_common
-    CacheAsyncSetJob.perform_later("project_common_service", {issues: -1}, self.project_id)
-  end
-
-  def incre_user_statistic 
-    CacheAsyncSetJob.perform_later("user_statistic_service", {issue_count: 1}, self.author_id)
-  end
-
-  def decre_user_statistic
-    CacheAsyncSetJob.perform_later("user_statistic_service", {issue_count: -1}, self.author_id)
-  end
-
-  def incre_platform_statistic
-    CacheAsyncSetJob.perform_later("platform_statistic_service", {issue_count: 1})
-  end
-
-  def decre_platform_statistic
-    CacheAsyncSetJob.perform_later("platform_statistic_service", {issue_count: -1})
   end
 
   def get_assign_user

app/models/laboratory.rb

@@ -44,7 +44,7 @@ class Laboratory < ApplicationRecord
 
   def site
     rails_env = EduSetting.get('rails_env')
-    suffix = rails_env && rails_env != 'production' ? ".#{rails_env}.gitlink.org.cn" : '.gitlink.org.cn'
+    suffix = rails_env && rails_env != 'production' ? ".#{rails_env}.trustie.net" : '.trustie.net'
 
     identifier ? "#{identifier}#{suffix}" : ''
   end
@@ -74,6 +74,74 @@ class Laboratory < ApplicationRecord
     RequestStore.store[:current_laboratory] ||= User.anonymous
   end
 
+  def shixuns
+    if main_site?
+      not_shixun_ids = Shixun.joins(:laboratory_shixuns).where("laboratory_shixuns.laboratory_id != #{Laboratory.current.id}")
+      Shixun.where.not(id: not_shixun_ids.pluck(:shixun_id))
+    elsif sync_shixun
+      laboratory_shixun_ids = laboratory_shixuns.pluck(:shixun_id)
+      school_shixun_ids = Shixun.joins("join user_extensions on shixuns.user_id=user_extensions.user_id").where(user_extensions: { school_id: school_id }).pluck(:id)
+      shixun_ids = laboratory_shixun_ids + school_shixun_ids
+      Shixun.where(id: shixun_ids.uniq)
+    else
+      Shixun.joins(:laboratory_shixuns).where(laboratory_shixuns: { laboratory_id: id })
+    end
+  end
+
+  def subjects
+    if main_site?
+      not_subject_ids = Subject.joins(:laboratory_subjects).where("laboratory_subjects.laboratory_id != #{Laboratory.current.id}")
+      Subject.where.not(id: not_subject_ids.pluck(:subject_id))
+    elsif sync_subject
+      laboratory_subject_ids = laboratory_subjects.pluck(:subject_id)
+      school_subject_ids = Subject.joins("join user_extensions on subjects.user_id=user_extensions.user_id").where(user_extensions: { school_id: school_id }).pluck(:id)
+      subject_ids = laboratory_subject_ids + school_subject_ids
+      Subject.where(id: subject_ids.uniq)
+    else
+      Subject.joins(:laboratory_subjects).where(laboratory_subjects: { laboratory_id: id })
+    end
+  end
+
+  def all_courses
+    main_site? || !sync_course ? courses : courses.or(Course.where(school_id: school_id))
+  end
+
+  def shixun_repertoires
+    where_sql = ShixunTagRepertoire.where("shixun_tag_repertoires.tag_repertoire_id = tag_repertoires.id")
+
+    # 云上实验室过滤
+    unless main_site?
+      where_sql = where_sql.joins("JOIN laboratory_shixuns ls ON ls.shixun_id = shixun_tag_repertoires.shixun_id "\
+ 																	"AND ls.laboratory_id = #{id}")
+    end
+    where_sql = where_sql.select('1').to_sql
+    tags = TagRepertoire.where("EXISTS(#{where_sql})").distinct.includes(sub_repertoire: :repertoire)
+
+    tags_map = tags.group_by(&:sub_repertoire)
+    sub_reps_map = tags_map.keys.group_by(&:repertoire)
+
+    sub_reps_map.keys.sort_by(&:updated_at).reverse.map do |repertoire|
+      repertoire_hash = repertoire.as_json(only: %i[id name])
+      repertoire_hash[:sub_repertoires] =
+        sub_reps_map[repertoire].sort_by(&:updated_at).reverse.map do |sub_repertoire|
+          sub_repertoire_hash = sub_repertoire.as_json(only: %i[id name])
+          sub_repertoire_hash[:tags] = tags_map[sub_repertoire].sort_by(&:updated_at).reverse.map { |tag| tag.as_json(only: %i[id name]) }
+          sub_repertoire_hash
+        end
+      repertoire_hash
+    end
+  end
+
+  def subject_repertoires
+    exist_sql = Subject.where('subjects.repertoire_id = repertoires.id')
+
+    unless main_site?
+      exist_sql = exist_sql.joins(:laboratory_subjects).where(laboratory_subjects: { laboratory_id: id })
+    end
+
+    Repertoire.where("EXISTS(#{exist_sql.select('1').to_sql})").order(updated_at: :desc).distinct
+  end
+
   # 是否为主站
   def main_site?
     id == 1

app/models/message_template.rb

@@ -17,55 +17,48 @@ class MessageTemplate < ApplicationRecord
   def self.build_init_data
     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: 'GitLink: {nickname1} 在 {nickname2}/{repository} 指派给你一个易修')
+    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: '{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}', notification_url: '{baseurl}/{owner}/{identifier}/issues/{id}')
-    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> 删除', notification_url: '')
-    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: 'GitLink: 你已加入 {organization} 组织')
+    self.create(type: 'MessageTemplate::OrganizationJoined', sys_notice: '你已加入 <b>{organization}</b> 组织', notification_url: '{baseurl}/{login}', email: email_html, email_title: '你已加入 {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: 'GitLink: 你已被移出 {organization} 组织')
+    self.create(type: 'MessageTemplate::OrganizationLeft', sys_notice: '你已被移出 <b>{organization}</b> 组织', notification_url: '', email: email_html, email_title: '你已被移出 {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>', notification_url: '{baseurl}/{login}')
-    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> 复刻了你管理的仓库{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: 'GitLink: {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: '{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: 'GitLink: 你已加入 {repository} 项目')
+    self.create(type: 'MessageTemplate::ProjectJoined', sys_notice: '你已加入 <b>{repository}</b> 项目', notification_url: '{baseurl}/{owner}/{identifier}', email: email_html, email_title: '你已加入 {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: 'GitLink: 你已被移出 {repository} 项目')
+    self.create(type: 'MessageTemplate::ProjectLeft', sys_notice: '你已被移出 <b>{repository}</b> 项目', notification_url: '', email: email_html, email_title: '你已被移出 {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: 'GitLink: {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: '{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: 'GitLink: {nickname1} 已被移出项目 {nickname2}/{repository}')
+    self.create(type: 'MessageTemplate::ProjectMemberLeft', sys_notice: '<b>{nickname1}</b> 已被移出项目 <b>{nickname2}/{repository}</b>', notification_url: '{baseurl}/{owner}/{identifier}', email: email_html, email_title: '{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: 'GitLink: {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}/Messagecount', email: email_html, email_title: '{nickname1} 在 {nickname2}/{repository} 提交了一个合并请求')
-    email_html = File.read("#{email_template_html_dir}/project_role.html")
+    self.create(type: 'MessageTemplate::ProjectRole', sys_notice: '仓库 <b>{repository}</b> 已把你的角色改为 <b>{role}</b>', 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: 'GitLink: 您管理的仓库 {nickname2}/{repository} 仓库设置已被更改')
+    self.create(type: 'MessageTemplate::ProjectSettingChanged', sys_notice: '{nickname1}更改了 <b>{nickname2}/{repository}</b> 仓库设置：{ifname}更改项目名称为"<b>{name}</b>"{endname}{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: '您管理的仓库 {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: 'GitLink: {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}/Messagecount', email: email_html, email_title: '{nickname1} 在 {nickname2}/{repository} 指派给你一个合并请求')
-    self.create(type: 'MessageTemplate::PullRequestAtme', sys_notice: '<b>{nickname}</b> 在合并请求 <b>{title}</b> 中@我', notification_url: '{baseurl}/{owner}/{identifier}/pulls/{id}')
+    self.create(type: 'MessageTemplate::PullRequestAtme', sys_notice: '<b>{nickname}</b> 在合并请求 <b>{title}</b> 中@我', notification_url: '{baseurl}/{owner}/{identifier}/pulls/{id}/Messagecount')
-    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}', notification_url: '{baseurl}/{owner}/{identifier}/pulls/{id}/Messagecount')
-    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}')
+    self.create(type: 'MessageTemplate::PullRequestClosed', sys_notice: '你提交的合并请求：{title} <b>被拒绝</b>', notification_url: '')
-    email_html = File.read("#{email_template_html_dir}/pull_request_closed.html")
+    self.create(type: 'MessageTemplate::PullRequestJournal', sys_notice: '{nickname}评论合并请求{title}：<b>{notes}</b>', notification_url: '{baseurl}/{owner}/{identifier}/pulls/{id}/Messagecount')
-    self.create(type: 'MessageTemplate::PullRequestClosed', sys_notice: '你提交的合并请求：{title} <b>被拒绝</b>', email: email_html, email_title: 'GitLink: 合并请求 {title} 有状态变更', notification_url: '')
+    self.create(type: 'MessageTemplate::PullRequestMerged', sys_notice: '你提交的合并请求：{title} <b>已通过</b>', notification_url: '{baseurl}/{owner}/{identifier}/pulls/{id}/Messagecount')
-    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: 'GitLink: 合并请求 {title} 有状态变更', notification_url: '{baseurl}/{owner}/{identifier}/pulls/{id}')
   end
 
   def self.sys_notice

app/models/message_template/issue_assigned.rb

@@ -17,12 +17,6 @@ class MessageTemplate::IssueAssigned < MessageTemplate
 
   # MessageTemplate::IssueAssigned.get_message_content(User.where(login: 'yystopf'), User.last, Issue.last)
   def self.get_message_content(receivers, operator, issue)
-    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::IssueAssigned"]
-      end
-    end
-    return '', '', '' if receivers.blank?
     project = issue&.project
     owner = project&.owner 
     content = sys_notice.gsub('{nickname1}', operator&.real_name).gsub('{nickname2}', owner&.real_name).gsub('{repository}', project&.name).gsub('{title}', issue&.subject)
@@ -34,9 +28,6 @@ class MessageTemplate::IssueAssigned < MessageTemplate
   end
 
   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"]
-    end
     project = issue&.project
     owner = project&.owner 
     title = email_title

app/models/message_template/issue_changed.rb

@@ -17,12 +17,6 @@ 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"]})
   def self.get_message_content(receivers, operator, issue, change_params) 
-    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["CreateOrAssign::IssueChanged"]
-      end
-    end
-    return '', '', '' if receivers.blank?
     return '', '', '' if change_params.blank?
     project = issue&.project 
     owner = project&.owner 
@@ -186,184 +180,4 @@ class MessageTemplate::IssueChanged < MessageTemplate
     Rails.logger.info("MessageTemplate::IssueAssigned.get_message_content [ERROR] #{e}")
     return '', '', ''
   end
-
-  def self.get_email_message_content(receiver, operator, issue, change_params)
-    return '', '', '' if change_params.blank?
-    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/>') 
-      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 '', '', ''
-  end
 end

app/models/message_template/issue_deleted.rb

@@ -17,35 +17,10 @@ class MessageTemplate::IssueDeleted < MessageTemplate
 
   # MessageTemplate::IssueDeleted.get_message_content(User.where(login: 'yystopf'), User.last, "hahah")
   def self.get_message_content(receivers, operator, issue_title)
-    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["CreateOrAssign::IssueChanged"]
-      end
-    end
-    return '', '', '' if receivers.blank?
     content = sys_notice.gsub('{nickname}', operator&.real_name).gsub('{title}', issue_title)
     return receivers_string(receivers), content, notification_url
   rescue => e
-    Rails.logger.info("MessageTemplate::IssueDeleted.get_message_content [ERROR] #{e}")
+    Rails.logger.info("MessageTemplate::IssueAtme.get_message_content [ERROR] #{e}")
-    return '', '', ''
-  end
-
-  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)
-
-    return receiver&.mail, title, content
-  rescue => e
-    Rails.logger.info("MessageTemplate::IssueDeleted.get_email_message_content [ERROR] #{e}")
     return '', '', ''
   end
 end

app/models/message_template/organization_joined.rb

@@ -17,12 +17,6 @@ class MessageTemplate::OrganizationJoined < MessageTemplate
 
   # MessageTemplate::OrganizationJoined.get_message_content(User.where(login: 'yystopf'), Organization.last)
   def self.get_message_content(receivers, organization)
-    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::Organization"]
-      end
-    end
-    return '', '', '' if receivers.blank?
     content = sys_notice.gsub('{organization}', organization&.real_name)
     url = notification_url.gsub('{login}', organization&.name)
     return receivers_string(receivers), content, url
@@ -32,9 +26,6 @@ class MessageTemplate::OrganizationJoined < MessageTemplate
   end
 
   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"]
-    end
     title = email_title
     title.gsub!('{organization}', organization&.real_name)
     content = email 

app/models/message_template/organization_left.rb

@@ -17,12 +17,6 @@ class MessageTemplate::OrganizationLeft < MessageTemplate
 
   # MessageTemplate::OrganizationLeft.get_message_content(User.where(login: 'yystopf'), Organization.last)
   def self.get_message_content(receivers, organization)
-    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::Organization"]
-      end
-    end
-    return '', '', '' if receivers.blank?
     content = sys_notice.gsub('{organization}', organization&.real_name)
     url = notification_url.gsub('{login}', organization&.name)
     return receivers_string(receivers), content, url
@@ -32,9 +26,6 @@ class MessageTemplate::OrganizationLeft < MessageTemplate
   end
 
   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"]
-    end
     title = email_title
     title.gsub!('{organization}', organization&.real_name)
     content = email 

app/models/message_template/organization_role.rb

@@ -17,12 +17,6 @@ class MessageTemplate::OrganizationRole < MessageTemplate
 
   # MessageTemplate::OrganizationRole.get_message_content(User.where(login: 'yystopf'), Organization.last, '管理员')
   def self.get_message_content(receivers, organization, role)
-    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('{role}', role)
     url = notification_url.gsub('{login}', organization&.login)
     return receivers_string(receivers), content, url
@@ -32,9 +26,6 @@ class MessageTemplate::OrganizationRole < MessageTemplate
   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"]
-    end
     title = email_title
     title.gsub!('{organization}', organization&.real_name)
     title.gsub!('{role}', role)

app/models/message_template/project_issue.rb

@@ -17,15 +17,9 @@ class MessageTemplate::ProjectIssue < MessageTemplate
 
   # MessageTemplate::ProjectIssue.get_message_content(User.where(login: 'yystopf'), User.where(login: 'forgetest1'), User.last, Issue.last)
   def self.get_message_content(managers, followers, operator, issue)
-    managers.each do |receiver|
-      if receiver.user_template_message_setting.present? 
-        managers = managers.where.not(id: receiver.id) unless receiver.user_template_message_setting.notification_body["ManageProject::Issue"]
-      end
-    end
     project = issue&.project 
     owner = project&.owner 
     receivers = managers + followers
-    return '', '', '' if receivers.blank?
     content = sys_notice.gsub('{nickname1}', operator&.real_name).gsub('{nickname2}', owner&.real_name).gsub('{repository}', project&.name).gsub('{title}', issue&.subject)
     url = notification_url.gsub('{owner}', owner&.login).gsub('{identifier}', project&.identifier).gsub('{id}', issue&.id.to_s)
     
@@ -36,9 +30,6 @@ class MessageTemplate::ProjectIssue < MessageTemplate
   end
 
   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"]
-    end
     project = issue&.project 
     owner = project&.owner 
     title = email_title

app/models/message_template/project_joined.rb

@@ -17,12 +17,6 @@ class MessageTemplate::ProjectJoined < MessageTemplate
 
   # MessageTemplate::ProjectJoined.get_message_content(User.where(login: 'yystopf'), Project.last)
   def self.get_message_content(receivers, project)
-    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::Project"]
-      end
-    end
-    return '', '', '' if receivers.blank?
     content = sys_notice.gsub('{repository}', project&.name)
     url = notification_url.gsub('{owner}', project&.owner&.login).gsub('{identifier}', project&.identifier)
     return receivers_string(receivers), content, url
@@ -32,9 +26,6 @@ class MessageTemplate::ProjectJoined < MessageTemplate
   end
 
   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)
     

app/models/message_template/project_left.rb

@@ -17,11 +17,6 @@ class MessageTemplate::ProjectLeft < MessageTemplate
 
   # MessageTemplate::ProjectLeft.get_message_content(User.where(login: 'yystopf'), Project.last)
   def self.get_message_content(receivers, project)
-    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::Project"]
-      end
-    end
     content = sys_notice.gsub('{repository}', project&.name)
     url = notification_url.gsub('{owner}', project&.owner&.login).gsub('{identifier}', project&.identifier)
     return receivers_string(receivers), content, url
@@ -31,9 +26,6 @@ class MessageTemplate::ProjectLeft < MessageTemplate
   end
 
   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)
     

app/models/message_template/project_member_joined.rb

@@ -17,12 +17,6 @@ class MessageTemplate::ProjectMemberJoined < MessageTemplate
 
   # MessageTemplate::ProjectMemberJoined.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? 
-        receivers = receivers.where.not(id: receiver.id) unless receiver.user_template_message_setting.notification_body["ManageProject::Member"]
-      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}', project&.owner&.login).gsub('{identifier}', project&.identifier)
     return receivers_string(receivers), content, url
@@ -32,9 +26,6 @@ class MessageTemplate::ProjectMemberJoined < MessageTemplate
   end
 
   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)

app/models/message_template/project_member_left.rb

@@ -17,12 +17,6 @@ class MessageTemplate::ProjectMemberLeft < MessageTemplate
 
   # MessageTemplate::ProjectMemberLeft.get_message_content(User.where(login: 'yystopf'), User.last, Project.last)
   def self.get_message_content(receivers, user, project)
-    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["ManageProject::Member"]
-      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}', project&.owner&.login).gsub('{identifier}', project&.identifier)
     return receivers_string(receivers), content, url
@@ -32,9 +26,6 @@ class MessageTemplate::ProjectMemberLeft < MessageTemplate
   end
 
   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)

app/models/message_template/project_pull_request.rb

@@ -17,15 +17,9 @@ class MessageTemplate::ProjectPullRequest < MessageTemplate
 
   # MessageTemplate::ProjectPullRequest.get_message_content(User.where(login: 'yystopf'), User.where(login: 'testforge2'), User.last, PullRequest.last)
   def self.get_message_content(managers, followers, operator, pull_request)
-    managers.each do |receiver|
-      if receiver.user_template_message_setting.present? 
-        managers = managers.where.not(id: receiver.id) unless receiver.user_template_message_setting.notification_body["ManageProject::PullRequest"]
-      end
-    end
     project = pull_request&.project 
     owner = project&.owner 
     receivers = managers + followers
-    return '', '', '' if receivers.blank?
     content = sys_notice.gsub('{nickname1}', operator&.real_name).gsub('{nickname2}', owner&.real_name).gsub('{repository}', project&.name).gsub('{title}', pull_request&.title)
     url = notification_url.gsub('{owner}', owner&.login).gsub('{identifier}', project&.identifier).gsub('{id}', pull_request&.id.to_s)
 
@@ -36,9 +30,6 @@ class MessageTemplate::ProjectPullRequest < MessageTemplate
   end
 
   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"]
-    end
     project = pull_request&.project 
     owner = project&.owner 
     title = email_title

app/models/message_template/project_role.rb

@@ -17,13 +17,7 @@ class MessageTemplate::ProjectRole < MessageTemplate
 
   # MessageTemplate::ProjectRole.get_message_content(User.where(login: 'yystopf'), Project.last, '管理员')
   def self.get_message_content(receivers, project, role)
-    receivers.each do |receiver|
+    content = sys_notice.gsub('{repository}', project&.name).gsub('{role}', role)
-      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('{nickname}', project&.owner&.real_name).gsub('{repository}', project&.name).gsub('{role}', role)
     url = notification_url.gsub('{owner}', project&.owner&.login).gsub('{identifier}', project&.identifier)
     return receivers_string(receivers), content, url
   rescue => e
@@ -31,19 +25,14 @@ class MessageTemplate::ProjectRole < MessageTemplate
     return '', '', ''
   end
 
-  def self.get_email_message_content(receiver, project, role)
+  def self.get_email_message_content(receivers, project, role)
-    if receiver.user_template_message_setting.present? 
-      return '', '', '' unless receiver.user_template_message_setting.email_body["Normal::Permission"]
-    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)

app/models/message_template/project_setting_changed.rb

@@ -17,12 +17,6 @@ class MessageTemplate::ProjectSettingChanged < MessageTemplate
 
   # 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? 
-        receivers = receivers.where.not(id: receiver.id) unless receiver.user_template_message_setting.notification_body["ManageProject::SettingChanged"]
-      end
-    end
-    return '', '', '' if receivers.blank?
     return '', '', '' if change_params.blank?
     owner = project&.owner
     content = sys_notice.gsub('{nickname1}', operator&.real_name).gsub('{nickname2}', owner&.real_name).gsub('{repository}', project&.name)
@@ -40,18 +34,6 @@ class MessageTemplate::ProjectSettingChanged < MessageTemplate
     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?
@@ -159,9 +141,6 @@ class MessageTemplate::ProjectSettingChanged < MessageTemplate
   end
 
   def self.get_email_message_content(receiver, operator, project, change_params)
-    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
@@ -190,18 +169,6 @@ class MessageTemplate::ProjectSettingChanged < MessageTemplate
     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?

app/models/message_template/pull_request_assigned.rb

@@ -17,12 +17,6 @@ class MessageTemplate::PullRequestAssigned < MessageTemplate
 
   # MessageTemplate::PullRequestAssigned.get_message_content(User.where(login: 'yystopf'), User.last, PullRequest.last)
   def self.get_message_content(receivers, operator, pull_request)
-    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::PullRequestAssigned"]
-      end
-    end
-    return '', '', '' if receivers.blank?
     project = pull_request&.project 
     owner = project&.owner 
     content = sys_notice.gsub('{nickname1}', operator&.real_name).gsub('{nickname2}', owner&.real_name).gsub('{repository}', project&.name).gsub('{title}', pull_request&.title)
@@ -34,9 +28,6 @@ class MessageTemplate::PullRequestAssigned < MessageTemplate
   end
 
   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

app/models/message_template/pull_request_changed.rb

@@ -17,12 +17,6 @@ class MessageTemplate::PullRequestChanged < MessageTemplate
 
   # MessageTemplate::PullRequestChanged.get_message_content(User.where(login: 'yystopf'), User.last, PullRequest.last, {assigned_to_id: [nil, 203], priority_id: [2, 4], fixed_version_id: [nil, 5], issue_tags_value: ["", "7"]})
   def self.get_message_content(receivers, operator, pull_request, change_params)
-    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["CreateOrAssign::PullRequestChanged"]
-      end
-    end
-    return '', '', '' if receivers.blank?
     return '', '', '' if change_params.blank?
     project = pull_request&.project 
     owner = project&.owner 
@@ -98,96 +92,4 @@ class MessageTemplate::PullRequestChanged < MessageTemplate
     Rails.logger.info("MessageTemplate::PullRequestChanged.get_message_content [ERROR] #{e}")
     return '', '', ''
   end
-
-  def self.get_email_message_content(receiver, operator, pull_request, change_params)
-    return '', '', '' if change_params.blank?
-    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/>') 
-      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[: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 '', '', ''
-  end
 end

app/models/message_template/pull_request_closed.rb

@@ -17,12 +17,6 @@ class MessageTemplate::PullRequestClosed < MessageTemplate
 
   # MessageTemplate::PullRequestClosed.get_message_content(User.where(login: 'yystopf'), User.last, PullRequest.last)
   def self.get_message_content(receivers, operator, pull_request)
-    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["CreateOrAssign::PullRequestChanged"]
-      end
-    end
-    return '', '', '' if receivers.blank?
     project = pull_request&.project 
     owner = project&.owner 
     content = sys_notice.gsub('{title}', pull_request&.title)
@@ -32,30 +26,4 @@ class MessageTemplate::PullRequestClosed < MessageTemplate
     Rails.logger.info("MessageTemplate::PullRequestClosed.get_message_content [ERROR] #{e}")
     return '', '', ''
   end
-
-  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"]
-    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 '', '', ''
-  end
 end

app/models/message_template/pull_request_merged.rb

@@ -17,12 +17,6 @@ class MessageTemplate::PullRequestMerged < MessageTemplate
 
   # MessageTemplate::PullRequestMerged.get_message_content(User.where(login: 'yystopf'), User.last, PullRequest.last)
   def self.get_message_content(receivers, operator, pull_request)
-    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["CreateOrAssign::PullRequestChanged"]
-      end
-    end
-    return '', '', '' if receivers.blank?
     project = pull_request&.project 
     owner = project&.owner 
     content = sys_notice.gsub('{title}', pull_request&.title)
@@ -32,30 +26,4 @@ class MessageTemplate::PullRequestMerged < MessageTemplate
     Rails.logger.info("MessageTemplate::PullRequestMerged.get_message_content [ERROR] #{e}")
     return '', '', ''
   end
-
-  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"]
-    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 '', '', ''
-  end
 end

app/models/organization.rb

@@ -76,17 +76,11 @@ class Organization < Owner
   validates_uniqueness_of :login, :if => Proc.new { |user| user.login_changed? && user.login.present? }, case_sensitive: false
   validates :login, format: { with: NAME_REGEX, multiline: true, message: "只能含有数字、字母、下划线且不能以下划线开头和结尾" }
 
-  delegate :description, :website, :location, :repo_admin_change_team_access, :recommend,
+  delegate :description, :website, :location, :repo_admin_change_team_access,
            :visibility, :max_repo_creation, :num_projects, :num_users, :num_teams, to: :organization_extension, allow_nil: true
 
   scope :with_visibility, ->(visibility) { joins(:organization_extension).where(organization_extensions: {visibility: visibility}) if visibility.present? }
 
-  after_save :reset_cache_data
-
-  def reset_cache_data
-    Cache::V2::OwnerCommonService.new(self.id).reset
-  end
-
   def self.build(name, nickname, gitea_token=nil)
     self.create!(login: name, nickname: nickname, gitea_token: gitea_token)
   end

app/models/organization_extension.rb

@@ -15,7 +15,6 @@
 #  num_projects                  :integer          default("0")
 #  num_users                     :integer          default("0")
 #  num_teams                     :integer          default("0")
-#  recommend                     :boolean          default("0")
 #
 # Indexes
 #
@@ -31,8 +30,6 @@ class OrganizationExtension < ApplicationRecord
 
   enum visibility: {common: 0, limited: 1, privacy: 2}
 
-  before_save :set_recommend
-
   def self.build(organization_id, description, website, location, repo_admin_change_team_access, visibility, max_repo_creation)
     self.create!(organization_id: organization_id,
                  description: description,
@@ -42,9 +39,4 @@ class OrganizationExtension < ApplicationRecord
                  visibility: visibility,
                  max_repo_creation: max_repo_creation)
   end
-
-  private 
-  def set_recommend
-    self.recommend = false unless self.common?
-  end
 end

app/models/organization_user.rb

@@ -36,10 +36,10 @@ class OrganizationUser < ApplicationRecord
   end
 
   def send_create_message_to_notice_system
-    SendTemplateMessageJob.perform_later('OrganizationJoined', self.user_id, self.organization_id) if Site.has_notice_menu?
+    SendTemplateMessageJob.perform_later('OrganizationJoined', self.user_id, self.organization_id)
   end
 
   def send_destroy_message_to_notice_system 
-    SendTemplateMessageJob.perform_later('OrganizationLeft', self.user_id, self.organization_id) if Site.has_notice_menu?
+    SendTemplateMessageJob.perform_later('OrganizationLeft', self.user_id, self.organization_id)
   end
 end

app/models/praise_tread.rb

@@ -21,31 +21,15 @@ class PraiseTread < ApplicationRecord
   belongs_to :praise_tread_object, polymorphic: true, counter_cache: :praises_count
   has_many :tidings, :as => :container, :dependent => :destroy
 
-  after_create :send_tiding, :incre_project_common, :incre_user_statistic, :incre_platform_statistic
+  after_create :send_tiding
-  after_destroy :decre_project_common, :decre_user_statistic, :decre_platform_statistic
+  after_save :reset_cache_data
+  after_destroy :reset_cache_data
 
-  def incre_project_common
+  def reset_cache_data 
-    CacheAsyncSetJob.perform_later("project_common_service", {praises: 1}, self.praise_tread_object_id) if self.praise_tread_object_type == "Project"
+    self.reset_platform_cache_async_job
-  end
+    if self.praise_tread_object.is_a?(Project)
-
+      self.reset_user_cache_async_job(self.praise_tread_object&.owner)
-  def decre_project_common
+    end
-    CacheAsyncSetJob.perform_later("project_common_service", {praises: -1}, self.praise_tread_object_id) if self.praise_tread_object_type == "Project"
-  end
-
-  def incre_user_statistic 
-    CacheAsyncSetJob.perform_later("user_statistic_service", {project_praise_count: 1}, self.praise_tread_object&.user_id) if self.praise_tread_object_type == "Project"
-  end
-
-  def decre_user_statistic
-    CacheAsyncSetJob.perform_later("user_statistic_service", {project_praise_count: -1}, self.praise_tread_object&.user_id) if self.praise_tread_object_type == "Project"
-  end
-
-  def incre_platform_statistic
-    CacheAsyncSetJob.perform_later("platform_statistic_service", {project_praise_count: 1}) if self.praise_tread_object_type == "Project"
-  end
-
-  def decre_platform_statistic
-    CacheAsyncSetJob.perform_later("platform_statistic_service", {project_praise_count: -1}) if self.praise_tread_object_type == "Project"
   end
 
   def send_tiding

app/models/project.rb

@@ -1,3 +1,4 @@
+
 # == Schema Information
 #
 # Table name: projects
@@ -37,6 +38,8 @@
 #  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")
@@ -50,13 +53,10 @@
 #  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)
+#  order_index            :integer          default("0")
 #  lesson_url             :string(255)
-#  is_pinned              :boolean          default("0")
-#  recommend_index        :integer          default("0")
 #
 # Indexes
 #
@@ -79,7 +79,6 @@
 
 
 
-
 class Project < ApplicationRecord
   include Matchable
   include Publicable
@@ -127,15 +126,13 @@ class Project < ApplicationRecord
   has_many :pinned_projects, dependent: :destroy 
   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, :reset_cache_data
+  after_save :check_project_members
-  before_save :set_invite_code, :reset_unmember_followed, :set_recommend_and_is_pinned
+  before_save :set_invite_code, :reset_cache_data, :reset_unmember_followed
-  before_destroy :decre_project_common
+  after_destroy :reset_cache_data
-  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, :visits, :project_category_id, :project_language_id, :license_id, :ignore_id, :watchers_count, :created_on)}
-  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)}
   scope :recommend,           -> { visible.project_statics_select.where(recommend: true) }
-  scope :pinned, -> {where(is_pinned: true)}
 
   delegate :content, to: :project_detail, allow_nil: true
   delegate :name, to: :license, prefix: true, allow_nil: true
@@ -153,48 +150,12 @@ class Project < ApplicationRecord
   end
 
   def reset_cache_data 
-    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)
+      first_owner = Owner.find_by_id(changes[:user_id].first) 
-      CacheAsyncSetJob.perform_later("user_statistic_service", {project_count: 1}, changes[:user_id].last)
+      self.reset_user_cache_async_job(first_owner)
-    end
-    if changes[:project_language_id].present?
-      first_language = ProjectLanguage.find_by_id(changes[:project_language_id].first)
-      last_language = ProjectLanguage.find_by_id(changes[:project_language_id].last)
-      CacheAsyncSetJob.perform_later("user_statistic_service", {project_language_count_key: first_language&.name, project_language_count: -1}, self.user_id)
-      CacheAsyncSetJob.perform_later("user_statistic_service", {project_language_count_key: last_language&.name, project_language_count: 1}, self.user_id)
-      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
-  end
-
-  def decre_project_common
-    CacheAsyncClearJob.perform_later('project_common_service', self.id)
-  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
-
-  def decre_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
-
-  def incre_platform_statistic
-    CacheAsyncSetJob.perform_later("platform_statistic_service", {project_count: 1, project_language_count_key: self.project_language&.name, project_language_count: 1})
-  end
-
-  def decre_platform_statistic
-    CacheAsyncSetJob.perform_later("platform_statistic_service", {project_count: -1, project_language_count_key: self.project_language&.name, project_language_count: -1})
-  end
-
-  def is_full_public
-    owner = self.owner
-    if owner.is_a?(Organization)
-      return self.is_public && owner&.visibility == "common"
-    else
-      return self.is_public
     end
+    self.reset_platform_cache_async_job
+    self.reset_user_cache_async_job(self.owner)
   end
 
   def reset_unmember_followed
@@ -209,16 +170,6 @@ class Project < ApplicationRecord
     end
   end
 
-  def set_recommend_and_is_pinned
-    self.recommend = self.recommend_index.zero? ? false : true
-    # 私有项目不允许设置精选和推荐
-    unless self.is_public
-      self.recommend = false
-      self.recommend_index = 0
-      self.is_pinned = false 
-    end
-  end
-
   def self.search_project(search)
     ransack(name_or_identifier_cont: search)
   end

app/models/project_category.rb

@@ -8,27 +8,10 @@
 #  projects_count :integer          default("0")
 #  created_at     :datetime         not null
 #  updated_at     :datetime         not null
-#  ancestry       :string(255)
-#  pinned_index     :integer          default("0")
-#
-# Indexes
-#
-#  index_project_categories_on_ancestry  (ancestry)
 #
 
 class ProjectCategory < ApplicationRecord
   include Projectable
   has_ancestry
 
-  def logo_url
-    image_url('logo')
-  end
-
-  private
-
-  def image_url(type)
-    return nil unless Util::FileManage.exists?(self, type)
-    Util::FileManage.source_disk_file_url(self, type)
-  end
-
 end

app/models/project_trend.rb

@@ -20,8 +20,7 @@
 class ProjectTrend < ApplicationRecord
   CLOSE  = 'close'
   CREATE = 'create'
-  MERGE = 'merge'
+
-  
   belongs_to :project
   belongs_to :trend, polymorphic: true, optional: true
   belongs_to :user

app/models/pull_request.rb

@@ -37,36 +37,17 @@ 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_id, class_name: 'Gitea::Pull'
+  has_one :gitea_pull, foreign_key: :id, primary_key: :gitea_number, class_name: 'Gitea::Pull'
 
   scope :merged_and_closed, ->{where.not(status: 0)}
   scope :opening, -> {where(status: 0)}
 
-  after_create :incre_project_common, :incre_user_statistic, :incre_platform_statistic
+  after_save :reset_cache_data
-  after_destroy :decre_project_common, :decre_user_statistic, :decre_platform_statistic
+  after_destroy :reset_cache_data
 
-  def incre_project_common
+  def reset_cache_data 
-    CacheAsyncSetJob.perform_later("project_common_service", {pullrequests: 1}, self.project_id)
+    self.reset_platform_cache_async_job
-  end
+    self.reset_user_cache_async_job(self.user)
-
-  def decre_project_common
-    CacheAsyncSetJob.perform_later("project_common_service", {pullrequests: -1}, self.project_id)
-  end
-
-  def incre_user_statistic 
-    CacheAsyncSetJob.perform_later("user_statistic_service", {pullrequest_count: 1}, self.user_id)
-  end
-
-  def decre_user_statistic
-    CacheAsyncSetJob.perform_later("user_statistic_service", {pullrequest_count: -1}, self.user_id)
-  end
-
-  def incre_platform_statistic
-    CacheAsyncSetJob.perform_later("platform_statistic_service", {pullrequest_count: 1})
-  end
-
-  def decre_platform_statistic
-    CacheAsyncSetJob.perform_later("platform_statistic_service", {pullrequest_count: -1})
   end
 
   def fork_project

app/models/reversed_keyword.rb

@@ -18,10 +18,6 @@ class ReversedKeyword < ApplicationRecord
 
   before_validation :set_identifier 
 
-  def self.check_exists?(identifier)
-    self.is_reversed(identifier).exists?
-  end
-  
   private 
 
   def set_identifier 

app/models/site.rb

@@ -26,10 +26,6 @@ class Site < ApplicationRecord
     set_common_menu!
   end
 
-  def self.has_notice_menu?
-    self.common.where(key: 'notice').present?
-  end
-
   private
     def self.set_add_menu!
       adds= [
@@ -65,7 +61,7 @@ class Site < ApplicationRecord
       commons = [
         {name: '通知', key: 'notice', url: '/users/current_user/user_messages'},
         {name: '找回密码', key: 'lost_password', url: '/account/lost_password'},
-        {name: '注册', key: 'register', url: '/register'}
+        {name: '注册', key: 'register', url: '/login?login=false'}
       ]
 
       commons.each { |ele|

app/models/token.rb

@@ -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? || user.need_edit_info?)
+    if user && user.active?
       user
     end
   end
@@ -105,7 +105,7 @@ class Token < ActiveRecord::Base
   end
 
   def self.generate_token_value
-    Gitlink::Utils.random_hex(20)
+    Educoder::Utils.random_hex(20)
   end
 
   def self.delete_user_all_tokens(user)

app/models/user.rb

@@ -83,7 +83,6 @@ class User < Owner
   STATUS_ACTIVE     = 1
   STATUS_REGISTERED = 2
   STATUS_LOCKED     = 3
-  STATUS_EDIT_INFO   = 4
 
   # tpi tpm权限控制
   EDU_ADMIN = 1       # 超级管理员
@@ -117,6 +116,8 @@ class User < Owner
   enumerize :platform, in: [:forge, :educoder, :trustie, :military], default: :forge, scope: :shallow
 
   belongs_to :laboratory, optional: true
+  has_many :composes, dependent: :destroy
+  has_many :compose_users, dependent: :destroy
   has_one :user_extension, dependent: :destroy
   has_many :open_users, dependent: :destroy
   has_one :wechat_open_user, class_name: 'OpenUsers::Wechat'
@@ -170,13 +171,8 @@ class User < Owner
   has_many :pull_requests, dependent: :destroy
   has_many :public_keys, class_name: "Gitea::PublicKey",primary_key: :gitea_uid, foreign_key: :owner_id, dependent: :destroy
 
-  has_one :user_template_message_setting, dependent: :destroy
-
-  has_many :system_notification_histories
-  has_many :system_notifications, through: :system_notification_histories
-  
   # Groups and active users
-  scope :active, lambda { where(status: [STATUS_ACTIVE, STATUS_EDIT_INFO]) }
+  scope :active, lambda { where(status: STATUS_ACTIVE) }
   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?
@@ -191,7 +187,6 @@ class User < Owner
            :technical_title, :province, :city, :custom_department, to: :user_extension, allow_nil: true
 
   before_save :update_hashed_password, :set_lastname
-  after_save :reset_cache_data
   after_create do
     SyncTrustieJob.perform_later("user", 1) if allow_sync_to_trustie?
   end
@@ -208,10 +203,6 @@ class User < Owner
   validate :validate_sensitive_string
   validate :validate_password_length
 
-  def reset_cache_data
-    Cache::V2::OwnerCommonService.new(self.id).reset
-  end
-
   # 用户参与的所有项目
   def full_member_projects 
     normal_projects = Project.members_projects(self.id).to_sql
@@ -419,10 +410,6 @@ class User < Owner
     status == STATUS_LOCKED
   end
 
-  def need_edit_info?
-    status == STATUS_EDIT_INFO
-  end
-
   def activate
     self.status = STATUS_ACTIVE
   end
@@ -435,13 +422,8 @@ 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)
-    prohibit_gitea_user_login!(false)
   end
 
   def register!
@@ -450,16 +432,6 @@ class User < Owner
 
   def lock!
     update_attribute(:status, STATUS_LOCKED)
-    prohibit_gitea_user_login!
-  end
-
-  def prohibit_gitea_user_login!(prohibit_login = true)
-    Gitea::User::UpdateInteractor.call(self.login, 
-      {email: self.mail, prohibit_login: prohibit_login})
-  end
-
-  def need_edit_info!
-    update_attribute(:status, STATUS_EDIT_INFO)
   end
 
   # 课程用户身份
@@ -703,7 +675,7 @@ class User < Owner
   end
 
   def self.generate_salt
-    Gitlink::Utils.random_hex(16)
+    Educoder::Utils.random_hex(16)
   end
 
   # 全部已认证

app/models/watcher.rb

@@ -22,40 +22,22 @@ class Watcher < ApplicationRecord
 
   scope :watching_users, ->(watchable_id){ where("watchable_type = ? and user_id = ?",'User',watchable_id)}
 
-  after_create :send_create_message_to_notice_system, :incre_project_common, :incre_user_statistic, :incre_platform_statistic
+  after_save :reset_cache_data
-  after_destroy :decre_project_common, :decre_user_statistic, :decre_platform_statistic
+  after_destroy :reset_cache_data
+  after_create :send_create_message_to_notice_system
 
-
+  def reset_cache_data 
-  def incre_project_common
+    if self.watchable.is_a?(User)
-    CacheAsyncSetJob.perform_later("project_common_service", {watchers: 1}, self.watchable_id) if self.watchable_type == "Project"
+      self.reset_user_cache_async_job(self.watchable)
-  end
+    end
-
+    if self.watchable.is_a?(Project)
-  def decre_project_common
+      self.reset_user_cache_async_job(self.watchable&.owner)
-    CacheAsyncSetJob.perform_later("project_common_service", {watchers: -1}, self.watchable_id) if self.watchable_type == "Project"
+    end
-  end
+    self.reset_platform_cache_async_job
-
-  def incre_user_statistic 
-    CacheAsyncSetJob.perform_later("user_statistic_service", {follow_count: 1}, self.watchable_id) if self.watchable_type == "User"
-    CacheAsyncSetJob.perform_later("user_statistic_service", {project_watcher_count: 1}, self.watchable&.user_id) if self.watchable_type == "Project"
-  end
-
-  def decre_user_statistic
-    CacheAsyncSetJob.perform_later("user_statistic_service", {follow_count: -1}, self.watchable_id) if self.watchable_type == "User"
-    CacheAsyncSetJob.perform_later("user_statistic_service", {project_watcher_count: -1}, self.watchable&.user_id) if self.watchable_type == "Project"
-  end
-
-  def incre_platform_statistic
-    CacheAsyncSetJob.perform_later("platform_statistic_service", {follow_count: 1}) if self.watchable_type == "User"
-    CacheAsyncSetJob.perform_later("platform_statistic_service", {project_watcher_count: 1}) if self.watchable_type == "Project"
-  end
-
-  def decre_platform_statistic
-    CacheAsyncSetJob.perform_later("platform_statistic_service", {follow_count: -1}) if self.watchable_type == "User"
-    CacheAsyncSetJob.perform_later("platform_statistic_service", {project_watcher_count: -1}) if self.watchable_type == "Project"
   end
 
   def send_create_message_to_notice_system
-    SendTemplateMessageJob.perform_later('FollowTip', self.id) if self.watchable.is_a?(User) if Site.has_notice_menu?
+    SendTemplateMessageJob.perform_later('FollowTip', self.id) if self.watchable.is_a?(User)
   end
 
 end

app/queries/admins/course_list_query.rb

@@ -19,7 +19,7 @@ class Admins::CourseListQuery < ApplicationQuery
       case search_type
       when "0"
         course_lists = course_lists.joins(:user)
-                      .where('CONCAT(lastname, firstname) like :keyword', keyword: "%#{keyword}%")
+                      .where('CONCAT(lastname, firstname) like :keyword OR users.nickname like :keyword', keyword: "%#{keyword}%")
       when "1"
         course_lists = course_lists.where('name like :keyword', keyword: "%#{keyword}%")
       end

app/queries/admins/course_query.rb

@@ -35,7 +35,7 @@ class Admins::CourseQuery < ApplicationQuery
     # 关键字
     keyword = params[:keyword].to_s.strip
     if keyword
-      sql = 'CONCAT(lastname, firstname) LIKE :keyword OR courses.name LIKE :keyword OR course_lists.name LIKE :keyword'
+      sql = 'CONCAT(lastname, firstname) LIKE :keyword OR users.nickname LIKE :keyword OR courses.name LIKE :keyword OR course_lists.name LIKE :keyword'
       courses = courses.joins(:teacher, :course_list).where(sql, keyword: "%#{keyword}%")
     end
 

app/queries/admins/laboratory_shixun_query.rb

@@ -11,7 +11,7 @@ class Admins::LaboratoryShixunQuery < ApplicationQuery
 
     keyword = params[:keyword].to_s.strip
     if keyword.present?
-      like_sql = 'shixuns.name LIKE :keyword OR CONCAT(users.lastname, users.firstname) LIKE :keyword'
+      like_sql = 'shixuns.name LIKE :keyword OR CONCAT(users.lastname, users.firstname) LIKE :keyword OR users.nickname LIKE :keyword'
       laboratory_shixuns = laboratory_shixuns.joins(shixun: :user).where(like_sql, keyword: "%#{keyword}%")
     end
 

app/queries/admins/subject_query.rb

@@ -40,7 +40,7 @@ class Admins::SubjectQuery < ApplicationQuery
     # 关键字
     keyword = params[:keyword].to_s.strip
     if keyword
-      sql = 'CONCAT(lastname, firstname) LIKE :keyword OR subjects.name LIKE :keyword'
+      sql = 'CONCAT(lastname, firstname) LIKE :keyword OR users.nickname LIKE :keyword OR subjects.name LIKE :keyword'
       subjects = subjects.joins(:user).where(sql, keyword: "%#{keyword}%")
     end
 

app/queries/projects/list_query.rb

@@ -11,45 +11,19 @@ class Projects::ListQuery < ApplicationQuery
   end
 
   def call
-    collection = Project.all
+    q = Project.visible.by_name_or_identifier(params[:search])
-    collection = filter_projects(collection)
+
+    scope = q
+      .with_project_type(params[:project_type])
+      .with_project_category(params[:category_id])
+      .with_project_language(params[:language_id])
 
     sort = params[:sort_by] || "updated_on"
     sort_direction = params[:sort_direction] || "desc"
 
-    custom_sort(collection, sort, sort_direction)
+    custom_sort(scope, sort, sort_direction)
 
     # scope = scope.reorder("projects.#{sort} #{sort_direction}")
     # scope
   end
-
-  def filter_projects(collection)
-    collection = by_pinned(collection)
-    collection = by_search(collection)
-    collection = by_project_type(collection)
-    collection = by_project_category(collection)
-    collection = by_project_language(collection)
-    collection 
-  end
-
-  def by_search(items)
-    items.visible.by_name_or_identifier(params[:search])
-  end
-  
-  def by_project_type(items)
-    items.with_project_type(params[:project_type])
-  end
-
-  def by_project_category(items)
-    items.with_project_category(params[:category_id])
-  end
-
-  def by_project_language(items)
-    items.with_project_language(params[:language_id])
-  end
-  
-  def by_pinned(items)
-    (params[:pinned].present? && params[:category_id].present?) ? items.pinned : items
-  end
-  
 end

app/queries/weapps/subject_query.rb

@@ -28,10 +28,10 @@ class Weapps::SubjectQuery < ApplicationQuery
   private
 
   def order_type
-    params[:order] || "updated_at"
+    Subject.column_names.include?(params[:order]) ? params[:order] : 'updated_at'
   end
 
   def sort_type
-    params[:sort] || "desc"
+    %w(desc asc).include?(params[:sort]) ? params[:sort] : "desc"
   end
 end

app/services/admins/update_user_service.rb

@@ -15,13 +15,19 @@ class Admins::UpdateUserService < ApplicationService
     user.firstname = ''
     user.password = params[:password] if params[:password].present?
 
+    if params[:identity].to_s == 'student'
+      params[:technical_title] = nil
+    else
+      params[:student_id] = nil
+    end
     user.user_extension.assign_attributes(user_extension_attributes)
 
-    old_login = user.login
     ActiveRecord::Base.transaction do
       user.save!
       user.user_extension.save!
-      update_gitea_user(old_login)
+      user.update!(is_shixun_marker: true) if user.is_certification_teacher
+
+      update_gitlab_password if params[:password].present?
     end
 
     user
@@ -30,7 +36,7 @@ class Admins::UpdateUserService < ApplicationService
   private
 
   def user_attributes
-    params.slice(*%i[lastname nickname mail phone admin business is_test login
+    params.slice(*%i[lastname nickname mail phone admin business is_test
                      professional_certification authentication is_shixun_marker])
   end
 
@@ -38,29 +44,10 @@ class Admins::UpdateUserService < ApplicationService
     params.slice(*%i[gender identity technical_title student_id location location_city school_id department_id])
   end
 
-  def gitea_user_params
+  def update_gitlab_password
-    hash = {
+    return if user.gid.blank?
-      password: params[:password].to_s.presence,
+    # 同步修改gitlab密码
-      email: user.mail,
+    Gitlab.client.edit_user(user.gid, password: params[:password])
-      login_name: params[:login].to_s.presence,
-      admin: boolean_admin
-    }.compact
-
-    hash.delete_if {|_,v| v.to_s.strip == ''}
-  end
-
-  def boolean_admin
-    admin = params[:admin].to_s.presence
-    case admin
-    when "0" then false
-    when "1" then true
-    end
-  end
-
-  def update_gitea_user(old_login)
-    return if user.gitea_uid.blank?
-
-    Gitea::User::UpdateInteractor.call(old_login, gitea_user_params)
   rescue Exception => ex
     Util.logger_error(ex)
     raise Error, '保存失败'

app/services/application_service.rb

@@ -18,9 +18,4 @@ class ApplicationService
   def str_to_boolean str
     ActiveModel::Type::Boolean.new.cast str
   end
-
-  def phone_mail_type value
-    value =~ /^1\d{10}$/ ? 1 : 0
-  end
-
 end

app/services/gitea/client_service.rb

@@ -82,8 +82,6 @@ class Gitea::ClientService < ApplicationService
         req.headers['Content-Type'] = 'application/json'
         req.response :logger # 显示日志
         req.adapter Faraday.default_adapter
-        req.options.timeout = 100           # open/read timeout in seconds
-        req.options.open_timeout = 10      # connection open timeout in seconds
         if token.blank?
           req.basic_auth(username, secret)
         else

app/services/gitea/repository/update_service.rb

@@ -19,8 +19,7 @@ class Gitea::Repository::UpdateService < Gitea::ClientService
   end
 
   def call
-    response = patch(url, data_params)
+    patch(url, data_params)
-    render_200_response(response)
   end
 
   private

app/services/notice/write/email_create_service.rb

@@ -21,7 +21,7 @@ class Notice::Write::EmailCreateService < Notice::Write::ClientService
   end
 
   def request_subject
-    "#{subject}"
+    "Trustie: #{subject}"
   end
 
   def request_params

app/services/projects/accept_join_service.rb

@@ -53,8 +53,8 @@ class Projects::AcceptJoinService < ApplicationService
 
   def operate_project_member
     Projects::AddMemberInteractor.call(@project.owner, @project, @applied_project.user, permission)
-    SendTemplateMessageJob.perform_later('ProjectJoined', @user.id, @applied_project.user_id, @project.id) if Site.has_notice_menu?
+    SendTemplateMessageJob.perform_later('ProjectJoined', @user.id, @applied_project.user_id, @project.id)
-    SendTemplateMessageJob.perform_later('ProjectMemberJoined', @user.id, @applied_project.user_id, @project.id) if Site.has_notice_menu?
+    SendTemplateMessageJob.perform_later('ProjectMemberJoined', @user.id, @applied_project.user_id, @project.id)
   end
 
   def send_apply_message