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

Merge pull request 'fix code review' (#246 ) from jasder/forgeplus:develop into develop
Merge branch 'develop' of https://git.trustie.net/Gitlink/forgeplus into develop
2021-11-14 20:39:31 +08:00 · 2021-11-11 18:21:51 +08:00 · 2021-11-11 18:09:26 +08:00 · 2021-11-11 18:09:08 +08:00 · 2021-11-11 18:06:08 +08:00 · 2021-11-11 18:03:30 +08:00
363 changed files with 1188 additions and 6702 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/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
@ -5,7 +5,7 @@ class Admins::ProjectCategoriesController < Admins::BaseController
  def index 
    sort_by = ProjectCategory.column_names.include?(params[:sort_by]) ? params[:sort_by] : 'created_at'
    sort_direction = %w(desc asc).include?(params[:sort_direction]) ? params[:sort_direction] : 'desc'
-    q = ProjectCategory.includes(:projects).ransack(name_cont: params[:name])
+    q = ProjectCategory.ransack(name_cont: params[:name])
    project_categories = q.result(distinct: true).order("#{sort_by} #{sort_direction}")
    @project_categories = paginate(project_categories)
    
@ -33,12 +33,13 @@ class Admins::ProjectCategoriesController < Admins::BaseController
  end

  def update 
-    if @project_category.update_attributes({name: @name, pinned_index: params[:project_category][:pinned_index].to_i}) && save_image_file(params[:logo], 'logo')
+    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 
      redirect_to admins_project_categories_path
-      flash[:success] = '更新失败'
+      flash[:danger] = '更新失败'
    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

 	# 发送及记录激活码
@ -140,7 +102,7 @@ class ApplicationController < ActionController::Base
 		when 1, 2, 4, 9
 			# 手机类型的发送
 			sigle_para = {phone: value}
-			status = Educoder::Sms.send(mobile: value, code: code)
+			status = Gitlink::Sms.send(mobile: value, code: code)
 			tip_exception(-2, code_msg(status)) if status != 0
 		when 8, 3, 5
 			# 邮箱类型的发送
@ -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
@ -256,7 +183,7 @@ class ApplicationController < ActionController::Base

 	# 异常提醒
 	def tip_exception(status = -1, message)
-		raise Educoder::TipException.new(status, message)
+		raise Gitlink::TipException.new(status, message)
 	end

 	def missing_template
@ -265,7 +192,7 @@ class ApplicationController < ActionController::Base

 	# 弹框提醒
 	def tip_show_exception(status = -2, message)
-		raise Educoder::TipException.new(status, message)
+		raise Gitlink::TipException.new(status, message)
 	end

 	def normal_status(status = 0, message)
@ -345,18 +272,18 @@ class ApplicationController < ActionController::Base

 		# 测试版前端需求
 		logger.info("subdomain:#{request.subdomain}")
-		if request.subdomain != "www"
-			if params[:debug] == 'teacher' #todo 为了测试,记得讲debug删除
-				User.current = User.find 81403
-			elsif params[:debug] == 'student'
-				User.current = User.find 8686
-			elsif params[:debug] == 'admin'
-				logger.info "@@@@@@@@@@@@@@@@@@@@@@ debug mode....."
-				user =  User.find 36480
-				User.current = user
-				cookies.signed[:user_id] = user.id
-			end
-		end
+		# if request.subdomain != "www"
+		# 	if params[:debug] == 'teacher' #todo 为了测试,记得讲debug删除
+		# 		User.current = User.find 81403
+		# 	elsif params[:debug] == 'student'
+		# 		User.current = User.find 8686
+		# 	elsif params[:debug] == 'admin'
+		# 		logger.info "@@@@@@@@@@@@@@@@@@@@@@ debug mode....."
+		# 		user =  User.find 36480
+		# 		User.current = user
+		# 		cookies.signed[:user_id] = user.id
+		# 	end
+		# end
 		# User.current = User.find 81403
 	end

@ -446,7 +373,7 @@ class ApplicationController < ActionController::Base
 			JSON.parse(res)
 		rescue Exception => e
 			uid_logger_error("--uri_exec: exception #{e.message}")
-			raise Educoder::TipException.new("实训平台繁忙（繁忙等级：84）")
+			raise Gitlink::TipException.new("实训平台繁忙（繁忙等级：84）")
 		end
 	end

@ -465,7 +392,7 @@ class ApplicationController < ActionController::Base
 			end
 		rescue Exception => e
 			uid_logger("--uri_exec: exception #{e.message}")
-			raise Educoder::TipException.new(message)
+			raise Gitlink::TipException.new(message)
 		end
 	end

@ -489,7 +416,7 @@ class ApplicationController < ActionController::Base
 			end
 		rescue Exception => e
 			uid_logger("--uri_exec: exception #{e.message}")
-			raise Educoder::TipException.new("服务器繁忙")
+			raise Gitlink::TipException.new("服务器繁忙")
 		end
 	end

@ -661,8 +588,8 @@ class ApplicationController < ActionController::Base

 	# 获取Oauth Client
 	def get_client(site)
-		client_id = Rails.configuration.educoder['client_id']
-		client_secret = Rails.configuration.educoder['client_secret']
+		client_id = Rails.configuration.Gitlink['client_id']
+		client_secret = Rails.configuration.Gitlink['client_secret']

 		OAuth2::Client.new(client_id, client_secret, site: site)
 	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/attachments_controller.rb
+++ b/app/controllers/attachments_controller.rb
@ -196,7 +196,7 @@ class AttachmentsController < ApplicationController
  end

  def file_save_to_ucloud(path, file, content_type)
-    ufile = Educoder::Ufile.new(
+    ufile = Gitlink::Ufile.new(
        ucloud_public_key: edu_setting('public_key'),
        ucloud_private_key: edu_setting('private_key'),
        ucloud_public_read: true,
--- a/app/controllers/concerns/controller_rescue_handler.rb
+++ b/app/controllers/concerns/controller_rescue_handler.rb
@ -20,7 +20,7 @@ module ControllerRescueHandler
    end
    # rescue_from ActionView::MissingTemplate, with: :object_not_found
    # rescue_from ActiveRecord::RecordNotFound, with: :object_not_found
-    rescue_from Educoder::TipException, with: :tip_show
+    rescue_from Gitlink::TipException, with: :tip_show
    rescue_from ::ActionView::MissingTemplate, with: :missing_template
    rescue_from ActiveRecord::RecordNotFound, with: :object_not_found
    rescue_from ActionController::ParameterMissing, with: :render_parameter_missing
--- a/app/controllers/concerns/git_common.rb
+++ b/app/controllers/concerns/git_common.rb
@ -36,10 +36,10 @@ module GitCommon
    begin
      @commits = GitService.commits(repo_path: @repo_path)
      logger.info("git first commit is #{@commits.try(:first)}")
-      raise Educoder::TipException.new("请先创建版本库") if @commits.nil?
+      raise Gitlink::TipException.new("请先创建版本库") if @commits.nil?
    rescue Exception => e
      uid_logger_error(e.message)
-      raise Educoder::TipException.new("提交记录异常")
+      raise Gitlink::TipException.new("提交记录异常")
    end
  end

--- a/app/controllers/concerns/git_helper.rb
+++ b/app/controllers/concerns/git_helper.rb
@ -34,7 +34,7 @@ module GitHelper

    rescue Exception => e
      Rails.logger.error(e.message)
-      raise Educoder::TipException.new("文档内容获取异常")
+      raise Gitlink::TipException.new("文档内容获取异常")
    end
  end

@ -64,7 +64,7 @@ module GitHelper

  # 版本库Fork功能
  def project_fork(container, original_rep_path, username)
-    raise Educoder::TipException.new("fork源路径为空,fork失败!") if original_rep_path.blank?
+    raise Gitlink::TipException.new("fork源路径为空,fork失败!") if original_rep_path.blank?
    # 将要生成的仓库名字
    new_repo_name = "#{username.try(:strip)}/#{container.try(:identifier)}#{ Time.now.strftime("%Y%m%d%H%M%S")}"
    # uid_logger("start fork container: repo_name is #{new_repo_name}")
--- 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,12 +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.login, @organization.mail).read
+    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?
--- a/app/controllers/project_rank_controller.rb
+++ b/app/controllers/project_rank_controller.rb
@ -2,9 +2,11 @@ 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_rack = []
+    @project_rank = []
  end

  private 
--- 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
@ -191,7 +191,7 @@ class ProjectsController < ApplicationController

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

--- 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/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
@ -52,7 +52,7 @@ class UsersController < ApplicationController
      @projects_mirrior_count = user_projects.mirror.size
      @projects_sync_mirrior_count = user_projects.sync_mirror.size
      # 为了缓存活跃用户的基本信息，后续删除
-      Cache::V2::OwnerCommonService.new(@user.login, @user.mail).read
+      Cache::V2::OwnerCommonService.new(@user.id).read
  end

  def watch_users
--- a/app/decorators/course_decorator.rb
+++ b/app/decorators/course_decorator.rb
@ -1,5 +0,0 @@
-module CourseDecorator
-  def can_visited?
-    is_public == 1 || User.current.admin_or_business? || User.current.member_of_course?(self)
-  end
-end
--- a/app/decorators/ec_course_target_decorator.rb
+++ b/app/decorators/ec_course_target_decorator.rb
@ -1,2 +0,0 @@
-module EcCourseTargetDecorator
-end
--- a/app/decorators/experience_decorator.rb
+++ b/app/decorators/experience_decorator.rb
@ -1,16 +0,0 @@
-module ExperienceDecorator
-  def container_type_text
-    I18n.t("experience.container_type.#{container_type.to_s.underscore}")
-  end
-
-  def content
-    case container_type.to_s.underscore
-    when 'game' then
-      game = Game.find_by(id: container_id)
-      game.present? ? "通过实训“#{game.challenge.shixun.name}”的第#{game.challenge.position}关获得的奖励" : ''
-    when 'shixun_publish' then
-      shixun = Shixun.find_by(id: container_id)
-      shixun.present? ? "发布实训“#{shixun.name}”获得的奖励" : ''
-    end
-  end
-end
--- a/app/decorators/grade_decorator.rb
+++ b/app/decorators/grade_decorator.rb
@ -1,39 +0,0 @@
-module GradeDecorator
-  def container_type_text
-    I18n.t("grade.container_type.#{container_type.to_s.underscore}")
-  end
-
-  def content
-    case container_type.to_s.underscore
-    when 'avatar'         then '用户首次上传头像获得的奖励'
-    when 'phone'          then '用户首次绑定手机号码获得的奖励'
-    when 'mail'           then '用户首次绑定邮箱获得的奖励'
-    when 'attendance'     then '用户每天签到获得的奖励'
-    when 'account'        then '新用户首次填写基本资料获得的奖励'
-    when 'memo'           then '发布的评论或者帖子获得平台奖励'
-    when 'discusses'      then '发布的评论获得平台奖励'
-    when 'star'           then '用户给实训评分获得的随机奖励'
-    when 'feedback'       then '反馈的问题获得平台奖励'
-    when 'authentication' then '用户首次完成实名认证获得的奖励'
-    when 'professional'   then '用户首次完成职业认证获得的奖励'
-    when 'answer' then
-      game = Game.find_by(id: container_id)
-      game.present? ? "查看实训“#{game.challenge.shixun.name}”第#{game.challenge.position}关的参考答案消耗的金币" : ''
-    when 'game' then
-      game = Game.find_by(id: container_id)
-      game.present? ? "通过实训“#{game.challenge.shixun.name}”的第#{game.challenge.position}关获得的奖励" : ''
-    when 'test_set' then
-      game = Game.find_by(id: container_id)
-      game.present? ? "查看实训“#{game.challenge.shixun.name}”的第#{game.challenge.position}关的隐藏测试集消耗的金币" : ''
-    when 'shixun_publish' then
-      shixun = Shixun.find_by(id: container_id)
-      shixun.present? ? "发布实训“#{shixun.name}”获得的奖励" : ''
-    when 'check_ta_answer' then
-      game = Game.find_by(id: container_id)
-      game.present? ? "查看实训“#{game.challenge.shixun.name}”第#{game.challenge.position}关的TA人解答消耗的金币" : ''
-    when 'hack' then
-      hack = Hack.find_by(id: container_id)
-      hack.present? ? "完成了题目解答“#{hack.name}”，获得金币奖励：#{hack.score}" : ''
-    end
-  end
-end
--- a/app/decorators/library_decorator.rb
+++ b/app/decorators/library_decorator.rb
@ -1,5 +0,0 @@
-module LibraryDecorator
-  extend ApplicationDecorator
-
-  display_time_method :published_at, :created_at, :updated_at
-end
--- a/app/decorators/shixun_decorator.rb
+++ b/app/decorators/shixun_decorator.rb
@ -1,5 +0,0 @@
-module ShixunDecorator
-  def human_status
-    I18n.t("shixun.status.#{status}")
-  end
-end
--- a/app/decorators/subject_decorator.rb
+++ b/app/decorators/subject_decorator.rb
@ -1,5 +0,0 @@
-module SubjectDecorator
-  def can_visited?
-    published? || User.current.admin? || member?(User.current)
-  end
-end
--- a/app/decorators/video_decorator.rb
+++ b/app/decorators/video_decorator.rb
@ -1,5 +0,0 @@
-module VideoDecorator
-  extend ApplicationDecorator
-
-  display_time_method :published_at, :created_at, :updated_at
-end
--- 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/add_school_apply_form.rb
+++ b/app/forms/add_school_apply_form.rb
@ -1,10 +0,0 @@
-class AddSchoolApplyForm
-  include ActiveModel::Model
-
-  attr_accessor :name, :province, :city, :address, :remarks
-
-  validates :name, presence: true
-  # validates :province, presence: true
-  # validates :city, presence: true
-  # validates :address, presence: true
-end
--- a/app/forms/apply_shixun_mirror_form.rb
+++ b/app/forms/apply_shixun_mirror_form.rb
@ -1,27 +0,0 @@
-class ApplyShixunMirrorForm
-  include ActiveModel::Model
-
-  attr_accessor :language, :runtime, :run_method, :attachment_id
-
-  validates :language, presence: true
-  validates :runtime, presence: true
-  validates :run_method, presence: true
-  validates :attachment_id, presence: true, numericality: { only_integer: true }
-
-  validate :ensure_attachment_presence
-  def ensure_attachment_presence
-    return unless attachment_id
-
-    if attachment.blank?
-      errors.add(:attachment_id, :attachment_not_exist)
-    end
-  end
-
-  def attachment
-    @attachment ||= Attachment.find_by_id(attachment_id)
-  end
-
-  def to_json
-    { language: language, runtime: runtime, run_method: run_method, attachment_id: attachment_id }.to_json
-  end
-end
--- 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/examination_banks/save_exam_form.rb
+++ b/app/forms/examination_banks/save_exam_form.rb
@ -1,15 +0,0 @@
-class ExaminationBanks::SaveExamForm
-  include ActiveModel::Model
-
-  attr_accessor :discipline_id, :sub_discipline_id, :difficulty, :name, :duration, :tag_discipline_id
-
-  validates :discipline_id, presence: true
-  validates :sub_discipline_id, presence: true
-  validates :difficulty, presence: true, inclusion: {in: 1..3}, numericality: { only_integer: true }
-  validates :name, presence: true, length: { maximum: 60, too_long: "不能超过60个字符" }
-  validate :validate_duration
-
-  def validate_duration
-    raise '时长应为大于0的整数' if duration.present? && duration.to_i < 1
-  end
-end
--- a/app/forms/examination_intelligent_settings/save_exam_form.rb
+++ b/app/forms/examination_intelligent_settings/save_exam_form.rb
@ -1,12 +0,0 @@
-class ExaminationIntelligentSettings::SaveExamForm
-  include ActiveModel::Model
-
-  attr_accessor :name, :duration
-
-  validates :name, presence: true, length: { maximum: 60 }
-  validate :validate_duration
-
-  def validate_duration
-    raise '时长应为大于0的整数' if duration.present? && duration.to_i < 1
-  end
-end
--- a/app/forms/examination_intelligent_settings/save_exam_setting_form.rb
+++ b/app/forms/examination_intelligent_settings/save_exam_setting_form.rb
@ -1,11 +0,0 @@
-class ExaminationIntelligentSettings::SaveExamSettingForm
-  include ActiveModel::Model
-
-  attr_accessor :discipline_id, :sub_discipline_id, :source, :difficulty, :tag_discipline_id, :question_settings
-
-  validates :discipline_id, presence: true
-  validates :sub_discipline_id, presence: true
-  validates :source, presence: true
-  validates :difficulty, presence: true, inclusion: {in: 1..3}, numericality: { only_integer: true }
-  validates :question_settings, presence: true
-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/forms/weapps/create_course_form.rb
+++ b/app/forms/weapps/create_course_form.rb
@ -1,20 +0,0 @@
-class Weapps::CreateCourseForm
-  include ActiveModel::Model
-
-  attr_accessor :course
-  attr_accessor :name, :course_list_name, :credit, :course_module_types, :end_date
-
-  validates :name, presence: true
-  validates :course_list_name, presence: true
-
-  validate :course_name_prefix
-  validate :check_course_modules
-
-  def course_name_prefix
-    raise '课堂名称应以课程名称开头' unless name.index(course_list_name) && name.index(course_list_name) == 0
-  end
-
-  def check_course_modules
-    raise '请至少添加一个课堂模块' if course_module_types.blank?
-  end
-end
--- a/app/forms/weapps/update_course_form.rb
+++ b/app/forms/weapps/update_course_form.rb
@ -1,15 +0,0 @@
-class Weapps::UpdateCourseForm
-  include ActiveModel::Model
-
-  attr_accessor :course
-  attr_accessor :name, :course_list_name, :credit, :end_date
-
-  validates :name, presence: true
-  validates :course_list_name, presence: true
-
-  validate :course_name_prefix
-
-  def course_name_prefix
-    raise '课堂名称应以课程名称开头' unless name.index(course_list_name) && name.index(course_list_name) == 0
-  end
-end
--- a/app/helpers/admins/projects_helper.rb
+++ b/app/helpers/admins/projects_helper.rb
@ -4,7 +4,7 @@ module Admins::ProjectsHelper
    owner = project.owner

    if owner.is_a?(User)
-      link_to(project.owner&.real_name, "/users/#{project&.owner&.login}", target: '_blank')
+      link_to(project.owner&.real_name, "/#{project&.owner&.login}", target: '_blank')
    elsif owner.is_a?(Organization)
      link_to(project.owner&.real_name, "/organize/#{project&.owner&.login}", target: '_blank')
    else
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@ -1,6 +1,6 @@
 # 所有的方法请按首字母的顺序依次列出
 module ApplicationHelper
-  include Educoder::I18n
+  include Gitlink::I18n
  include GitHelper

  ONE_MINUTE = 60 * 1000
@ -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/boards_helper.rb
+++ b/app/helpers/boards_helper.rb
@ -1,2 +0,0 @@
-module BoardsHelper
-end
--- a/app/helpers/challenges_helper.rb
+++ b/app/helpers/challenges_helper.rb
@ -1,10 +0,0 @@
-module ChallengesHelper
-
-  def match_begin_symbol str
-    str.gsub(/\A\r/, "\r\r")
-  end
-
-
-  
-
-end
--- a/app/helpers/course_groups_helper.rb
+++ b/app/helpers/course_groups_helper.rb
@ -1,2 +0,0 @@
-module CourseGroupsHelper
-end
--- a/app/helpers/course_modules_helper.rb
+++ b/app/helpers/course_modules_helper.rb
@ -1,2 +0,0 @@
-module CourseModulesHelper
-end
--- a/app/helpers/course_second_categories_helper.rb
+++ b/app/helpers/course_second_categories_helper.rb
@ -1,2 +0,0 @@
-module CourseSecondCategoriesHelper
-end
--- a/app/helpers/course_stages_helper.rb
+++ b/app/helpers/course_stages_helper.rb
@ -1,2 +0,0 @@
-module CourseStagesHelper
-end
--- a/app/helpers/courses_helper.rb
+++ b/app/helpers/courses_helper.rb
@ -1,298 +0,0 @@
-module CoursesHelper
-
-  def member_manager group, teachers
-    str = ""
-    members = teachers.select{|teacher| teacher.teacher_course_groups.pluck(:course_group_id).include?(group.id) || teacher.teacher_course_groups.size == 0}
-    str = members.uniq.size == teachers.size ? "全部教师" : members.map{|member| member.user.real_name}.join("、")
-    str
-    # teachers.each do |member|
-    #   if member.teacher_course_groups.exists?(course_group_id: group.id) || member.teacher_course_groups.size == 0
-    #     str << member.user.real_name
-    #   end
-    # end
-  end
-
-  def edit_auth group, teachers
-    User.current.admin_or_business? ||
-      teachers.select{|teacher| teacher.user_id == User.current.id &&
-        (teacher.teacher_course_groups.pluck(:course_group_id).include?(group.id) || teacher.teacher_course_groups.size == 0)}.size > 0
-  end
-
-    # 是否有切换为学生的入口
-  def switch_student_role is_teacher, course, user
-    is_teacher && course.course_members.where(user_id: user.id, role: %i(STUDENT)).exists?
-  end
-
-  # 是否有切换为教师的入口
-  def switch_teacher_role is_student, course, user
-    is_student && course.course_members.where(user_id: user.id, role: %i(CREATOR PROFESSOR)).exists?
-  end
-
-  # 是否有切换为助教的入口
-  def switch_assistant_role is_student, course, user
-    is_student && course.course_members.where(user_id: user.id, role: %i(ASSISTANT_PROFESSOR)).exists?
-  end
-
-  # 课堂结束天数
-  def course_end_date end_date
-    if end_date.present?
-      curr = Time.new
-      date = ((Date.parse(end_date.to_s) - Date.parse(curr.to_s)).to_i)
-      date > 0 ? "#{date}天后" : ""
-    end
-  end
-
-  # 课堂模块的url
-  def module_url mod, course
-    return nil if mod.blank? or course.blank?
-    case mod.module_type
-    when "announcement"
-      "/courses/#{course.id}/informs"
-    when "online_learning"
-      "/courses/#{course.id}/online_learning"
-    when "shixun_homework"
-      "/courses/#{course.id}/shixun_homeworks/#{mod.id}"
-    when "common_homework"
-      "/courses/#{course.id}/common_homeworks/#{mod.id}"
-    when "group_homework"
-      "/courses/#{course.id}/group_homeworks/#{mod.id}"
-    when "graduation"
-      "/courses/#{course.id}/graduation_topics/#{mod.id}"
-    when "exercise"
-      "/courses/#{course.id}/exercises/#{mod.id}"
-    when "poll"
-      "/courses/#{course.id}/polls/#{mod.id}"
-    when "attachment"
-      "/courses/#{course.id}/files/#{mod.id}"
-    when "board"
-      course_board = course.course_board
-      "/courses/#{course.id}/boards/#{course_board.id}"
-    when "course_group"
-      "/courses/#{course.id}/course_groups"
-    when "statistics"
-      "/courses/#{course.id}/statistics"
-    when "video"
-      "/courses/#{course.id}/course_videos"
-    end
-  end
-
-  # 子目录对应的url
-  def category_url category, course
-    case category.category_type
-      when "shixun_homework"
-        "/courses/#{course.id}/shixun_homework/#{category.id}"
-      when "graduation"
-        if category.name == "毕设选题"
-          "/courses/#{course.id}/graduation_topics/#{category.course_module_id}"
-        else
-          "/courses/#{course.id}/graduation_tasks/#{category.course_module_id}"
-        end
-      when "attachment"
-        "/courses/#{course.id}/file/#{category.id}"
-    end
-  end
-
-  # 子目录下的任务数
-  def category_task_count course, category, user
-    case category.category_type
-    when "shixun_homework"
-      get_homework_commons_count(course, 4, category.id)
-    when "graduation"
-      if category.name == "毕设选题"
-        course.graduation_topics_count
-      else
-        course.graduation_tasks_count
-      end
-    when "attachment"
-      get_attachment_count(course, category.id)
-    end
-  end
-
-  # 课堂模块的任务数
-  def course_task_count(course, module_type)
-    case module_type
-      when "shixun_homework"
-        get_homework_commons_count(course, 4, 0)
-      when "common_homework"
-        get_homework_commons_count(course, 1, 0)
-      when "group_homework"
-        get_homework_commons_count(course, 3, 0)
-      when "graduation"
-        0
-      when "exercise"
-        course.exercises_count
-      when "poll"
-        course.polls_count
-      when "attachment"
-        get_attachment_count(course, 0)
-      when "board"
-        course_board = course.course_board
-        course_board.present? ? course_board.messages.size : 0
-      when "course_group"
-        course.course_groups_count
-      when "announcement"
-        course.informs.count
-      when "online_learning"
-        course.shixuns.count
-      when "video"
-        course.course_videos.count + course.live_links.count
-    end
-  end
-
-  # 当前用户可见的课堂作业，type指定作业类型， category_id指定二级目录
-  def visible_homework course, user, type, category_id=0
-    if user.teacher_of_course?(course)
-      homeworks = course.homework_commons.where("homework_type = #{type} and course_second_category_id = #{category_id}")
-    elsif user.member_of_course?(course)
-      member = course.course_members.find_by(user_id: user.id, role: 4)
-      if member.try(:course_group_id).to_i == 0
-        homeworks = course.homework_commons.where("homework_commons.homework_type = #{type} and publish_time <= '#{Time.now}'
-                                                   and unified_setting = 1 and course_second_category_id = #{category_id}")
-      else
-        not_homework_ids = course.homework_group_settings.where("course_group_id = #{member.try(:course_group_id)} and
-                                                                 (publish_time > '#{Time.now}' or publish_time is null)").pluck(:homework_common_id)
-        # not_homework_ids = not_homework_ids.blank? ? "(-1)" : "(" + not_homework_ids.map(&:homework_common_id).join(",") + ")"
-        homeworks = course.homework_commons.where.not(id: not_homework_ids).where("homework_commons.homework_type = #{type} and publish_time <= '#{Time.now}'
-                                                   and course_second_category_id = #{category_id}")
-      end
-    else
-      homeworks = course.homework_commons.where("homework_type = #{type} and publish_time <= '#{Time.now}' and unified_setting = 1
-                                                 and course_second_category_id = #{category_id}")
-    end
-    homeworks
-  end
-
-  # 当前用户可见的课堂试卷
-  def visible_exercise course, user
-    if user.teacher_of_course?(course)
-      exercises = course.exercises
-    elsif user.member_of_course?(course)
-      member = course.course_members.find_by(user_id: user.id, role: 4)
-      if member.try(:course_group_id).to_i == 0
-        exercises = course.exercises.where("publish_time <= '#{Time.now}' and unified_setting = 1")
-      else
-        not_exercise_ids = course.exercise_group_settings.where("course_group_id = #{member.try(:course_group_id)} and
-                                                                 (publish_time > '#{Time.now}' or publish_time is null)").pluck(:exercise_id)
-        exercises = course.exercises.where.not(id: not_exercise_ids).where("publish_time <= '#{Time.now}'")
-      end
-    else
-      exercises = course.exercises.where("publish_time <= '#{Time.now}' and unified_setting = 1")
-    end
-    exercises
-  end
-
-  # 当前用户可见的课堂问卷
-  def visible_poll course, user
-    if user.teacher_of_course?(course)
-      polls = course.polls
-    elsif user.member_of_course?(course)
-      member = course.course_members.find_by(user_id: user.id, role: 4)
-      if member.try(:course_group_id).to_i == 0
-        polls = course.polls.where("publish_time <= '#{Time.now}' and unified_setting = 1")
-      else
-        not_poll_ids = course.poll_group_settings.where("course_group_id = #{member.try(:course_group_id)} and
-                                                                 (publish_time > '#{Time.now}' or publish_time is null)").pluck(:poll_id)
-        polls = course.polls.where.not(id: not_poll_ids).where("publish_time <= '#{Time.now}'")
-      end
-    else
-      polls = course.polls.where("publish_time <= '#{Time.now}' and unified_setting = 1")
-    end
-    polls
-  end
-
-  # 当前用户可见的课堂资源，category_id指定资源的目录
-  def visible_attachment course, user, category_id=0
-    result = []
-    course.attachments.where(course_second_category_id: category_id).each do |attachment|
-      if attachment.unified_setting
-        if attachment.is_public == 1 && attachment.is_publish == 1 || user == attachment.author || user.teacher_of_course?(course) || (user.member_of_course?(course) && attachment.is_publish == 1)
-          result << attachment
-        end
-      else
-        if attachment.is_public == 1 && attachment.is_publish == 1 && !user.member_of_course?(course) || user == attachment.author || user.teacher_of_course?(course)
-          result << attachment
-        elsif user.member_of_course?(course) && attachment.is_publish == 1
-          member = course.course_members.find_by(user_id: user.id, role: 4)
-          if member.try(:course_group_id).to_i == 0 && attachment.unified_setting
-            result << attachment
-          elsif attachment.attachment_group_settings.where("course_group_id = #{member.try(:course_group_id)} and publish_time > '#{Time.now}'").count == 0
-            result << attachment
-          end
-        end
-      end
-    end
-    result
-  end
-
-  # 获取课堂的资源数
-  def get_attachment_count(course, category_id)
-    category_id.to_i == 0 ? course.attachments.size : course.attachments.where(course_second_category_id: category_id).size
-  end
-
-  # 获取课堂的作业数
-  def get_homework_commons_count(course, type, category_id)
-    category_id == 0 ? HomeworkCommon.where(course_id: course.id, homework_type: type).size :
-      HomeworkCommon.where(course_id: course.id, homework_type: type, course_second_category_id: category_id).size
-  end
-
-
-  # 获取课堂的任务数(作业数＋试卷数＋问卷数)
-  def get_tasks_count(course)
-    course.homework_commons_count + course.exercises_count + course.polls_count
-  end
-
-  # 当前用户可见的毕设任务
-  def visible_graduation_task course, user
-    if user.teacher_of_course?(course)
-      tasks = course.graduation_tasks
-    else
-      tasks = course.graduation_tasks.where("publish_time <= '#{Time.now}'")
-    end
-    tasks
-  end
-
-  # 分班情况
-  def course_group_info course, user_id
-    course_group_ids = course.group_course_power(user_id)
-    course_groups =
-        if course_group_ids.present?
-          course.course_groups.where(id: course_group_ids).includes(:course_members)
-        else
-          course.course_groups.includes(:course_members)
-        end
-    group_info = []
-    if !course_groups.blank?
-      course_groups.each do |group|
-        group_info << {course_group_id: group.id, group_group_name: group.name, count: group.course_members_count}
-      end
-
-      none_group_count = course.students.where(course_group_id: 0).size
-      group_info << {course_group_id: 0, group_group_name: "未分班", count: none_group_count} if none_group_count > 0 && !course_group_ids.present?
-    end
-
-    return group_info
-  end
-
-  def left_group_info course
-    group_info = []
-    if course.course_groups_count > 0
-      none_group_count = course.students.where(course_group_id: 0).size
-      group_info << {category_id: 0, category_name: "未分班", position: course.course_groups.pluck(:position).max.to_i + 1,
-                     category_count: none_group_count, category_type: false,
-                     second_category_url: "/courses/#{@course.id}/course_groups/0"}
-      course.course_groups.each do |course_group|
-        group_info << {category_id: course_group.id, category_name: course_group.name, position: course_group.position,
-                       category_count: course_group.course_members_count, category_type: false,
-                       second_category_url: "/courses/#{@course.id}/course_groups/#{course_group.id}"}
-      end
-    end
-    group_info
-  end
-
-  def last_subject_shixun course, myshixuns
-    myshixun = myshixuns.sort{|x,y| y[:updated_at] <=> x[:updated_at] }.first
-    return "" unless myshixun
-    stage_shixun = course.course_stage_shixuns.where(shixun_id: myshixun.shixun_id).take
-    progress = stage_shixun&.course_stage&.position.to_s + "-" + stage_shixun&.position.to_s + " " + myshixun.shixun&.name
-  end
-end
--- a/app/helpers/discusses_helper.rb
+++ b/app/helpers/discusses_helper.rb
@ -1,2 +0,0 @@
-module DiscussesHelper
-end
--- a/app/helpers/edu_datas_helper.rb
+++ b/app/helpers/edu_datas_helper.rb
@ -1,2 +0,0 @@
-module EduDatasHelper
-end
--- a/app/helpers/graduation_tasks_helper.rb
+++ b/app/helpers/graduation_tasks_helper.rb
@ -1,150 +0,0 @@
-module GraduationTasksHelper
-  include CoursesHelper
-  # 教师评阅
-  def teacher_comment task, user_id
-    [{ id: 0 ,name: "未评", count: task.uncomment_count(user_id)}, {id: 1, name: "已评", count: task.comment_count(user_id)}]
-  end
-
-  # 作品状态
-  def task_status task, user_id
-    [{id: 0, name: "未提交",   count: task.unfinished_count(user_id)},
-     {id: 1, name: "按时提交", count: task.finished_count(user_id)},
-     {id: 2, name: "延时提交", count: task.delay_finished_count(user_id)}]
-  end
-
-  # 交叉评阅
-  def cross_comment task, user_id
-    if task.cross_comment && task.status >= 3
-      [{id: 1, name: "只看我的交叉评阅", count: task.graduation_work_comment_assignations.myself(user_id).count}]
-    else
-      []
-    end
-  end
-
-  def task_curr_status task, course
-    result = {}
-    status = []
-    time = ""
-
-    if course.try(:is_end)
-      status << "已结束"
-      time = course.end_date.present? ? course.end_date.strftime("%Y-%m-%d") : ""
-    else
-      if task.status > 1 && task.allow_late && (task.late_time.nil? || task.late_time > Time.now)
-        status << "补交中"
-      end
-
-      case task.status
-        when 0
-          status << "未发布"
-          time = task.publish_time.present? ? "将于 #{format_time(task.publish_time)} 发布" : "创建于#{time_from_now(task.created_at)}"
-        when 1
-          if task.end_time && task.end_time >= Time.now
-            status << "提交中"
-            time = how_much_time(task.end_time)
-          end
-        when 2
-          status << "评阅中"
-          time = task.comment_time.present? ? how_much_time(task.comment_time) : course.end_date.present? ? how_much_time(course.end_date.end_of_day) : ""
-        when 3
-          status << "交叉评阅中"
-          time = course.end_date.present? ? how_much_time(course.end_date.end_of_day) : ""
-      end
-
-      status << "未开启补交" if (!task.allow_late && task.status != 0)    #6.11 -hs 新增status不等于0
-
-      # 如果还在补交阶段则显示补交结束时间
-      if task.status > 1 && task.allow_late && task.late_time && task.late_time > Time.now
-        time = how_much_time(task.late_time)
-      end
-    end
-
-    result[:status] = status
-    result[:time] = time
-    result
-  end
-
-  # 作品数统计：type： 1 已提交  0 未提交
-  def grduationwork_count task, type
-   works = task.graduation_works
-   type == 1 ? works.select{|work| work.work_status != 0}.size : works.select{|work| work.work_status == 0}.size
-  end
-
-  # 普通/分组 作业作品状态数组
-  def graduation_work_status task, user_id, course
-    status = []
-    work = task.graduation_works.find_by(user_id: user_id)
-
-    work = work || GraduationWork.create(graduation_task_id: task.id, user_id: user_id)
-    late_time = task.late_time || course.end_date
-
-    if course.is_end && work && work.work_status > 0
-      status << "查看作品"
-    elsif !course.is_end
-      if task.publish_time && task.publish_time < Time.now
-        # 作业未截止时
-        if task.end_time > Time.now
-          if task.task_type == 2 && task.base_on_project
-            if work.project_id.nil? || work.project_id == 0
-              status << "创建项目"
-              status << "关联项目"
-            elsif work.work_status == 0
-              status << "取消关联"
-              status << "提交作品"
-            else
-              status << "修改作品"
-            end
-          else
-            if work.work_status == 0
-              status << "提交作品"
-            else
-              status << "修改作品"
-            end
-          end
-
-          # 补交阶段
-        elsif task.allow_late && (late_time.nil? || late_time > Time.now)
-          if task.task_type == 2 && task.base_on_project
-            if work.project_id.nil? || work.project_id == 0
-              status << "创建项目"
-              status << "关联项目"
-            elsif work.work_status == 0
-              status << "取消关联"
-              status << "补交作品"
-            else
-              status << "补交附件"
-              status << "查看作品"
-            end
-          else
-            if work.work_status == 0
-              status << "补交作品"
-            else
-              status << "补交附件"
-              status << "查看作品"
-            end
-          end
-
-          # 匿评阶段
-        elsif work.work_status != 0
-          status << "查看作品"
-        end
-      end
-    end
-  end
-
-  # 阶段剩余时间
-  def task_left_time task
-    if task.publish_time && task.publish_time < Time.now
-      if task.end_time > Time.now
-        status = "剩余提交时间"
-        time = "#{how_much_time(task.end_time)}"
-      else
-        if task.allow_late && task.late_time && task.late_time >= Time.now
-          status = "剩余补交时间"
-          time = "#{how_much_time(task.late_time)}"
-        end
-      end
-    end
-    {status: status, time: time}
-  end
-end
--- a/app/helpers/graduation_topics_helper.rb
+++ b/app/helpers/graduation_topics_helper.rb
@ -1,30 +0,0 @@
-module GraduationTopicsHelper
-
-  # 课题类型
-  def topic_type
-    [{id: 1, name: "设计"}, {id: 2, name: "论文"}, {id: 3, name: "创作"}]
-  end
-
-  # 课程来源
-  def topic_source
-    [{id: 1, name: "生产/社会实际"}, {id: 2, name:"结合科研"}, {id: 3, name: "其它"}]
-  end
-
-  # 课题性质1
-  def topic_property_first
-    [{id: 1, name: "真题"}, {id: 2, name:"模拟题"}]
-  end
-
-  # 课题性质2
-  def topic_property_second
-    [{id: 1, name: "纵向课题"}, {id: 2, name:"横向课题"}, {id: 3, name: "自选"}]
-  end
-
-  # 课题重复
-  def topic_repeat
-    [{id: 1, name: "新题"}, {id: 2, name:"往届题，有新要求"}, {id: 3, name: "往届题，无新要求"}]
-  end
-
-
-
-end
--- a/app/helpers/graduation_works_helper.rb
+++ b/app/helpers/graduation_works_helper.rb
@ -1,20 +0,0 @@
-module GraduationWorksHelper
-  include GraduationTasksHelper
-
-  # 作品最终成绩
-  # 参数： work作品， current_user用户，course_identity用户在课堂的身份
-  def work_final_score work, current_user, course_identity
-    work_score =
-        if work.work_score.nil?
-          "--"
-        else
-          if work.check_score_power? current_user, course_identity
-            format("%.1f", work.work_score < 0 ? 0 : work.work_score.round(1))
-          else
-            "**"
-          end
-        end
-    # work_score 最终成绩； late_penalty 迟交扣分； final_score 最终评分
-    {username: work.user.full_name, login: work.user.login, work_score: work_score, final_score: work.final_score}
-  end
-end
--- a/app/helpers/hack_user_lastest_codes_helper.rb
+++ b/app/helpers/hack_user_lastest_codes_helper.rb
@ -1,2 +0,0 @@
-module HackUserLastestCodesHelper
-end
--- a/app/helpers/hacks_helper.rb
+++ b/app/helpers/hacks_helper.rb
@ -1,2 +0,0 @@
-module HacksHelper
-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/helpers/trustie_hacks_helper.rb
+++ b/app/helpers/trustie_hacks_helper.rb
@ -1,2 +0,0 @@
-module TrustieHacksHelper
-end
--- a/app/helpers/weapps/courses_helper.rb
+++ b/app/helpers/weapps/courses_helper.rb
@ -1,69 +0,0 @@
-module Weapps::CoursesHelper
-  require 'chinese_pinyin'
-
-  def teacher_list teachers, user_course_identity
-    data = []
-    teachers.each do |teacher|
-      if teacher.user.present?
-        teacher_user = teacher.user
-        name = teacher_user.real_name
-        role = teacher.role == "CREATOR" ? "管理员" : teacher.role == "PROFESSOR" ? "教师" : "助教"
-        member_roles = user_course_identity < Course::ASSISTANT_PROFESSOR ? teacher_user.course_role(teacher.course) : []
-        item = {name: name, course_member_id: teacher.id, login: teacher_user.login, user_id: teacher.user_id, role: role,
-                school: teacher_user.school_name, image_url: url_to_avatar(teacher_user), member_roles: member_roles}
-        pinyin = Pinyin.t(name.strip, splitter: '')
-        first_char = pinyin[0]
-        letter = first_letter first_char
-        if data.pluck(:letter).include?(letter)
-          data.select{|a|a[:letter]==letter}.first[:items] << item
-        else
-          data << {letter: letter, items: [item]}
-        end
-      end
-    end
-    # data = data.sort do |a, b|
-    #   [a[:letter]] <=> [b[:letter]]
-    # end
-    # data.push(data.shift) if data.select{|a|a[:letter]=='#'}.first.present? # '#'排在最后
-    return data
-  end
-
-
-  def student_list students, excellent, user_course_identity
-    data = []
-    students.each do |student|
-      if student.user.present?
-        student_user = student.user
-        name = student_user.real_name
-        phone = excellent ? "" : student_user.hidden_phone
-        member_roles = user_course_identity < Course::ASSISTANT_PROFESSOR ? student_user.course_role(student.course) : []
-        item = {name: name, course_member_id: student.id, login: student_user.login, user_id: student.user_id,
-                student_id: student_user.student_id, image_url: url_to_avatar(student_user), phone: phone, member_roles: member_roles}
-        pinyin = Pinyin.t(name.strip, splitter: '')
-        first_char = pinyin[0]
-        letter = first_letter first_char
-        if data.pluck(:letter).include?(letter)
-          data.select{|a|a[:letter]==letter}.first[:items] << item
-        else
-          data << {letter: letter, items: [item]}
-        end
-      end
-    end
-    # data = data.sort do |a, b|
-    #   [a[:letter]] <=> [b[:letter]]
-    # end
-    # data.push(data.shift) if data.select{|a|a[:letter]=='#'}.first.present? # '#'排在最后
-    return data
-  end
-
-  def first_letter char
-    if char.ord >= 97 && char.ord <= 122
-      letter = (char.ord - 32).chr.to_s
-    elsif char.ord >= 65 && char.ord <= 90
-      letter = char
-    else
-      letter = '#'
-    end
-    letter
-  end
-end
--- a/app/imports/admins/import_course_member_excel.rb
+++ b/app/imports/admins/import_course_member_excel.rb
@ -1,20 +0,0 @@
-class Admins::ImportCourseMemberExcel < BaseImportXlsx
-  Data = Struct.new(:student_id, :name, :course_id, :role, :course_group_name, :school_id)
-
-  def read_each(&block)
-    sheet.each_row_streaming(pad_cells: true, offset: 1) do |row|
-      data = row.map(&method(:cell_value))[0..5]
-      block.call Data.new(*data)
-    end
-  end
-
-  private
-
-  def check_sheet_valid!
-    raise_import_error('请按照模板格式导入') if sheet.row(1).size != 6
-  end
-
-  def cell_value(obj)
-    obj&.cell_value&.to_s&.strip
-  end
-end
--- a/app/jobs/batch_publish_video_notify_job.rb
+++ b/app/jobs/batch_publish_video_notify_job.rb
@ -1,23 +0,0 @@
-# 批量发布视频 消息任务
-class BatchPublishVideoNotifyJob < ApplicationJob
-  queue_as :notify
-
-  def perform(user_id, video_ids)
-    user = User.find_by(id: user_id)
-    return if user.blank?
-
-    attrs = %i[user_id trigger_user_id container_id container_type tiding_type status created_at updated_at]
-
-    same_attrs = {
-      user_id: 1,
-      trigger_user_id: user.id,
-      container_type: 'Video',
-      tiding_type: 'Apply', status: 0
-    }
-    Tiding.bulk_insert(*attrs) do |worker|
-      user.videos.where(id: video_ids).each do |video|
-        worker.add same_attrs.merge(container_id: video.id)
-      end
-    end
-  end
-end
--- 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
@ -7,6 +7,8 @@ class CacheAsyncResetJob < ApplicationJob
      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
--- a/app/jobs/cache_async_set_job.rb
+++ b/app/jobs/cache_async_set_job.rb
@ -7,6 +7,8 @@ class CacheAsyncSetJob < ApplicationJob
      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
--- a/app/jobs/course_add_student_create_works_job.rb
+++ b/app/jobs/course_add_student_create_works_job.rb
@ -1,67 +0,0 @@
-# 学生加入课堂时创建相关任务作品
-class CourseAddStudentCreateWorksJob < ApplicationJob
-  queue_as :default
-
-  def perform(course_id, student_ids)
-    course = Course.find_by(id: course_id)
-    return if course.blank?
-
-    # 如果之前存在相关作品，则更新is_delete字段
-    student_works = StudentWork.joins(:homework_common).where(user_id: student_ids, homework_commons: {course_id: course.id})
-    student_works.update_all(is_delete: 0)
-
-    exercise_users = ExerciseUser.joins(:exercise).where(user_id: student_ids, exercises: {course_id: course.id})
-    exercise_users.update_all(is_delete: 0)
-
-    poll_users = PollUser.joins(:poll).where(user_id: student_ids, polls: {course_id: course.id})
-    poll_users.update_all(is_delete: 0)
-
-    graduation_works = course.graduation_works.where(user_id: student_ids)
-    graduation_works.update_all(is_delete: 0)
-
-    attrs = %i[homework_common_id user_id created_at updated_at]
-
-    StudentWork.bulk_insert(*attrs) do |worker|
-      student_ids.each do |user_id|
-        same_attrs = {user_id: user_id}
-        course.homework_commons.where(homework_type: %i[normal group practice]).each do |homework|
-          next if StudentWork.where(user_id: user_id, homework_common_id: homework.id).any?
-          worker.add same_attrs.merge(homework_common_id: homework.id)
-        end
-      end
-    end
-
-    attrs = %i[exercise_id user_id created_at updated_at]
-    ExerciseUser.bulk_insert(*attrs) do |worker|
-      student_ids.each do |user_id|
-        same_attrs = {user_id: user_id}
-        course.exercises.each do |exercise|
-          next if ExerciseUser.where(user_id: user_id, exercise_id: exercise.id).any?
-          worker.add same_attrs.merge(exercise_id: exercise.id)
-        end
-      end
-    end
-
-    attrs = %i[poll_id user_id created_at updated_at]
-    PollUser.bulk_insert(*attrs) do |worker|
-      student_ids.each do |user_id|
-        same_attrs = {user_id: user_id}
-        course.polls.each do |poll|
-          next if PollUser.where(user_id: user_id, poll_id: poll.id).any?
-          worker.add same_attrs.merge(poll_id: poll.id)
-        end
-      end
-    end
-
-    attrs = %i[graduation_task_id user_id course_id created_at updated_at]
-    GraduationWork.bulk_insert(*attrs) do |worker|
-      student_ids.each do |user_id|
-        same_attrs = {user_id: user_id, course_id: course.id}
-        course.graduation_tasks.each do |task|
-          next if GraduationWork.where(user_id: user_id, graduation_task_id: task.id).any?
-          worker.add same_attrs.merge(graduation_task_id: task.id)
-        end
-      end
-    end
-  end
-end
--- a/app/jobs/course_delete_student_delete_works_job.rb
+++ b/app/jobs/course_delete_student_delete_works_job.rb
@ -1,19 +0,0 @@
-class CourseDeleteStudentDeleteWorksJob < ApplicationJob
-  queue_as :default
-
-  def perform(course_id, student_ids)
-    course = Course.find_by(id: course_id)
-    return if course.blank?
-
-    student_works = StudentWork.joins(:homework_common).where(user_id: student_ids, homework_commons: {course_id: course.id})
-    student_works.update_all(is_delete: 1)
-
-    exercise_users = ExerciseUser.joins(:exercise).where(user_id: student_ids, exercises: {course_id: course.id})
-    exercise_users.update_all(is_delete: 1)
-
-    poll_users = PollUser.joins(:poll).where(user_id: student_ids, polls: {course_id: course.id})
-    poll_users.update_all(is_delete: 1)
-
-    course.graduation_works.where(user_id: student_ids).update_all(is_delete: 1)
-  end
-end
--- a/app/jobs/course_delete_student_notify_job.rb
+++ b/app/jobs/course_delete_student_notify_job.rb
@ -1,22 +0,0 @@
-# 删除课堂用户
-class CourseDeleteStudentNotifyJob < ApplicationJob
-  queue_as :notify
-
-  def perform(course_id, student_ids, trigger_user_id)
-    course = Course.find_by(id: course_id)
-    return if course.blank?
-
-    attrs = %i[user_id trigger_user_id container_id container_type belong_container_id
-              belong_container_type tiding_type created_at updated_at]
-
-    same_attrs = {
-      trigger_user_id: trigger_user_id, container_id: course.id, container_type: 'DeleteCourseMember',
-      belong_container_id: course.id, belong_container_type: 'Course', tiding_type: 'System'
-    }
-    Tiding.bulk_insert(*attrs) do |worker|
-      student_ids.each do |user_id|
-        worker.add same_attrs.merge(user_id: user_id)
-      end
-    end
-  end
-end
--- a/app/jobs/create_diff_record_job.rb
+++ b/app/jobs/create_diff_record_job.rb
@ -1,12 +0,0 @@
-class CreateDiffRecordJob < ApplicationJob
-  queue_as :default
-
-  def perform(user_id, obj_id, obj_klass, column_name, before, after)
-    user = User.find_by(id: user_id)
-    obj = obj_klass.constantize.find_by(id: obj_id)
-
-    return if user.blank? || obj.blank?
-
-    CreateDiffRecordService.call(user, obj, column_name, before, after)
-  end
-end
--- a/app/jobs/delete_department_notify_job.rb
+++ b/app/jobs/delete_department_notify_job.rb
@ -1,21 +0,0 @@
-# 删除部门 消息通知
-class DeleteDepartmentNotifyJob < ApplicationJob
-  queue_as :notify
-
-  def perform(department_id, operator_id, user_ids)
-    department = Department.unscoped.find_by(id: department_id)
-    return if department.blank? || user_ids.blank?
-
-    attrs = %i[ user_id trigger_user_id container_id container_type tiding_type status created_at updated_at]
-
-    same_attrs = {
-      trigger_user_id: operator_id, container_id: department.id, container_type: 'Department',
-      status: 4, tiding_type: 'System'
-    }
-    Tiding.bulk_insert(*attrs) do |worker|
-      user_ids.each do |user_id|
-        worker.add same_attrs.merge(user_id: user_id)
-      end
-    end
-  end
-end
--- a/app/jobs/exercise_publish_notify_job.rb
+++ b/app/jobs/exercise_publish_notify_job.rb
@ -1,44 +0,0 @@
-# 试卷发布 消息通知
-class ExercisePublishNotifyJob < ApplicationJob
-  queue_as :notify
-
-  def perform(exercise_id, group_ids)
-    exercise = Exercise.find_by(id: exercise_id)
-    return if exercise.blank?
-    user = exercise.user
-    course = exercise.course
-
-    if group_ids.present?
-      students = course.students.where(course_group_id: group_ids)
-      subquery = course.teacher_course_groups.where(course_group_id: group_ids).select(:course_member_id)
-      teachers = course.teachers.where(id: subquery)
-    else
-      students = course.students
-      teachers = course.teachers
-    end
-
-    attrs = %i[
-      user_id trigger_user_id container_id container_type parent_container_id parent_container_type
-      belong_container_id belong_container_type viewed tiding_type created_at updated_at
-    ]
-
-    same_attrs = {
-      trigger_user_id: user.id, container_id: exercise.id, container_type: 'Exercise',
-      parent_container_id: exercise.id, parent_container_type: 'ExercisePublish',
-      belong_container_id: exercise.course_id, belong_container_type: 'Course',
-      viewed: 0, tiding_type: 'Exercise'
-    }
-    Tiding.bulk_insert(*attrs) do |worker|
-      teacher_ids = teachers.pluck(:user_id)
-      unless exercise.tidings.exists?(parent_container_type: 'ExercisePublish', user_id: teacher_ids)
-        teacher_ids.each do |user_id|
-          worker.add same_attrs.merge(user_id: user_id)
-        end
-      end
-
-      students.pluck(:user_id).each do |user_id|
-        worker.add same_attrs.merge(user_id: user_id)
-      end
-    end
-  end
-end
--- a/app/jobs/get_aliyun_video_info_job.rb
+++ b/app/jobs/get_aliyun_video_info_job.rb
@ -1,17 +0,0 @@
-# 获取阿里云视频信息
-class GetAliyunVideoInfoJob < ApplicationJob
-  queue_as :default
-
-  def perform(vod_video_id)
-    video = Video.find_by(uuid: vod_video_id)
-    return if video.blank? || video.vod_uploading?
-
-    result = AliyunVod::Service.get_play_info(video.uuid)
-    cover_url = result.dig('VideoBase', 'CoverURL')
-    file_url  = (result.dig('PlayInfoList', 'PlayInfo') || []).first&.[]('PlayURL')
-
-    video.cover_url = cover_url if cover_url.present? && video.cover_url.blank?
-    video.file_url  = file_url if file_url.present?
-    video.save!
-  end
-end
--- a/app/jobs/graduation_task_cross_comment_job.rb
+++ b/app/jobs/graduation_task_cross_comment_job.rb
@ -1,22 +0,0 @@
-# 毕设任务的交叉评阅分配
-class GraduationTaskCrossCommentJob < ApplicationJob
-  queue_as :default
-
-  def perform(graduation_task_id)
-    task = GraduationTask.find_by(id: graduation_task_id)
-    return if task.blank?
-
-    task.graduation_task_group_assignations.includes(:graduation_group, :graduation_work).each do |assignation|
-      graduation_group = assignation.graduation_group
-      work = assignation.graduation_work
-      if graduation_group.present? && work.present?
-        member_ids = graduation_group.course_members.pluck(:user_id).uniq
-        member_ids.each do |user_id|
-          unless work.graduation_work_comment_assignations.exists?(user_id: user_id)
-            work.graduation_work_comment_assignations << GraduationWorkCommentAssignation.new(user_id: user_id, graduation_task_id: task.id)
-          end
-        end
-      end
-    end
-  end
-end
--- a/app/jobs/graduation_task_publish_notify_job.rb
+++ b/app/jobs/graduation_task_publish_notify_job.rb
@ -1,28 +0,0 @@
-# 任务发布 消息通知
-class GraduationTaskPublishNotifyJob < ApplicationJob
-  queue_as :notify
-
-  def perform(graduation_task_id)
-    task = GraduationTask.find_by(id: graduation_task_id)
-    return if task.blank?
-    course = task.course
-    return if course.blank?
-
-    attrs = %i[
-      user_id trigger_user_id container_id container_type parent_container_id parent_container_type
-      belong_container_id belong_container_type viewed tiding_type created_at updated_at
-    ]
-
-    same_attrs = {
-      trigger_user_id: task.user_id, container_id: task.id, container_type: 'GraduationTask',
-      parent_container_id: task.id, parent_container_type: 'TaskPublish',
-      belong_container_id: task.course_id, belong_container_type: 'Course',
-      viewed: 0, tiding_type: 'GraduationTask'
-    }
-    Tiding.bulk_insert(*attrs) do |worker|
-      course.course_members.pluck(:user_id).uniq.each do |user_id|
-        worker.add same_attrs.merge(user_id: user_id)
-      end
-    end
-  end
-end
--- a/app/jobs/resubmit_student_work_notify_job.rb
+++ b/app/jobs/resubmit_student_work_notify_job.rb
@ -1,33 +0,0 @@
-class ResubmitStudentWorkNotifyJob < ApplicationJob
-  queue_as :notify
-
-  def perform(homework_id, student_ids)
-    homework = HomeworkCommon.find_by(id: homework_id)
-    return if homework.blank? || student_ids.blank?
-    course = homework.course
-
-    attrs = %i[user_id trigger_user_id container_id container_type parent_container_id parent_container_type
-              belong_container_id belong_container_type tiding_type viewed created_at updated_at]
-
-    same_attrs = {
-      container_type: 'ResubmitStudentWork', parent_container_id: homework.id, parent_container_type: 'HomeworkCommon',
-      belong_container_id: course.id, belong_container_type: 'Course', tiding_type: 'HomeworkCommon', viewed: 0
-    }
-    Tiding.bulk_insert(*attrs) do |worker|
-      student_ids.each do |user_id|
-        next unless User.exists?(id: user_id)
-
-        work = homework.student_works.find_by(user_id: user_id)
-        next if work.blank?
-        score_user_ids = work.student_works_scores.where.not(score: nil).where(reviewer_role: [1, 2]).pluck(user_id).uniq
-        next if score_user_ids.blank?
-
-        attrs = same_attrs.merge(trigger_user_id: user_id, container_id: work.id)
-
-        score_user_ids.each do |user_id|
-          worker.add attrs.merge(user_id: user_id)
-        end
-      end
-    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/laboratory.rb
+++ b/app/models/laboratory.rb
@ -44,7 +44,7 @@ class Laboratory < ApplicationRecord

  def site
    rails_env = EduSetting.get('rails_env')
-    suffix = rails_env && rails_env != 'production' ? ".#{rails_env}.trustie.net" : '.trustie.net'
+    suffix = rails_env && rails_env != 'production' ? ".#{rails_env}.gitlink.org.cn" : '.gitlink.org.cn'

    identifier ? "#{identifier}#{suffix}" : ''
  end
@ -74,74 +74,6 @@ class Laboratory < ApplicationRecord
    RequestStore.store[:current_laboratory] ||= User.anonymous
  end

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

  def reset_cache_data
-    Cache::V2::OwnerCommonService.new(self.login, self.mail).reset
+    Cache::V2::OwnerCommonService.new(self.id).reset
  end

  def self.build(name, nickname, gitea_token=nil)
--- a/app/models/project.rb
+++ b/app/models/project.rb
@ -128,7 +128,7 @@ class Project < ApplicationRecord
  has_many :pinned_projects, dependent: :destroy 
  has_many :has_pinned_users, through: :pinned_projects, source: :user
  has_many :webhooks, class_name: "Gitea::Webhook", primary_key: :gpid, foreign_key: :repo_id
-  after_create :init_project_common, :incre_user_statistic, :incre_platform_statistic
+  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
@ -169,12 +169,8 @@ class Project < ApplicationRecord
    end
  end

-  def init_project_common
-    CacheAsyncResetJob.perform_later("project_common_service", self.id)
-  end
-
  def decre_project_common
-    $redis_cache.del("v2-project-common:#{self.id}")
+    CacheAsyncClearJob.perform_later('project_common_service', self.id)
  end

  def incre_user_statistic 
--- 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/token.rb
+++ b/app/models/token.rb
@ -1,19 +1,19 @@
-# == Schema Information
-#
-# Table name: tokens
-#
-#  id         :integer          not null, primary key
-#  user_id    :integer          default("0"), not null
-#  action     :string(30)       default(""), not null
-#  value      :string(40)       default(""), not null
-#  created_on :datetime         not null
-#
-# Indexes
-#
-#  index_tokens_on_user_id  (user_id)
-#  tokens_value             (value) UNIQUE
-#
-
+# == Schema Information
+#
+# Table name: tokens
+#
+#  id         :integer          not null, primary key
+#  user_id    :integer          default("0"), not null
+#  action     :string(30)       default(""), not null
+#  value      :string(40)       default(""), not null
+#  created_on :datetime         not null
+#
+# Indexes
+#
+#  index_tokens_on_user_id  (user_id)
+#  tokens_value             (value) UNIQUE
+#
+
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License
@ -105,7 +105,7 @@ class Token < ActiveRecord::Base
  end

  def self.generate_token_value
-    Educoder::Utils.random_hex(20)
+    Gitlink::Utils.random_hex(20)
  end

  def self.delete_user_all_tokens(user)
--- 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|
@ -207,7 +208,7 @@ class User < Owner
  validate :validate_password_length

  def reset_cache_data
-    Cache::V2::OwnerCommonService.new(self.login, self.mail).reset
+    Cache::V2::OwnerCommonService.new(self.id).reset
  end

  # 用户参与的所有项目
@ -431,6 +432,7 @@ class User < Owner

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

  def register!
@ -439,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

  # 课程用户身份
@ -682,7 +690,7 @@ class User < Owner
  end

  def self.generate_salt
-    Educoder::Utils.random_hex(16)
+    Gitlink::Utils.random_hex(16)
  end

  # 全部已认证
--- a/app/queries/admins/course_list_query.rb
+++ b/app/queries/admins/course_list_query.rb
@ -1,30 +0,0 @@
-class Admins::CourseListQuery < ApplicationQuery
-  include CustomSortable
-
-  attr_reader :params
-
-  sort_columns :created_at, default_by: :created_at, default_direction: :desc
-
-  def initialize(params)
-    @params = params
-  end
-
-  def call
-    course_lists = CourseList.all
-
-    # 关键字模糊查询
-    keyword = params[:keyword].to_s.strip
-    if keyword.present?
-      search_type = params[:search_type] || "0"
-      case search_type
-      when "0"
-        course_lists = course_lists.joins(:user)
-                      .where('CONCAT(lastname, firstname) like :keyword OR users.nickname like :keyword', keyword: "%#{keyword}%")
-      when "1"
-        course_lists = course_lists.where('name like :keyword', keyword: "%#{keyword}%")
-      end
-    end
-
-    custom_sort(course_lists, params[:sort_by], params[:sort_direction])
-  end
-end
--- a/app/queries/admins/course_query.rb
+++ b/app/queries/admins/course_query.rb
@ -1,44 +0,0 @@
-class Admins::CourseQuery < ApplicationQuery
-  include CustomSortable
-
-  attr_reader :params
-
-  sort_columns :created_at, default_by: :created_at, default_direction: :desc, default_table: 'courses'
-
-  def initialize(params)
-    @params = params
-  end
-
-  def call
-    courses = Course.all
-
-    courses = courses.where(id: params[:id]) if params[:id].present?
-
-    # 状态过滤
-    status =
-      case params[:status].to_s.strip
-      when 'processing'   then 0
-      when 'ended'  then 1
-      end
-    courses = courses.where(is_end: status) if status
-
-    # 单位
-    if params[:school_id].present?
-      courses = courses.where(school_id: params[:school_id])
-    end
-
-    # 首页展示
-    if params[:homepage_show].present? && params[:homepage_show].to_s == 'true'
-      courses = courses.where(homepage_show: true)
-    end
-
-    # 关键字
-    keyword = params[:keyword].to_s.strip
-    if keyword
-      sql = 'CONCAT(lastname, firstname) LIKE :keyword OR users.nickname LIKE :keyword OR courses.name LIKE :keyword OR course_lists.name LIKE :keyword'
-      courses = courses.joins(:teacher, :course_list).where(sql, keyword: "%#{keyword}%")
-    end
-
-    custom_sort(courses, params[:sort_by], params[:sort_direction])
-  end
-end
--- a/app/queries/admins/department_apply_query.rb
+++ b/app/queries/admins/department_apply_query.rb
@ -1,25 +0,0 @@
-class Admins::DepartmentApplyQuery < ApplicationQuery
-  include CustomSortable
-
-  attr_reader :params
-
-  sort_columns :created_at, default_by: :created_at, default_direction: :desc
-
-  def initialize(params)
-    @params = params
-  end
-
-  def call
-    status = params[:status]
-
-    applies = ApplyAddDepartment.where(status: status) if status.present?
-
-    # 关键字模糊查询
-    keyword = params[:keyword].to_s.strip
-    if keyword.present?
-      applies = applies.where('name LIKE :keyword', keyword: "%#{keyword}%")
-    end
-
-    custom_sort(applies, params[:sort_by], params[:sort_direction])
-  end
-end
--- a/app/queries/admins/department_query.rb
+++ b/app/queries/admins/department_query.rb
@ -1,32 +0,0 @@
-class Admins::DepartmentQuery < ApplicationQuery
-  include CustomSortable
-
-  attr_reader :params
-
-  sort_columns :created_at, default_by: :created_at, default_direction: :desc
-
-  def initialize(params)
-    @params = params
-  end
-
-  def call
-    departments = Department.where(is_auth: true).without_deleted
-
-    keyword = params[:keyword].to_s.strip
-    if keyword.present?
-      departments = departments.joins(:school)
-                      .where('schools.name LIKE :keyword OR departments.name LIKE :keyword', keyword: "%#{keyword}%")
-    end
-
-    if params[:with_member].to_s == 'true'
-      subquery = DepartmentMember.where('department_id = departments.id').select('1 AS one').to_sql
-      departments = departments.where("EXISTS(#{subquery})")
-    end
-
-    if params[:with_identifier].to_s == 'true'
-      departments = departments.where.not(identifier: nil).where.not(identifier: '')
-    end
-
-    custom_sort(departments, params[:sort_by], params[:sort_direction])
-  end
-end
--- a/app/queries/admins/laboratory_shixun_query.rb
+++ b/app/queries/admins/laboratory_shixun_query.rb
@ -1,36 +0,0 @@
-class Admins::LaboratoryShixunQuery < ApplicationQuery
-  attr_reader :laboratory, :params
-
-  def initialize(laboratory, params)
-    @laboratory = laboratory
-    @params     = params
-  end
-
-  def call
-    laboratory_shixuns = laboratory.laboratory_shixuns.joins(:shixun)
-
-    keyword = params[:keyword].to_s.strip
-    if keyword.present?
-      like_sql = 'shixuns.name LIKE :keyword OR CONCAT(users.lastname, users.firstname) LIKE :keyword OR users.nickname LIKE :keyword'
-      laboratory_shixuns = laboratory_shixuns.joins(shixun: :user).where(like_sql, keyword: "%#{keyword}%")
-    end
-
-    # 实训状态
-    laboratory_shixuns = laboratory_shixuns.where(shixuns: { status: params[:status] }) if params[:status].present?
-
-    # 技术平台
-    if params[:tag_id].present?
-      laboratory_shixuns = laboratory_shixuns.joins(shixun: :shixun_mirror_repositories)
-                             .where(shixun_mirror_repositories: { mirror_repository_id: params[:tag_id] })
-    end
-
-    # 首页展示、单位自建
-    %i[homepage ownership].each do |column|
-      if params[column].present? && params[column].to_s == 'true'
-        laboratory_shixuns = laboratory_shixuns.where(column => true)
-      end
-    end
-
-    laboratory_shixuns
-  end
-end
--- a/app/queries/admins/school_query.rb
+++ b/app/queries/admins/school_query.rb
@ -1,23 +0,0 @@
-class Admins::SchoolQuery < ApplicationQuery
-  include CustomSortable
-
-  attr_reader :params
-
-  sort_columns :users_count, :created_at, default_by: :created_at, default_direction: :desc
-
-  def initialize(params)
-    @params = params
-  end
-
-  def call
-    schools = School.all
-
-    keyword = strip_param(:keyword)
-    Rails.logger.info("###########{keyword}")
-    if keyword
-      schools = schools.where('schools.name LIKE ?', "%#{keyword}%")
-    end
-    schools = schools.left_joins(:user_extensions).select('schools.*, IFNULL(count(user_extensions.user_id),0) users_count').group('schools.id')
-    custom_sort schools, params[:sort_by], params[:sort_direction]
-  end
-end
--- a/app/queries/admins/subject_query.rb
+++ b/app/queries/admins/subject_query.rb
@ -1,49 +0,0 @@
-class Admins::SubjectQuery < ApplicationQuery
-  include CustomSortable
-
-  attr_reader :params
-
-  sort_columns :created_at, default_by: :created_at, default_direction: :desc, default_table: 'subjects'
-
-  def initialize(params)
-    @params = params
-  end
-
-  def call
-    subjects = Subject.all
-
-    subjects = subjects.where(id: params[:id]) if params[:id].present?
-
-    # 状态过滤
-    status =
-        case params[:status].to_s.strip
-        when "editing" then {status: 0}
-        when "applying" then {status: 2, public: [0, 1]}
-        when "pending" then {public: 1}
-        when "published" then {public: 2}
-        end
-
-    subjects = subjects.where(status) if status
-
-    # 创建者单位
-    if params[:school_id].present?
-      subjects = subjects.joins(user: :user_extension).where(user_extensions: { school_id: params[:school_id] })
-    end
-
-    # 首页展示、金课
-    %i[homepage_show excellent].each do |column|
-      if params[column].present? && params[column].to_s == 'true'
-        subjects = subjects.where(column => true)
-      end
-    end
-
-    # 关键字
-    keyword = params[:keyword].to_s.strip
-    if keyword
-      sql = 'CONCAT(lastname, firstname) LIKE :keyword OR users.nickname LIKE :keyword OR subjects.name LIKE :keyword'
-      subjects = subjects.joins(:user).where(sql, keyword: "%#{keyword}%")
-    end
-
-    custom_sort(subjects, params[:sort_by], params[:sort_direction])
-  end
-end
--- a/app/queries/projects/list_query.rb
+++ b/app/queries/projects/list_query.rb
@ -11,20 +11,45 @@ class Projects::ListQuery < ApplicationQuery
  end

  def call
-    q = params[:pinned].present? ? Project.pinned : Project
-    q = q.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/Show More
+++ b/Show More
Author	SHA1	Message	Date
jasder	4fa10a3683	Merge pull request 'fix mege develop' (#248 ) from develop into master	2021-11-14 20:39:31 +08:00
jasder	f13b8009ad	Merge pull request 'fix code review' (#246 ) from jasder/forgeplus:develop into develop	2021-11-11 18:21:51 +08:00
jasder	e216d7da70	Merge branch 'develop' of https://git.trustie.net/Gitlink/forgeplus into develop	2021-11-11 18:09:26 +08:00
jasder	0106f2d5dd	Merge pull request '存在问题修复' (#244 ) from yystopf/forgeplus:hh_hotfix into develop	2021-11-11 18:09:08 +08:00
jasder	4f33e1194c	Merge branch 'featrue_codereview' into develop	2021-11-11 18:06:08 +08:00
jasder	03beee6cae	FIX code review	2021-11-11 18:03:30 +08:00
yystopf	49c7827f87	fix	2021-11-10 16:40:11 +08:00
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	cbf8f1fa67	FIX code review	2021-10-27 17:19:39 +08:00
jasder	4676b756e8	FIX 完善邮箱注册发送邮件功能	2021-10-27 17:01:16 +08:00
jasder	2719e60248	ADD 邮箱、登录名、手机号验证api	2021-10-27 15:15:06 +08:00
jasder	cb11a5c8e9	发布v3.1.1版本 * FIX 修复pulls、issues 搜索数量统计问题 * FIX 解决在线创建文件错误提示信息不准确的问题 * FIX table name bug * FIX 解决applied_projects相关表操作的问题 * FIX 解决排序参数的判断预防SQL注入 * FIX 项目导航栏数量改为开启中的数量 * FIX 解决项目邀请码的索引查询问题 * FIX FIX get readme file bug * FIX sql attack * FIX projects load by invite code slowly	2021-06-18 17:09:57 +08:00
jasder	c5d73b7cf8	v3.1.0 * 改版升级个人主页 * 修复bug * 更改license	2021-06-09 09:52:57 +08:00
jasder	8a10a183e0	Merge branch 'develop'	2021-05-24 10:18:03 +08:00
jasder	6d1bcabd51	Merge branch 'master' of https://git.trustie.net/jasder/forgeplus	2021-05-24 10:10:24 +08:00
jasder	86f03ffafc	Merge OK	2021-05-08 17:46:22 +08:00