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

dev_hs
杨树明 6 years ago
commit a5f73799be

@ -484,7 +484,11 @@ module ExercisesHelper
game_code = game_challenge game_code = game_challenge
code = game_code.try(:new_code) code = game_code.try(:new_code)
else else
code = git_fle_content(game.myshixun.repo_path,cha_path) begin
code = git_fle_content(game.myshixun.repo_path,cha_path)
rescue
code = ""
end
end end
end end
if ex_shixun_answer_content.blank? #把关卡的答案存入试卷的实训里 if ex_shixun_answer_content.blank? #把关卡的答案存入试卷的实训里

@ -31,8 +31,9 @@ json.shixun_detail do
if shixun_challenge.challenge&.path.present? if shixun_challenge.challenge&.path.present?
if game.try(:lastest_code).blank? if game.try(:lastest_code).blank?
cha_path = challenge_path(shixun_challenge.challenge&.path) cha_path = challenge_path(shixun_challenge.challenge&.path)
latest_code = git_fle_content(game.myshixun.repo_path,cha_path) begin
if latest_code.to_s == "true" latest_code = git_fle_content(game.myshixun.repo_path,cha_path)
rescue
latest_code = "" latest_code = ""
end end
else else

@ -149,7 +149,12 @@ namespace :excellent_course_exercise do
game_code = game_challenge game_code = game_challenge
code = game_code.try(:new_code) code = game_code.try(:new_code)
else else
code = git_fle_content(game.myshixun.repo_path,cha_path) begin #8-23,hs
code = git_fle_content(game.myshixun.repo_path,cha_path)
rescue
code = ""
end
# code = git_fle_content(game.myshixun.repo_path,cha_path)
end end
end end
if ex_shixun_answer_content.blank? #把关卡的答案存入试卷的实训里 if ex_shixun_answer_content.blank? #把关卡的答案存入试卷的实训里

Loading…
Cancel
Save