Merge remote-tracking branch 'origin/dev_military_server_local' into dev_military_server_local

app/controllers/application_controller.rb

@@ -339,12 +339,12 @@ class ApplicationController < ActionController::Base
 		logger.info("subdomain:#{request.subdomain}")
 		if request.subdomain != "www"
 			if params[:debug] == 'teacher' #todo 为了测试,记得讲debug删除
-				User.current = User.find 81403
+				User.current = User.find 6
 			elsif params[:debug] == 'student'
-				User.current = User.find 8686
+				User.current = User.find 7
 			elsif params[:debug] == 'admin'
 				logger.info "@@@@@@@@@@@@@@@@@@@@@@ debug mode....."
-				user =  User.find 36480
+				user =  User.find 1
 				User.current = user
 				cookies.signed[:user_id] = user.id
 			end