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

app/helpers/exercises_helper.rb

@@ -424,13 +424,13 @@ module ExercisesHelper
             end
             ex_shixun_answer_content = answers_content&.where(exercise_shixun_challenge_id: exercise_cha.id)
             if ex_shixun_answer_content.blank?  #把关卡的答案存入试卷的实训里
-              cha_path = challenge_path exercise_cha.challenge.path
-              game_challenge = game.game_codes.search_challenge_path(cha_path).first
+              cha_path = challenge_path exercise_cha.challenge&.path
+              game_challenge = game.game_codes.search_challenge_path(cha_path)&.first
               if game_challenge.present?
                 game_code = game_challenge
                 code = game_code.try(:new_code)
               else
-                code = git_fle_content(exercise_cha.shixun.repo_path,cha_path)
+                code = git_fle_content(exercise_cha.shixun&.repo_path,cha_path)
               end
               sx_option = {
                   :exercise_question_id => q.id,

config/initializers/pdfkit.rb

@@ -1,6 +1,6 @@
 PDFKit.configure do |config|
-  # config.wkhtmltopdf = ENV["WKHTMLTOPDF_EXEC"] || 'wkhtmltopdf'
-  config.wkhtmltopdf = ENV["WKHTMLTOPDF_EXEC"] || '/usr/bin/wkhtmltopdf'
+  config.wkhtmltopdf = ENV["WKHTMLTOPDF_EXEC"] || 'wkhtmltopdf'
+  # config.wkhtmltopdf = ENV["WKHTMLTOPDF_EXEC"] || '/usr/bin/wkhtmltopdf'
   config.default_options = {
       encoding: "UTF-8",
       page_size: 'A4',