fix: atme sender info

fix: user rank
fix: change params is blank not sent email
2021-11-10 11:32:59 +08:00 · 2021-11-10 10:47:03 +08:00 · 2021-11-10 10:05:35 +08:00 · 2021-11-10 09:43:22 +08:00 · 2021-11-09 17:04:45 +08:00 · 2021-11-09 16:56:49 +08:00
134 changed files with 2843 additions and 590 deletions
--- a/api_document.md
+++ b/api_document.md
@ -51,6 +51,51 @@ 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
 {
--- a/app/assets/images/logo.png
+++ b/app/assets/images/logo.png
--- a/app/assets/javascripts/admin.js
+++ b/app/assets/javascripts/admin.js
@ -99,3 +99,38 @@ $(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 {
+    }
+  });
+})
--- a/app/assets/javascripts/admins/projects/index.js
+++ b/app/assets/javascripts/admins/projects/index.js
@ -0,0 +1,141 @@
+/*
+ * @Description: Do not edit
+ * @Date: 2021-08-31 11:16:45
+ * @LastEditors: viletyy
+ * @Author: viletyy
+ * @LastEditTime: 2021-08-31 14:19:46
+ * @FilePath: /forgeplus/app/assets/javascripts/admins/system_notifications/index.js
+ */
+$(document).on('turbolinks:load', function(){
+
+    var showSuccessNotify = function() {
+      $.notify({
+        message: '操作成功'
+      },{
+        type: 'success'
+      });
+    }
+
+    // close user
+    $('.project-list-container').on('click', '.recommend-action', function(){
+      var $closeAction = $(this);
+      var $uncloseAction = $closeAction.siblings('.unrecommend-action');
+      var $editAction = $closeAction.siblings('.edit-recommend-action');
+
+      var keywordID = $closeAction.data('id');
+      customConfirm({
+        content: '确认将该项目设置为推荐项目吗?',
+        ok: function(){
+          $.ajax({
+            url: '/admins/projects/' + keywordID,
+            method: 'PUT',
+            dataType: 'json',
+            data: {
+              project: {
+                recommend: true,
+                recommend_index: 1
+              }
+            },
+            success: function() {
+              showSuccessNotify();
+              $closeAction.hide();
+              $uncloseAction.show();
+              $editAction.show();
+              $(".project-item-"+keywordID).children('td').eq(5).text("√")
+            }
+          });
+        }
+      });
+    });
+
+    // unclose user
+    $('.project-list-container').on('click', '.unrecommend-action', function(){
+      var $uncloseAction = $(this);
+      var $closeAction = $uncloseAction.siblings('.recommend-action');
+      var $editAction = $closeAction.siblings('.edit-recommend-action');
+
+      var keywordID = $uncloseAction.data('id');
+      customConfirm({
+        content: '确认取消该推荐项目吗？',
+        ok: function () {
+          $.ajax({
+            url: '/admins/projects/' + keywordID,
+            method: 'PUT',
+            dataType: 'json',
+            data: {
+              project: {
+                recommend: false,
+                recommend_index: 0
+              }
+            },
+            success: function() {
+              showSuccessNotify();
+              $closeAction.show();
+              $uncloseAction.hide();
+              $editAction.hide();
+              $(".project-item-"+keywordID).children('td').eq(5).text("")
+            }
+          });
+        }
+      })
+    });
+
+
+    // close user
+    $('.project-list-container').on('click', '.pinned-action', function(){
+      var $closeAction = $(this);
+      var $uncloseAction = $closeAction.siblings('.unpinned-action');
+
+      var keywordID = $closeAction.data('id');
+      customConfirm({
+        content: '确认将该项目设置为精选项目吗?',
+        ok: function(){
+          $.ajax({
+            url: '/admins/projects/' + keywordID,
+            method: 'PUT',
+            dataType: 'json',
+            data: {
+              project: {
+                is_pinned: true,
+              }
+            },
+            success: function() {
+              showSuccessNotify();
+              $closeAction.hide();
+              $uncloseAction.show();
+              $(".project-item-"+keywordID).children('td').eq(4).text("√")
+            }
+          });
+        }
+      });
+    });
+
+    // unclose user
+    $('.project-list-container').on('click', '.unpinned-action', function(){
+      var $uncloseAction = $(this);
+      var $closeAction = $uncloseAction.siblings('.pinned-action');
+
+      var keywordID = $uncloseAction.data('id');
+      customConfirm({
+        content: '确认取消该精选项目吗？',
+        ok: function () {
+          $.ajax({
+            url: '/admins/projects/' + keywordID,
+            method: 'PUT',
+            dataType: 'json',
+            data: {
+              project: {
+                is_pinned: false,
+              }
+            },
+            success: function() {
+              showSuccessNotify();
+              $closeAction.show();
+              $uncloseAction.hide();
+              $(".project-item-"+keywordID).children('td').eq(4).text("")
+            }
+          });
+        }
+      })
+    });
+})
--- a/app/assets/stylesheets/admin.scss
+++ b/app/assets/stylesheets/admin.scss
@ -58,3 +58,149 @@ 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;
+  }
+}
--- a/app/controllers/accounts_controller.rb
+++ b/app/controllers/accounts_controller.rb
@ -1,4 +1,5 @@
 class AccountsController < ApplicationController
+  include ApplicationHelper

  #skip_before_action :check_account, :only => [:logout]

@ -9,7 +10,7 @@ class AccountsController < ApplicationController
  # 其他平台同步注册的用户
  def remote_register
    username = params[:username]&.gsub(/\s+/, "")
-    tip_exception("无法使用以下关键词：#{username}，请重新命名") if ReversedKeyword.is_reversed(username).present?
+    tip_exception("无法使用以下关键词：#{username}，请重新命名") if ReversedKeyword.check_exists?(username)
    email = params[:email]&.gsub(/\s+/, "")
    password = params[:password]
    platform = (params[:platform] || 'forge')&.gsub(/\s+/, "")
@ -109,60 +110,46 @@ class AccountsController < ApplicationController
  # 用户注册
  # 注意：用户注册需要兼顾本地版，本地版是不需要验证码及激活码以及使用授权的，注册完成即可使用
  # params[:login] 邮箱或者手机号
+  # params[:namespace] 登录名
  # params[:code]  验证码
  # code_type 1：注册手机验证码  8：邮箱注册验证码
-  # 本地forge注册入口
+  # 本地forge注册入口需要重新更改逻辑
  def register
+    # type只可能是1或者8
+    user = nil
    begin
-      # 查询验证码是否正确;type只可能是1或者8
-      type = phone_mail_type(params[:login].strip)
-      # code = params[:code].strip
+      Register::Form.new(register_params).validate!

-      if type == 1
-        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
+      user = Users::RegisterService.call(register_params)
+      password = register_params[:password].strip

-      code = generate_identifier User, 8, pre
-      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]})
+      # gitea用户注册, email, username, password
+      interactor = Gitea::RegisterInteractor.call({username: user.login, email: user.mail, password: password})
      if interactor.success?
        gitea_user = interactor.result
-        result = Gitea::User::GenerateTokenService.new(login, params[:password]).call
-        @user.gitea_token = result['sha1']
-        @user.gitea_uid = gitea_user[:body]['id']
-        if @user.save!
-          UserExtension.create!(user_id: @user.id)
-          successful_authentication(@user)
-          normal_status("注册成功")
+        result = Gitea::User::GenerateTokenService.call(user.login, password)
+        user.gitea_token = result['sha1']
+        user.gitea_uid = gitea_user[:body]['id']
+        if user.save!
+          UserExtension.create!(user_id: user.id)
+          successful_authentication(user)
+          render_ok
        end
      else
        tip_exception(-1, interactor.error)
      end
+    rescue Register::BaseForm::EmailError => e
+      render_error(-2, e.message)
+    rescue Register::BaseForm::LoginError => e
+      render_error(-3, e.message)
+    rescue Register::BaseForm::PhoneError => e
+      render_error(-4, e.message)
+    rescue Register::BaseForm::PasswordFormatError => e
+      render_error(-5, e.message)
+    rescue Register::BaseForm::VerifiCodeError => e
+      render_error(-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
@ -297,7 +284,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
@ -311,19 +298,22 @@ 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)
-    sucess_status
+    render_ok
  end

-  # 1 手机类型；0 邮箱类型
-  # 注意新版的login是自动名生成的
-  def phone_mail_type value
-    value =~ /^1\d{10}$/ ? 1 : 0
+  # check user's login or email or phone is used
+  # params[:value]  手机号或者邮箱号或者登录名
+  # params[:type] 为事件类型 1：登录名(login) 2：email(邮箱) 3：phone(手机号)
+  def check
+    Register::CheckColumnsForm.new(check_params).validate!
+    render_ok
  end
-
+  
  private

  # type 事件类型 1：用户注册 2：忘记密码 3: 绑定手机 4: 绑定邮箱, 5: 验证手机号是否有效 # 如果有新的继续后面加
@ -369,4 +359,13 @@ class AccountsController < ApplicationController
  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, :code)
+  end
+  
 end
--- a/app/controllers/admins/project_categories_controller.rb
+++ b/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)
+    @project_category = ProjectCategory.new(name: @name,position: max_position, pinned_index: params[:project_category][:pinned_index].to_i)
    if @project_category.save
      redirect_to admins_project_categories_path
      flash[:success] = '创建成功'
@ -33,7 +33,7 @@ class Admins::ProjectCategoriesController < Admins::BaseController
  end

  def update 
-    if @project_category.update_attribute(:name, @name)
+    if @project_category.update_attributes({name: @name, pinned_index: params[:project_category][:pinned_index].to_i}) && save_image_file(params[:logo], 'logo')
      redirect_to admins_project_categories_path
      flash[:success] = '更新成功'
    else 
@ -43,7 +43,7 @@ class Admins::ProjectCategoriesController < Admins::BaseController
  end

  def destroy 
-    if @project_language.destroy 
+    if @project_category.destroy 
      redirect_to admins_project_categories_path
      flash[:success] = "删除成功"
    else 
@ -80,4 +80,12 @@ 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
--- a/app/controllers/admins/projects_controller.rb
+++ b/app/controllers/admins/projects_controller.rb
@ -1,4 +1,5 @@
 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'
@ -8,6 +9,26 @@ 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
@ -21,4 +42,13 @@ 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
--- a/app/controllers/admins/system_notifications_controller.rb
+++ b/app/controllers/admins/system_notifications_controller.rb
@ -10,6 +10,10 @@ class Admins::SystemNotificationsController < Admins::BaseController
    @notifications = paginate(notifications)
  end

+  def history
+    @users = @notification.users
+  end
+
  def new 
    @notification = SystemNotification.new
  end
--- a/app/controllers/admins/users_controller.rb
+++ b/app/controllers/admins/users_controller.rb
@ -1,4 +1,6 @@
 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'
@ -8,12 +10,9 @@ 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)
@ -26,43 +25,47 @@ class Admins::UsersController < Admins::BaseController
  end

  def destroy
-    User.find(params[:id]).destroy!
+    @user.destroy!
+    Gitea::User::DeleteService.call(@user.login)

    render_delete_success
  end

  def lock
-    User.find(params[:id]).lock!
+    @user.lock!

    render_ok
  end

  def unlock
-    User.find(params[:id]).activate!
+    @user.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.find(params[:id]).reset_login_times!
+    @user.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])
+                                    password professional_certification authentication login])
  end
 end
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@ -70,49 +70,11 @@ 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
@ -120,16 +82,16 @@ class ApplicationController < ActionController::Base
 					 login =~ /^[a-zA-Z0-9]+([._\\]*[a-zA-Z0-9])$/
 			tip_exception(-2, "请输入正确的手机号或邮箱")
 		end
-		# 考虑到安全参数问题，多一次查询，去掉Union
-		user = User.where(phone: login).first ||  User.where(mail: login).first
-		if type.to_i == 1 && !user.nil?
+	
+		user_exist = Owner.exists?(phone: login) || Owner.exists?(mail: login)
+		if user_exist && type.to_i == 1
 			tip_exception(-2, "该手机号码或邮箱已被注册")
-		elsif type.to_i == 2 && user.nil?
+		elsif type.to_i == 2 && !user_exist
 			tip_exception(-2, "该手机号码或邮箱未注册")
-		elsif type.to_i == 3 && user.present?
+		elsif type.to_i == 3 && user_exist
 			tip_exception(-2, "该手机号码或邮箱已绑定")
 		end
-		sucess_status
+		render_ok
 	end

 	# 发送及记录激活码
@ -186,26 +148,6 @@ 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
@ -215,21 +157,6 @@ 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
@ -855,4 +782,8 @@ class ApplicationController < ActionController::Base
 		HotSearchKeyword.add(keyword)
 	end

+  def find_atme_receivers
+    @atme_receivers = User.where(login: params[:receivers_login])
+  end
+
 end
--- a/app/controllers/concerns/render_helper.rb
+++ b/app/controllers/concerns/render_helper.rb
@ -3,8 +3,8 @@ module RenderHelper
    render json: { status: 0, message: 'success' }.merge(data)
  end

-  def render_error(message = '')
-    render json: { status: -1, message: message }
+  def render_error(status = -1, message = '')
+    render json: { status: status, message: message }
  end

  def render_not_acceptable(message = '请求已拒绝')
--- a/app/controllers/issues_controller.rb
+++ b/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, only: [:create, :update]
+  before_action :check_token_enough, :find_atme_receivers, only: [:create, :update]

  include ApplicationHelper
  include TagChosenHelper
@ -142,6 +142,10 @@ 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, "创建失败")
@ -244,6 +248,10 @@ 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, "更新失败")
--- a/app/controllers/journals_controller.rb
+++ b/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, only: [:create]
+  before_action :require_profile_completed, :find_atme_receivers, only: [:create]
  before_action :set_issue
  before_action :check_issue_permission
  before_action :set_journal, only: [:destroy, :edit, :update]
@ -22,32 +22,35 @@ class JournalsController < ApplicationController
    if notes.blank?
      normal_status(-1, "评论内容不能为空")
    else
-      journal_params = {
-        journalized_id: @issue.id ,
-        journalized_type: "Issue",
-        user_id: current_user.id ,
-        notes: notes.to_s.strip,
-        parent_id: params[:parent_id]
-      }
-      journal = Journal.new journal_params
-      if journal.save
-        if params[:attachment_ids].present?
-          params[:attachment_ids].each do |id|
-            attachment = Attachment.select(:id, :container_id, :container_type)&.find_by_id(id)
-            unless attachment.blank?
-              attachment.container = journal
-              attachment.author_id = current_user.id
-              attachment.description = ""
-              attachment.save
+      ActiveRecord::Base.transaction do
+        journal_params = {
+          journalized_id: @issue.id ,
+          journalized_type: "Issue",
+          user_id: current_user.id ,
+          notes: notes.to_s.strip,
+          parent_id: params[:parent_id]
+        }
+        journal = Journal.new journal_params
+        if journal.save
+          if params[:attachment_ids].present?
+            params[:attachment_ids].each do |id|
+              attachment = Attachment.select(:id, :container_id, :container_type)&.find_by_id(id)
+              unless attachment.blank?
+                attachment.container = journal
+                attachment.author_id = current_user.id
+                attachment.description = ""
+                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
--- a/app/controllers/organizations/organizations_controller.rb
+++ b/app/controllers/organizations/organizations_controller.rb
@ -22,11 +22,12 @@ 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.is_reversed(organization_params[:name]).present?
+      tip_exception("无法使用以下关键词：#{organization_params[:name]}，请重新命名") if ReversedKeyword.check_exists?(organization_params[:name])
      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?
@ -68,8 +69,7 @@ class Organizations::OrganizationsController < Organizations::BaseController
  def recommend
    recommend = %W(xuos Huawei_Technology openatom_foundation pkecosystem TensorLayer)
    
-    @organizations = Organization.with_visibility(%w(common))
-      .where(login: recommend).select(:id, :login, :firstname, :lastname, :nickname)
+    @organizations = Organization.includes(:organization_extension).where(organization_extensions: {recommend: true}).to_a.each_slice(group_size).to_a
  end

  private
@ -80,6 +80,10 @@ 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
--- a/app/controllers/project_categories_controller.rb
+++ b/app/controllers/project_categories_controller.rb
@ -5,6 +5,10 @@ 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
--- a/app/controllers/project_rank_controller.rb
+++ b/app/controllers/project_rank_controller.rb
@ -0,0 +1,26 @@
+class ProjectRankController < ApplicationController
+  # 根据时间获取热门项目
+  def index 
+    $redis_cache.zunionstore("recent-days-project-rank", get_timeable_key_names)
+    deleted_data = $redis_cache.smembers("v2-project-rank-deleted")
+    $redis_cache.zrem("recent-days-project-rank", deleted_data) unless deleted_data.blank?
+    @project_rank = $redis_cache.zrevrange("recent-days-project-rank", 0, 4, withscores: true)
+  rescue Exception => e
+    @project_rank = []
+  end
+
+  private 
+  # 默认显示7天的
+  def time
+    params.fetch(:time, 7).to_i
+  end
+
+  def get_timeable_key_names
+    names_array = []
+    (0...time).to_a.each do |i|
+      date_time_string = (Date.today - i.days).to_s
+      names_array << "v2-project-rank-#{date_time_string}"
+    end
+    names_array
+  end
+end
--- a/app/controllers/projects/members_controller.rb
+++ b/app/controllers/projects/members_controller.rb
@ -0,0 +1,6 @@
+class Projects::MembersController < Projects::BaseController
+  def index 
+    users = @project.all_collaborators.like(params[:search]).includes(:user_extension)
+    @users = kaminari_paginate(users)
+  end
+end
--- a/app/controllers/projects_controller.rb
+++ b/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 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 banner_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]
+  before_action :load_repository, except: %i[index group_type_list migrate create recommend banner_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)
-    @projects = paginate scope.includes(:project_category, :project_language, :repository, :project_educoder, :owner, :project_units)
+    @projects = kaminari_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 =
@ -190,6 +190,8 @@ class ProjectsController < ApplicationController
  end

  def simple
+    # 为了缓存活跃项目的基本信息，后续删除
+    Cache::V2::ProjectCommonService.new(@project.id).read
    json_response(@project, current_user)
  end

@ -197,6 +199,10 @@ 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?
--- a/app/controllers/pull_requests_controller.rb
+++ b/app/controllers/pull_requests_controller.rb
@ -5,6 +5,7 @@ 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

@ -61,6 +62,8 @@ class PullRequestsController < ApplicationController
        @pull_request.bind_gitea_pull_request!(@gitea_pull_request[:body]["number"], @gitea_pull_request[:body]["id"])
        SendTemplateMessageJob.perform_later('PullRequestAssigned', current_user.id, @pull_request&.id) if Site.has_notice_menu?
        SendTemplateMessageJob.perform_later('ProjectPullRequest', current_user.id, @pull_request&.id) if Site.has_notice_menu?
+        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
      else
        render_error("create pull request error: #{@gitea_pull_request[:status]}")
        raise ActiveRecord::Rollback
@ -106,6 +109,8 @@ 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更新失败")
--- a/app/controllers/repositories_controller.rb
+++ b/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
--- a/app/controllers/user_rank_controller.rb
+++ b/app/controllers/user_rank_controller.rb
@ -0,0 +1,24 @@
+class UserRankController < ApplicationController
+  # 根据时间获取热门开发者
+  def index 
+    $redis_cache.zunionstore("recent-days-user-rank", get_timeable_key_names)
+    @user_rank = $redis_cache.zrevrange("recent-days-user-rank", 0, 3, withscores: true)
+  rescue Exception => e
+    @user_rank = []
+  end
+
+  private 
+  # 默认显示7天的
+  def time
+    params.fetch(:time, 7).to_i
+  end
+
+  def get_timeable_key_names
+    names_array = []
+    (0...time).to_a.each do |i|
+      date_time_string = (Date.today - i.days).to_s
+      names_array << "v2-user-rank-#{date_time_string}"
+    end
+    names_array
+  end
+end
--- a/app/controllers/users/statistics_controller.rb
+++ b/app/controllers/users/statistics_controller.rb
@ -188,30 +188,32 @@ 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 = Cache::UserFollowCountService.call(observed_user)
-      @platform_follow_count = Cache::PlatformFollowCountService.call
+      @follow_count = @user_result["follow-count"].to_i
+      @platform_follow_count = @platform_result["follow-count"].to_i
      # 用户pr数量
-      @pullrequest_count = Cache::UserPullrequestCountService.call(observed_user)
-      @platform_pullrequest_count = Cache::PlatformPullrequestCountService.call
+      @pullrequest_count = @user_result["pullrequest-count"].to_i
+      @platform_pullrequest_count = @platform_result["pullrequest-count"].to_i
      # 用户issue数量
-      @issues_count = Cache::UserIssueCountService.call(observed_user)
-      @platform_issues_count = Cache::PlatformIssueCountService.call
+      @issues_count = @user_result["issue-count"].to_i
+      @platform_issues_count = @platform_result["issue-count"].to_i
      # 用户总项目数 
-      @project_count = Cache::UserProjectCountService.call(observed_user)
-      @platform_project_count = Cache::PlatformProjectCountService.call
+      @project_count = @user_result["project-count"].to_i
+      @platform_project_count = @platform_result["project-count"].to_i
      # 用户项目被fork数量
-      @fork_count = Cache::UserProjectForkCountService.call(observed_user)
-      @platform_fork_count = Cache::PlatformProjectForkCountService.call
+      @fork_count = @user_result["fork-count"].to_i
+      @platform_fork_count = @platform_result["fork-count"].to_i
      # 用户项目关注数
-      @project_watchers_count = Cache::UserProjectWatchersCountService.call(observed_user)
-      @platform_project_watchers_count = Cache::PlatformProjectWatchersCountService.call 
+      @project_watchers_count = @user_result["project-watcher-count"].to_i
+      @platform_project_watchers_count = @platform_result["project-watcher-count"].to_i
      # 用户项目点赞数
-      @project_praises_count = Cache::UserProjectPraisesCountService.call(observed_user)
-      @platform_project_praises_count = Cache::PlatformProjectPraisesCountService.call
+      @project_praises_count = @user_result["project-praise-count"].to_i
+      @platform_project_praises_count = @platform_result["project-praise-count"].to_i
      # 用户不同语言项目数量
-      @project_languages_count = Cache::UserProjectLanguagesCountService.call(observed_user)
-      @platform_project_languages_count = Cache::PlatformProjectLanguagesCountService.call
+      @project_languages_count = JSON.parse(@user_result["project-language"])
+      @platform_project_languages_count = JSON.parse(@platform_result["project-language"])
    end
  end
 end
--- a/app/controllers/users/system_notification_histories_controller.rb
+++ b/app/controllers/users/system_notification_histories_controller.rb
@ -0,0 +1,15 @@
+class Users::SystemNotificationHistoriesController < Users::BaseController 
+  before_action :private_user_resources!, only: [:create]
+  def create 
+    @history = observed_user.system_notification_histories.new(system_notification_id: params[:system_notification_id])
+    if @history.save
+      render_ok
+    else 
+      Rails.logger.info @history.errors.as_json
+      render_error(@history.errors.full_messages.join(","))
+    end
+  rescue Exception => e
+    uid_logger_error(e.message)
+    tip_exception(e.message)
+  end
+end
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@ -51,6 +51,8 @@ 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
@ -191,7 +193,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') + '/projects'
+    domain_url = EduSetting.get('host_name')
    if projects.present?
      projects.each do |p|
        project_url = "/#{p.owner.login}/#{p.identifier}"
--- a/app/docs/slate/source/images/logo.png
+++ b/app/docs/slate/source/images/logo.png
--- a/app/docs/slate/source/images/trustie_logo.png
+++ b/app/docs/slate/source/images/trustie_logo.png
--- a/app/docs/slate/source/includes/_users.md
+++ b/app/docs/slate/source/includes/_users.md
@ -199,6 +199,36 @@ 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

--- a/app/forms/base_form.rb
+++ b/app/forms/base_form.rb
@ -23,7 +23,11 @@ class BaseForm
  end

  def check_reversed_keyword(repository_name)
-    raise "项目标识已被占用." if ReversedKeyword.is_reversed(repository_name).exists?
+    raise "项目标识已被占用." if ReversedKeyword.check_exists?(repository_name)
+  end
+
+  private
+  def strip(str)
+    str.to_s.strip.presence
  end
-  
 end
--- a/app/forms/projects/update_form.rb
+++ b/app/forms/projects/update_form.rb
@ -3,11 +3,12 @@ class Projects::UpdateForm < BaseForm
  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)
-    Rails.logger.info project_identifier
-    Rails.logger.info identifier
+
    check_repository_name(user_id, identifier) unless identifier.blank? || identifier == project_identifier
  end

--- a/app/forms/register/base_form.rb
+++ b/app/forms/register/base_form.rb
@ -0,0 +1,51 @@
+module Register
+  class BaseForm < ::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)
+    
+    private
+    def check_login(login)
+      login = strip(login)
+      raise LoginError, "登录名格式有误" unless login =~ CustomRegexp::LOGIN
+
+      login_exist = Owner.exists?(login: login) || ReversedKeyword.check_exists?(login)
+      raise LoginError, '登录名已被使用' if login_exist
+    end
+
+    def check_mail(mail)
+      mail = strip(mail)
+      raise EmailError, "邮件格式有误" unless mail =~ CustomRegexp::EMAIL
+  
+      mail_exist = Owner.exists?(mail: mail)
+      raise EmailError, '邮箱已被使用' if mail_exist
+    end
+    
+    def check_phone(phone)
+      phone = strip(phone)
+      raise PhoneError, "手机号格式有误" unless phone =~ CustomRegexp::PHONE
+
+      phone_exist = Owner.exists?(phone: phone)
+      raise PhoneError, '手机号已被使用' if phone_exist
+    end
+
+    def check_password(password)
+      password = strip(password)
+      raise PasswordFormatError, "8~16位密码，支持字母数字和符号" unless password =~ CustomRegexp::PASSWORD
+    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
+    
+  end
+end
--- a/app/forms/register/check_columns_form.rb
+++ b/app/forms/register/check_columns_form.rb
@ -0,0 +1,19 @@
+module Register
+  class CheckColumnsForm < Register::BaseForm
+    attr_accessor :type, :value
+
+    validates :type, presence: true, numericality: true
+    validates :value, presence: true
+    validate :check!
+    
+    def check!
+      # params[:type] 为事件类型 1：登录名(login) 2：email(邮箱) 3：phone(手机号)
+      case strip(type).to_i
+      when 1 then check_login(strip(value))
+      when 2 then check_mail(strip(value))
+      when 3 then check_phone(strip(value))
+      else raise("type值无效")
+      end
+    end
+  end
+end
--- a/app/forms/register/form.rb
+++ b/app/forms/register/form.rb
@ -0,0 +1,27 @@
+module Register
+  class Form < Register::BaseForm
+    # login 登陆方式，支持邮箱、登陆、手机号等
+    # namespace 用户空间地址
+    # type: 1：手机号注册；2：邮箱注册
+    attr_accessor :login, :namespace, :password, :code, :type
+
+    validates :login, :code, :password, :namespace, presence: true
+    validate :check!
+    
+    def check!
+      Rails.logger.info "Register::Form params: code: #{code}; login: #{login}; namespace: #{namespace}; password: #{password}; type: #{type}"
+      db_verifi_code = 
+        if type == 1
+          check_phone(login)
+          VerificationCode.where(phone: login, code: code, code_type: 1).last
+        elsif type == 0
+          check_mail(login)
+          VerificationCode.where(email: login, code: code, code_type: 8).last
+        end
+      
+      check_login(namespace)
+      check_verifi_code(db_verifi_code, code)
+      check_password(password)
+    end
+  end
+end
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@ -442,6 +442,14 @@ 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
@ -455,5 +463,11 @@ 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
  
 end
--- a/app/helpers/avatar_helper.rb
+++ b/app/helpers/avatar_helper.rb
@ -0,0 +1,26 @@
+module AvatarHelper
+  def relative_path
+    "avatars"
+  end
+
+  def storage_path
+    File.join(Rails.root, "public", "images", relative_path)
+  end
+
+  def disk_filename(source_type,source_id,image_file=nil)
+    File.join(storage_path, "#{source_type}", "#{source_id}")
+  end
+
+  def url_to_avatar(source)
+    if File.exist?(disk_filename(source&.class, source&.id))
+      ctime = File.ctime(disk_filename(source.class, source.id)).to_i
+      if %w(User Organization).include?(source.class.to_s)
+        File.join("images", relative_path, ["#{source.class}", "#{source.id}"]) + "?t=#{ctime}"
+      else
+        File.join("images/avatars", ["#{source.class}", "#{source.id}"]) + "?t=#{ctime}"
+      end
+    elsif source.class.to_s == 'User'
+      source.get_letter_avatar_url
+    end
+  end
+end
--- a/app/helpers/repositories_helper.rb
+++ b/app/helpers/repositories_helper.rb
@ -35,6 +35,16 @@ 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
--- a/app/jobs/cache_async_clear_job.rb
+++ b/app/jobs/cache_async_clear_job.rb
@ -0,0 +1,12 @@
+class CacheAsyncClearJob < ApplicationJob
+  queue_as :cache
+
+  def perform(type, id=nil)
+    case type 
+    when "project_common_service"
+      Cache::V2::ProjectCommonService.new(id).clear
+    when "owner_common_service"
+      Cache::V2::OwnnerCommonService.new(id).clear
+    end
+  end
+end
--- a/app/jobs/cache_async_reset_job.rb
+++ b/app/jobs/cache_async_reset_job.rb
@ -0,0 +1,16 @@
+class CacheAsyncResetJob < ApplicationJob
+  queue_as :cache
+
+  def perform(type, id=nil)
+    case type 
+    when "platform_statistic_service"
+      Cache::V2::PlatformStatisticService.new.reset
+    when "project_common_service"
+      Cache::V2::ProjectCommonService.new(id).reset
+    when "owner_common_service"
+      Cache::V2::OwnnerCommonService.new(id).reset
+    when "user_statistic_service"
+      Cache::V2::UserStatisticService.new(id).reset
+    end
+  end
+end
--- a/app/jobs/cache_async_set_job.rb
+++ b/app/jobs/cache_async_set_job.rb
@ -0,0 +1,16 @@
+class CacheAsyncSetJob < ApplicationJob
+  queue_as :cache
+
+  def perform(type, params={}, id=nil)
+    case type 
+    when "platform_statistic_service"
+      Cache::V2::PlatformStatisticService.new(params).call
+    when "project_common_service"
+      Cache::V2::ProjectCommonService.new(id, params).call
+    when "owner_common_service"
+      Cache::V2::OwnnerCommonService.new(id, params).call
+    when "user_statistic_service"
+      Cache::V2::UserStatisticService.new(id, params).call
+    end
+  end
+end
--- a/app/jobs/send_template_message_job.rb
+++ b/app/jobs/send_template_message_job.rb
@ -36,9 +36,9 @@ 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)
+      Notice::Write::CreateService.call(receivers_string, content, notification_url, source, {operator_id: operator.id, issue_id: issue.id}, 2, operator_id)
    when 'IssueChanged'
      operator_id, issue_id, change_params = args[0], args[1], args[2]
      operator = User.find_by_id(operator_id)
@ -234,9 +234,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)
+      Notice::Write::CreateService.call(receivers_string, content, notification_url, source, {operator_id: operator.id, pull_request_id: pull_request.id}, 2, operator_id)
    when 'PullRequestChanged'
      operator_id, pull_request_id, change_params = args[0], args[1], args[2]
      operator = User.find_by_id(operator_id)
--- a/app/libs/custom_regexp.rb
+++ b/app/libs/custom_regexp.rb
@ -1,6 +1,7 @@
 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/
--- a/app/mailers/user_mailer.rb
+++ b/app/mailers/user_mailer.rb
@ -1,17 +1,11 @@
 class UserMailer < ApplicationMailer
  # 注意：这个地方一定要和你的邮箱服务域名一致
-  default from: 'educoder@trustie.org'
+  default from: 'notification@trustie.org'

  # 用户注册验证码
  def register_email(mail, code)
    @code = code
-    mail(to: mail, subject: '验证你的电子邮件')
+    mail(to: mail, subject: 'Gitink | 注册验证码')
  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
--- a/app/models/application_record.rb
+++ b/app/models/application_record.rb
@ -17,14 +17,6 @@ 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
--- a/app/models/fork_user.rb
+++ b/app/models/fork_user.rb
@ -20,12 +20,30 @@ class ForkUser < ApplicationRecord
  belongs_to :user
  belongs_to :fork_project, class_name: 'Project', foreign_key: :fork_project_id

-  after_save :reset_cache_data
-  after_destroy :reset_cache_data
+  after_create :incre_project_common, :incre_user_statistic, :incre_platform_statistic
+  after_destroy :decre_project_common, :decre_user_statistic, :decre_platform_statistic

-  def reset_cache_data 
-    self.reset_platform_cache_async_job
-    self.reset_user_cache_async_job(self.project.owner)
+  def incre_project_common
+    CacheAsyncSetJob.perform_later("project_common_service", {forks: 1}, self.project_id)
  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
--- a/app/models/issue.rb
+++ b/app/models/issue.rb
@ -74,13 +74,32 @@ 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_save :reset_cache_data
-  after_destroy :update_closed_issues_count_in_project!, :reset_cache_data
+  after_destroy :update_closed_issues_count_in_project!, :decre_project_common, :decre_user_statistic, :decre_platform_statistic

-  def reset_cache_data 
-    self.reset_platform_cache_async_job
-    self.reset_user_cache_async_job(self.user)
+  def incre_project_common
+    CacheAsyncSetJob.perform_later("project_common_service", {issues: 1}, self.project_id)
+  end
+
+  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
--- a/app/models/message_template.rb
+++ b/app/models/message_template.rb
@ -17,55 +17,55 @@ 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: '{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: 'Gitlink: {nickname1} 在 {nickname2}/{repository} 指派给你一个易修')
    self.create(type: 'MessageTemplate::IssueAssignerExpire', sys_notice: '您负责的易修 <b>{title}</b> 已临近截止日期，请尽快处理', notification_url: '{baseurl}/{owner}/{identifier}/issues/{id}')
    self.create(type: 'MessageTemplate::IssueAtme', sys_notice: '<b>{nickname}</b> 在易修 <b>{title}</b> 中@我', notification_url: '{baseurl}/{owner}/{identifier}/issues/{id}')
    email_html = File.read("#{email_template_html_dir}/issue_changed.html")
-    self.create(type: 'MessageTemplate::IssueChanged', sys_notice: '在项目 <b>{nickname2}/{repository}</b> 的易修 <b>{title}</b> 中：{ifassigner}{nickname1}将负责人从 <b>{assigner1}</b> 修改为 <b>{assigner2}</b> {endassigner}{ifstatus}{nickname1}将状态从 <b>{status1}</b> 修改为 <b>{status2}</b> {endstatus}{iftracker}{nickname1}将类型从 <b>{tracker1}</b> 修改为 <b>{tracker2}</b> {endtracker}{ifpriority}{nickname1}将优先级从 <b>{priority1}</b> 修改为 <b>{priority2}</b> {endpriority}{ifmilestone}{nickname1}将里程碑从 <b>{milestone1}</b> 修改为 <b>{milestone2}</b> {endmilestone}{iftag}{nickname1}将标记从 <b>{tag1}</b> 修改为 <b>{tag2}</b> {endtag}{ifdoneratio}{nickname1}将完成度从 <b>{doneratio1}</b> 修改为 <b>{doneratio2}</b> {enddoneratio}{ifbranch}{nickname1}将指定分支从 <b>{branch1}</b> 修改为 <b>{branch2}</b> {endbranch}{ifstartdate}{nickname1}将开始日期从 <b>{startdate1}</b> 修改为 <b>{startdate2}</b> {endstartdate}{ifduedate}{nickname1}将结束日期从 <b>{duedate1}</b> 修改为 <b>{duedate2}</b> {endduedate}', email: email_html, email_title: '易修 {title} 有状态变更', 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> 删除', email: email_html, email_title: '易修 {title} 有状态变更', 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: '你已加入 {organization} 组织')
+    self.create(type: 'MessageTemplate::OrganizationJoined', sys_notice: '你已加入 <b>{organization}</b> 组织', notification_url: '{baseurl}/{login}', email: email_html, email_title: 'Gitlink: 你已加入 {organization} 组织')
    email_html = File.read("#{email_template_html_dir}/organization_left.html")
-    self.create(type: 'MessageTemplate::OrganizationLeft', sys_notice: '你已被移出 <b>{organization}</b> 组织', notification_url: '', email: email_html, email_title: '你已被移出 {organization} 组织')
+    self.create(type: 'MessageTemplate::OrganizationLeft', sys_notice: '你已被移出 <b>{organization}</b> 组织', notification_url: '', email: email_html, email_title: 'Gitlink: 你已被移出 {organization} 组织')
    email_html = File.read("#{email_template_html_dir}/organization_role.html")
-    self.create(type: 'MessageTemplate::OrganizationRole', sys_notice: '组织 <b>{organization}</b> 已把你的角色改为 <b>{role}</b>', email: email_html, email_title: '在 {organization} 组织你的账号有权限变更', 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: '{nickname1} 在 {nickname2}/{repository} 新建了一个易修')
+    self.create(type: 'MessageTemplate::ProjectIssue', sys_notice: '{nickname1}在 <b>{nickname2}/{repository}</b> 新建易修：<b>{title}</b>', notification_url: '{baseurl}/{owner}/{identifier}/issues/{id}', email: email_html, email_title: 'Gitlink: {nickname1} 在 {nickname2}/{repository} 新建了一个易修')
    email_html = File.read("#{email_template_html_dir}/project_joined.html")
-    self.create(type: 'MessageTemplate::ProjectJoined', sys_notice: '你已加入 <b>{repository}</b> 项目', notification_url: '{baseurl}/{owner}/{identifier}', email: email_html, email_title: '你已加入 {repository} 项目')
+    self.create(type: 'MessageTemplate::ProjectJoined', sys_notice: '你已加入 <b>{repository}</b> 项目', notification_url: '{baseurl}/{owner}/{identifier}', email: email_html, email_title: 'Gitlink: 你已加入 {repository} 项目')
    email_html = File.read("#{email_template_html_dir}/project_left.html")
-    self.create(type: 'MessageTemplate::ProjectLeft', sys_notice: '你已被移出 <b>{repository}</b> 项目', notification_url: '', email: email_html, email_title: '你已被移出 {repository} 项目')
+    self.create(type: 'MessageTemplate::ProjectLeft', sys_notice: '你已被移出 <b>{repository}</b> 项目', notification_url: '', email: email_html, email_title: 'Gitlink: 你已被移出 {repository} 项目')
    email_html = File.read("#{email_template_html_dir}/project_member_joined.html")
-    self.create(type: 'MessageTemplate::ProjectMemberJoined', sys_notice: '<b>{nickname1}</b> 已加入项目 <b>{nickname2}/{repository}</b>', notification_url: '{baseurl}/{owner}/{identifier}', email: email_html, email_title: '{nickname1} 已加入项目 {nickname2}/{repository}')
+    self.create(type: 'MessageTemplate::ProjectMemberJoined', sys_notice: '<b>{nickname1}</b> 已加入项目 <b>{nickname2}/{repository}</b>', notification_url: '{baseurl}/{owner}/{identifier}', email: email_html, email_title: 'Gitlink: {nickname1} 已加入项目 {nickname2}/{repository}')
    email_html = File.read("#{email_template_html_dir}/project_member_left.html")
-    self.create(type: 'MessageTemplate::ProjectMemberLeft', sys_notice: '<b>{nickname1}</b> 已被移出项目 <b>{nickname2}/{repository}</b>', notification_url: '{baseurl}/{owner}/{identifier}', email: email_html, email_title: '{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: 'Gitlink: {nickname1} 已被移出项目 {nickname2}/{repository}')
    self.create(type: 'MessageTemplate::ProjectMilestone', sys_notice: '{nickname1}在 <b>{nickname2}/{repository}</b> 创建了一个里程碑：<b>{title}</b>', notification_url: '{baseurl}/{owner}/{identifier}/milestones/{id}')
    self.create(type: 'MessageTemplate::ProjectPraised', sys_notice: '<b>{nickname}</b> 点赞了你管理的仓库', notification_url: '{baseurl}/{login}')
    email_html = File.read("#{email_template_html_dir}/project_pull_request.html")
-    self.create(type: 'MessageTemplate::ProjectPullRequest', sys_notice: '{nickname1}在 <b>{nickname2}/{repository}</b> 提交了一个合并请求：<b>{title}</b>', notification_url: '{baseurl}/{owner}/{identifier}/pulls/{id}', email: email_html, email_title: '{nickname1} 在 {nickname2}/{repository} 提交了一个合并请求')
+    self.create(type: 'MessageTemplate::ProjectPullRequest', sys_notice: '{nickname1}在 <b>{nickname2}/{repository}</b> 提交了一个合并请求：<b>{title}</b>', notification_url: '{baseurl}/{owner}/{identifier}/pulls/{id}', email: email_html, email_title: 'Gitlink: {nickname1} 在 {nickname2}/{repository} 提交了一个合并请求')
    email_html = File.read("#{email_template_html_dir}/project_role.html")
-    self.create(type: 'MessageTemplate::ProjectRole', sys_notice: '仓库 <b>{nickname}/{repository}</b> 已把你的角色改为 <b>{role}</b>', email: email_html, email_title: '在 {nickname}/{repository} 项目你的账号有权限变更', notification_url: '{baseurl}/{owner}/{identifier}')
+    self.create(type: 'MessageTemplate::ProjectRole', sys_notice: '仓库 <b>{nickname}/{repository}</b> 已把你的角色改为 <b>{role}</b>', email: email_html, email_title: 'Gitlink: 在 {nickname}/{repository} 项目你的账号有权限变更', notification_url: '{baseurl}/{owner}/{identifier}')
    email_html = File.read("#{email_template_html_dir}/project_setting_changed.html")
-    self.create(type: 'MessageTemplate::ProjectSettingChanged', sys_notice: '{nickname1}更改了 <b>{nickname2}/{repository}</b> 仓库设置：{ifname}更改项目名称为"<b>{name}</b>"{endname}{ifidentifier}更改项目标识为"<b>{identifier}</b>"{endidentifier}{ifdescription}更改项目简介为"<b>{description}</b>"{enddescription}{ifcategory}更改项目类别为"<b>{category}</b>"{endcategory}{iflanguage}更改项目语言为"<b>{language}</b>"{endlanguage}{ifpermission}将仓库设为"<b>{permission}</b>"{endpermission}{ifnavbar}将项目导航更改为"<b>{navbar}</b>"{endnavbar}', notification_url: '{baseurl}/{owner}/{identifier}/settings', email: email_html, email_title: '您管理的仓库 {nickname2}/{repository} 仓库设置已被更改')
+    self.create(type: 'MessageTemplate::ProjectSettingChanged', sys_notice: '{nickname1}更改了 <b>{nickname2}/{repository}</b> 仓库设置：{ifname}更改项目名称为"<b>{name}</b>"{endname}{ifidentifier}更改项目标识为"<b>{identifier}</b>"{endidentifier}{ifdescription}更改项目简介为"<b>{description}</b>"{enddescription}{ifcategory}更改项目类别为"<b>{category}</b>"{endcategory}{iflanguage}更改项目语言为"<b>{language}</b>"{endlanguage}{ifpermission}将仓库设为"<b>{permission}</b>"{endpermission}{ifnavbar}将项目导航更改为"<b>{navbar}</b>"{endnavbar}', notification_url: '{baseurl}/{owner}/{identifier}/settings', email: email_html, email_title: 'Gitlink: 您管理的仓库 {nickname2}/{repository} 仓库设置已被更改')
    self.create(type: 'MessageTemplate::ProjectTransfer', sys_notice: '你关注的仓库{nickname1}/{repository1}已被转移至{nickname2}/{repository2}', notification_url: '{baseurl}/{owner}/{identifier}')
    self.create(type: 'MessageTemplate::ProjectVersion', sys_notice: '{nickname1}在 <b>{nickname2}/{repository}</b> 创建了发行版：<b>{title}</b>', notification_url: '{baseurl}/{owner}/{identifier}/releases')
    email_html = File.read("#{email_template_html_dir}/pull_request_assigned.html")
-    self.create(type: 'MessageTemplate::PullRequestAssigned', sys_notice: '{nickname1}在 <b>{nickname2}/{repository}</b> 指派给你一个合并请求：<b>{title}<b>', notification_url: '{baseurl}/{owner}/{identifier}/pulls/{id}', email: email_html, email_title: '{nickname1} 在 {nickname2}/{repository} 指派给你一个合并请求')
+    self.create(type: 'MessageTemplate::PullRequestAssigned', sys_notice: '{nickname1}在 <b>{nickname2}/{repository}</b> 指派给你一个合并请求：<b>{title}<b>', notification_url: '{baseurl}/{owner}/{identifier}/pulls/{id}', email: email_html, email_title: 'Gitlink: {nickname1} 在 {nickname2}/{repository} 指派给你一个合并请求')
    self.create(type: 'MessageTemplate::PullRequestAtme', sys_notice: '<b>{nickname}</b> 在合并请求 <b>{title}</b> 中@我', notification_url: '{baseurl}/{owner}/{identifier}/pulls/{id}')
    email_html = File.read("#{email_template_html_dir}/pull_request_changed.html")
-    self.create(type: 'MessageTemplate::PullRequestChanged', sys_notice: '在项目{nickname2}/{repository}的合并请求 <b>{title}</b> 中：{ifassigner}{nickname1}将审查成员从 <b>{assigner1}</b> 修改为 <b>{assigner2}</b> {endassigner}{ifmilestone}{nickname1}将里程碑从 <b>{milestone1}</b> 修改为 <b>{milestone2}</b> {endmilestone}{iftag}{nickname1}将标记从 <b>{tag1}</b> 修改为 <b>{tag2}</b> {endtag}{ifpriority}{nickname1}将优先级从 <b>{priority1}</b> 修改为 <b>{priority2}</b> {endpriority}', email: email_html, email_title: '合并请求 {title} 有状态变更', notification_url: '{baseurl}/{owner}/{identifier}/pulls/{id}')
+    self.create(type: 'MessageTemplate::PullRequestChanged', sys_notice: '在项目{nickname2}/{repository}的合并请求 <b>{title}</b> 中：{ifassigner}{nickname1}将审查成员从 <b>{assigner1}</b> 修改为 <b>{assigner2}</b> {endassigner}{ifmilestone}{nickname1}将里程碑从 <b>{milestone1}</b> 修改为 <b>{milestone2}</b> {endmilestone}{iftag}{nickname1}将标记从 <b>{tag1}</b> 修改为 <b>{tag2}</b> {endtag}{ifpriority}{nickname1}将优先级从 <b>{priority1}</b> 修改为 <b>{priority2}</b> {endpriority}', email: email_html, email_title: 'Gitlink: 合并请求 {title} 有状态变更', notification_url: '{baseurl}/{owner}/{identifier}/pulls/{id}')
    email_html = File.read("#{email_template_html_dir}/pull_request_closed.html")
-    self.create(type: 'MessageTemplate::PullRequestClosed', sys_notice: '你提交的合并请求：{title} <b>被拒绝</b>', email: email_html, email_title: '合并请求 {title} 有状态变更', notification_url: '')
+    self.create(type: 'MessageTemplate::PullRequestClosed', sys_notice: '你提交的合并请求：{title} <b>被拒绝</b>', email: email_html, email_title: 'Gitlink: 合并请求 {title} 有状态变更', notification_url: '')
    self.create(type: 'MessageTemplate::PullRequestJournal', sys_notice: '{nickname}评论合并请求{title}：<b>{notes}</b>', notification_url: '{baseurl}/{owner}/{identifier}/pulls/{id}')
    email_html = File.read("#{email_template_html_dir}/pull_request_merged.html")
-    self.create(type: 'MessageTemplate::PullRequestMerged', sys_notice: '你提交的合并请求：{title} <b>已通过</b>', email: email_html, email_title: '合并请求 {title} 有状态变更', notification_url: '{baseurl}/{owner}/{identifier}/pulls/{id}')
+    self.create(type: 'MessageTemplate::PullRequestMerged', sys_notice: '你提交的合并请求：{title} <b>已通过</b>', email: email_html, email_title: 'Gitlink: 合并请求 {title} 有状态变更', notification_url: '{baseurl}/{owner}/{identifier}/pulls/{id}')
  end

  def self.sys_notice
--- a/app/models/message_template/issue_changed.rb
+++ b/app/models/message_template/issue_changed.rb
@ -188,6 +188,7 @@ class MessageTemplate::IssueChanged < MessageTemplate
  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
--- a/app/models/message_template/pull_request_changed.rb
+++ b/app/models/message_template/pull_request_changed.rb
@ -100,6 +100,7 @@ class MessageTemplate::PullRequestChanged < MessageTemplate
  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
--- a/app/models/organization.rb
+++ b/app/models/organization.rb
@ -76,11 +76,17 @@ 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,
+  delegate :description, :website, :location, :repo_admin_change_team_access, :recommend,
           :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
--- a/app/models/organization_extension.rb
+++ b/app/models/organization_extension.rb
@ -15,6 +15,7 @@
 #  num_projects                  :integer          default("0")
 #  num_users                     :integer          default("0")
 #  num_teams                     :integer          default("0")
+#  recommend                     :boolean          default("0")
 #
 # Indexes
 #
@ -30,6 +31,8 @@ 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,
@ -39,4 +42,9 @@ class OrganizationExtension < ApplicationRecord
                 visibility: visibility,
                 max_repo_creation: max_repo_creation)
  end
+
+  private 
+  def set_recommend
+    self.recommend = false unless self.common?
+  end
 end
--- a/app/models/praise_tread.rb
+++ b/app/models/praise_tread.rb
@ -1,35 +1,51 @@
-# == Schema Information
-#
-# Table name: praise_treads
-#
-#  id                       :integer          not null, primary key
-#  user_id                  :integer          not null
-#  praise_tread_object_id   :integer
-#  praise_tread_object_type :string(255)
-#  praise_or_tread          :integer          default("1")
-#  created_at               :datetime         not null
-#  updated_at               :datetime         not null
-#
-# Indexes
-#
-#  praise_tread  (praise_tread_object_id,praise_tread_object_type)
-#
-
+# == Schema Information
+#
+# Table name: praise_treads
+#
+#  id                       :integer          not null, primary key
+#  user_id                  :integer          not null
+#  praise_tread_object_id   :integer
+#  praise_tread_object_type :string(255)
+#  praise_or_tread          :integer          default("1")
+#  created_at               :datetime         not null
+#  updated_at               :datetime         not null
+#
+# Indexes
+#
+#  praise_tread  (praise_tread_object_id,praise_tread_object_type)
+#
+

 class PraiseTread < ApplicationRecord
  belongs_to :user
  belongs_to :praise_tread_object, polymorphic: true, counter_cache: :praises_count
  has_many :tidings, :as => :container, :dependent => :destroy

-  after_create :send_tiding
-  after_save :reset_cache_data
-  after_destroy :reset_cache_data
+  after_create :send_tiding, :incre_project_common, :incre_user_statistic, :incre_platform_statistic
+  after_destroy :decre_project_common, :decre_user_statistic, :decre_platform_statistic

-  def reset_cache_data 
-    self.reset_platform_cache_async_job
-    if self.praise_tread_object.is_a?(Project)
-      self.reset_user_cache_async_job(self.praise_tread_object&.owner)
-    end
+  def incre_project_common
+    CacheAsyncSetJob.perform_later("project_common_service", {praises: 1}, self.praise_tread_object_id) if self.praise_tread_object_type == "Project"
+  end
+
+  def decre_project_common
+    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
--- a/app/models/project.rb
+++ b/app/models/project.rb
@ -55,8 +55,9 @@
 #  platform               :integer          default("0")
 #  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,6 +80,7 @@



+
 class Project < ApplicationRecord
  include Matchable
  include Publicable
@ -126,13 +128,15 @@ 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_save :check_project_members
-  before_save :set_invite_code, :reset_cache_data, :reset_unmember_followed
-  after_destroy :reset_cache_data
-  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)}
+  after_create :incre_user_statistic, :incre_platform_statistic
+  after_save :check_project_members, :reset_cache_data
+  before_save :set_invite_code, :reset_unmember_followed, :set_recommend_and_is_pinned
+  before_destroy :decre_project_common
+  after_destroy :decre_user_statistic, :decre_platform_statistic
+  scope :project_statics_select, -> {select(:id,:name, :is_public, :identifier, :status, :project_type, :user_id, :forked_count, :description, :visits, :project_category_id, :project_language_id, :license_id, :ignore_id, :watchers_count, :created_on)}
  scope :no_anomory_projects, -> {where("projects.user_id is not null and projects.user_id != ?", 2)}
  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
@ -150,12 +154,48 @@ class Project < ApplicationRecord
  end

  def reset_cache_data 
+    CacheAsyncResetJob.perform_later("project_common_service", self.id)
    if changes[:user_id].present?
-      first_owner = Owner.find_by_id(changes[:user_id].first) 
-      self.reset_user_cache_async_job(first_owner)
+      CacheAsyncSetJob.perform_later("user_statistic_service", {project_count: -1}, changes[:user_id].first)
+      CacheAsyncSetJob.perform_later("user_statistic_service", {project_count: 1}, changes[:user_id].last)
+    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
@ -170,6 +210,16 @@ 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
--- a/app/models/project_category.rb
+++ b/app/models/project_category.rb
@ -8,10 +8,27 @@
 #  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
--- a/app/models/pull_request.rb
+++ b/app/models/pull_request.rb
@ -42,12 +42,31 @@ class PullRequest < ApplicationRecord
  scope :merged_and_closed, ->{where.not(status: 0)}
  scope :opening, -> {where(status: 0)}

-  after_save :reset_cache_data
-  after_destroy :reset_cache_data
+  after_create :incre_project_common, :incre_user_statistic, :incre_platform_statistic
+  after_destroy :decre_project_common, :decre_user_statistic, :decre_platform_statistic

-  def reset_cache_data 
-    self.reset_platform_cache_async_job
-    self.reset_user_cache_async_job(self.user)
+  def incre_project_common
+    CacheAsyncSetJob.perform_later("project_common_service", {pullrequests: 1}, self.project_id)
+  end
+
+  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
--- a/app/models/reversed_keyword.rb
+++ b/app/models/reversed_keyword.rb
@ -18,6 +18,10 @@ class ReversedKeyword < ApplicationRecord

  before_validation :set_identifier 

+  def self.check_exists?(identifier)
+    self.is_reversed(identifier).exists?
+  end
+  
  private 

  def set_identifier 
--- a/app/models/system_notification.rb
+++ b/app/models/system_notification.rb
@ -15,6 +15,13 @@ class SystemNotification < ApplicationRecord

  default_scope { order(created_at: :desc)}

+  has_many :system_notification_histories
+  has_many :users, through: :system_notification_histories
+
  scope :is_top, lambda { where(is_top: true) }

+  def read_member?(user_id)
+    self.system_notification_histories.where(user_id: user_id).present? ? true : false
+  end
+
 end
--- a/app/models/system_notification_history.rb
+++ b/app/models/system_notification_history.rb
@ -0,0 +1,23 @@
+# == Schema Information
+#
+# Table name: system_notification_histories
+#
+#  id                :integer          not null, primary key
+#  system_message_id :integer
+#  user_id           :integer
+#  created_at        :datetime         not null
+#  updated_at        :datetime         not null
+#
+# Indexes
+#
+#  index_system_notification_histories_on_system_message_id  (system_message_id)
+#  index_system_notification_histories_on_user_id            (user_id)
+#
+
+class SystemNotificationHistory < ApplicationRecord
+
+  belongs_to :system_notification
+  belongs_to :user
+
+  validates :system_notification_id, uniqueness: { scope: :user_id, message: '只能阅读一次'}
+end
--- a/app/models/user.rb
+++ b/app/models/user.rb
@ -116,8 +116,6 @@ 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'
@ -173,6 +171,9 @@ class User < Owner

  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) }
  scope :like, lambda { |keywords|
@ -189,6 +190,7 @@ 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
@ -205,6 +207,10 @@ 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
@ -426,6 +432,7 @@ class User < Owner

  def activate!
    update_attribute(:status, STATUS_ACTIVE)
+    prohibit_gitea_user_login!(false)
  end

  def register!
@ -434,6 +441,12 @@ 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

  # 课程用户身份
--- a/app/models/watcher.rb
+++ b/app/models/watcher.rb
@ -22,18 +22,36 @@ class Watcher < ApplicationRecord

  scope :watching_users, ->(watchable_id){ where("watchable_type = ? and user_id = ?",'User',watchable_id)}

-  after_save :reset_cache_data
-  after_destroy :reset_cache_data
-  after_create :send_create_message_to_notice_system
+  after_create :send_create_message_to_notice_system, :incre_project_common, :incre_user_statistic, :incre_platform_statistic
+  after_destroy :decre_project_common, :decre_user_statistic, :decre_platform_statistic

-  def reset_cache_data 
-    if self.watchable.is_a?(User)
-      self.reset_user_cache_async_job(self.watchable)
-    end
-    if self.watchable.is_a?(Project)
-      self.reset_user_cache_async_job(self.watchable&.owner)
-    end
-    self.reset_platform_cache_async_job
+
+  def incre_project_common
+    CacheAsyncSetJob.perform_later("project_common_service", {watchers: 1}, self.watchable_id) if self.watchable_type == "Project"
+  end
+
+  def decre_project_common
+    CacheAsyncSetJob.perform_later("project_common_service", {watchers: -1}, self.watchable_id) if self.watchable_type == "Project"
+  end
+
+  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
--- a/app/queries/projects/list_query.rb
+++ b/app/queries/projects/list_query.rb
@ -11,19 +11,45 @@ class Projects::ListQuery < ApplicationQuery
  end

  def call
-    q = Project.visible.by_name_or_identifier(params[:search])
-
-    scope = q
-      .with_project_type(params[:project_type])
-      .with_project_category(params[:category_id])
-      .with_project_language(params[:language_id])
+    collection = Project.all
+    collection = filter_projects(collection)

    sort = params[:sort_by] || "updated_on"
    sort_direction = params[:sort_direction] || "desc"

-    custom_sort(scope, sort, sort_direction)
+    custom_sort(collection, 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
--- a/app/services/admins/update_user_service.rb
+++ b/app/services/admins/update_user_service.rb
@ -15,19 +15,13 @@ 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!
-      user.update!(is_shixun_marker: true) if user.is_certification_teacher
-
-      update_gitlab_password if params[:password].present?
+      update_gitea_user(old_login)
    end

    user
@ -36,7 +30,7 @@ class Admins::UpdateUserService < ApplicationService
  private

  def user_attributes
-    params.slice(*%i[lastname nickname mail phone admin business is_test
+    params.slice(*%i[lastname nickname mail phone admin business is_test login
                     professional_certification authentication is_shixun_marker])
  end

@ -44,10 +38,29 @@ class Admins::UpdateUserService < ApplicationService
    params.slice(*%i[gender identity technical_title student_id location location_city school_id department_id])
  end

-  def update_gitlab_password
-    return if user.gid.blank?
-    # 同步修改gitlab密码
-    Gitlab.client.edit_user(user.gid, password: params[:password])
+  def gitea_user_params
+    hash = {
+      password: params[:password].to_s.presence,
+      email: user.mail,
+      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, '保存失败'
--- a/app/services/atme_service.rb
+++ b/app/services/atme_service.rb
@ -0,0 +1,37 @@
+class AtmeService < ApplicationService
+  Error = Class.new(StandardError)
+
+  attr_reader :user, :receivers, :atmeable
+
+  def initialize(user, receivers, atmeable)
+    @user = user
+    @receivers = receivers
+    @atmeable = atmeable
+  end
+
+  def call
+    Rails.logger.info "[ATME] service args: [user]=>#{user}, [receivers]=>#{receivers}, [atmeable]=>#{atmeable}"
+    return if atmeable.nil?
+    Rails.logger.info "[ATME] atmeable class name is:  #{ atmeable.class.name}"
+    case atmeable.class.name
+    when 'Issue'
+      message_source = 'IssueAtme'
+    when 'PullRequest'
+      message_source = 'PullRequestAtme'
+    when 'Journal'
+      journal = Journal.find_by_id(atmeable.id)
+      if journal.present?
+        if journal&.issue&.pull_request.present?
+          @atmeable = journal&.issue&.pull_request
+          message_source = 'PullRequestAtme'
+        else
+          @atmeable = journal&.issue
+          message_source = 'IssueAtme'
+        end
+      end
+    else 
+      return 
+    end
+    SendTemplateMessageJob.perform_now(message_source, receivers, user.id, @atmeable.id) if Site.has_notice_menu?
+  end
+end
--- a/app/services/cache/v2/owner_common_service.rb
+++ b/app/services/cache/v2/owner_common_service.rb
@ -0,0 +1,135 @@
+class Cache::V2::OwnerCommonService < ApplicationService 
+  include AvatarHelper
+  attr_reader :owner_id, :name
+  attr_accessor :owner, :login, :email
+
+  def initialize(owner_id, params={})
+    @owner_id = owner_id
+    @email = params[:email]
+    @name = params[:name]
+    @avatar_url = params[:avatar_url]
+  end
+
+  def read  
+    owner_common
+  end
+
+  def call 
+    set_owner_common
+  end
+
+  def reset 
+    reset_owner_common
+  end
+
+  def clear 
+    clear_owner_common
+  end
+
+  private 
+  def load_owner 
+    @owner = Owner.find_by_id @owner_id
+    @login = @owner&.login
+    @email ||= @owner&.mail
+  end
+
+  def owner_common_key
+    "v2-owner-common:#{@login}-#{@email.to_s}"
+  end
+
+  def owner_common_key_by_id
+    "v2-owner-common:#{@owner&.id}"
+  end
+
+  def owner_common
+    result = $redis_cache.hgetall(owner_common_key_by_id)
+    result.blank? ? reset_owner_common : result
+  end
+
+  def set_owner_common
+    if $redis_cache.hgetall(owner_common_key_by_id).blank?
+      reset_owner_common
+      return
+    else
+      load_owner
+      return if @owner.nil?
+      if @name.present?
+        if $redis_cache.hget(owner_common_key, "name").nil?
+          reset_owner_name
+        else
+          $redis_cache.hset(owner_common_key, "name", @name)   
+          $redis_cache.hset(owner_common_key_by_id, "name", @name) 
+        end
+      end
+      if @email.present?
+        if $redis_cache.hget(owner_common_key, "email").nil?
+          reset_owner_email
+        else
+          # 更改邮箱这里把旧数据删除
+          $redis_cache.del("v2-owner-common:#{@login}-*")
+          $redis_cache.hset(owner_common_key, "email", @email) 
+          $redis_cache.hset(owner_common_key_by_id, "email", @email) 
+        end    
+      end
+      if @avatar_url.present?
+        if $redis_cache.hget(owner_common_key, "avatar_url").nil?
+          reset_owner_avatar_url
+        else
+          $redis_cache.hset(owner_common_key, "avatar_url", @avatar_url) 
+          $redis_cache.hset(owner_common_key_by_id, "avatar_url", @avatar_url)
+        end
+
+      end
+    end
+
+    $redis_cache.hgetall(owner_common_key)
+  end
+  def reset_owner_id
+    $redis_cache.hset(owner_common_key, "id", owner&.id) 
+    $redis_cache.hset(owner_common_key_by_id, "id", owner&.id) 
+  end
+
+  def reset_owner_type 
+    $redis_cache.hset(owner_common_key, "type", owner&.type) 
+    $redis_cache.hset(owner_common_key_by_id, "type", owner&.type) 
+  end
+
+  def reset_owner_login 
+    $redis_cache.hset(owner_common_key, "login", owner&.login) 
+    $redis_cache.hset(owner_common_key_by_id, "login", owner&.login) 
+  end
+
+  def reset_owner_email 
+    $redis_cache.hset(owner_common_key, "email", owner&.mail) 
+    $redis_cache.hset(owner_common_key_by_id, "email", owner&.mail) 
+  end
+
+  def reset_owner_name 
+    $redis_cache.hset(owner_common_key, "name", owner&.real_name) 
+    $redis_cache.hset(owner_common_key_by_id, "name", owner&.real_name) 
+  end
+
+  def reset_owner_avatar_url 
+    $redis_cache.hset(owner_common_key, "avatar_url", url_to_avatar(owner)) 
+    $redis_cache.hset(owner_common_key_by_id, "avatar_url", url_to_avatar(owner)) 
+  end
+
+  def reset_owner_common
+    clear_owner_common
+    reset_owner_id
+    reset_owner_type
+    reset_owner_login
+    reset_owner_email
+    reset_owner_name
+    reset_owner_avatar_url
+
+    $redis_cache.hgetall(owner_common_key)
+  end
+
+  def clear_owner_common
+    load_owner
+    return if @owner.nil?
+    $redis_cache.del(owner_common_key)
+    $redis_cache.del(owner_common_key_by_id)
+  end
+end
--- a/app/services/cache/v2/platform_statistic_service.rb
+++ b/app/services/cache/v2/platform_statistic_service.rb
@ -0,0 +1,184 @@
+class Cache::V2::PlatformStatisticService < ApplicationService 
+  attr_reader :follow_count, :fork_count, :issue_count, :project_count, :project_language_count_key, :project_language_count, :project_praise_count, :project_watcher_count, :pullrequest_count
+
+  def initialize(params={})
+    @follow_count = params[:follow_count]
+    @fork_count = params[:fork_count]
+    @issue_count = params[:issue_count]
+    @project_count = params[:project_count]
+    @project_language_count_key = params[:project_language_count_key]
+    @project_language_count = params[:project_language_count]
+    @project_praise_count = params[:project_praise_count]
+    @project_watcher_count = params[:project_watcher_count]
+    @pullrequest_count = params[:pullrequest_count]
+  end
+
+  def read 
+    platform_statistic
+  end
+
+  def call 
+    set_platform_statistic
+  end
+
+  def reset 
+    reset_platform_statistic
+  end
+
+  private 
+
+  def platform_statistic_key
+    "v2-platform-statistic"
+  end
+
+  def follow_count_key 
+    "follow-count"
+  end
+
+  def fork_count_key
+    "fork-count"
+  end
+
+  def issue_count_key 
+    "issue-count"
+  end
+
+  def project_count_key 
+    "project-count"
+  end
+
+  def project_language_key 
+    "project-language"
+  end
+
+  def project_praise_count_key 
+    "project-praise-count"
+  end
+
+  def project_watcher_count_key 
+    "project-watcher-count"
+  end
+
+  def pullrequest_count_key
+    "pullrequest-count"
+  end
+
+  def platform_statistic
+    result = $redis_cache.hgetall(platform_statistic_key)
+
+    result.blank? ? reset_platform_statistic : result
+  end
+
+  def set_platform_statistic
+    if $redis_cache.hgetall(platform_statistic_key).blank?
+      reset_platform_statistic
+      return
+    end
+    if @follow_count.present?
+      if $redis_cache.hget(platform_statistic_key, follow_count_key).nil?
+        reset_platform_follow_count
+      else
+        $redis_cache.hincrby(platform_statistic_key, follow_count_key, @follow_count) 
+      end
+    end
+    if @fork_count.present?
+      if $redis_cache.hget(platform_statistic_key, fork_count_key).nil?
+        reset_platform_fork_count
+      else
+        $redis_cache.hincrby(platform_statistic_key, fork_count_key, @fork_count) 
+      end
+    end
+    if @issue_count.present?
+      if $redis_cache.hget(platform_statistic_key, issue_count_key).nil?
+        reset_platform_issue_count
+      else
+        $redis_cache.hincrby(platform_statistic_key, issue_count_key, @issue_count) 
+      end
+    end
+    if @project_count.present?
+      if $redis_cache.hget(platform_statistic_key, project_count_key).nil?
+        reset_platform_project_count
+      else
+        $redis_cache.hincrby(platform_statistic_key, project_count_key, @project_count) 
+      end
+    end
+    if @project_language_count_key.present? && project_language_count.present?
+      if $redis_cache.hget(platform_statistic_key, project_language_key).nil?
+        reset_platform_project_language
+      else
+        result = JSON.parse($redis_cache.hget(platform_statistic_key, project_language_key))
+        result[@project_language_count_key] ||= 0
+        result[@project_language_count_key] += project_language_count.to_i
+        $redis_cache.hset(platform_statistic_key, project_language_key, result.to_json) 
+      end
+    end
+    if @project_praise_count.present?
+      if $redis_cache.hget(platform_statistic_key, project_praise_count_key).nil?
+        reset_platform_project_praise_count
+      else
+        $redis_cache.hincrby(platform_statistic_key, project_praise_count_key, @project_praise_count) 
+      end
+    end
+    if @project_watcher_count.present?
+      if $redis_cache.hget(platform_statistic_key, project_watcher_count_key).nil?
+        reset_platform_project_watcher_count
+      else
+        $redis_cache.hincrby(platform_statistic_key, project_watcher_count_key, @project_watcher_count) 
+      end
+    end
+    if @pullrequest_count.present?
+      if $redis_cache.hget(platform_statistic_key, pullrequest_count_key).nil?
+        reset_platform_pullrequest_count
+      else
+        $redis_cache.hincrby(platform_statistic_key, pullrequest_count_key, @pullrequest_count) 
+      end
+    end
+    $redis_cache.hgetall(platform_statistic_key)
+  end
+
+  def reset_platform_follow_count 
+    $redis_cache.hset(platform_statistic_key, follow_count_key, Watcher.where(watchable_type: 'User').count)
+  end
+
+  def reset_platform_fork_count
+    $redis_cache.hset(platform_statistic_key, fork_count_key, ForkUser.count)
+  end
+
+  def reset_platform_issue_count
+    $redis_cache.hset(platform_statistic_key, issue_count_key, Issue.count)
+  end
+
+  def reset_platform_project_count
+    $redis_cache.hset(platform_statistic_key, project_count_key, Project.count)
+  end
+
+  def reset_platform_project_language
+    $redis_cache.hset(platform_statistic_key, project_language_key, ProjectLanguage.where.not(projects_count: 0).group("project_languages.name").sum(:projects_count).to_json)
+  end
+
+  def reset_platform_project_praise_count
+    $redis_cache.hset(platform_statistic_key, project_praise_count_key, PraiseTread.where(praise_tread_object_type: "Project").count)
+  end
+
+  def reset_platform_project_watcher_count
+    $redis_cache.hset(platform_statistic_key, project_watcher_count_key, Watcher.where(watchable_type: 'Project').count)
+  end
+
+  def reset_platform_pullrequest_count
+    $redis_cache.hset(platform_statistic_key, pullrequest_count_key, PullRequest.count)
+  end
+
+  def reset_platform_statistic
+    $redis_cache.del(platform_statistic_key)
+    reset_platform_follow_count
+    reset_platform_fork_count
+    reset_platform_issue_count
+    reset_platform_project_count
+    reset_platform_project_language
+    reset_platform_project_praise_count
+    reset_platform_project_watcher_count
+    reset_platform_pullrequest_count
+
+    $redis_cache.hgetall(platform_statistic_key)
+  end
+end
--- a/app/services/cache/v2/project_common_service.rb
+++ b/app/services/cache/v2/project_common_service.rb
@ -0,0 +1,219 @@
+class Cache::V2::ProjectCommonService < ApplicationService 
+  attr_reader :project_id, :owner_id, :name, :identifier, :description, :visits, :watchers, :praises, :forks, :issues, :pullrequests
+  attr_accessor :project
+
+  def initialize(project_id, params={})
+    @project_id = project_id
+    @owner_id = params[:owner_id]
+    @name = params[:name]
+    @identifier = params[:identifier]
+    @description = params[:description]
+    @visits = params[:visits]
+    @watchers = params[:watchers]
+    @praises = params[:praises]
+    @forks = params[:forks]
+    @issues = params[:issues]
+    @pullrequests = params[:pullrequests]
+  end
+
+  def read 
+    project_common
+  end
+
+  def call 
+    set_project_common
+  end
+
+  def reset 
+    reset_project_common
+  end
+
+  def clear 
+    clear_project_common
+  end
+
+  private 
+  def load_project
+    @project = Project.find_by_id(project_id)
+  end
+
+  def project_common_key
+    "v2-project-common:#{@project_id}"
+  end
+
+  def owner_id_key 
+    "owner_id"
+  end
+
+  def name_key
+    "name"
+  end
+
+  def identifier_key
+    "identifier"
+  end
+
+  def description_key 
+    "description"
+  end
+
+  def visits_key 
+    "visits"
+  end
+
+  def watchers_key 
+    "watchers"
+  end
+
+  def praises_key 
+    "praises"
+  end
+
+  def forks_key 
+    "forks"
+  end
+
+  def issues_key
+    "issues"
+  end
+
+  def pullrequests_key 
+    "pullrequests"
+  end
+
+  def project_common
+    result = $redis_cache.hgetall(project_common_key)
+    result.blank? ? reset_project_common : result
+  end
+
+  def set_project_common
+    if $redis_cache.hgetall(project_common_key).blank?
+      reset_project_common
+      return
+    else
+      load_project
+      return unless @project.is_full_public
+      if @owner_id.present?
+        if $redis_cache.hget(project_common_key, owner_id_key).nil?
+          reset_project_owner_id
+        else
+          $redis_cache.hset(project_common_key, owner_id_key, @owner_id) 
+        end
+      end
+      if @name.present?
+        if $redis_cache.hget(project_common_key, name_key).nil?
+          reset_project_name
+        else
+          $redis_cache.hset(project_common_key, name_key, @name) 
+        end
+      end
+      if @identifier.present?
+        if $redis_cache.hget(project_common_key, identifier_key).nil?
+          reset_project_identifier
+        else
+          $redis_cache.hset(project_common_key, identifier_key, @identifier) 
+        end
+      end
+      if @description.present?
+        if $redis_cache.hget(project_common_key, description_key).nil?
+          reset_project_description
+        else
+          $redis_cache.hset(project_common_key, description_key, @description) 
+        end
+      end
+      if @visits.present?
+        $redis_cache.hincrby(project_common_key, visits_key, @visits.to_s) 
+        Cache::V2::ProjectRankService.call(@project_id, {visits: @visits})
+        Cache::V2::ProjectDateRankService.call(@project_id, Date.today, {visits: @visits})
+      end
+      if @watchers.present?
+        $redis_cache.hincrby(project_common_key, watchers_key, @watchers) 
+      end
+      if @praises.present?
+        $redis_cache.hincrby(project_common_key, praises_key, @praises) 
+          Cache::V2::ProjectRankService.call(@project_id, {praises: @praises})
+          Cache::V2::ProjectDateRankService.call(@project_id, Date.today, {praises: @praises})
+      end
+      if @forks.present?
+        $redis_cache.hincrby(project_common_key, forks_key, @forks) 
+        Cache::V2::ProjectRankService.call(@project_id, {forks: @forks})
+        Cache::V2::ProjectDateRankService.call(@project_id, Date.today, {forks: @forks})
+      end
+      if @issues.present?
+        $redis_cache.hincrby(project_common_key, issues_key, @issues) 
+        Cache::V2::ProjectRankService.call(@project_id, {issues: @issues})
+        Cache::V2::ProjectDateRankService.call(@project_id, Date.today, {issues: @issues})
+      end
+      if @pullrequests.present?
+        $redis_cache.hincrby(project_common_key, pullrequests_key, @pullrequests) 
+        Cache::V2::ProjectRankService.call(@project_id, {pullrequests: @pullrequests})
+        Cache::V2::ProjectDateRankService.call(@project_id, Date.today, {pullrequests: @pullrequests})
+      end
+    end
+    
+    $redis_cache.hgetall(project_common_key)
+  end
+  
+  def reset_project_owner_id
+    $redis_cache.hset(project_common_key, owner_id_key, @project&.user_id)
+  end
+
+  def reset_project_name
+    $redis_cache.hset(project_common_key, name_key, @project&.name)
+  end
+
+  def reset_project_identifier
+    $redis_cache.hset(project_common_key, identifier_key, @project&.identifier)
+  end
+
+  def reset_project_description
+    $redis_cache.hset(project_common_key, description_key, @project&.description)
+  end
+
+  def reset_project_visits
+    $redis_cache.hset(project_common_key, visits_key, @project&.visits || 0)
+  end
+
+  def reset_project_watchers
+    $redis_cache.hset(project_common_key, watchers_key, Watcher.where(watchable_type: 'Project', watchable_id: @project_id).count)
+  end
+
+  def reset_project_praises
+    $redis_cache.hset(project_common_key, praises_key,  PraiseTread.where(praise_tread_object_type: 'Project', praise_tread_object_id: @project_id).count)
+  end
+
+  def reset_project_forks
+    $redis_cache.hset(project_common_key, forks_key, ForkUser.where(project_id: @project_id).count)
+  end
+
+  def reset_project_issues
+    $redis_cache.hset(project_common_key, issues_key, Issue.issue_issue.where(project_id: @project_id).count)
+  end
+
+  def reset_project_pullrequests
+    $redis_cache.hset(project_common_key, pullrequests_key, PullRequest.where(project_id: @project_id).count)
+  end
+
+  def reset_project_common
+    load_project
+    return unless @project.is_full_public
+    $redis_cache.del(project_common_key)
+    reset_project_owner_id
+    reset_project_name
+    reset_project_identifier
+    reset_project_description
+    reset_project_visits
+    reset_project_watchers
+    reset_project_praises
+    reset_project_forks
+    reset_project_issues
+    reset_project_pullrequests
+
+    $redis_cache.hgetall(project_common_key)
+  end
+
+  def clear_project_common
+    $redis_cache.del(project_common_key)
+    Cache::V2::ProjectRankService.new(@project_id).clear
+  end
+end
--- a/app/services/cache/v2/project_date_rank_service.rb
+++ b/app/services/cache/v2/project_date_rank_service.rb
@ -0,0 +1,51 @@
+class Cache::V2::ProjectDateRankService < ApplicationService 
+  attr_reader :project_id, :rank_date, :visits, :praises, :forks, :issues, :pullrequests
+  attr_accessor :project_common
+
+  def initialize(project_id, rank_date=Date.today, params={})
+    @project_id = project_id
+    @rank_date = rank_date
+    @visits = params[:visits]
+    @praises = params[:praises]
+    @forks = params[:forks]
+    @issues = params[:issues]
+    @pullrequests = params[:pullrequests]
+  end
+
+  def read 
+    project_rank
+  end
+
+  def call 
+    set_project_rank
+  end
+
+  private 
+  def project_rank_key
+    "v2-project-rank-#{@rank_date.to_s}"
+  end
+
+  def project_rank
+    $redis_cache.zscore(project_rank_key, @project_id)
+  end
+
+  def set_project_rank
+    if @visits.present?
+      $redis_cache.zincrby(project_rank_key, @visits.to_i * 1, @project_id) 
+    end
+    if @praises.present?
+      $redis_cache.zincrby(project_rank_key, @praises.to_i * 5, @project_id) 
+    end
+    if @forks.present?
+      $redis_cache.zincrby(project_rank_key, @forks.to_i * 5, @project_id) 
+    end
+    if @issues.present?
+      $redis_cache.zincrby(project_rank_key, @issues.to_i * 10, @project_id) 
+    end
+    if @pullrequests.present?
+      $redis_cache.zincrby(project_rank_key, @pullrequests.to_i * 10, @project_id) 
+    end
+
+    $redis_cache.zscore(project_rank_key, @project_id)
+  end
+end
--- a/app/services/cache/v2/project_rank_service.rb
+++ b/app/services/cache/v2/project_rank_service.rb
@ -0,0 +1,87 @@
+class Cache::V2::ProjectRankService < ApplicationService 
+  attr_reader :project_id, :visits, :praises, :forks, :issues, :pullrequests
+  attr_accessor :project_common
+
+  def initialize(project_id, params={})
+    @project_id = project_id
+    @visits = params[:visits]
+    @praises = params[:praises]
+    @forks = params[:forks]
+    @issues = params[:issues]
+    @pullrequests = params[:pullrequests]
+  end
+
+  def read 
+    project_rank
+  end
+
+  def call 
+    set_project_rank
+  end
+
+  def reset 
+    reset_project_rank
+  end
+
+  def clear 
+    clear_project_rank
+  end
+
+  private 
+  def load_project_common
+    @project_common = Cache::V2::ProjectCommonService.new(@project_id).read
+  end
+
+  def project_rank_key
+    "v2-project-rank"
+  end
+
+  def project_rank
+    result = $redis_cache.zscore(project_rank_key, @project_id)
+    result.blank? ? reset_project_rank : result
+  end
+
+  def set_project_rank
+    load_project_common
+    if $redis_cache.zscore(project_rank_key, @project_id).blank?
+      reset_project_rank
+      return
+    else
+      if @visits.present?
+        $redis_cache.zincrby(project_rank_key, @visits.to_i * 1, @project_id) 
+      end
+      if @praises.present?
+        $redis_cache.zincrby(project_rank_key, @praises.to_i * 5, @project_id) 
+      end
+      if @forks.present?
+        $redis_cache.zincrby(project_rank_key, @forks.to_i * 5, @project_id) 
+      end
+      if @issues.present?
+        $redis_cache.zincrby(project_rank_key, @issues.to_i * 10, @project_id) 
+      end
+      if @pullrequests.present?
+        $redis_cache.zincrby(project_rank_key, @pullrequests.to_i * 10, @project_id) 
+      end
+      reset_user_project_rank
+    end
+
+    $redis_cache.zscore(project_rank_key, @project_id)
+  end
+
+  def reset_project_rank
+    load_project_common
+    score = @project_common["visits"].to_i * 1 + @project_common["praises"].to_i * 5 + @project_common["forks"].to_i * 5 + @project_common["issues"].to_i * 10 + @project_common["pullrequests"].to_i * 10
+    $redis_cache.zadd(project_rank_key, score, @project_id) 
+    reset_user_project_rank
+
+    $redis_cache.zscore(project_rank_key, @project_id)
+  end
+
+  def reset_user_project_rank
+    $redis_cache.zadd("v2-user-project-rank:#{@project_common["owner_id"]}", $redis_cache.zscore(project_rank_key, @project_id), @project_id)
+  end
+
+  def clear_project_rank
+    $redis_cache.sadd('v2-project-rank-deleted', @project_id)
+  end
+end
--- a/app/services/cache/v2/user_date_rank_service.rb
+++ b/app/services/cache/v2/user_date_rank_service.rb
@ -0,0 +1,119 @@
+class Cache::V2::UserDateRankService < ApplicationService 
+  attr_reader :user_id, :rank_date, :follow_count, :fork_count, :issue_count, :project_count, :project_language_count_key, :project_language_count, :project_praise_count, :project_watcher_count, :pullrequest_count
+
+  def initialize(user_id, rank_date=Date.today, params={})
+    @user_id = user_id
+    @rank_date = rank_date
+    @follow_count = params[:follow_count]
+    @fork_count = params[:fork_count]
+    @issue_count = params[:issue_count]
+    @project_count = params[:project_count]
+    @project_language_count_key = params[:project_language_count_key]
+    @project_language_count = params[:project_language_count]
+    @project_praise_count = params[:project_praise_count]
+    @project_watcher_count = params[:project_watcher_count]
+    @pullrequest_count = params[:pullrequest_count]
+  end
+
+  def read_rank
+    user_rank
+  end
+
+  def read_statistic
+    user_statistic
+  end
+
+  def call 
+    set_user_rank
+  end
+
+  private 
+  def user_rank_key
+    "v2-user-rank-#{@rank_date.to_s}"
+  end
+
+  def user_date_statistic_key 
+    "v2-user-statistic:#{@user_id}-#{@rank_date.to_s}"
+  end
+
+  def user_rank
+    $redis_cache.zscore(user_rank_key, @user_id)
+  end
+
+  def user_statistic 
+    $redis_cache.hgetall(user_date_statistic_key)
+  end
+
+  def set_user_statistic
+    if @follow_count.present?
+      $redis_cache.hincrby(user_date_statistic_key, "follow-count", @follow_count.to_i) 
+    end
+    if @fork_count.present?
+      $redis_cache.hincrby(user_date_statistic_key, "fork-count", @fork_count.to_i) 
+    end
+    if @issue_count.present?
+      $redis_cache.hincrby(user_date_statistic_key, "issue-count", @issue_count.to_i) 
+    end
+    if @project_count.present?
+      $redis_cache.hincrby(user_date_statistic_key, "project-count", @project_count.to_i) 
+    end
+    if project_language_count_key.present? && project_language_count.present?
+      if $redis_cache.hget(user_date_statistic_key, "project-language").nil?
+        result = {}
+        result[@project_language_count_key] = project_language_count.to_i
+        result.delete(@project_language_count_key) if result[@project_language_count_key] == 0
+        $redis_cache.hset(user_date_statistic_key, "project-language", result.to_json)
+      else
+        result = JSON.parse($redis_cache.hget(user_date_statistic_key, "project-language"))
+        result[@project_language_count_key] ||= 0
+        result[@project_language_count_key] += project_language_count.to_i
+        result.delete(@project_language_count_key) if result[@project_language_count_key] == 0
+        $redis_cache.hset(user_date_statistic_key, "project-language", result.to_json) 
+      end
+    end
+    if @project_praise_count.present?
+      $redis_cache.hincrby(user_date_statistic_key, "project-praise-count", @project_praise_count.to_i) 
+    end
+    if @project_watcher_count.present?
+      $redis_cache.hincrby(user_date_statistic_key, "project-watcher-count", @project_watcher_count.to_i) 
+    end
+    if @pullrequest_count.present?
+      $redis_cache.hincrby(user_date_statistic_key, "pullrequest-count", @pullrequest_count.to_i) 
+    end
+
+    $redis_cache.hgetall(user_date_statistic_key)
+  end
+
+  def set_user_rank
+    set_user_statistic
+    follow_count = $redis_cache.hget(user_date_statistic_key, "follow-count") || 0
+    pullrequest_count = $redis_cache.hget(user_date_statistic_key, "pullrequest-count") || 0
+    issues_count = $redis_cache.hget(user_date_statistic_key, "issue-count") || 0
+    project_count = $redis_cache.hget(user_date_statistic_key, "project-count") || 0
+    fork_count = $redis_cache.hget(user_date_statistic_key, "fork-count") || 0
+    project_watchers_count = $redis_cache.hget(user_date_statistic_key, "project-watcher-count") || 0
+    project_praises_count = $redis_cache.hget(user_date_statistic_key, "project-praise-count") || 0
+    project_language = $redis_cache.hget(user_date_statistic_key, "project-language") 
+    project_languages_count = project_language.nil? || project_language == "{}" ? 0 : JSON.parse(project_language).length
+    # 影响力
+    influence = (60.0 + follow_count.to_i / (follow_count.to_i + 20.0) * 40.0).to_i 
+
+    # 贡献度
+    contribution = (60.0 + pullrequest_count.to_i / (pullrequest_count.to_i + 20.0) * 40.0).to_i
+
+    # 活跃度
+    activity = (60.0 + issues_count.to_i / (issues_count.to_i + 80.0) * 40.0).to_i
+
+    # 项目经验
+    experience = 10 * project_count.to_i + 5 * fork_count.to_i + project_watchers_count.to_i + project_praises_count.to_i 
+    experience = (60.0 + experience / (experience + 100.0) * 40.0).to_i
+    # 语言能力
+    language = (60.0 + project_languages_count.to_i / (project_languages_count.to_i + 5.0) * 40.0).to_i
+
+    score = influence+ contribution + activity + experience + language
+    $redis_cache.zrem(user_rank_key, @user_id)
+    $redis_cache.zadd(user_rank_key, score-300, @user_id) if score > 300
+
+    $redis_cache.zscore(user_rank_key, @user_id)
+  end
+end
--- a/app/services/cache/v2/user_statistic_service.rb
+++ b/app/services/cache/v2/user_statistic_service.rb
@ -0,0 +1,202 @@
+class Cache::V2::UserStatisticService < ApplicationService 
+  attr_reader :user_id, :follow_count, :fork_count, :issue_count, :project_count, :project_language_count_key, :project_language_count, :project_praise_count, :project_watcher_count, :pullrequest_count
+
+  def initialize(user_id, params={})
+    @user_id = user_id
+    @follow_count = params[:follow_count]
+    @fork_count = params[:fork_count]
+    @issue_count = params[:issue_count]
+    @project_count = params[:project_count]
+    @project_language_count_key = params[:project_language_count_key]
+    @project_language_count = params[:project_language_count]
+    @project_praise_count = params[:project_praise_count]
+    @project_watcher_count = params[:project_watcher_count]
+    @pullrequest_count = params[:pullrequest_count]
+    Cache::V2::OwnerCommonService.new(user_id).read
+  end
+
+  def read 
+    user_statistic
+  end
+
+  def call 
+    set_user_statistic
+  end
+
+  def reset 
+    reset_user_statistic
+  end
+
+  private 
+
+  def user_statistic_key
+    "v2-user-statistic:#{@user_id}"
+  end
+
+  def follow_count_key 
+    "follow-count"
+  end
+
+  def fork_count_key
+    "fork-count"
+  end
+
+  def issue_count_key 
+    "issue-count"
+  end
+
+  def project_count_key 
+    "project-count"
+  end
+
+  def project_language_key 
+    "project-language"
+  end
+
+  def project_praise_count_key 
+    "project-praise-count"
+  end
+
+  def project_watcher_count_key 
+    "project-watcher-count"
+  end
+
+  def pullrequest_count_key
+    "pullrequest-count"
+  end
+
+  def user_statistic
+    result = $redis_cache.hgetall(user_statistic_key)
+    result.blank? ? reset_user_statistic : result
+  end
+
+  def set_user_statistic
+    if $redis_cache.hgetall(user_statistic_key).blank?
+      reset_user_statistic
+      return
+    end
+    if @follow_count.present?
+      if $redis_cache.hget(user_statistic_key, follow_count_key).nil?
+        reset_user_follow_count
+        Cache::V2::UserDateRankService.call(@user_id, Date.today, {follow_count: @follow_count})
+      else
+        $redis_cache.hincrby(user_statistic_key, follow_count_key, @follow_count) 
+        Cache::V2::UserDateRankService.call(@user_id, Date.today, {follow_count: @follow_count})
+      end
+    end
+    if @fork_count.present?
+      if $redis_cache.hget(user_statistic_key, fork_count_key).nil?
+        reset_user_fork_count
+        Cache::V2::UserDateRankService.call(@user_id, Date.today, {fork_count: @fork_count})
+      else
+        $redis_cache.hincrby(user_statistic_key, fork_count_key, @fork_count) 
+        Cache::V2::UserDateRankService.call(@user_id, Date.today, {fork_count: @fork_count})
+      end
+    end
+    if @issue_count.present?
+      if $redis_cache.hget(user_statistic_key, issue_count_key).nil?
+        reset_user_issue_count
+        Cache::V2::UserDateRankService.call(@user_id, Date.today, {issue_count: @issue_count})
+      else
+        $redis_cache.hincrby(user_statistic_key, issue_count_key, @issue_count) 
+        Cache::V2::UserDateRankService.call(@user_id, Date.today, {issue_count: @issue_count})
+      end
+    end
+    if @project_count.present?
+      if $redis_cache.hget(user_statistic_key, project_count_key).nil?
+        reset_user_project_count
+        Cache::V2::UserDateRankService.call(@user_id, Date.today, {project_count: @project_count})
+      else
+        $redis_cache.hincrby(user_statistic_key, project_count_key, @project_count) 
+        Cache::V2::UserDateRankService.call(@user_id, Date.today, {project_count: @project_count})
+      end
+    end
+    if @project_language_count_key.present? && project_language_count.present?
+      if $redis_cache.hget(user_statistic_key, project_language_key).nil?
+        reset_user_project_language
+        Cache::V2::UserDateRankService.call(@user_id, Date.today, {project_language_count_key: @project_language_count_key, project_language_count: @project_language_count})
+      else
+        result = JSON.parse($redis_cache.hget(user_statistic_key, project_language_key))
+        result[@project_language_count_key] ||= 0
+        result[@project_language_count_key] += project_language_count.to_i
+        result.delete(@project_language_count_key) if result[@project_language_count_key] == 0
+        $redis_cache.hset(user_statistic_key, project_language_key, result.to_json) 
+        Cache::V2::UserDateRankService.call(@user_id, Date.today, {project_language_count_key: @project_language_count_key, project_language_count: @project_language_count})
+      end
+    end
+    if @project_praise_count.present?
+      if $redis_cache.hget(user_statistic_key, project_praise_count_key).nil?
+        reset_user_project_praise_count
+        Cache::V2::UserDateRankService.call(@user_id, Date.today, {project_praise_count: @project_praise_count})
+      else
+        $redis_cache.hincrby(user_statistic_key, project_praise_count_key, @project_praise_count) 
+        Cache::V2::UserDateRankService.call(@user_id, Date.today, {project_praise_count: @project_praise_count})
+      end
+    end
+    if @project_watcher_count.present?
+      if $redis_cache.hget(user_statistic_key, project_watcher_count_key).nil?
+        reset_user_project_watcher_count
+        Cache::V2::UserDateRankService.call(@user_id, Date.today, {project_watcher_count: @project_watcher_count})
+      else
+        $redis_cache.hincrby(user_statistic_key, project_watcher_count_key, @project_watcher_count) 
+        Cache::V2::UserDateRankService.call(@user_id, Date.today, {project_watcher_count: @project_watcher_count})
+      end
+    end
+    if @pullrequest_count.present?
+      if $redis_cache.hget(user_statistic_key, pullrequest_count_key).nil?
+        reset_user_pullrequest_count
+        Cache::V2::UserDateRankService.call(@user_id, Date.today, {pullrequest_count: @pullrequest_count})
+      else
+        $redis_cache.hincrby(user_statistic_key, pullrequest_count_key, @pullrequest_count) 
+        Cache::V2::UserDateRankService.call(@user_id, Date.today, {pullrequest_count: @pullrequest_count})
+      end
+    end
+    $redis_cache.hgetall(user_statistic_key)
+  end
+
+  def reset_user_follow_count 
+    $redis_cache.hset(user_statistic_key, follow_count_key, Watcher.where(watchable_type: 'User', watchable_id: @user_id).count)
+  end
+
+  def reset_user_fork_count
+    $redis_cache.hset(user_statistic_key, fork_count_key, ForkUser.joins(:project).where(projects: {user_id: @user_id}).count)
+  end
+
+  def reset_user_issue_count
+    $redis_cache.hset(user_statistic_key, issue_count_key, Issue.where(author_id: @user_id).count)
+  end
+
+  def reset_user_project_count
+    $redis_cache.hset(user_statistic_key, project_count_key, Project.where(user_id: @user_id).count)
+  end
+
+  def reset_user_project_language
+    $redis_cache.hset(user_statistic_key, project_language_key, Project.where(user_id: @user_id).joins(:project_language).group("project_languages.name").count.to_json)
+  end
+
+  def reset_user_project_praise_count
+    $redis_cache.hset(user_statistic_key, project_praise_count_key, PraiseTread.where(praise_tread_object_type: 'Project', praise_tread_object_id: Project.where(user_id: @user_id)).count)
+  end
+
+  def reset_user_project_watcher_count
+    $redis_cache.hset(user_statistic_key, project_watcher_count_key, Watcher.where(watchable_type: 'Project', watchable_id: Project.where(user_id: @user_id)).count)
+  end
+
+  def reset_user_pullrequest_count
+    $redis_cache.hset(user_statistic_key, pullrequest_count_key, PullRequest.where(user_id: @user_id).count)
+  end
+
+  def reset_user_statistic
+    $redis_cache.del(user_statistic_key)
+    reset_user_follow_count
+    reset_user_fork_count
+    reset_user_issue_count
+    reset_user_project_count
+    reset_user_project_language
+    reset_user_project_praise_count
+    reset_user_project_watcher_count
+    reset_user_pullrequest_count
+
+    $redis_cache.hgetall(user_statistic_key)
+  end
+end
--- a/app/services/gitea/client_service.rb
+++ b/app/services/gitea/client_service.rb
@ -82,6 +82,8 @@ 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
--- a/app/services/gitea/user/delete_service.rb
+++ b/app/services/gitea/user/delete_service.rb
@ -0,0 +1,31 @@
+class Gitea::User::DeleteService < Gitea::ClientService
+  attr_reader :username
+
+  def initialize(username)
+    @username  = username
+  end
+
+  def call
+    response = delete(request_url, params)
+
+    render_status(response)
+  end
+
+  private
+  def token
+    {
+      username: Gitea.gitea_config[:access_key_id],
+      password: Gitea.gitea_config[:access_key_secret]
+    }
+  end
+
+  def request_url
+    "/admin/users/#{username}"
+  end
+
+  def params 
+    Hash.new.merge(token: token)
+  end
+  
+
+end
--- a/app/services/notice/write/email_create_service.rb
+++ b/app/services/notice/write/email_create_service.rb
@ -21,7 +21,7 @@ class Notice::Write::EmailCreateService < Notice::Write::ClientService
  end

  def request_subject
-    "Trustie: #{subject}"
+    "#{subject}"
  end

  def request_params
--- a/app/services/users/register_service.rb
+++ b/app/services/users/register_service.rb
@ -0,0 +1,58 @@
+class Users::RegisterService < ApplicationService
+  def initialize(params)
+    @login     = params[:login]
+    @namespace = params[:namespace]
+    @password  = params[:password]
+    @code      = params[:code]
+  end
+
+  def call
+    code      = strip(@code)
+    login     = strip(@login)
+    namespace = strip(@namespace)
+    password  = strip(@password)
+
+    Rails.logger.info "Users::RegisterService params:   ##### #{params} "
+
+    email, phone = 
+      if register_type == 1
+        phone_register(login, code)
+      elsif register_type == 0
+        mail_register(login, code)
+      end
+
+    user = User.new(admin: false, login: namespace, mail: email, phone: phone, type: "User")
+    user.password = password
+    user.activate # 现在因为是验证码，所以在注册的时候就可以激活
+
+    user
+  end
+
+  private
+  # 手机注册
+  def phone_register(login, code)
+    Rails.logger.info("start register by phone:  phone is #{login}")
+    email = nil
+    phone = login
+    
+    [email, phone]
+  end
+
+  # 邮箱注册
+  def mail_register(login, code)
+    Rails.logger.info("start register by email:  email is #{login}")
+    email = login
+    phone = nil
+
+    [email, phone]
+  end
+
+  def register_type
+    phone_mail_type(@login)
+  end
+
+  def phone_mail_type value
+    value =~ /^1\d{10}$/ ? 1 : 0
+  end
+  
+end
--- a/app/views/admins/project_categories/_form_modal.html.erb
+++ b/app/views/admins/project_categories/_form_modal.html.erb
@ -7,9 +7,33 @@
          <span aria-hidden="true">&times;</span>
        </button>
      </div>
-       <%= form_for @project_category, url: {controller: "project_categories", action: "#{type}"} do |p| %>
+       <%= form_for @project_category, url: {controller: "project_categories", action: "#{type}"}, html: { enctype: 'multipart/form-data' } do |p| %>
        <div class="modal-body">
-          <%= p.text_field :name,class: "form-control input-lg",placeholder: "分类名称",required: true, maxlength: 64%>
+          <div class="form-group">
+            <label>
+              分类名称 <span class="ml10 color-orange mr20">*</span>
+            </label>
+            <%= p.text_field :name,class: "form-control input-lg",placeholder: "分类名称",required: true, maxlength: 64%>
+          </div>
+          <div class="form-group">
+            <label>
+              精选等级
+            </label>
+            <%= p.number_field :pinned_index,class: "form-control input-lg",placeholder: "精选等级",required: true%>
+          </div>
+          <div class="logo-item">
+            <% logo_img = @project_category.logo_url %>
+            <div class="logo-item-left mr-3 <%= logo_img ? 'has-img' : '' %>">
+              <img class="logo-item-img nav-logo-img" src="<%= logo_img %>" style="<%= logo_img.present? ? '' : 'display: none' %>"/>
+              <%= file_field_tag(:logo, accept: 'image/png,image/jpg,image/jpeg',style: "display: none", value: params[:logo]) %>
+              <label for="logo" class="logo-item-upload" data-toggle="tooltip" data-title="选择图片"></label>
+            </div>
+            <div class="logo-item-right">
+              <div class="logo-item-title flex-1">logo</div>
+              <div>格式：PNG、JPG</div>
+              <div>尺寸：高度38px以内，宽等比例缩放</div>
+            </div>
+          </div>
        </div>
        <div class="modal-footer">
          <button type="button" class="btn btn-secondary" data-dismiss="modal">取消</button>
--- a/app/views/admins/project_categories/_list.html.erb
+++ b/app/views/admins/project_categories/_list.html.erb
@ -3,7 +3,9 @@
  <tr>
    <th width="5%">序号</th>
    <th width="30%">名称</th>
+    <th width="20%"><%= sort_tag('精选', name: 'pinned_index', path: admins_project_categories_path) %></th>
    <th width="20%"><%= sort_tag('项目数', name: 'projects_count', path: admins_project_categories_path) %></th>
+    <th width="20%">精选项目数</th>
    <th width="20%"><%= sort_tag('创建时间', name: 'created_at', path: admins_project_categories_path) %></th>
    <th width="25%">操作</th>
  </tr>
@ -16,7 +18,9 @@
        <td>
          <%= link_to(project_category.name, "/projects?category_id=#{project_category.id}", target: '_blank') %>
        </td>
+        <td><%= project_category.pinned_index == 0 ? "" : "√" %></td>
        <td><%= project_category.projects_count %></td>
+        <td><%= project_category.projects.select(:id).where(is_pinned: true).size %></td>
        <td><%= project_category.created_at&.strftime('%Y-%m-%d %H:%M') %></td>
        <td class="action-container">
        <%= link_to "编辑", edit_admins_project_category_path(project_category), remote: true, class: "action" %>
--- a/app/views/admins/project_categories/edit.js.erb
+++ b/app/views/admins/project_categories/edit.js.erb
@ -1,2 +1,19 @@
 $("#project-category-modals").html("<%= j render(partial: 'admins/project_categories/form_modal', locals: {type: 'update'}) %>")
-$(".project-category-change-modal").modal('show');
+$(".project-category-change-modal").modal('show');
+
+
+$('.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 {
+  }
+});
--- a/app/views/admins/projects/edit.js.erb
+++ b/app/views/admins/projects/edit.js.erb
@ -0,0 +1,2 @@
+$("#projects-modals").html("<%= j render(partial: 'admins/projects/shared/form_modal', locals: {type: 'update'}) %>")
+$(".project-change-modal").modal('show');
--- a/app/views/admins/projects/index.html.erb
+++ b/app/views/admins/projects/index.html.erb
@ -12,4 +12,7 @@

 <div class="box admin-list-container project-list-container">
  <%= render partial: 'admins/projects/shared/list', locals: { projects: @projects } %>
-</div>
+</div>
+
+<div id="projects-modals">
+</div>
--- a/app/views/admins/projects/shared/_form_modal.html.erb
+++ b/app/views/admins/projects/shared/_form_modal.html.erb
@ -0,0 +1,26 @@
+<div class="modal fade project-change-modal" tabindex="-1" role="dialog" aria-hidden="true">
+  <div class="modal-dialog modal-dialog-centered" role="document">
+    <div class="modal-content">
+      <div class="modal-header">
+        <h5 class="modal-title"><%= type == "create" ? "新增" : "编辑" %></h5>
+        <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+          <span aria-hidden="true">&times;</span>
+        </button>
+      </div>
+       <%= form_for @project, url: {controller: "projects", action: "#{type}"} do |p| %>
+        <div class="modal-body">
+          <div class="form-group">
+            <label>
+              推荐等级 
+            </label>
+            <%= p.number_field :recommend_index,class: "form-control input-lg",required: true%>
+          </div>
+        </div>
+        <div class="modal-footer">
+          <button type="button" class="btn btn-secondary" data-dismiss="modal">取消</button>
+          <%= p.submit "确认", class: "btn btn-primary submit-btn" %>
+        </div>
+      <% end %>
+    </div>
+  </div>
+</div>
--- a/app/views/admins/projects/shared/_list.html.erb
+++ b/app/views/admins/projects/shared/_list.html.erb
@ -1,10 +1,12 @@
 <table class="table table-hover text-center subject-list-table">
  <thead class="thead-light">
    <tr>
-      <th width="4%">序号</th>
-      <th width="4%">ID</th>
-      <th width="15%" class="text-left">项目名称</th>
+      <th width="6%">序号</th>
+      <th width="6%">ID</th>
+      <th width="20%" class="text-left">项目名称</th>
      <th width="6%">公开</th>
+      <th width="6%">精选</th>
+      <th width="6%">推荐</th>
      <th width="5%">issue</th>
      <th width="5%">资源</th>
      <th width="6%">版本库</th>
@ -12,8 +14,8 @@
      <th width="6%">里程碑</th>
      <th width="10%">成员</th>
      <th width="10%">管理员</th>
-      <th width="11%"><%= sort_tag('创建时间', name: 'created_on', path: admins_projects_path) %></th>
-      <th width="10%">操作</th>
+      <th width="15%"><%= sort_tag('创建时间', name: 'created_on', path: admins_projects_path) %></th>
+      <th width="25%">操作</th>
    </tr>
  </thead>
  <tbody>
@ -26,6 +28,8 @@
        <%= link_to(project.name, "/projects/#{project&.owner&.login}/#{project.identifier}", target: '_blank') %>
      </td>
      <td><%= project.is_public ? '√' : '' %></td>
+      <td><%= project.is_pinned ? '√' : '' %></td>
+      <td><%= project.recommend ? '√' : '' %></td>
      <td><%= project.issues.size %></td>
      <td><%= project.attachments.size %></td>
      <td><%= project&.project_score.try(:changeset_num).to_i %></td>
@ -37,8 +41,15 @@
      </td>
      <td><%= project.created_on&.strftime('%Y-%m-%d %H:%M') %></td>
      <td class="action-container">
+          <% if project.is_public %>
+            <%= javascript_void_link '精选', class: 'action pinned-action', data: { id: project.id }, style: project.is_pinned ? 'display: none;' : '' %>
+            <%= javascript_void_link '取消精选', class: 'action unpinned-action', data: { id: project.id }, style: project.is_pinned ? '' : 'display: none;' %>
+            <%= javascript_void_link '推荐', class: 'action recommend-action', data: { id: project.id }, style: project.recommend ? 'display: none;' : '' %>
+            <%= javascript_void_link '取消推荐', class: 'action unrecommend-action', data: { id: project.id }, style: project.recommend ? '' : 'display: none;' %>
+            <%= link_to "设置推荐等级", edit_admins_project_path(project.id), remote: true, class: "action edit-recommend-action", style: project.recommend ? '' : 'display: none;' %>
+          <% end %>
          <%= link_to "删除", admins_project_path(project.id), method: :delete, data:{confirm: "确认删除的吗？"}, class: "delete-project-action" %>
-      </td>
+      </td> 
    </tr>
    <% end %>
    <% else %>
--- a/app/views/admins/users/edit.html.erb
+++ b/app/views/admins/users/edit.html.erb
@ -7,8 +7,8 @@

 <div class="box user-edit-container">
  <div class="user-info mb-4 row">
-    <%= link_to "/users/#{@user.login}", class: 'user-info-avatar col-md-1', target: '_blank', data: { toggle: 'tooltip', title: '个人中心' } do %>
-      <img src="/images/<%= url_to_avatar(@user) %>" class="rounded-circle" width="80" height="80" />
+    <%= link_to "/#{@user.login}", class: 'user-info-avatar col-md-1', target: '_blank', data: { toggle: 'tooltip', title: '个人中心' } do %>
+      <img src="/<%= url_to_avatar(@user) %>" class="rounded-circle" width="80" height="80" />
    <% end %>
    <div class="d-flex flex-column justify-content-between col-md-3 user-info-content">
      <div class="user-info-name flex"><%= @user.real_name %> | <%= @user.id %> | <%= @user.login %></div>
@ -50,6 +50,10 @@

    <div><h6>基本信息</h6></div>
    <div class="form-group px-2">
+      <div class="form-row">
+        <%= f.input :login, label: '登录名', wrapper_html: { class: 'col-md-3' }, input_html: {  readonly: true, class: 'col-md-11', value: @user.login } %>
+      </div>
+
      <div class="form-row">
        <%= f.input :lastname, label: '姓名', wrapper_html: { class: 'col-md-3' }, input_html: {  class: 'col-md-11', value: @user.only_real_name } %>
      </div>
@ -109,7 +113,6 @@
        <div class="d-flex">
          <%= f.input :professional_certification, as: :boolean, label: '职业认证', checked_value: 1, unchecked_value: 0 %>
          <%= f.input :authentication, as: :boolean, label: '实名认证', wrapper_html: { class: 'ml-3' }, checked_value: 1, unchecked_value: 0 %>
-          <%= f.input :is_shixun_marker, as: :boolean, label: '实训制作', wrapper_html: { class: 'ml-3' }, checked_value: 1, unchecked_value: 0 %>
        </div>
      </div>

--- a/app/views/admins/users/shared/_user_list.html.erb
+++ b/app/views/admins/users/shared/_user_list.html.erb
@ -18,7 +18,7 @@
        <tr class="user-item-<%= user.id %>">
          <td><%= list_index_no((params[:page] || 1).to_i, index) %></td>
          <td class="text-left">
-            <%= link_to "/users/#{user.login}", target: '_blank' do %>
+            <%= link_to "/#{user.login}", target: '_blank' do %>
              <%= overflow_hidden_span user.real_name, width: 100 %>
            <% end %>
          </td>
@ -44,7 +44,6 @@
            <div class="d-inline">
              <%= javascript_void_link('更多', class: 'action dropdown-toggle', 'data-toggle': 'dropdown', 'aria-haspopup': true, 'aria-expanded': false) %>
              <div class="dropdown-menu more-action-dropdown">
-                <%= javascript_void_link('奖励', class: 'dropdown-item reward-grade-action', data: { toggle: 'modal', target: '.admin-users-reward-grade-modal', id: user.id }) %>

                <%= javascript_void_link '恢复禁密账号', class: 'dropdown-item reset-login-times-action', data: { id: user.id } %>

--- a/app/views/organizations/organizations/recommend.json.jbuilder
+++ b/app/views/organizations/organizations/recommend.json.jbuilder
@ -1,6 +1,12 @@
-json.organizations @organizations do |organization|
-  json.id organization.id
-  json.name organization.login
-  json.nickname organization.nickname.blank? ? organization.name : organization.nickname
-  json.avatar_url url_to_avatar(organization)
+json.organizations do
+
+  json.array! @organizations.each do |group|
+    json.array! group.each do |organization|
+      json.id organization.id
+      json.name organization.login
+      json.nickname organization.real_name
+      json.avatar_url url_to_avatar(organization)
+      json.website organization.website
+    end
+  end
 end
--- a/app/views/project_categories/pinned_index.json.jbuilder
+++ b/app/views/project_categories/pinned_index.json.jbuilder
@ -0,0 +1 @@
+json.project_categories @project_categories, :id, :name, :logo_url
--- a/app/views/project_rank/_detail.json.jbuilder
+++ b/app/views/project_rank/_detail.json.jbuilder
@ -0,0 +1,20 @@
+project_common = $redis_cache.hgetall("v2-project-common:#{item[0]}")
+owner_common = $redis_cache.hgetall("v2-owner-common:#{project_common["owner_id"]}")
+json.id item[0]
+json.score item[1]
+json.name project_common["name"]
+json.identifier project_common["identifier"]
+json.description project_common["description"]
+json.owner do 
+  json.id project_common["owner_id"]
+  json.type owner_common["type"]
+  json.name owner_common["name"]
+  json.login owner_common["login"]
+  json.avatar_url owner_common["avatar_url"]
+end
+json.visits project_common["visits"]
+json.forks project_common["forks"]
+json.watchers project_common["watchers"]
+json.praises project_common["praises"]
+json.issues project_common["issues"]
+json.pulls project_common["pullrequests"]
--- a/app/views/project_rank/index.json.jbuilder
+++ b/app/views/project_rank/index.json.jbuilder
@ -0,0 +1,8 @@
+json.partial! "commons/success"
+json.projects do 
+
+  json.array! @project_rank.each do |item|
+    json.partial! "detail", locals: {item: item}
+  end
+
+end
--- a/app/views/projects/banner_recommend.json.jbuilder
+++ b/app/views/projects/banner_recommend.json.jbuilder
@ -0,0 +1,36 @@
+json.partial! "commons/success"
+json.projects do 
+  json.array! @projects do |project|
+    owner = project.owner
+    json.id project.id
+    json.identifier project.identifier
+    json.name project.name
+    json.description project.description
+    json.visits project.visits
+    json.author do
+      json.name owner.try(:show_real_name)
+      json.type owner.type
+      json.login owner.login
+      json.image_url url_to_avatar(owner)
+    end
+  
+    json.category do
+      if project.project_category.blank?
+        json.nil!
+      else
+        json.id project.project_category.id
+        json.name project.project_category.name
+      end
+    end
+  
+    json.language do 
+      if project.project_language.blank?
+        json.nil!
+      else
+        json.id project.project_language.id 
+        json.name project.project_language.name 
+      end
+    end
+  end
+end
+
--- a/app/views/projects/branches.json.jbuilder
+++ b/app/views/projects/branches.json.jbuilder
@ -12,10 +12,10 @@ json.array! @branches do |branch|
    json.timestamp render_unix_time(branch['commit']['timestamp'])
    json.time_from_now time_from_now(branch['commit']['timestamp'])
    json.author do 
-      json.partial! 'repositories/commit_author', user: render_commit_author(branch['commit']['author']), name: branch['commit']['author']['name']
+      json.partial! 'repositories/commit_author', user: render_cache_commit_author(branch['commit']['author']), name: branch['commit']['author']['name']
    end
    json.committer do 
-      json.partial! 'repositories/commit_author', user: render_commit_author(branch['commit']['committer']), name: branch['commit']['committer']['name']
+      json.partial! 'repositories/commit_author', user: render_cache_commit_author(branch['commit']['committer']), name: branch['commit']['committer']['name']
    end
  end
 end
--- a/app/views/projects/branches_slice.json.jbuilder
+++ b/app/views/projects/branches_slice.json.jbuilder
@ -14,10 +14,10 @@ json.array! @branches_slice do |branch_slice|
      json.timestamp render_unix_time(branch['commit']['timestamp'])
      json.time_from_now time_from_now(branch['commit']['timestamp'])
      json.author do 
-        json.partial! 'repositories/commit_author', user: render_commit_author(branch['commit']['author']), name: branch['commit']['author']['name']
+        json.partial! 'repositories/commit_author', user: render_cache_commit_author(branch['commit']['author']), name: branch['commit']['author']['name']
      end
      json.committer do 
-        json.partial! 'repositories/commit_author', user: render_commit_author(branch['commit']['committer']), name: branch['commit']['committer']['name']
+        json.partial! 'repositories/commit_author', user: render_cache_commit_author(branch['commit']['committer']), name: branch['commit']['committer']['name']
      end
    end
  end
--- a/app/views/projects/index.json.jbuilder
+++ b/app/views/projects/index.json.jbuilder
@ -1,4 +1,4 @@
-json.total_count @total_count
+json.total_count @projects.total_count
 json.projects @projects do |project|
  # json.partial! "/projects/project_detail", project: project
  json.id project.id
--- a/app/views/projects/members/index.json.jbuilder
+++ b/app/views/projects/members/index.json.jbuilder
@ -0,0 +1,4 @@
+json.total_count @users.total_count
+json.users do
+  json.partial! 'users/user_small', users: @users
+end
--- a/app/views/pull_requests/_commit.json.jbuilder
+++ b/app/views/pull_requests/_commit.json.jbuilder
@ -1,11 +1,9 @@
 json.author do
-  author = User.find_by(mail: commit['Author']['Email'])
-  json.partial! 'repositories/commit_author', locals: { user: author, name: commit['Committer']['Name'] }
+  json.partial! 'repositories/commit_author', locals: { user: render_cache_commit_author(commit['Author']), name: commit['Author']['Name'] }
 end

 json.committer do
-  author = User.find_by(mail: commit['Committer']['Email'])
-  json.partial! 'repositories/commit_author', locals: { user: author, name: commit['Committer']['Name'] }
+  json.partial! 'repositories/commit_author', locals: { user: render_cache_commit_author(commit['Committer']), name: commit['Committer']['Name'] }
 end
 json.timestamp render_unix_time(commit['Committer']['When'])
 json.time_from_now time_from_now(commit['Committer']['When'])
--- a/app/views/pull_requests/index.json.jbuilder
+++ b/app/views/pull_requests/index.json.jbuilder
@ -7,7 +7,8 @@ json.limit @limit
 json.user_admin_or_member @user_admin_or_member
 json.user_admin_or_developer @user_admin_or_developer
 json.project_name @project.name
-json.project_author_name @project.owner.try(:login)
+json.project_author @project.owner.try(:login)
+json.project_author_name @project.owner.try(:show_real_name)

 json.issues do
  json.array! @issues.to_a do |issue|
@ -21,7 +22,7 @@ json.issues do
    json.fork_project_id pr&.fork_project_id
    json.fork_project_identifier pr&.fork_project&.identifier
    json.fork_project_user pr&.fork_project&.owner.try(:login)
-
+    json.fork_project_user_name pr&.fork_project&.owner.try(:show_real_name)
    
    json.id issue.id
    json.name issue.subject
--- a/app/views/pull_requests/show.json.jbuilder
+++ b/app/views/pull_requests/show.json.jbuilder
@ -12,6 +12,7 @@ json.pull_request do
  json.extract! @pull_request, :id,:base, :head, :status,:fork_project_id, :is_original
  json.pull_request_staus @pull_request.status == 1 ? "merged" : (@pull_request.status == 2 ? "closed" : "open")
  json.fork_project_user @pull_request&.fork_project&.owner.try(:login)
+  json.fork_project_user_name @pull_request&.fork_project&.owner.try(:show_real_name)
  json.create_user @pull_request&.user&.login
  json.mergeable @gitea_pull["mergeable"]
  json.state @gitea_pull["state"]
@ -19,7 +20,8 @@ end

 json.issue do
  json.extract! @issue, :id,:subject,:description,:is_private, :branch_name
-  json.project_author_name @project.owner.try(:login)
+  json.project_author @project.owner.try(:login)
+  json.project_author_name @project.owner.try(:show_real_name)
  #json.user_permission @user_permission
  json.closed_on @issue.closed_on.present? ? format_time(@issue.closed_on) : ""
  json.created_at format_time(@issue.created_on)
--- a/app/views/repositories/_commit.json.jbuilder
+++ b/app/views/repositories/_commit.json.jbuilder
@ -26,9 +26,9 @@ if @project.forge?
  end

  json.author do
-    json.partial! 'commit_author', user: render_commit_author(commit['commit']['author']), name: commit['commit']['author']['name']
+    json.partial! 'commit_author', user: render_cache_commit_author(commit['commit']['author']), name: commit['commit']['author']['name']
  end
  json.committer do
-    json.partial! 'commit_author', user: render_commit_author(commit['commit']['committer']), name: commit['commit']['committer']['name']
+    json.partial! 'commit_author', user: render_cache_commit_author(commit['commit']['committer']), name: commit['commit']['committer']['name']
  end
 end
--- a/app/views/repositories/_commit_author.json.jbuilder
+++ b/app/views/repositories/_commit_author.json.jbuilder
@ -1,9 +1,17 @@
-if user
-  json.id user.id
-  json.login user.login
-  json.name user.real_name
-  json.type user&.type
-  json.image_url url_to_avatar(user)
+if user.present?
+  if user.is_a?(Hash)
+    json.id user["id"]
+    json.login user["login"]
+    json.name user["name"]
+    json.type user["type"]
+    json.image_url user["avatar_url"]
+  else
+    json.id user.id
+    json.login user.login
+    json.name user.real_name
+    json.type user&.type
+    json.image_url url_to_avatar(user)
+  end 
 else
  json.id nil
  json.login name 
--- a/app/views/repositories/_contributor.json.jbuilder
+++ b/app/views/repositories/_contributor.json.jbuilder
@ -0,0 +1,16 @@
+user = $redis_cache.hgetall("v2-owner-common:#{contributor["login"]}-#{contributor["email"]}")
+if user.blank?
+  json.contributions contributor["contributions"]
+  # json.gid contributor["id"]
+  json.login contributor["login"]
+  json.type nil
+  json.name contributor["login"]
+  json.image_url User::Avatar.get_letter_avatar_url(contributor["login"])
+else
+  json.contributions contributor["contributions"]
+  # json.gid contributor["id"]
+  json.login user["login"]
+  json.type user["type"]
+  json.name user["name"]
+  json.image_url user["avatar_url"]
+end
--- a/app/views/repositories/commits.json.jbuilder
+++ b/app/views/repositories/commits.json.jbuilder
@ -28,10 +28,10 @@ else
      #   end
      # end
      json.author do 
-        json.partial! 'commit_author', user: render_commit_author(commit['commit']['author']), name: commit['commit']['author']['name']
+        json.partial! 'commit_author', user: render_cache_commit_author(commit['commit']['author']), name: commit['commit']['author']['name']
      end
      json.committer do 
-        json.partial! 'commit_author', user: render_commit_author(commit['commit']['committer']), name: commit['commit']['committer']['name']
+        json.partial! 'commit_author', user: render_cache_commit_author(commit['commit']['committer']), name: commit['commit']['committer']['name']
      end
    end
  end
--- a/app/views/repositories/contributors.json.jbuilder
+++ b/app/views/repositories/contributors.json.jbuilder
@ -1,16 +1,6 @@
 total_count = @contributors.size 
 json.contributors @contributors.each do |contributor|
-  user = User.find_by(gitea_uid: contributor["id"])
-  if contributor["login"] == "root" 
-    total_count -= 1
-    next
-  end
-  json.contributions contributor["contributions"]
-  # json.gid contributor["id"]
-  json.login user.login
-  json.type user&.type
-  json.name user.real_name
-  json.image_url url_to_avatar(user)
+  json.partial! 'contributor', locals: { contributor: contributor }
 end
 json.total_count total_count

--- a/app/views/repositories/detail.json.jbuilder
+++ b/app/views/repositories/detail.json.jbuilder
@ -56,17 +56,7 @@ json.tags_count @result[:branch_tag_total_count]['tag_count'] || 0
 json.contributors do
  total_count = @result[:contributor].size
  json.list @result[:contributor].each do |contributor|
-    user = User.find_by(gitea_uid: contributor["id"])
-    if contributor["login"] == "root" || user.nil?
-      total_count -= 1
-      next
-    end
-    json.contributions contributor["contributions"]
-    json.gid contributor["id"]
-    json.login user.login
-    json.type user&.type
-    json.name user.real_name
-    json.image_url url_to_avatar(user)
+    json.partial! 'contributor', locals: { contributor: contributor }
  end
  json.total_count total_count
 end
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
yystopf	222e5c1050	fix: atme sender info	2021-11-10 11:32:59 +08:00
yystopf	1298fedcbb	fix: user rank	2021-11-10 10:47:03 +08:00
yystopf	937603d0f2	fix: change params is blank not sent email	2021-11-10 10:05:35 +08:00
yystopf	685d2b80f2	fix	2021-11-10 09:43:22 +08:00
yystopf	2e35fb92a9	fix: change message template email title	2021-11-09 17:04:45 +08:00
yystopf	c4e88ad690	fix	2021-11-09 16:56:49 +08:00
yystopf	e316a60433	fix: pullrequest fork_project_user_name	2021-11-09 16:56:49 +08:00
jasder	f1f4867b8c	Merge pull request 'FIX sync user info' (#243 ) from jasder/forgeplus:develop into develop	2021-11-08 16:31:01 +08:00
jasder	6fe3507a16	Merge remote-tracking branch 'gitlink/develop' into develop	2021-11-08 14:22:57 +08:00
jasder	6b0f9a689a	Merge pull request '@我功能' (#239 ) from yystopf/forgeplus:hh_notification_v2_2 into develop	2021-11-08 14:21:00 +08:00
yystopf	eb18a1e7aa	add: project members api and update forks api	2021-11-08 11:35:14 +08:00
yystopf	1a449d1dc6	add: atme service	2021-11-08 11:35:14 +08:00
jasder	c19c83d505	Merge branch 'develop' of https://git.trustie.net/Gitlink/forgeplus into develop	2021-11-05 11:36:51 +08:00
jasder	5cd7104fbb	Merge pull request '缓存逻辑修改以及消息模板修改' (#233 ) from yystopf/forgeplus:hh_fix_cache into develop	2021-11-05 09:23:22 +08:00
jasder	9f31dc02f4	FIX 后台管理修改用户信息时同步git用户	2021-11-04 17:58:45 +08:00
yystopf	e27ba76f33	fix: project identifier regex	2021-11-03 14:43:17 +08:00
yystopf	6adcb89829	fix	2021-11-02 14:34:02 +08:00
yystopf	e2411b350f	fix	2021-11-02 14:31:33 +08:00
yystopf	26f6738d29	fix: email template html	2021-11-02 13:52:57 +08:00
jasder	1008f17849	FIX 调整注册接口	2021-11-02 13:39:45 +08:00
yystopf	43c683e83f	fix: contributor load cache data	2021-11-02 11:27:17 +08:00
yystopf	282d3d0122	fix	2021-11-02 10:15:35 +08:00
yystopf	1b47f51550	fix	2021-11-02 10:03:13 +08:00
yystopf	890fe7d629	fix	2021-11-02 09:59:21 +08:00
yystopf	7193323be9	fix: field upper but	2021-11-02 09:59:21 +08:00
yystopf	28c3b4dda4	add: repo commit user use cache data	2021-11-02 09:59:21 +08:00
yystopf	46405e704a	add: rank not include deleted project	2021-11-02 09:59:21 +08:00
yystopf	2273b4817e	Merge pull request '用户排行榜数据缺失报错问题' (#231 ) from yystopf/forgeplus:hh_project_rank into develop	2021-11-02 09:59:05 +08:00
jasder	6c67b92bb1	FIX revert system_notification_histories	2021-11-01 11:06:18 +08:00
jasder	ab2e1ffa0e	FIX revert system_notification_histories[bug]	2021-11-01 11:06:08 +08:00
jasder	97ed641c63	FIX 增加gitea接口的响应时间(timeout设置为100s)	2021-11-01 11:05:31 +08:00
jasder	84ad7130d3	Revert "FIX 增加gitea接口的响应时间(timeout设置为100s)" This reverts commit `0e9699885d`.	2021-11-01 11:04:37 +08:00
jasder	83661dcf71	FIX update query projects api	2021-11-01 11:03:14 +08:00
jasder	0e9699885d	FIX 增加gitea接口的响应时间(timeout设置为100s)	2021-11-01 11:03:00 +08:00
jasder	1533f40890	Merge branch 'develop' of https://git.trustie.net/Gitlink/forgeplus into develop	2021-11-01 11:00:01 +08:00
yystopf	de2399a0a1	fix: project category load slowly	2021-10-29 19:54:58 +08:00
yystopf	eba672f39a	fix: user popular project nil	2021-10-29 19:39:08 +08:00
jasder	c0df55c20f	Merge pull request 'ADD 合并项目首页改版功能' (#227 ) from feature_project_detail into develop	2021-10-29 11:21:27 +08:00
yystopf	a983ce5e8a	Merge pull request '项目首页api以及后台推荐精选功能' (#226 ) from yystopf/forgeplus:hh_project_detail into feature_project_detail	2021-10-29 10:57:28 +08:00
yystopf	6efe9e7ec0	Merge pull request '修改排行榜的数量' (#225 ) from yystopf/forgeplus:hh_project_rank into feature_project_detail	2021-10-29 10:56:17 +08:00
yystopf	4f53994470	fix: rank count	2021-10-28 16:33:30 +08:00
yystopf	11d102f240	fix	2021-10-28 15:32:49 +08:00
yystopf	8698829678	fix: organization recommend api	2021-10-28 15:28:33 +08:00
yystopf	81ab0b01c0	fix: banner recommend remove login require	2021-10-28 14:21:42 +08:00
yystopf	3f690fd9a0	add: pinned projects size	2021-10-28 11:00:32 +08:00
yystopf	2b6d5e694e	fix	2021-10-28 10:56:30 +08:00
yystopf	9aff90c03a	fix	2021-10-28 10:52:44 +08:00
yystopf	43dc966cf9	add: project category upload logo	2021-10-27 18:02:21 +08:00
jasder	cbf8f1fa67	FIX code review	2021-10-27 17:19:39 +08:00
yystopf	274e5090ce	fix	2021-10-27 17:07:48 +08:00
yystopf	cc0e01cc47	fix	2021-10-27 17:06:35 +08:00
jasder	4676b756e8	FIX 完善邮箱注册发送邮件功能	2021-10-27 17:01:16 +08:00
yystopf	f0580720e3	fix	2021-10-27 16:58:31 +08:00
yystopf	91852d7957	add: project explore management	2021-10-27 16:50:18 +08:00
jasder	2719e60248	ADD 邮箱、登录名、手机号验证api	2021-10-27 15:15:06 +08:00
yystopf	0970a402c8	fix	2021-10-27 14:38:30 +08:00
yystopf	a43f6714de	add: project explore api	2021-10-27 14:20:27 +08:00
yystopf	e5eb0d3d47	Merge pull request '项目排行榜以及用户排行榜' (#224 ) from yystopf/forgeplus:hh_project_rank into feature_project_detail	2021-10-27 11:24:35 +08:00
yystopf	01f99a2f12	fix	2021-10-27 11:03:34 +08:00
yystopf	c019766df2	fix	2021-10-27 10:48:45 +08:00
yystopf	9232a284d8	fix	2021-10-27 10:46:09 +08:00
yystopf	e6c6e544fe	fix	2021-10-27 10:00:06 +08:00
yystopf	d0791ee653	fix: privacy project not use cache	2021-10-27 09:48:23 +08:00
yystopf	e1b0abbf31	fix	2021-10-27 09:20:46 +08:00
yystopf	21fa609e05	add: project rank and user rank api	2021-10-26 18:42:35 +08:00
yystopf	69c87fd5a4	add: callback cache	2021-10-26 15:22:42 +08:00
yystopf	91f1f4090f	fix: old cache	2021-10-25 18:03:56 +08:00
jasder	31676df86e	Merge pull request 'FIX 解决老版本trustie项目链接错误的问题' (#223 ) from jasder/forgeplus:develop into develop	2021-10-25 17:27:07 +08:00
jasder	9cd54b0ccb	FIX 解决老版本trustie项目链接错误的问题	2021-10-25 17:24:28 +08:00
yystopf	fa476732e5	add: user common info cache service	2021-10-25 17:23:17 +08:00
yystopf	f9bb74aba4	add: cache service	2021-10-25 16:57:11 +08:00
				`@ -0,0 +1 @@`
				`json.project_categories @project_categories, :id, :name, :logo_url`