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

dev_forum
hjm 5 years ago
commit bfeb792fa2

@ -325,6 +325,7 @@ class ApplicationController < ActionController::Base
unless file_content.present? unless file_content.present?
raise("获取文件代码异常") raise("获取文件代码异常")
end end
logger.info("#######game_id:#{game_id}, file_content:#{file_content}")
game_code = GameCode.where(:game_id => game_id, :path => path).first game_code = GameCode.where(:game_id => game_id, :path => path).first
if game_code.nil? if game_code.nil?
GameCode.create!(:game_id => game_id, :new_code => file_content, :path => path) GameCode.create!(:game_id => game_id, :new_code => file_content, :path => path)

@ -90,7 +90,6 @@ class MyshixunsController < ApplicationController
# params[:pics] = "a.png,b.png,c.png" # params[:pics] = "a.png,b.png,c.png"
def training_task_status def training_task_status
logger.info("##################training_task_status_start#{params[:jsonTestDetails][:buildID]}")
ActiveRecord::Base.transaction do ActiveRecord::Base.transaction do
begin begin
t1 = Time.now t1 = Time.now

Loading…
Cancel
Save