Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun

app/controllers/application_controller.rb

@@ -108,6 +108,7 @@ class ApplicationController < ActionController::Base
 	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?
 	rescue Exception => e
 		tip_exception(e.message)
 	end

app/controllers/courses_controller.rb

@@ -1178,6 +1178,7 @@ class CoursesController < ApplicationController
   # Use callbacks to share common setup or constraints between actions.
   def set_course
     @course = Course.find_by!(id: params[:id])
+    tip_exception(404, "") if @course.is_delete == 1 && !current_user.admin?
   end
 
   # Never trust parameters from the scary internet, only allow the white list through.