From 06bae0facf6ef87cabb1232deccd26c8d545b730 Mon Sep 17 00:00:00 2001
From: daiao <358551898@qq.com>
Date: Sat, 11 Jan 2020 20:31:16 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E6=97=B6=E9=97=B4=E8=AF=BE=E7=A8=8B?=
 =?UTF-8?q?=E7=BB=9F=E8=AE=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/subjects_controller.rb           | 1 +
 app/views/subjects/statistics_info.json.jbuilder | 6 ++++++
 2 files changed, 7 insertions(+)
 create mode 100644 app/views/subjects/statistics_info.json.jbuilder

diff --git a/app/controllers/subjects_controller.rb b/app/controllers/subjects_controller.rb
index d58c4a9c3..47863a3a0 100644
--- a/app/controllers/subjects_controller.rb
+++ b/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
diff --git a/app/views/subjects/statistics_info.json.jbuilder b/app/views/subjects/statistics_info.json.jbuilder
new file mode 100644
index 000000000..b31e41b31
--- /dev/null
+++ b/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
\ No newline at end of file

From 457c629b9ea59034bc663789b5bbfbc245deb6f8 Mon Sep 17 00:00:00 2001
From: daiao <358551898@qq.com>
Date: Mon, 13 Jan 2020 10:30:03 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E8=B0=83=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/application_controller.rb | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index e0639de3f..ed839eccf 100644
--- a/app/controllers/application_controller.rb
+++ b/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

From ec8e92c5f616bdb7ae8f5e8bd0a8349e28f5b8ff Mon Sep 17 00:00:00 2001
From: daiao <358551898@qq.com>
Date: Mon, 13 Jan 2020 10:31:09 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E8=B0=83=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/application_controller.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index ed839eccf..9faa14593 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -24,7 +24,7 @@ class ApplicationController < ActionController::Base
 	# 所有请求必须合法签名
 	def check_sign
 		Rails.logger.info("#####################request: #{request.headers}")
-		Rails.logger.info("#####################type: #{request.type}")
+		#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