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

app/controllers/application_controller.rb

@@ -319,6 +319,8 @@ class ApplicationController < ActionController::Base
 	# 通关后，把最后一次成功的代码存到数据库
 	# type 0 创始内容， 1 最新内容
 	def game_passed_code(path, myshixun, game_id)
+		# 如果代码窗口是隐藏的，则不用保存代码
+		return if myshixun.shixun.hide_code
 		file_content = git_fle_content myshixun.repo_path, path
 		unless file_content.present?
 			raise("获取文件代码异常")

app/controllers/myshixuns_controller.rb

@@ -93,6 +93,7 @@ class MyshixunsController < ApplicationController
     ActiveRecord::Base.transaction do
       begin
         t1 = Time.now
+        Rails.logger.info("@@@222222#{params[:jsonTestDetails]}")
         jsonTestDetails = JSON.parse(params[:jsonTestDetails])
         timeCost = JSON.parse(params[:timeCost])
         brige_end_time = Time.parse(timeCost['evaluateEnd']) if timeCost['evaluateEnd'].present?
@@ -129,8 +130,8 @@ class MyshixunsController < ApplicationController
 
             # is_public = test_sets.where(:position => j_test_set['caseId']).first.try(:is_public)
             logger.info "actual_output:################################################# #{actual_output}"
-            ts_time = format("%.2f",  j_test_set['testSetTime'].to_f/1000000000).to_f
-            ts_mem = format("%.2f",  j_test_set['testSetMem'].to_f/1024/1024).to_f
+            ts_time = format("%.2f",  j_test_set['testSetTime'].to_f/1000000000).to_f if j_test_set['testSetTime']
+            ts_mem = format("%.2f",  j_test_set['testSetMem'].to_f/1024/1024).to_f if j_test_set['testSetMem']
 
             Output.create!(:code => status, :game_id => game_id, :out_put => outPut, :test_set_position => j_test_set['caseId'],
                            :actual_output => actual_output, :result => j_test_set['passed'].to_i, :query_index => max_query_index,
@@ -209,10 +210,10 @@ class MyshixunsController < ApplicationController
         end
         uid_logger("training_task_status start#4**#{game_id}**** #{Time.now.strftime("%Y-%m-%d %H:%M:%S.%L")}")
         sucess_status
-      rescue Exception => e
-        tip_exception(e.message)
-        uid_logger_error("training_task_status error: #{e}")
-        raise ActiveRecord::Rollback
+      # rescue Exception => e
+      #   tip_exception(e.message)
+      #   uid_logger_error("training_task_status error: #{e}")
+      #   raise ActiveRecord::Rollback
       end
     end
   end