Merge branches 'courseware' and 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into courseware

app/controllers/exercises_controller.rb

@@ -1192,7 +1192,7 @@ class ExercisesController < ApplicationController
 
       if @exercise.time > 0
         start_time = Time.current - @exercise.time * 60
-        ex_user_ids = @exercise_users_list.where("start_at <= '#{Time.at(start_time)}' and commit_status = 0").pluck(:user_id)
+        ex_user_ids = @exercise_users_list.where("start_at <= '#{Time.at(start_time)}' and commit_status = 0").pluck(:id)
         if ex_user_ids.size > 0
           EndExerciseCalculateJob.perform_later(ex_user_ids, @exercise, Time.now.to_s, false, 2)
         end