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

app/models/searchable/shixun.rb

@@ -2,7 +2,7 @@ module Searchable::Shixun
   extend ActiveSupport::Concern
 
   included do
-    searchkick language: 'chinese'#, callbacks: :async
+    searchkick language: 'chinese', callbacks: :async
 
     scope :search_import, -> { includes(:shixun_info, :challenges, :challenge_tags, :users, user: { user_extension: :school }) }
   end

app/services/users/bind_email_service.rb

@@ -13,7 +13,7 @@ class Users::BindEmailService < ApplicationService
 
     raise Error, '该邮箱已被绑定' if User.where.not(id: user.id).exists?(mail: params[:email])
 
-    code = VerificationCode.where(mail: params[:email], code: params[:code], code_type: 4).last
+    code = VerificationCode.where(email: params[:email], code: params[:code], code_type: 4).last
     raise Error, '验证码无效' unless code&.effective?
 
     ActiveRecord::Base.transaction do

db/migrate/20190517092730_add_description_to_edu_settings.rb

@@ -1,7 +1,7 @@
 class AddDescriptionToEduSettings < ActiveRecord::Migration[5.2]
   def change
-    # add_column :edu_settings, :description, :string
-    # add_index :edu_settings, :name, unique: :true
+    add_column :edu_settings, :description, :string
+    add_index :edu_settings, :name, unique: :true
 
     ['tomcat_webssh', 'webssh_username', 'webssh_password', 'git_address_ip', 'git_address_domain', 'git_username',
     'git_password', 'public_key', 'private_key', 'public_bucket', 'public_bucket_host', 'public_cdn_host', 'cloud_bridge',

db/migrate/20190613022158_add_exec_time_to_challenge.rb

@@ -1,6 +1,6 @@
 class AddExecTimeToChallenge < ActiveRecord::Migration[5.2]
   def change
-    # add_column :challenges, :exec_time, :integer
+    add_column :challenges, :exec_time, :integer
 
     Shixun.find_each do |shixun|
       shixun.challenges.update_all(exec_time: shixun.exec_time)

db/migrate/20190705085829_add_sec_key_to_outputs.rb

@@ -1,7 +1,7 @@
 class AddSecKeyToOutputs < ActiveRecord::Migration[5.2]
   def change
-    add_column :outputs, :sec_key, :string
-    add_column :outputs, :ts_mem, :float
-    add_column :outputs, :ts_time, :float
+    #add_column :outputs, :sec_key, :string
+    # add_column :outputs, :ts_mem, :float
+    # add_column :outputs, :ts_time, :float
   end
 end

db/migrate/20190716064225_add_max_mem_to_evaluate_records.rb

@@ -1,5 +1,5 @@
 class AddMaxMemToEvaluateRecords < ActiveRecord::Migration[5.2]
   def change
-    add_column :evaluate_records, :max_mem, :float
+    #add_column :evaluate_records, :max_mem, :float
   end
 end