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

app/controllers/application_controller.rb

@@ -23,6 +23,8 @@ class ApplicationController < ActionController::Base
 
 	# 所有请求必须合法签名
 	def check_sign
+		Rails.logger.info("#####################request: #{request.headers}")
+		#Rails.logger.info("#####################type: #{request.type}")
 		if !Rails.env.development? && EduSetting.get("host_name") != "https://test-newweb.educoder.net"
 			Rails.logger.info("66666  #{params}")
 			# suffix = request.url.split(".").last.split("?").first

app/controllers/subjects_controller.rb

@@ -13,6 +13,7 @@ class SubjectsController < ApplicationController
   include ApplicationHelper
   include SubjectsHelper
   include GitCommon
+  include CustomSortable
 
   def index
     @tech_system = current_laboratory.subject_repertoires

app/views/subjects/statistics_info.json.jbuilder

@@ -0,0 +1,6 @@
+json.status 0
+json.message "success"
+json.data do
+  json.subject_info @subject.subject_record
+  json.other_info @data
+end