Merge branch 'dev_cxt2' into dev_aliyun

app/controllers/messages_controller.rb

@@ -189,7 +189,7 @@ class MessagesController < ApplicationController
 
   private
   def validate_sort_type
-    normal_status(2, "参数sort_tyope暂时只支持 'time', 'hot'两种") if params.has_key?(:sort_type) && !SORT_TYPE.include?(params[:sort_type].strip)
+    normal_status(2, "参数sort_type暂时只支持 'time', 'hot'两种") if params.has_key?(:sort_type) && !SORT_TYPE.include?(params[:sort_type].strip)
   end
 
   def find_message
@@ -207,7 +207,7 @@ class MessagesController < ApplicationController
 
   def notify_course_students message, course
     course.students.includes(:user).each do |student|
-      UserMailer.course_message_email(student&.user&.mail, message.id).deliver_later if student&.user&.mail
+      UserMailer.course_message_email(student&.user&.mail, message.id).deliver_now if student&.user&.mail
     end
   end
 end