Merge branches 'dev_aliyun' and 'dev_jupyter' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_jupyter

app/controllers/challenges_controller.rb

@@ -178,6 +178,7 @@ class ChallengesController < ApplicationController
 
   # tab 0:过关任务的更新; 1:评测设置的更新; 2:表示参考答案的更新;
   def update
+    begin
       ActiveRecord::Base.transaction do
         tab = params[:tab].to_i
         @challenge.update_attributes(challenge_params)
@@ -236,6 +237,11 @@ class ChallengesController < ApplicationController
         end
 
       end
+    rescue => e
+      logger_error("##update_challenges: ##{e.message}")
+      tip_exception("更新失败！")
+    end
+
   end
 
   # 参考答案的'增,删,改'

app/jobs/sync_trustie_job.rb

@@ -17,10 +17,17 @@ class SyncTrustieJob < ApplicationJob
       "number": count
     }
     uri = URI.parse(url)
+    # http = Net::HTTP.new(uri.hostname, uri.port)
+
     if api_host
       http = Net::HTTP.new(uri.hostname, uri.port)
-      http.send_request('PUT', uri.path, sync_json.to_json, {'Content-Type' => 'application/json'})
+
-      Rails.logger.info("#######_________response__sync__end_____#########")
+      if api_host.include?("https://")
+        http.use_ssl = true
+      end
+
+      response = http.send_request('PUT', uri.path, sync_json.to_json, {'Content-Type' => 'application/json'})
+      Rails.logger.info("#######_________response__sync__end_____#########{response.body}")
     end
   end
 end

db/migrate/20191211073142_modify_type_for_test_sets.rb

@@ -0,0 +1,7 @@
+class ModifyTypeForTestSets < ActiveRecord::Migration[5.2]
+  def change
+    change_column :test_sets, :input, :longtext
+    change_column :test_sets, :output, :longtext
+
+  end
+end