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

app/controllers/games_controller.rb

@@ -596,7 +596,7 @@ class GamesController < ApplicationController
                  :times => params[:first].to_i, :podType => @shixun.webssh, :content_modified => content_modified,
                  :containers => "#{Base64.urlsafe_encode64(shixun_container_limit(@shixun))}",
                  :persistenceName => @shixun.identifier, :tpmScript => "#{tpmScript}", :sec_key => sec_key,
-                 :timeLimit => "#{game_challenge.exec_time}", :isPublished => (@shixun.status < 2 ? 0 : 1) }
+                 :timeLimit => game_challenge.exec_time, :isPublished => (@shixun.status < 2 ? 0 : 1) }
 
     # 评测有文件输出的需要特殊传字段 path：表示文件存储的位置
     br_params['file'] = Base64.urlsafe_encode64({path: "#{game_challenge.picture_path}"}.to_json) if game_challenge.picture_path.present?

app/services/concerns/elasticsearch_able.rb

@@ -22,8 +22,6 @@ module ElasticsearchAble
       fragment_size: EduSetting.get('es_highlight_fragment_size') || 30,
       tag: '<span class="highlight">',
       fields: {
-        name: { type: 'plain' },
-        subject: { type: 'plain' },
         challenge_names: { type: 'plain' },
         challenge_tag_names: { type: 'plain' },
         description: { type: 'plain' },