From 4676b756e8ed258b0757c62e8d46ff275ed79411 Mon Sep 17 00:00:00 2001 From: jasder Date: Wed, 27 Oct 2021 17:01:16 +0800 Subject: [PATCH] =?UTF-8?q?FIX=20=E5=AE=8C=E5=96=84=E9=82=AE=E7=AE=B1?= =?UTF-8?q?=E6=B3=A8=E5=86=8C=E5=8F=91=E9=80=81=E9=82=AE=E4=BB=B6=E5=8A=9F?= =?UTF-8?q?=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/assets/images/logo.png | Bin 2816 -> 10051 bytes app/controllers/application_controller.rb | 85 ++---------------- app/mailers/user_mailer.rb | 11 +-- app/views/user_mailer/register_email.html.erb | 12 +-- 4 files changed, 14 insertions(+), 94 deletions(-) diff --git a/app/assets/images/logo.png b/app/assets/images/logo.png index 436d23490404beedcf7cd776bbf8ed0282794ca4..72505d8a2cf0c50ec0ee18d34a00ba082cbbc2b7 100644 GIT binary patch literal 10051 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 SnFiSa0000 Course::STUDENT && @course.is_public == 0 - tip_exception(401, "..") unless User.current.logged? - check_account - tip_exception(@course.excellent ? 410 : 409, "您没有权限进入") - end - if @user_course_identity > Course::CREATOR && @user_course_identity <= Course::STUDENT && @course.tea_id != current_user.id - # 实名认证和职业认证的身份判断 - tip_exception(411, "你的实名认证和职业认证审核未通过") if @course.authentication && - @course.professional_certification && (!current_user.authentication && !current_user.professional_certification) - tip_exception(411, "你的实名认证审核未通过") if @course.authentication && !current_user.authentication - tip_exception(411, "你的职业认证审核未通过") if @course.professional_certification && !current_user.professional_certification - end - uid_logger("###############user_course_identity:#{@user_course_identity}") - end - - # 题库的访问权限 - def bank_visit_auth - tip_exception(-2,"未通过职业认证") if current_user.is_teacher? && !current_user.certification_teacher? && !current_user.admin_or_business? && @bank.user_id != current_user.id && @bank.is_public - tip_exception(403, "无权限") unless @bank.user_id == current_user.id || current_user.admin_or_business? || - (current_user.certification_teacher? && @bank.is_public) - end - - # 判断用户的邮箱或者手机是否可用 # params[:type] 1: 注册；2：忘记密码；3：绑定 def check_mail_and_phone_valid login, type @@ -120,16 +82,16 @@ class ApplicationController < ActionController::Base login =~ /^[a-zA-Z0-9]+([._\\]*[a-zA-Z0-9])$/ tip_exception(-2, "请输入正确的手机号或邮箱") end - # 考虑到安全参数问题，多一次查询，去掉Union - user = User.where(phone: login).first || User.where(mail: login).first - if type.to_i == 1 && !user.nil? + + user_exist = Owner.exists?(phone: login) || Owner.exists?(mail: login) + if user_exist && type.to_i == 1 tip_exception(-2, "该手机号码或邮箱已被注册") - elsif type.to_i == 2 && user.nil? + elsif type.to_i == 2 && !user_exist tip_exception(-2, "该手机号码或邮箱未注册") - elsif type.to_i == 3 && user.present? + elsif type.to_i == 3 && user_exist tip_exception(-2, "该手机号码或邮箱已绑定") end - sucess_status + render_ok end # 发送及记录激活码 @@ -186,26 +148,6 @@ class ApplicationController < ActionController::Base end end - def find_course - return normal_status(2, '缺少course_id参数！') if params[:course_id].blank? - @course = Course.find(params[:course_id]) - tip_exception(404, "") if @course.is_delete == 1 && !current_user.admin_or_business? - rescue Exception => e - tip_exception(e.message) - end - - def course_manager - return normal_status(403, '只有课堂管理员才有权限') if @user_course_identity > Course::CREATOR - end - - def find_board - return normal_status(2, "缺少board_id参数") if params[:board_id].blank? - @board = Board.find(params[:board_id]) - rescue Exception => e - uid_logger_error(e.message) - tip_exception(e.message) - end - def validate_type(object_type) normal_status(2, "参数") if params.has_key?(:sort_type) && !SORT_TYPE.include?(params[:sort_type].strip) end @@ -215,21 +157,6 @@ class ApplicationController < ActionController::Base @page_size = params[:page_size] || 15 end - # 课堂教师权限 - def teacher_allowed - logger.info("#####identity: #{current_user.course_identity(@course)}") - unless current_user.course_identity(@course) < Course::STUDENT - normal_status(403, "") - end - end - - # 课堂教师、课堂管理员、超级管理员的权限(不包含助教) - def teacher_or_admin_allowed - unless current_user.course_identity(@course) < Course::ASSISTANT_PROFESSOR - normal_status(403, "") - end - end - def require_admin normal_status(403, "") unless User.current.admin? end diff --git a/app/mailers/user_mailer.rb b/app/mailers/user_mailer.rb index 6e957b4df..d03f14e6f 100644 --- a/app/mailers/user_mailer.rb +++ b/app/mailers/user_mailer.rb @@ -1,17 +1,10 @@ class UserMailer < ApplicationMailer # 注意：这个地方一定要和你的邮箱服务域名一致 - default from: 'educoder@trustie.org' + default from: 'notification@gitlink.org.cn' # 用户注册验证码 def register_email(mail, code) @code = code - mail(to: mail, subject: '验证你的电子邮件') - end - - # 课堂讨论区的邮件通知 - def course_message_email(mail, message_id) - @message = Message.find_by(id: message_id) - @course = @message&.board&.course - mail(to: mail, subject: '课堂发布了新的帖子') if @message.present? && @course.present? + mail(to: mail, subject: 'GitLink | 注册确实开源邮箱验证') end end diff --git a/app/views/user_mailer/register_email.html.erb b/app/views/user_mailer/register_email.html.erb index 6f88177c5..431db06f3 100644 --- a/app/views/user_mailer/register_email.html.erb +++ b/app/views/user_mailer/register_email.html.erb @@ -1,7 +1,7 @@ - 验证码发送 + GitLink-验证码发送