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

app/controllers/exercise_answers_controller.rb

@@ -110,7 +110,7 @@ class ExerciseAnswersController < ApplicationController
     elsif @exercise_user.commit_status == 1
       normal_status(-1,"已提交/已结束的试卷不允许修改！")
     else
-      if (@exercise_user_status == Exercise::DEADLINE && @exercise_user.commit_status == 0) || (@exercise.time > 0 && @exercise_user.start_at.present? && ((@exercise_user.start_at + (@exercise.time.to_i + 1).minutes) < Time.now))
+      if (@exercise_user_status == Exercise::DEADLINE && @exercise_user.commit_status == 0) || (@exercise.time > 0 && @exercise_user.start_at.present? && ((@exercise_user.start_at + @exercise.time.to_i.minutes) < Time.now))
         objective_score = calculate_student_score(@exercise,current_user)[:total_score]
         subjective_score = @exercise_user.subjective_score < 0.0 ? 0.0 : @exercise_user.subjective_score
         total_score = objective_score + subjective_score