Merge remote-tracking branch 'origin/dev_aliyun' into dev_aliyun

app/controllers/exercises_controller.rb

@@ -1566,15 +1566,22 @@ class ExercisesController < ApplicationController
 
   def check_user_id_start_answer #判断用户在开始答题时，是否有用户id传入,如果为老师，则id必需，否则为当前用户的id
     user_login = params[:login]
-    # exercise_current_user_id = params[:user_id]
     if user_login.blank? && @user_course_identity < Course::STUDENT  #id不存在，且当前为老师/管理员等
       normal_status(-1,"请输入学生登陆名！")
     else
-      @ex_answerer = User.find_by(login: user_login) #回答者
+      if @user_course_identity < Course::STUDENT || @exercise.score_open
+        @ex_answerer = user_login.blank? ? current_user : User.find_by(login: user_login)
+      else
+        @ex_answerer = current_user
+      end
+
       if @ex_answerer.blank?
         normal_status(404,"答题用户不存在")
+      elsif @user_course_identity > Course::STUDENT && !@exercise.is_public
+        normal_status(403,"非公开试卷")
       else
-        @exercise_current_user_id = @ex_answerer.id || current_user.id
+        # @exercise_current_user_id = @ex_answerer.id || current_user.id
+        @exercise_current_user_id = @ex_answerer.id
       end
     end
   end

app/views/courses/settings.json.jbuilder

@@ -5,6 +5,7 @@ json.course_id @course.id
 json.school @course.school&.name
 json.class_period @course.class_period
 json.credit @course.credit
+json.start_date @course.start_date
 json.end_date @course.end_date
 json.is_public @course.is_public
 json.course_module_types @course.course_modules.where(hidden: 0).pluck(:module_type)

lib/tasks/excellent_course_exercise.rake

@@ -38,6 +38,8 @@ namespace :excellent_course_exercise do
         rand_num = index < pass_count - 1 ? 20 : rand(1..16)
       elsif exercise_question_ids.length == 17
         rand_num = index < pass_count - 1 ? rand(13..17) : rand(1..11)
+      elsif exercise_question_ids.length == 39
+        rand_num = index < pass_count - 1 ? rand(30..39) : rand(1..18)
       else
         rand_num = exercise_question_ids.length
       end